diff --git a/chatterino.pro b/chatterino.pro index dafca10d3..ccac62a84 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -1,403 +1,405 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-12-28T18:23:35 -# -#------------------------------------------------- - -message(----) - -# define project shit -QT += widgets core gui network multimedia svg concurrent -CONFIG += communi -COMMUNI += core model util - -INCLUDEPATH += src/ -TARGET = chatterino -TEMPLATE = app -PRECOMPILED_HEADER = src/PrecompiledHeader.hpp -CONFIG += precompile_header -DEFINES += CHATTERINO -DEFINES += "AB_NAMESPACE=chatterino" -DEFINES += AB_CUSTOM_THEME -DEFINES += AB_CUSTOM_SETTINGS -CONFIG += AB_NOT_STANDALONE - -useBreakpad { - LIBS += -L$$PWD/lib/qBreakpad/handler/build - include(lib/qBreakpad/qBreakpad.pri) - DEFINES += C_USE_BREAKPAD -} - -# https://bugreports.qt.io/browse/QTBUG-27018 -equals(QMAKE_CXX, "clang++")|equals(QMAKE_CXX, "g++") { - TARGET = bin/chatterino -} - -# Icons -#macx:ICON = resources/images/chatterino2.icns -win32:RC_FILE = resources/windows.rc - -macx { - LIBS += -L/usr/local/lib -} - -# Submodules -include(lib/appbase.pri) -include(lib/humanize.pri) -DEFINES += IRC_NAMESPACE=Communi -include(lib/libcommuni.pri) -include(lib/websocketpp.pri) -include(lib/openssl.pri) -include(lib/wintoast.pri) - -# Optional feature: QtWebEngine -#exists ($(QTDIR)/include/QtWebEngine/QtWebEngine) { -# message(Using QWebEngine) -# QT += webenginewidgets -# DEFINES += "USEWEBENGINE" -#} - -SOURCES += \ - src/Application.cpp \ - src/common/Channel.cpp \ - src/common/CompletionModel.cpp \ - src/common/NetworkData.cpp \ - src/common/NetworkManager.cpp \ - src/common/NetworkRequest.cpp \ - src/common/NetworkResult.cpp \ - src/common/NetworkTimer.cpp \ - src/controllers/accounts/Account.cpp \ - src/controllers/accounts/AccountController.cpp \ - src/controllers/accounts/AccountModel.cpp \ - src/controllers/commands/Command.cpp \ - src/controllers/commands/CommandController.cpp \ - src/controllers/commands/CommandModel.cpp \ - src/controllers/highlights/HighlightController.cpp \ - src/controllers/highlights/HighlightModel.cpp \ - src/controllers/highlights/HighlightBlacklistModel.cpp \ - src/controllers/highlights/UserHighlightModel.cpp \ - src/controllers/ignores/IgnoreController.cpp \ - src/controllers/ignores/IgnoreModel.cpp \ - src/controllers/notifications/NotificationController.cpp \ - src/controllers/taggedusers/TaggedUser.cpp \ - src/controllers/taggedusers/TaggedUsersController.cpp \ - src/controllers/taggedusers/TaggedUsersModel.cpp \ - src/main.cpp \ - src/messages/Image.cpp \ - src/messages/layouts/MessageLayout.cpp \ - src/messages/layouts/MessageLayoutContainer.cpp \ - src/messages/layouts/MessageLayoutElement.cpp \ - src/messages/Link.cpp \ - src/messages/Message.cpp \ - src/messages/MessageBuilder.cpp \ - src/messages/MessageColor.cpp \ - src/messages/MessageElement.cpp \ - src/providers/emoji/Emojis.cpp \ - src/providers/irc/AbstractIrcServer.cpp \ - src/providers/irc/IrcAccount.cpp \ - src/providers/irc/IrcChannel2.cpp \ - src/providers/irc/IrcConnection2.cpp \ - src/providers/irc/IrcServer.cpp \ - src/providers/twitch/IrcMessageHandler.cpp \ - src/providers/twitch/PartialTwitchUser.cpp \ - src/providers/twitch/PubsubActions.cpp \ - src/providers/twitch/PubsubHelpers.cpp \ - src/providers/twitch/TwitchAccount.cpp \ - src/providers/twitch/TwitchAccountManager.cpp \ - src/providers/twitch/TwitchChannel.cpp \ - src/providers/twitch/TwitchEmotes.cpp \ - src/providers/twitch/TwitchHelpers.cpp \ - src/providers/twitch/TwitchMessageBuilder.cpp \ - src/providers/twitch/TwitchServer.cpp \ - src/providers/twitch/TwitchUser.cpp \ - src/singletons/helper/GifTimer.cpp \ - src/singletons/helper/LoggingChannel.cpp \ - src/controllers/moderationactions/ModerationAction.cpp \ - src/singletons/WindowManager.cpp \ - src/util/DebugCount.cpp \ - src/util/RapidjsonHelpers.cpp \ - src/util/StreamLink.cpp \ - src/widgets/AccountSwitchPopupWidget.cpp \ - src/widgets/AccountSwitchWidget.cpp \ - src/widgets/AttachedWindow.cpp \ - src/widgets/dialogs/EmotePopup.cpp \ - src/widgets/dialogs/LastRunCrashDialog.cpp \ - src/widgets/dialogs/LoginDialog.cpp \ - src/widgets/dialogs/LogsPopup.cpp \ - src/widgets/dialogs/NotificationPopup.cpp \ - src/widgets/dialogs/QualityPopup.cpp \ - src/widgets/dialogs/SelectChannelDialog.cpp \ - src/widgets/dialogs/SettingsDialog.cpp \ - src/widgets/dialogs/TextInputDialog.cpp \ - src/widgets/dialogs/UserInfoPopup.cpp \ - src/widgets/dialogs/WelcomeDialog.cpp \ - src/widgets/helper/ChannelView.cpp \ - src/widgets/helper/ComboBoxItemDelegate.cpp \ - src/widgets/helper/DebugPopup.cpp \ - src/widgets/helper/EditableModelView.cpp \ - src/widgets/helper/NotebookButton.cpp \ - src/widgets/helper/NotebookTab.cpp \ - src/widgets/helper/ResizingTextEdit.cpp \ - src/widgets/helper/ScrollbarHighlight.cpp \ - src/widgets/helper/SearchPopup.cpp \ - src/widgets/helper/SettingsDialogTab.cpp \ - src/widgets/Notebook.cpp \ - src/widgets/Scrollbar.cpp \ - src/widgets/settingspages/AboutPage.cpp \ - src/widgets/settingspages/AccountsPage.cpp \ - src/widgets/settingspages/BrowserExtensionPage.cpp \ - src/widgets/settingspages/CommandPage.cpp \ - src/widgets/settingspages/EmotesPage.cpp \ - src/widgets/settingspages/ExternalToolsPage.cpp \ - src/widgets/settingspages/HighlightingPage.cpp \ - src/widgets/settingspages/KeyboardSettingsPage.cpp \ - src/widgets/settingspages/LogsPage.cpp \ - src/widgets/settingspages/ModerationPage.cpp \ - src/widgets/settingspages/NotificationPage.cpp \ - src/widgets/settingspages/SettingsPage.cpp \ - src/widgets/settingspages/SpecialChannelsPage.cpp \ - src/widgets/splits/Split.cpp \ - src/widgets/splits/SplitContainer.cpp \ - src/widgets/splits/SplitHeader.cpp \ - src/widgets/splits/SplitInput.cpp \ - src/widgets/splits/SplitOverlay.cpp \ - src/widgets/StreamView.cpp \ - src/widgets/Window.cpp \ - src/common/LinkParser.cpp \ - src/controllers/moderationactions/ModerationActions.cpp \ - src/singletons/NativeMessaging.cpp \ - src/singletons/Emotes.cpp \ - src/singletons/Logging.cpp \ - src/singletons/Paths.cpp \ - src/singletons/Resources.cpp \ - src/singletons/Settings.cpp \ - src/singletons/Updates.cpp \ - src/singletons/Theme.cpp \ - src/controllers/moderationactions/ModerationActionModel.cpp \ - src/widgets/settingspages/LookPage.cpp \ - src/widgets/settingspages/FeelPage.cpp \ - src/util/InitUpdateButton.cpp \ - src/widgets/dialogs/UpdateDialog.cpp \ - src/widgets/settingspages/IgnoresPage.cpp \ - src/providers/twitch/PubsubClient.cpp \ - src/providers/twitch/TwitchApi.cpp \ - src/messages/Emote.cpp \ - src/messages/ImageSet.cpp \ - src/providers/bttv/BttvEmotes.cpp \ - src/providers/LinkResolver.cpp \ - src/providers/ffz/FfzEmotes.cpp \ - src/autogenerated/ResourcesAutogen.cpp \ - src/singletons/Badges.cpp \ - src/providers/twitch/TwitchBadges.cpp \ - src/providers/chatterino/ChatterinoBadges.cpp \ - src/providers/twitch/TwitchParseCheerEmotes.cpp \ - src/providers/bttv/LoadBttvChannelEmote.cpp \ - src/util/JsonQuery.cpp \ - src/RunGui.cpp \ - src/BrowserExtension.cpp \ - src/util/FormatTime.cpp \ - src/controllers/notifications/NotificationModel.cpp \ - src/singletons/Toasts.cpp \ - src/common/DownloadManager.cpp \ - src/messages/MessageContainer.cpp \ - src/common/UsernameSet.cpp \ - src/widgets/settingspages/AdvancedPage.cpp \ - src/util/IncognitoBrowser.cpp \ - src/widgets/splits/ClosedSplits.cpp \ - src/providers/ffz/FfzModBadge.cpp \ - src/widgets/settingspages/GeneralPage.cpp \ - src/providers/twitch/ChatroomChannel.cpp - -HEADERS += \ - src/Application.hpp \ - src/common/Channel.hpp \ - src/common/Common.hpp \ - src/common/CompletionModel.hpp \ - src/common/Atomic.hpp \ - src/common/NetworkCommon.hpp \ - src/common/NetworkData.hpp \ - src/common/NetworkManager.hpp \ - src/common/NetworkRequest.hpp \ - src/common/NetworkRequester.hpp \ - src/common/NetworkResult.hpp \ - src/common/NetworkTimer.hpp \ - src/common/NetworkWorker.hpp \ - src/common/NullablePtr.hpp \ - src/common/ProviderId.hpp \ - src/common/SignalVectorModel.hpp \ - src/common/Version.hpp \ - src/controllers/accounts/Account.hpp \ - src/controllers/accounts/AccountController.hpp \ - src/controllers/accounts/AccountModel.hpp \ - src/controllers/commands/Command.hpp \ - src/controllers/commands/CommandController.hpp \ - src/controllers/commands/CommandModel.hpp \ - src/controllers/highlights/HighlightController.hpp \ - src/controllers/highlights/HighlightModel.hpp \ - src/controllers/highlights/HighlightBlacklistModel.hpp \ - src/controllers/highlights/HighlightPhrase.hpp \ - src/controllers/highlights/HighlightBlacklistUser.hpp \ - src/controllers/highlights/UserHighlightModel.hpp \ - src/controllers/ignores/IgnoreController.hpp \ - src/controllers/ignores/IgnoreModel.hpp \ - src/controllers/ignores/IgnorePhrase.hpp \ - src/controllers/notifications/NotificationController.hpp \ - src/controllers/taggedusers/TaggedUser.hpp \ - src/controllers/taggedusers/TaggedUsersController.hpp \ - src/controllers/taggedusers/TaggedUsersModel.hpp \ - src/messages/Image.hpp \ - src/messages/layouts/MessageLayout.hpp \ - src/messages/layouts/MessageLayoutContainer.hpp \ - src/messages/layouts/MessageLayoutElement.hpp \ - src/messages/LimitedQueue.hpp \ - src/messages/LimitedQueueSnapshot.hpp \ - src/messages/Link.hpp \ - src/messages/Message.hpp \ - src/messages/MessageBuilder.hpp \ - src/messages/MessageColor.hpp \ - src/messages/MessageElement.hpp \ - src/messages/Selection.hpp \ - src/PrecompiledHeader.hpp \ - src/providers/emoji/Emojis.hpp \ - src/providers/irc/AbstractIrcServer.hpp \ - src/providers/irc/IrcAccount.hpp \ - src/providers/irc/IrcChannel2.hpp \ - src/providers/irc/IrcConnection2.hpp \ - src/providers/irc/IrcServer.hpp \ - src/providers/twitch/EmoteValue.hpp \ - src/providers/twitch/IrcMessageHandler.hpp \ - src/providers/twitch/PartialTwitchUser.hpp \ - src/providers/twitch/PubsubActions.hpp \ - src/providers/twitch/PubsubHelpers.hpp \ - src/providers/twitch/TwitchAccount.hpp \ - src/providers/twitch/TwitchAccountManager.hpp \ - src/providers/twitch/TwitchChannel.hpp \ - src/providers/twitch/TwitchEmotes.hpp \ - src/providers/twitch/TwitchHelpers.hpp \ - src/providers/twitch/TwitchMessageBuilder.hpp \ - src/providers/twitch/TwitchServer.hpp \ - src/providers/twitch/TwitchUser.hpp \ - src/singletons/helper/GifTimer.hpp \ - src/singletons/helper/LoggingChannel.hpp \ - src/controllers/moderationactions/ModerationAction.hpp \ - src/singletons/WindowManager.hpp \ - src/util/ConcurrentMap.hpp \ - src/util/DebugCount.hpp \ - src/util/IrcHelpers.hpp \ - src/util/LayoutCreator.hpp \ - src/util/QStringHash.hpp \ - src/util/RapidjsonHelpers.hpp \ - src/util/RemoveScrollAreaBackground.hpp \ - src/util/SharedPtrElementLess.hpp \ - src/util/StandardItemHelper.hpp \ - src/util/StreamLink.hpp \ - src/widgets/AccountSwitchPopupWidget.hpp \ - src/widgets/AccountSwitchWidget.hpp \ - src/widgets/AttachedWindow.hpp \ - src/widgets/dialogs/EmotePopup.hpp \ - src/widgets/dialogs/LastRunCrashDialog.hpp \ - src/widgets/dialogs/LoginDialog.hpp \ - src/widgets/dialogs/LogsPopup.hpp \ - src/widgets/dialogs/NotificationPopup.hpp \ - src/widgets/dialogs/QualityPopup.hpp \ - src/widgets/dialogs/SelectChannelDialog.hpp \ - src/widgets/dialogs/SettingsDialog.hpp \ - src/widgets/dialogs/TextInputDialog.hpp \ - src/widgets/dialogs/UserInfoPopup.hpp \ - src/widgets/dialogs/WelcomeDialog.hpp \ - src/widgets/helper/ChannelView.hpp \ - src/widgets/helper/ComboBoxItemDelegate.hpp \ - src/widgets/helper/DebugPopup.hpp \ - src/widgets/helper/EditableModelView.hpp \ - src/widgets/helper/Line.hpp \ - src/widgets/helper/NotebookButton.hpp \ - src/widgets/helper/NotebookTab.hpp \ - src/widgets/helper/ResizingTextEdit.hpp \ - src/widgets/helper/ScrollbarHighlight.hpp \ - src/widgets/helper/SearchPopup.hpp \ - src/widgets/helper/SettingsDialogTab.hpp \ - src/widgets/Notebook.hpp \ - src/widgets/Scrollbar.hpp \ - src/widgets/settingspages/AboutPage.hpp \ - src/widgets/settingspages/AccountsPage.hpp \ - src/widgets/settingspages/BrowserExtensionPage.hpp \ - src/widgets/settingspages/CommandPage.hpp \ - src/widgets/settingspages/EmotesPage.hpp \ - src/widgets/settingspages/ExternalToolsPage.hpp \ - src/widgets/settingspages/HighlightingPage.hpp \ - src/widgets/settingspages/KeyboardSettingsPage.hpp \ - src/widgets/settingspages/LogsPage.hpp \ - src/widgets/settingspages/ModerationPage.hpp \ - src/widgets/settingspages/NotificationPage.hpp \ - src/widgets/settingspages/SettingsPage.hpp \ - src/widgets/settingspages/SpecialChannelsPage.hpp \ - src/widgets/splits/Split.hpp \ - src/widgets/splits/SplitContainer.hpp \ - src/widgets/splits/SplitHeader.hpp \ - src/widgets/splits/SplitInput.hpp \ - src/widgets/splits/SplitOverlay.hpp \ - src/widgets/StreamView.hpp \ - src/widgets/Window.hpp \ - src/providers/twitch/TwitchCommon.hpp \ - src/util/IsBigEndian.hpp \ - src/common/LinkParser.hpp \ - src/controllers/moderationactions/ModerationActions.hpp \ - src/singletons/Emotes.hpp \ - src/singletons/Logging.hpp \ - src/singletons/Paths.hpp \ - src/singletons/Resources.hpp \ - src/singletons/Settings.hpp \ - src/singletons/Updates.hpp \ - src/singletons/NativeMessaging.hpp \ - src/singletons/Theme.hpp \ - src/common/SignalVector.hpp \ - src/widgets/dialogs/LogsPopup.hpp \ - src/controllers/moderationactions/ModerationActionModel.hpp \ - src/widgets/settingspages/LookPage.hpp \ - src/widgets/settingspages/FeelPage.hpp \ - src/util/InitUpdateButton.hpp \ - src/widgets/dialogs/UpdateDialog.hpp \ - src/widgets/settingspages/IgnoresPage.hpp \ - src/providers/twitch/PubsubClient.hpp \ - src/providers/twitch/TwitchApi.hpp \ - src/messages/Emote.hpp \ - src/messages/ImageSet.hpp \ - src/providers/bttv/BttvEmotes.hpp \ - src/providers/LinkResolver.hpp \ - src/providers/ffz/FfzEmotes.hpp \ - src/autogenerated/ResourcesAutogen.hpp \ - src/singletons/Badges.hpp \ - src/providers/twitch/TwitchBadges.hpp \ - src/providers/chatterino/ChatterinoBadges.hpp \ - src/common/Aliases.hpp \ - src/providers/twitch/TwitchParseCheerEmotes.hpp \ - src/providers/bttv/LoadBttvChannelEmote.hpp \ - src/util/JsonQuery.hpp \ - src/RunGui.hpp \ - src/BrowserExtension.hpp \ - src/util/FormatTime.hpp \ - src/controllers/notifications/NotificationModel.hpp \ - src/singletons/Toasts.hpp \ - src/common/DownloadManager.hpp \ - src/messages/MessageContainer.hpp \ - src/common/UsernameSet.hpp \ - src/widgets/settingspages/AdvancedPage.hpp \ - src/util/IncognitoBrowser.hpp \ - src/widgets/splits/ClosedSplits.hpp \ - src/providers/ffz/FfzModBadge.hpp \ - src/widgets/settingspages/GeneralPage.hpp \ - src/messages/HistoricMessageAppearance.hpp \ - src/providers/twitch/ChatroomChannel.hpp - -RESOURCES += \ - resources/resources.qrc \ - resources/resources_autogenerated.qrc - -DISTFILES += - -FORMS += - -# do not use windows min/max macros -#win32 { -# DEFINES += NOMINMAX -#} +#------------------------------------------------- +# +# Project created by QtCreator 2016-12-28T18:23:35 +# +#------------------------------------------------- + +message(----) + +# define project shit +QT += widgets core gui network multimedia svg concurrent +CONFIG += communi +COMMUNI += core model util + +INCLUDEPATH += src/ +TARGET = chatterino +TEMPLATE = app +PRECOMPILED_HEADER = src/PrecompiledHeader.hpp +CONFIG += precompile_header +DEFINES += CHATTERINO +DEFINES += "AB_NAMESPACE=chatterino" +DEFINES += AB_CUSTOM_THEME +DEFINES += AB_CUSTOM_SETTINGS +CONFIG += AB_NOT_STANDALONE + +useBreakpad { + LIBS += -L$$PWD/lib/qBreakpad/handler/build + include(lib/qBreakpad/qBreakpad.pri) + DEFINES += C_USE_BREAKPAD +} + +# https://bugreports.qt.io/browse/QTBUG-27018 +equals(QMAKE_CXX, "clang++")|equals(QMAKE_CXX, "g++") { + TARGET = bin/chatterino +} + +# Icons +#macx:ICON = resources/images/chatterino2.icns +win32:RC_FILE = resources/windows.rc + +macx { + LIBS += -L/usr/local/lib +} + +# Submodules +include(lib/appbase.pri) +include(lib/humanize.pri) +DEFINES += IRC_NAMESPACE=Communi +include(lib/libcommuni.pri) +include(lib/websocketpp.pri) +include(lib/openssl.pri) +include(lib/wintoast.pri) + +# Optional feature: QtWebEngine +#exists ($(QTDIR)/include/QtWebEngine/QtWebEngine) { +# message(Using QWebEngine) +# QT += webenginewidgets +# DEFINES += "USEWEBENGINE" +#} + +SOURCES += \ + src/Application.cpp \ + src/autogenerated/ResourcesAutogen.cpp \ + src/BrowserExtension.cpp \ + src/common/Channel.cpp \ + src/common/CompletionModel.cpp \ + src/common/DownloadManager.cpp \ + src/common/LinkParser.cpp \ + src/common/NetworkData.cpp \ + src/common/NetworkManager.cpp \ + src/common/NetworkRequest.cpp \ + src/common/NetworkResult.cpp \ + src/common/NetworkTimer.cpp \ + src/common/UsernameSet.cpp \ + src/controllers/accounts/Account.cpp \ + src/controllers/accounts/AccountController.cpp \ + src/controllers/accounts/AccountModel.cpp \ + src/controllers/commands/Command.cpp \ + src/controllers/commands/CommandController.cpp \ + src/controllers/commands/CommandModel.cpp \ + src/controllers/highlights/HighlightBlacklistModel.cpp \ + src/controllers/highlights/HighlightController.cpp \ + src/controllers/highlights/HighlightModel.cpp \ + src/controllers/highlights/UserHighlightModel.cpp \ + src/controllers/ignores/IgnoreController.cpp \ + src/controllers/ignores/IgnoreModel.cpp \ + src/controllers/moderationactions/ModerationAction.cpp \ + src/controllers/moderationactions/ModerationActionModel.cpp \ + src/controllers/moderationactions/ModerationActions.cpp \ + src/controllers/notifications/NotificationController.cpp \ + src/controllers/notifications/NotificationModel.cpp \ + src/controllers/taggedusers/TaggedUser.cpp \ + src/controllers/taggedusers/TaggedUsersController.cpp \ + src/controllers/taggedusers/TaggedUsersModel.cpp \ + src/main.cpp \ + src/messages/Emote.cpp \ + src/messages/Image.cpp \ + src/messages/ImageSet.cpp \ + src/messages/layouts/MessageLayout.cpp \ + src/messages/layouts/MessageLayoutContainer.cpp \ + src/messages/layouts/MessageLayoutElement.cpp \ + src/messages/Link.cpp \ + src/messages/Message.cpp \ + src/messages/MessageBuilder.cpp \ + src/messages/MessageColor.cpp \ + src/messages/MessageContainer.cpp \ + src/messages/MessageElement.cpp \ + src/providers/bttv/BttvEmotes.cpp \ + src/providers/bttv/LoadBttvChannelEmote.cpp \ + src/providers/chatterino/ChatterinoBadges.cpp \ + src/providers/emoji/Emojis.cpp \ + src/providers/ffz/FfzEmotes.cpp \ + src/providers/ffz/FfzModBadge.cpp \ + src/providers/irc/AbstractIrcServer.cpp \ + src/providers/irc/IrcAccount.cpp \ + src/providers/irc/IrcChannel2.cpp \ + src/providers/irc/IrcConnection2.cpp \ + src/providers/irc/IrcServer.cpp \ + src/providers/LinkResolver.cpp \ + src/providers/twitch/ChatroomChannel.cpp \ + src/providers/twitch/IrcMessageHandler.cpp \ + src/providers/twitch/PartialTwitchUser.cpp \ + src/providers/twitch/PubsubActions.cpp \ + src/providers/twitch/PubsubClient.cpp \ + src/providers/twitch/PubsubHelpers.cpp \ + src/providers/twitch/TwitchAccount.cpp \ + src/providers/twitch/TwitchAccountManager.cpp \ + src/providers/twitch/TwitchApi.cpp \ + src/providers/twitch/TwitchBadges.cpp \ + src/providers/twitch/TwitchChannel.cpp \ + src/providers/twitch/TwitchEmotes.cpp \ + src/providers/twitch/TwitchHelpers.cpp \ + src/providers/twitch/TwitchMessageBuilder.cpp \ + src/providers/twitch/TwitchParseCheerEmotes.cpp \ + src/providers/twitch/TwitchServer.cpp \ + src/providers/twitch/TwitchUser.cpp \ + src/RunGui.cpp \ + src/singletons/Badges.cpp \ + src/singletons/Emotes.cpp \ + src/singletons/helper/GifTimer.cpp \ + src/singletons/helper/LoggingChannel.cpp \ + src/singletons/Logging.cpp \ + src/singletons/NativeMessaging.cpp \ + src/singletons/Paths.cpp \ + src/singletons/Resources.cpp \ + src/singletons/Settings.cpp \ + src/singletons/Theme.cpp \ + src/singletons/Toasts.cpp \ + src/singletons/Updates.cpp \ + src/singletons/WindowManager.cpp \ + src/util/DebugCount.cpp \ + src/util/FormatTime.cpp \ + src/util/IncognitoBrowser.cpp \ + src/util/InitUpdateButton.cpp \ + src/util/JsonQuery.cpp \ + src/util/RapidjsonHelpers.cpp \ + src/util/StreamLink.cpp \ + src/widgets/AccountSwitchPopupWidget.cpp \ + src/widgets/AccountSwitchWidget.cpp \ + src/widgets/AttachedWindow.cpp \ + src/widgets/dialogs/EmotePopup.cpp \ + src/widgets/dialogs/LastRunCrashDialog.cpp \ + src/widgets/dialogs/LoginDialog.cpp \ + src/widgets/dialogs/LogsPopup.cpp \ + src/widgets/dialogs/NotificationPopup.cpp \ + src/widgets/dialogs/QualityPopup.cpp \ + src/widgets/dialogs/SelectChannelDialog.cpp \ + src/widgets/dialogs/SettingsDialog.cpp \ + src/widgets/dialogs/TextInputDialog.cpp \ + src/widgets/dialogs/UpdateDialog.cpp \ + src/widgets/dialogs/UserInfoPopup.cpp \ + src/widgets/dialogs/WelcomeDialog.cpp \ + src/widgets/helper/ChannelView.cpp \ + src/widgets/helper/ComboBoxItemDelegate.cpp \ + src/widgets/helper/DebugPopup.cpp \ + src/widgets/helper/EditableModelView.cpp \ + src/widgets/helper/NotebookButton.cpp \ + src/widgets/helper/NotebookTab.cpp \ + src/widgets/helper/ResizingTextEdit.cpp \ + src/widgets/helper/ScrollbarHighlight.cpp \ + src/widgets/helper/SearchPopup.cpp \ + src/widgets/helper/SettingsDialogTab.cpp \ + src/widgets/Notebook.cpp \ + src/widgets/Scrollbar.cpp \ + src/widgets/settingspages/AboutPage.cpp \ + src/widgets/settingspages/AccountsPage.cpp \ + src/widgets/settingspages/AdvancedPage.cpp \ + src/widgets/settingspages/BrowserExtensionPage.cpp \ + src/widgets/settingspages/CommandPage.cpp \ + src/widgets/settingspages/EmotesPage.cpp \ + src/widgets/settingspages/ExternalToolsPage.cpp \ + src/widgets/settingspages/FeelPage.cpp \ + src/widgets/settingspages/GeneralPage.cpp \ + src/widgets/settingspages/HighlightingPage.cpp \ + src/widgets/settingspages/IgnoresPage.cpp \ + src/widgets/settingspages/KeyboardSettingsPage.cpp \ + src/widgets/settingspages/LogsPage.cpp \ + src/widgets/settingspages/LookPage.cpp \ + src/widgets/settingspages/ModerationPage.cpp \ + src/widgets/settingspages/NotificationPage.cpp \ + src/widgets/settingspages/SettingsPage.cpp \ + src/widgets/settingspages/SpecialChannelsPage.cpp \ + src/widgets/splits/ClosedSplits.cpp \ + src/widgets/splits/Split.cpp \ + src/widgets/splits/SplitContainer.cpp \ + src/widgets/splits/SplitHeader.cpp \ + src/widgets/splits/SplitInput.cpp \ + src/widgets/splits/SplitOverlay.cpp \ + src/widgets/StreamView.cpp \ + src/widgets/Window.cpp \ + +HEADERS += \ + src/Application.hpp \ + src/autogenerated/ResourcesAutogen.hpp \ + src/BrowserExtension.hpp \ + src/common/Aliases.hpp \ + src/common/Atomic.hpp \ + src/common/Channel.hpp \ + src/common/Common.hpp \ + src/common/CompletionModel.hpp \ + src/common/ConcurrentMap.hpp \ + src/common/DownloadManager.hpp \ + src/common/LinkParser.hpp \ + src/common/NetworkCommon.hpp \ + src/common/NetworkData.hpp \ + src/common/NetworkManager.hpp \ + src/common/NetworkRequest.hpp \ + src/common/NetworkRequester.hpp \ + src/common/NetworkResult.hpp \ + src/common/NetworkTimer.hpp \ + src/common/NetworkWorker.hpp \ + src/common/NullablePtr.hpp \ + src/common/ProviderId.hpp \ + src/common/SignalVector.hpp \ + src/common/SignalVectorModel.hpp \ + src/common/UniqueAccess.hpp \ + src/common/UsernameSet.hpp \ + src/common/Version.hpp \ + src/controllers/accounts/Account.hpp \ + src/controllers/accounts/AccountController.hpp \ + src/controllers/accounts/AccountModel.hpp \ + src/controllers/commands/Command.hpp \ + src/controllers/commands/CommandController.hpp \ + src/controllers/commands/CommandModel.hpp \ + src/controllers/highlights/HighlightBlacklistModel.hpp \ + src/controllers/highlights/HighlightBlacklistUser.hpp \ + src/controllers/highlights/HighlightController.hpp \ + src/controllers/highlights/HighlightModel.hpp \ + src/controllers/highlights/HighlightPhrase.hpp \ + src/controllers/highlights/UserHighlightModel.hpp \ + src/controllers/ignores/IgnoreController.hpp \ + src/controllers/ignores/IgnoreModel.hpp \ + src/controllers/ignores/IgnorePhrase.hpp \ + src/controllers/moderationactions/ModerationAction.hpp \ + src/controllers/moderationactions/ModerationActionModel.hpp \ + src/controllers/moderationactions/ModerationActions.hpp \ + src/controllers/notifications/NotificationController.hpp \ + src/controllers/notifications/NotificationModel.hpp \ + src/controllers/taggedusers/TaggedUser.hpp \ + src/controllers/taggedusers/TaggedUsersController.hpp \ + src/controllers/taggedusers/TaggedUsersModel.hpp \ + src/messages/Emote.hpp \ + src/messages/Image.hpp \ + src/messages/ImageSet.hpp \ + src/messages/layouts/MessageLayout.hpp \ + src/messages/layouts/MessageLayoutContainer.hpp \ + src/messages/layouts/MessageLayoutElement.hpp \ + src/messages/LimitedQueue.hpp \ + src/messages/LimitedQueueSnapshot.hpp \ + src/messages/Link.hpp \ + src/messages/Message.hpp \ + src/messages/MessageBuilder.hpp \ + src/messages/MessageColor.hpp \ + src/messages/MessageContainer.hpp \ + src/messages/MessageElement.hpp \ + src/messages/MessageParseArgs.hpp \ + src/messages/Selection.hpp \ + src/PrecompiledHeader.hpp \ + src/providers/bttv/BttvEmotes.hpp \ + src/providers/bttv/LoadBttvChannelEmote.hpp \ + src/providers/chatterino/ChatterinoBadges.hpp \ + src/providers/emoji/Emojis.hpp \ + src/providers/ffz/FfzEmotes.hpp \ + src/providers/ffz/FfzModBadge.hpp \ + src/providers/irc/AbstractIrcServer.hpp \ + src/providers/irc/IrcAccount.hpp \ + src/providers/irc/IrcChannel2.hpp \ + src/providers/irc/IrcConnection2.hpp \ + src/providers/irc/IrcServer.hpp \ + src/providers/LinkResolver.hpp \ + src/providers/twitch/ChatroomChannel.hpp \ + src/providers/twitch/EmoteValue.hpp \ + src/providers/twitch/IrcMessageHandler.hpp \ + src/providers/twitch/PartialTwitchUser.hpp \ + src/providers/twitch/PubsubActions.hpp \ + src/providers/twitch/PubsubClient.hpp \ + src/providers/twitch/PubsubHelpers.hpp \ + src/providers/twitch/TwitchAccount.hpp \ + src/providers/twitch/TwitchAccountManager.hpp \ + src/providers/twitch/TwitchApi.hpp \ + src/providers/twitch/TwitchBadges.hpp \ + src/providers/twitch/TwitchChannel.hpp \ + src/providers/twitch/TwitchCommon.hpp \ + src/providers/twitch/TwitchEmotes.hpp \ + src/providers/twitch/TwitchHelpers.hpp \ + src/providers/twitch/TwitchMessageBuilder.hpp \ + src/providers/twitch/TwitchParseCheerEmotes.hpp \ + src/providers/twitch/TwitchServer.hpp \ + src/providers/twitch/TwitchUser.hpp \ + src/RunGui.hpp \ + src/singletons/Badges.hpp \ + src/singletons/Emotes.hpp \ + src/singletons/helper/GifTimer.hpp \ + src/singletons/helper/LoggingChannel.hpp \ + src/singletons/Logging.hpp \ + src/singletons/NativeMessaging.hpp \ + src/singletons/Paths.hpp \ + src/singletons/Resources.hpp \ + src/singletons/Settings.hpp \ + src/singletons/Theme.hpp \ + src/singletons/Toasts.hpp \ + src/singletons/Updates.hpp \ + src/singletons/WindowManager.hpp \ + src/util/ConcurrentMap.hpp \ + src/util/DebugCount.hpp \ + src/util/FormatTime.hpp \ + src/util/IncognitoBrowser.hpp \ + src/util/InitUpdateButton.hpp \ + src/util/IrcHelpers.hpp \ + src/util/IsBigEndian.hpp \ + src/util/JsonQuery.hpp \ + src/util/LayoutCreator.hpp \ + src/util/QStringHash.hpp \ + src/util/rangealgorithm.hpp \ + src/util/RapidjsonHelpers.hpp \ + src/util/RemoveScrollAreaBackground.hpp \ + src/util/SharedPtrElementLess.hpp \ + src/util/StandardItemHelper.hpp \ + src/util/StreamLink.hpp \ + src/widgets/AccountSwitchPopupWidget.hpp \ + src/widgets/AccountSwitchWidget.hpp \ + src/widgets/AttachedWindow.hpp \ + src/widgets/dialogs/EmotePopup.hpp \ + src/widgets/dialogs/LastRunCrashDialog.hpp \ + src/widgets/dialogs/LoginDialog.hpp \ + src/widgets/dialogs/LogsPopup.hpp \ + src/widgets/dialogs/NotificationPopup.hpp \ + src/widgets/dialogs/QualityPopup.hpp \ + src/widgets/dialogs/SelectChannelDialog.hpp \ + src/widgets/dialogs/SettingsDialog.hpp \ + src/widgets/dialogs/TextInputDialog.hpp \ + src/widgets/dialogs/UpdateDialog.hpp \ + src/widgets/dialogs/UserInfoPopup.hpp \ + src/widgets/dialogs/WelcomeDialog.hpp \ + src/widgets/helper/ChannelView.hpp \ + src/widgets/helper/ComboBoxItemDelegate.hpp \ + src/widgets/helper/DebugPopup.hpp \ + src/widgets/helper/EditableModelView.hpp \ + src/widgets/helper/Line.hpp \ + src/widgets/helper/NotebookButton.hpp \ + src/widgets/helper/NotebookTab.hpp \ + src/widgets/helper/ResizingTextEdit.hpp \ + src/widgets/helper/ScrollbarHighlight.hpp \ + src/widgets/helper/SearchPopup.hpp \ + src/widgets/helper/SettingsDialogTab.hpp \ + src/widgets/Notebook.hpp \ + src/widgets/Scrollbar.hpp \ + src/widgets/settingspages/AboutPage.hpp \ + src/widgets/settingspages/AccountsPage.hpp \ + src/widgets/settingspages/AdvancedPage.hpp \ + src/widgets/settingspages/BrowserExtensionPage.hpp \ + src/widgets/settingspages/CommandPage.hpp \ + src/widgets/settingspages/EmotesPage.hpp \ + src/widgets/settingspages/ExternalToolsPage.hpp \ + src/widgets/settingspages/FeelPage.hpp \ + src/widgets/settingspages/GeneralPage.hpp \ + src/widgets/settingspages/HighlightingPage.hpp \ + src/widgets/settingspages/IgnoresPage.hpp \ + src/widgets/settingspages/KeyboardSettingsPage.hpp \ + src/widgets/settingspages/LogsPage.hpp \ + src/widgets/settingspages/LookPage.hpp \ + src/widgets/settingspages/ModerationPage.hpp \ + src/widgets/settingspages/NotificationPage.hpp \ + src/widgets/settingspages/SettingsPage.hpp \ + src/widgets/settingspages/SpecialChannelsPage.hpp \ + src/widgets/splits/ClosedSplits.hpp \ + src/widgets/splits/Split.hpp \ + src/widgets/splits/SplitContainer.hpp \ + src/widgets/splits/SplitHeader.hpp \ + src/widgets/splits/SplitInput.hpp \ + src/widgets/splits/SplitOverlay.hpp \ + src/widgets/StreamView.hpp \ + src/widgets/Window.hpp \ + +RESOURCES += \ + resources/resources.qrc \ + resources/resources_autogenerated.qrc + +DISTFILES += + +FORMS += + +# do not use windows min/max macros +#win32 { +# DEFINES += NOMINMAX +#} diff --git a/src/messages/HistoricMessageAppearance.hpp b/src/messages/HistoricMessageAppearance.hpp deleted file mode 100644 index 54cdb0686..000000000 --- a/src/messages/HistoricMessageAppearance.hpp +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -namespace chatterino { - -enum HistoricMessageAppearance { - Crossed = (1 << 0), - Greyed = (1 << 1), -}; - -} // namespace chatterino diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp index a7ba26756..808d40d94 100644 --- a/src/messages/layouts/MessageLayout.cpp +++ b/src/messages/layouts/MessageLayout.cpp @@ -103,9 +103,6 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags _flags) { this->layoutCount_++; - const auto addTest = this->message_->flags.hasAny( - {MessageFlag::DisconnectedMessage, MessageFlag::ConnectedMessage}); - auto messageFlags = this->message_->flags; if (this->flags.has(MessageLayoutFlag::Expanded) || @@ -117,14 +114,6 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags _flags) this->container_->begin(width, this->scale_, messageFlags); - if (addTest) - { - this->container_->addElementNoLineBreak(new TestLayoutElement( - EmptyElement::instance(), QSize(width, this->scale_ * 6), - getTheme()->messages.backgrounds.regular, false)); - this->container_->breakLine(); - } - for (const auto &element : this->message_->elements) { if (getSettings()->hideModerated && @@ -135,14 +124,6 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags _flags) element->addToContainer(*this->container_, _flags); } - if (addTest) - { - this->container_->breakLine(); - this->container_->addElement(new TestLayoutElement( - EmptyElement::instance(), QSize(width, this->scale_ * 6), - getTheme()->messages.backgrounds.regular, true)); - } - if (this->height_ != this->container_->getHeight()) { this->deleteBuffer(); @@ -205,29 +186,12 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex, app->themes->messages.disabled); // painter.fillRect(0, y, pixmap->width(), pixmap->height(), // QBrush(QColor(64, 64, 64, 64))); - - if (getSettings()->redDisabledMessages) - { - painter.fillRect(0, y, pixmap->width(), pixmap->height(), - QBrush(QColor(255, 0, 0, 63), Qt::BDiagPattern)); - // app->themes->messages.disabled); - } } if (this->message_->flags.has(MessageFlag::RecentMessage)) { - const auto &historicMessageAppearance = - getSettings()->historicMessagesAppearance.getValue(); - if (historicMessageAppearance & HistoricMessageAppearance::Crossed) - { - painter.fillRect(0, y, pixmap->width(), pixmap->height(), - QBrush(QColor(255, 0, 0, 63), Qt::BDiagPattern)); - } - if (historicMessageAppearance & HistoricMessageAppearance::Greyed) - { - painter.fillRect(0, y, pixmap->width(), pixmap->height(), - app->themes->messages.disabled); - } + painter.fillRect(0, y, pixmap->width(), pixmap->height(), + app->themes->messages.disabled); } // draw selection diff --git a/src/messages/layouts/MessageLayoutElement.cpp b/src/messages/layouts/MessageLayoutElement.cpp index 93e0afe93..a8bcc30c9 100644 --- a/src/messages/layouts/MessageLayoutElement.cpp +++ b/src/messages/layouts/MessageLayoutElement.cpp @@ -368,72 +368,4 @@ int TextIconLayoutElement::getXFromIndex(int index) } } -// TestLayoutElement -TestLayoutElement::TestLayoutElement(MessageElement &element, const QSize &size, - const QColor &background, bool end) - : MessageLayoutElement(element, size) - , size_(size) - , background_(background) - , end_(end) -{ -} - -void TestLayoutElement::addCopyTextToString(QString &str, int from, - int to) const -{ -} - -int TestLayoutElement::getSelectionIndexCount() const -{ - return 0; -} - -void TestLayoutElement::paint(QPainter &painter) -{ - const auto dy = this->getRect().y(); - const auto color = end_ ? background_ : QColor(0, 0, 0, 127); - - // make zig zag - auto polygon = QPolygon(); - for (auto x = size_.height() / -2; x < size_.width() + 16; - x += size_.height()) - { - polygon.push_back({x, dy + 0}); - polygon.push_back({x + size_.height(), dy + size_.height()}); - x += size_.height(); - polygon.push_back({x, dy + size_.height()}); - polygon.push_back({x + size_.height(), dy + 0}); - } - - // finish polygon - polygon.push_back({size_.width(), 1000}); - polygon.push_back({0, 1000}); - - // finish polygon - polygon.push_back({size_.width(), 1000}); - polygon.push_back({0, 1000}); - - // turn into path - auto path = QPainterPath(); - path.addPolygon(polygon); - - // draw - painter.fillPath(path, color); - painter.strokePath(path, QColor(127, 127, 127, 127)); -} - -void TestLayoutElement::paintAnimated(QPainter &painter, int yOffset) -{ -} - -int TestLayoutElement::getMouseOverIndex(const QPoint &abs) const -{ - return 0; -} - -int TestLayoutElement::getXFromIndex(int index) -{ - return 0; -} - } // namespace chatterino diff --git a/src/messages/layouts/MessageLayoutElement.hpp b/src/messages/layouts/MessageLayoutElement.hpp index 24139be4e..d5e11a0a3 100644 --- a/src/messages/layouts/MessageLayoutElement.hpp +++ b/src/messages/layouts/MessageLayoutElement.hpp @@ -125,25 +125,4 @@ private: QString line2; }; -class TestLayoutElement : public MessageLayoutElement -{ -public: - TestLayoutElement(MessageElement &creator, const QSize &size, - const QColor &background, bool end); - -protected: - void addCopyTextToString(QString &str, int from = 0, - int to = INT_MAX) const override; - int getSelectionIndexCount() const override; - void paint(QPainter &painter) override; - void paintAnimated(QPainter &painter, int yOffset) override; - int getMouseOverIndex(const QPoint &abs) const override; - int getXFromIndex(int index) override; - -private: - QSize size_; - QColor background_; - bool end_; -}; - } // namespace chatterino diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp index 7cb45b3c7..d803fdbe9 100644 --- a/src/providers/irc/AbstractIrcServer.cpp +++ b/src/providers/irc/AbstractIrcServer.cpp @@ -233,7 +233,6 @@ void AbstractIrcServer::onConnected() auto connected = makeSystemMessage("connected"); connected->flags.set(MessageFlag::ConnectedMessage); - connected->flags.set(MessageFlag::Centered); auto reconnected = makeSystemMessage("reconnected"); reconnected->flags.set(MessageFlag::ConnectedMessage); diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp index 4d922af53..c471f0632 100644 --- a/src/singletons/Settings.hpp +++ b/src/singletons/Settings.hpp @@ -4,7 +4,6 @@ #include "controllers/highlights/HighlightPhrase.hpp" #include "controllers/moderationactions/ModerationAction.hpp" -#include "messages/HistoricMessageAppearance.hpp" #include #include @@ -32,9 +31,6 @@ public: Qt::VerPattern}; QStringSetting lastMessageColor = {"/appearance/messages/lastMessageColor", ""}; - IntSetting historicMessagesAppearance = { - "/appearance/messages/historicMessagesAppearance", - HistoricMessageAppearance::Crossed | HistoricMessageAppearance::Greyed}; BoolSetting showEmptyInput = {"/appearance/showEmptyInputBox", true}; BoolSetting showMessageLength = {"/appearance/messages/showMessageLength", false}; @@ -68,7 +64,6 @@ public: BoolSetting headerUptime = {"/appearance/splitheader/showUptime", false}; FloatSetting customThemeMultiplier = {"/appearance/customThemeMultiplier", -0.5f}; - BoolSetting redDisabledMessages = {"/appearance/redStripes", true}; // BoolSetting useCustomWindowFrame = {"/appearance/useCustomWindowFrame", // false}; diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp index cc8dfb3b9..ee012c21a 100644 --- a/src/widgets/settingspages/GeneralPage.cpp +++ b/src/widgets/settingspages/GeneralPage.cpp @@ -190,7 +190,7 @@ void GeneralPage::initLayout(SettingsLayout &layout) layout.addCheckbox("Show tab close button", s.showTabCloseButton); layout.addCheckbox("Show input when empty", s.showEmptyInput); layout.addCheckbox("Show input message length", s.showMessageLength); - layout.addCheckbox("Hide preferences button (ctrl+p to show)", + layout.addCheckbox("Hide preferences button (ctrl+p to show)", s.hidePreferencesButton); layout.addCheckbox("Hide user button", s.hideUserButton); @@ -267,50 +267,6 @@ void GeneralPage::initLayout(SettingsLayout &layout) layout.addTitle2("Misc"); layout.addCheckbox("Show twitch whispers inline", s.inlineWhispers); - layout.addDropdown( - "Historic messages appearance", - {"Crossed and Greyed", "Crossed", "Greyed", "No change"}, - s.historicMessagesAppearance, - [](auto val) { - if (val & HistoricMessageAppearance::Crossed && - val & HistoricMessageAppearance::Greyed) - { - return QString("Crossed and Greyed"); - } - else if (val & HistoricMessageAppearance::Crossed) - { - return QString("Crossed"); - } - else if (val & HistoricMessageAppearance::Greyed) - { - return QString("Greyed"); - } - else - { - return QString("No Change"); - } - }, - [](auto args) -> int { - switch (args.index) - { - default: - case 0: - return HistoricMessageAppearance::Crossed | - HistoricMessageAppearance::Greyed; - break; - case 1: - return HistoricMessageAppearance::Crossed; - break; - case 2: - return HistoricMessageAppearance::Greyed; - break; - case 3: - return 0; - break; - } - }, - false); - layout.addCheckbox("Emphasize deleted messages", s.redDisabledMessages); /* layout.addTitle2("Cache"); diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp index 3c1c2ed66..9ba2f983b 100644 --- a/src/widgets/settingspages/LookPage.cpp +++ b/src/widgets/settingspages/LookPage.cpp @@ -182,12 +182,6 @@ void LookPage::addMessageTab(LayoutCreator layout) layout.append( this->createCheckBox("Compact emotes", getSettings()->compactEmotes)); - /// greyOutHistoricMessages setting changed by hemirt from checkbox to - /// historicMessagesBehaviour dropdown QString option - // layout.append(this->createCheckBox("Grey out historic messages", - // getSettings()->greyOutHistoricMessages)); - /// - // -- layout.emplace(false); // bold-slider