HistoricMessageAppearance

Merge branch 'master' of https://github.com/fourtf/chatterino2

src/singletons/Settings.hpp

@@ -4,6 +4,7 @@
 
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
+#include "messages/HistoricMessageAppearance.hpp"
 
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/settings/settinglistener.hpp>
@@ -31,9 +32,9 @@ public:
                                      Qt::VerPattern};
     QStringSetting lastMessageColor = {"/appearance/messages/lastMessageColor",
                                        ""};
-    QStringSetting historicMessagesAppearance = {
+    IntSetting historicMessagesAppearance = {
         "/appearance/messages/historicMessagesAppearance",
-        "Crossed and Greyed"};
+        HistoricMessageAppearance::Crossed | HistoricMessageAppearance::Greyed};
     BoolSetting showEmptyInput = {"/appearance/showEmptyInputBox", true};
     BoolSetting showMessageLength = {"/appearance/messages/showMessageLength",
                                      false};
@@ -66,6 +67,7 @@ public:
     BoolSetting headerUptime = {"/appearance/splitheader/showUptime", false};
     FloatSetting customThemeMultiplier = {"/appearance/customThemeMultiplier",
                                           -0.5f};
+    BoolSetting redDisabledMessages = {"/appearance/redStripes", true};
     // BoolSetting useCustomWindowFrame = {"/appearance/useCustomWindowFrame",
     // false};