From 89d907671523511c1dba52b159cc593ad48ae111 Mon Sep 17 00:00:00 2001 From: fourtf Date: Sat, 23 Jun 2018 22:17:57 +0200 Subject: [PATCH] polishing for the update --- src/singletons/nativemessagingmanager.cpp | 4 ++-- src/singletons/settingsmanager.hpp | 1 + src/widgets/settingspages/commandpage.cpp | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/singletons/nativemessagingmanager.cpp b/src/singletons/nativemessagingmanager.cpp index 26fdf6e46..79b6562f9 100644 --- a/src/singletons/nativemessagingmanager.cpp +++ b/src/singletons/nativemessagingmanager.cpp @@ -26,7 +26,7 @@ namespace ipc = boost::interprocess; #include -#define EXTENSION_ID "lgnlbmhbnbncmiohgcbhgiaddibhinon" +#define EXTENSION_ID "glknmaideaikkmemifbfkhnomoknepka" #define MESSAGE_SIZE 1024 namespace chatterino { @@ -87,7 +87,7 @@ void NativeMessagingManager::registerHost() QJsonDocument document; auto obj = getBaseDocument(); - QJsonArray allowed_origins_arr = {"chrome-extension://aeicjepmjkgmbeohnchmpfjbpchogmjn/"}; + QJsonArray allowed_origins_arr = {"chrome-extension://" EXTENSION_ID "/"}; obj.insert("allowed_origins", allowed_origins_arr); document.setObject(obj); diff --git a/src/singletons/settingsmanager.hpp b/src/singletons/settingsmanager.hpp index 110eebc7c..e4513a53c 100644 --- a/src/singletons/settingsmanager.hpp +++ b/src/singletons/settingsmanager.hpp @@ -127,6 +127,7 @@ public: /// Misc IntSetting startUpNotification = {"/misc/startUpNotification", 0}; + QStringSetting currentVersion = {"/misc/currentVersion", ""}; void updateWordTypeMask(); diff --git a/src/widgets/settingspages/commandpage.cpp b/src/widgets/settingspages/commandpage.cpp index f96cdae3a..143ba44c8 100644 --- a/src/widgets/settingspages/commandpage.cpp +++ b/src/widgets/settingspages/commandpage.cpp @@ -36,11 +36,6 @@ CommandPage::CommandPage() util::LayoutCreator layoutCreator(this); auto layout = layoutCreator.emplace().withoutMargin(); - auto warning = layout.emplace("The command system will be reworked in the " - "future!\nYour saved commands will get discarded then. " - "Deleting commands crashes chatterino right now."); - warning.getElement()->setStyleSheet("color: #f00"); - helper::EditableModelView *view = layout.emplace(app->commands->createModel(nullptr)).getElement();