noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

polishing for the update

Browse source
This commit is contained in:
fourtf 2018-06-23 22:17:57 +02:00
parent 88ef3ef07a
commit 89d9076715
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/singletons/nativemessagingmanager.cpp
View file

@ -26,7 +26,7 @@ namespace ipc = boost::interprocess;
#include <iostream> #include <iostream>
#define EXTENSION_ID "lgnlbmhbnbncmiohgcbhgiaddibhinon" #define EXTENSION_ID "glknmaideaikkmemifbfkhnomoknepka"
#define MESSAGE_SIZE 1024 #define MESSAGE_SIZE 1024
namespace chatterino { namespace chatterino {
@ -87,7 +87,7 @@ void NativeMessagingManager::registerHost()
QJsonDocument document; QJsonDocument document;
auto obj = getBaseDocument(); 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); obj.insert("allowed_origins", allowed_origins_arr);
document.setObject(obj); document.setObject(obj);

1
src/singletons/settingsmanager.hpp
View file

@ -127,6 +127,7 @@ public:
/// Misc /// Misc
IntSetting startUpNotification = {"/misc/startUpNotification", 0}; IntSetting startUpNotification = {"/misc/startUpNotification", 0};
QStringSetting currentVersion = {"/misc/currentVersion", ""};
void updateWordTypeMask(); void updateWordTypeMask();

5
src/widgets/settingspages/commandpage.cpp
View file

@ -36,11 +36,6 @@ CommandPage::CommandPage()
util::LayoutCreator<CommandPage> layoutCreator(this); util::LayoutCreator<CommandPage> layoutCreator(this);
auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin(); auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
auto warning = layout.emplace<QLabel>("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 = helper::EditableModelView *view =
layout.emplace<helper::EditableModelView>(app->commands->createModel(nullptr)).getElement(); layout.emplace<helper::EditableModelView>(app->commands->createModel(nullptr)).getElement();