Implemment dark mode

src/NotepadNext/ApplicationSettings.cpp

@@ -51,6 +51,8 @@ CREATE_SETTING(Gui, ExitOnLastTabClosed, exitOnLastTabClosed, bool, false)
 
 CREATE_SETTING(Gui, CombineSearchResults, combineSearchResults, bool, false)
 
+CREATE_SETTING(Gui, DarkMode, darkMode, bool, true)
+
 CREATE_SETTING(App, RestorePreviousSession, restorePreviousSession, bool, false)
 CREATE_SETTING(App, RestoreUnsavedFiles, restoreUnsavedFiles, bool, false)
 CREATE_SETTING(App, RestoreTempFiles, restoreTempFiles, bool, false)

src/NotepadNext/ApplicationSettings.h

@@ -107,4 +107,6 @@ class ApplicationSettings : public QSettings
     DEFINE_SETTING(FontName, fontName, QString);
     DEFINE_SETTING(FontSize, fontSize, int);
     DEFINE_SETTING(AdditionalWordChars, additionalWordChars, QString);
+
+    DEFINE_SETTING(DarkMode, darkMode, bool)
 };

src/NotepadNext/EditorManager.cpp

@@ -23,6 +23,8 @@
 #include "EditorManager.h"
 #include "ScintillaNext.h"
 #include "Scintilla.h"
+#include "Settings.h"
+#include "NotepadNextApplication.h"
 
 // Editor decorators
 #include "BraceMatch.h"
@@ -35,7 +37,7 @@
 #include "AutoCompletion.h"
 #include "URLFinder.h"
 #include "BookMarkDecorator.h"
-
+#include "ThemeColors.h"
 
 const int MARK_HIDELINESBEGIN = 23;
 const int MARK_HIDELINESEND = 22;
@@ -185,7 +187,7 @@ void EditorManager::setupEditor(ScintillaNext *editor)
     editor->setMarginWidthN(2, 14);
 
     editor->markerDefine(MARK_HIDELINESUNDERLINE, SC_MARK_UNDERLINE);
-    editor->markerSetBack(MARK_HIDELINESUNDERLINE, 0x77CC77);
+
 
     editor->markerDefine(MARK_HIDELINESBEGIN, SC_MARK_ARROW);
     editor->markerDefine(MARK_HIDELINESEND, SC_MARK_ARROWDOWN);
@@ -203,57 +205,21 @@ void EditorManager::setupEditor(ScintillaNext *editor)
     editor->setCaretLineVisible(true);
     editor->setCaretLineVisibleAlways(true);
     editor->setCaretWidth(2);
-
-    editor->setEdgeColour(0x80FFFF);
-
-    // https://www.scintilla.org/ScintillaDoc.html#ElementColours
-    // SC_ELEMENT_SELECTION_TEXT
-    // SC_ELEMENT_SELECTION_BACK
-    // SC_ELEMENT_SELECTION_ADDITIONAL_TEXT
-    // SC_ELEMENT_SELECTION_ADDITIONAL_BACK
-    // SC_ELEMENT_SELECTION_SECONDARY_TEXT
-    // SC_ELEMENT_SELECTION_SECONDARY_BACK
-    // SC_ELEMENT_SELECTION_INACTIVE_TEXT
-    editor->setElementColour(SC_ELEMENT_SELECTION_INACTIVE_BACK, 0xFFE0E0E0);
-    // SC_ELEMENT_CARET
-    // SC_ELEMENT_CARET_ADDITIONAL
-    editor->setElementColour(SC_ELEMENT_CARET_LINE_BACK, 0xFFFFE8E8);
-    editor->setElementColour(SC_ELEMENT_WHITE_SPACE, 0xFFD0D0D0);
-    // SC_ELEMENT_WHITE_SPACE_BACK
-    // SC_ELEMENT_HOT_SPOT_ACTIVE
-    // SC_ELEMENT_HOT_SPOT_ACTIVE_BACK
-    editor->setElementColour(SC_ELEMENT_FOLD_LINE, 0xFFA0A0A0);
-    // SC_ELEMENT_HIDDEN_LINE
-
-    editor->setWhitespaceSize(2);
-
-    editor->setFoldMarginColour(true, 0xFFFFFF);
-    editor->setFoldMarginHiColour(true, 0xE9E9E9);
+
+    editor->setIndentationGuides(SC_IV_LOOKBOTH);
 
     editor->setAutomaticFold(SC_AUTOMATICFOLD_SHOW | SC_AUTOMATICFOLD_CLICK | SC_AUTOMATICFOLD_CHANGE);
-    editor->markerEnableHighlight(true);
-
-    editor->setCharsDefault();
-    editor->setWordChars(editor->wordChars() + settings->additionalWordChars().toLatin1());
-
-    editor->styleSetFore(STYLE_DEFAULT, 0x000000);
-    editor->styleSetBack(STYLE_DEFAULT, 0xFFFFFF);
+    editor->markerEnableHighlight(true);    
+
+    editor->setWhitespaceSize(2);
+
     editor->styleSetSize(STYLE_DEFAULT, settings->fontSize());
     editor->styleSetFont(STYLE_DEFAULT, settings->fontName().toUtf8().data());
-    editor->styleClearAll();
-
-    editor->styleSetFore(STYLE_LINENUMBER, 0x808080);
-    editor->styleSetBack(STYLE_LINENUMBER, 0xE4E4E4);
+
     editor->styleSetBold(STYLE_LINENUMBER, false);
 
-    editor->styleSetFore(STYLE_BRACELIGHT, 0x0000FF);
-    editor->styleSetBack(STYLE_BRACELIGHT, 0xFFFFFF);
-
-    editor->styleSetFore(STYLE_BRACEBAD, 0x000080);
-    editor->styleSetBack(STYLE_BRACEBAD, 0xFFFFFF);
-
-    editor->styleSetFore(STYLE_INDENTGUIDE, 0xC0C0C0);
-    editor->styleSetBack(STYLE_INDENTGUIDE, 0xFFFFFF);
+    // set up editor theme, only colour now, dark mode aware
+    setupEditorTheme(editor);
 
     // STYLE_CONTROLCHAR
     // STYLE_CALLTIP
@@ -297,6 +263,116 @@ void EditorManager::setupEditor(ScintillaNext *editor)
     bm->setEnabled(true);
 }
 
+void EditorManager::setupEditorTheme(ScintillaNext *editor)
+{
+    if (getSettings()->darkMode()) {  
+        editor->setCaretFore(DARK_DEFAULT_FG);
+
+        //editor->setSelFore(true, 0xEFEFEF);
+        editor->setSelBack(true, 0xA0A0A0);
+
+        // folding/arker
+        for (int i = SC_MARKNUM_FOLDEREND; i <= SC_MARKNUM_FOLDEROPEN; ++i) {
+            editor->markerSetFore(i, 0x808080);
+            editor->markerSetBack(i, 0x1F1F1F);
+            editor->markerSetBackSelected(i, 0x0000FF);
+        }
+
+        editor->markerSetBack(MARK_HIDELINESUNDERLINE, invertColor(0x77CC77));     
+        // end folding/marker
+
+        editor->setEdgeColour(invertColor(0x80FFFF));
+
+        // https://www.scintilla.org/ScintillaDoc.html#ElementColours 
+        // SC_ELEMENT_SELECTION_TEXT
+        // SC_ELEMENT_SELECTION_BACK
+        // SC_ELEMENT_SELECTION_ADDITIONAL_TEXT
+        // SC_ELEMENT_SELECTION_ADDITIONAL_BACK
+        // SC_ELEMENT_SELECTION_SECONDARY_TEXT
+        // SC_ELEMENT_SELECTION_SECONDARY_BACK
+        // SC_ELEMENT_SELECTION_INACTIVE_TEXT
+        editor->setElementColour(SC_ELEMENT_SELECTION_INACTIVE_BACK, invertColor(0xFFE0E0E0));
+        // SC_ELEMENT_CARET
+        // SC_ELEMENT_CARET_ADDITIONAL
+        editor->setElementColour(SC_ELEMENT_CARET_LINE_BACK, 0x606060);
+        // SC_ELEMENT_WHITE_SPACE
+        // SC_ELEMENT_WHITE_SPACE_BACK
+        // setElementColour supports transparency!
+        editor->setElementColour(SC_ELEMENT_WHITE_SPACE, invertColor(0xFFD0D0D0));
+        editor->setElementColour(SC_ELEMENT_WHITE_SPACE_BACK, DARK_DEFAULT_BG);
+
+        // SC_ELEMENT_HOT_SPOT_ACTIVE
+        // SC_ELEMENT_HOT_SPOT_ACTIVE_BACK
+        editor->setElementColour(SC_ELEMENT_FOLD_LINE, invertColor(0xFFA0A0A0));
+        // SC_ELEMENT_HIDDEN_LINE
+
+        editor->setFoldMarginColour(true, 0x3F3F3F);
+        editor->setFoldMarginHiColour(true, 0xE9E9E9);
+
+        editor->styleSetFore(STYLE_DEFAULT, DARK_DEFAULT_FG);
+        editor->styleSetBack(STYLE_DEFAULT, DARK_DEFAULT_BG);
+
+        editor->styleSetFore(STYLE_LINENUMBER, 0xE4E4E4);
+        editor->styleSetBack(STYLE_LINENUMBER, 0x808080);
+
+        editor->styleSetFore(STYLE_BRACELIGHT, DARK_DEFAULT_FG);
+        editor->styleSetBack(STYLE_BRACELIGHT, 0x0000FF);
+
+        editor->styleSetFore(STYLE_BRACEBAD, DARK_DEFAULT_FG);
+        editor->styleSetBack(STYLE_BRACEBAD, 0x000080);
+
+        editor->styleSetFore(STYLE_INDENTGUIDE, 0xC0C0C0);
+        editor->styleSetBack(STYLE_INDENTGUIDE, DARK_DEFAULT_BG);
+    }
+    else {
+        for (int i = SC_MARKNUM_FOLDEREND; i <= SC_MARKNUM_FOLDEROPEN; ++i) {
+            editor->markerSetFore(i, 0xF3F3F3);
+            editor->markerSetBack(i, 0x808080);
+            editor->markerSetBackSelected(i, 0x0000FF);
+        }
+
+        editor->markerSetBack(MARK_HIDELINESUNDERLINE, 0x77CC77);        
+        editor->setEdgeColour(0x80FFFF);
+
+        // https://www.scintilla.org/ScintillaDoc.html#ElementColours
+        // SC_ELEMENT_SELECTION_TEXT
+        // SC_ELEMENT_SELECTION_BACK
+        // SC_ELEMENT_SELECTION_ADDITIONAL_TEXT
+        // SC_ELEMENT_SELECTION_ADDITIONAL_BACK
+        // SC_ELEMENT_SELECTION_SECONDARY_TEXT
+        // SC_ELEMENT_SELECTION_SECONDARY_BACK
+        // SC_ELEMENT_SELECTION_INACTIVE_TEXT
+        editor->setElementColour(SC_ELEMENT_SELECTION_INACTIVE_BACK, 0xFFE0E0E0);
+        // SC_ELEMENT_CARET
+        // SC_ELEMENT_CARET_ADDITIONAL
+        editor->setElementColour(SC_ELEMENT_CARET_LINE_BACK, 0xFFFFE8E8);
+        editor->setElementColour(SC_ELEMENT_WHITE_SPACE, 0xFFD0D0D0);
+        // SC_ELEMENT_WHITE_SPACE_BACK
+        // SC_ELEMENT_HOT_SPOT_ACTIVE
+        // SC_ELEMENT_HOT_SPOT_ACTIVE_BACK
+        editor->setElementColour(SC_ELEMENT_FOLD_LINE, 0xFFA0A0A0);
+        // SC_ELEMENT_HIDDEN_LINE
+
+        editor->setFoldMarginColour(true, WHITE);
+        editor->setFoldMarginHiColour(true, 0xE9E9E9);
+
+        editor->styleSetFore(STYLE_DEFAULT, LIGHT_DEFAULT_FG);
+        editor->styleSetBack(STYLE_DEFAULT, LIGHT_DEFAULT_BG);
+
+        editor->styleSetFore(STYLE_LINENUMBER, 0x808080);
+        editor->styleSetBack(STYLE_LINENUMBER, 0xE4E4E4);
+
+        editor->styleSetFore(STYLE_BRACELIGHT, 0x0000FF);
+        editor->styleSetBack(STYLE_BRACELIGHT, LIGHT_DEFAULT_BG);
+
+        editor->styleSetFore(STYLE_BRACEBAD, 0x000080);
+        editor->styleSetBack(STYLE_BRACEBAD, LIGHT_DEFAULT_BG);
+
+        editor->styleSetFore(STYLE_INDENTGUIDE, 0xC0C0C0);
+        editor->styleSetBack(STYLE_INDENTGUIDE, LIGHT_DEFAULT_BG);    
+    }
+}
+
 void EditorManager::purgeOldEditorPointers()
 {
     QMutableListIterator<QPointer<ScintillaNext>> it(editors);

src/NotepadNext/EditorManager.h

@@ -47,6 +47,7 @@ class EditorManager : public QObject
 
 private:
     void setupEditor(ScintillaNext *editor);
+    void setupEditorTheme(ScintillaNext *editor);
     void purgeOldEditorPointers();
     QList<QPointer<ScintillaNext>> getEditors();
 

src/NotepadNext/LuaState.cpp

@@ -55,7 +55,7 @@ static int require_resource(lua_State *L)
 {
     const char *module = luaL_checkstring(L, 1);
 
-    QString module_file = QString(":/languages/%1.lua").arg(module);
+    QString module_file = QString(":/%1/%2.lua").arg(luaLanguagePath, module);
     QFile f(module_file);
 
     lua_pop(L, 1);
@@ -144,6 +144,11 @@ void LuaState::execute(const char *statement, bool clear)
         lua_settop(L, stacktop);
 }
 
+void LuaState::execute(const QString &statement)
+{
+    execute(statement.toLatin1().constData());
+}
+
 void LuaState::executeFile(const QString &fileName)
 {
     QFile ff(fileName);
@@ -174,3 +179,4 @@ void LuaState::raiseError(const char *errorMessage)
     lua_concat(L, 2);
     lua_error(L);
 }
+

src/NotepadNext/LuaState.h

@@ -27,13 +27,16 @@
 
 struct lua_State;
 
+extern QString luaLanguagePath;
+
 class LuaState
 {
 public:
     LuaState();
     ~LuaState();
 
     void execute(const char *statement, bool clear = true);
+    void execute(const QString& statement);
     void executeFile(const QString &fileName);
 
     template<typename T>
@@ -44,7 +47,6 @@ class LuaState
     void raiseError(const char *errorMessage = Q_NULLPTR);
 
     lua_State *L = Q_NULLPTR;
-
 private:
 };
 

src/NotepadNext/NotepadNext.pro

@@ -234,7 +234,8 @@ FORMS += \
 
 RESOURCES += \
     resources.qrc \
-    scripts.qrc
+    scripts.qrc \
+    qdarkstyle/dark/style.qrc
 
 INCLUDEPATH += $$PWD/decorators
 INCLUDEPATH += $$PWD/dialogs

src/NotepadNext/NotepadNextApplication.cpp

@@ -24,6 +24,7 @@
 #include "LuaExtension.h"
 #include "DebugManager.h"
 #include "SessionManager.h"
+#include "ThemeColors.h"
 #include "TranslationManager.h"
 #include "ApplicationSettings.h"
 
@@ -44,6 +45,8 @@
 #include <Windows.h>
 #endif
 
+QString luaLanguagePath;
+
 const SingleApplication::Options opts = SingleApplication::ExcludeAppPath | SingleApplication::ExcludeAppVersion | SingleApplication::SecondaryNotification;
 
 template <>
@@ -141,13 +144,25 @@ bool NotepadNextApplication::init()
         }
     });
 
+    // why setting loaded here? can it be loaded eailer?
     loadSettings();
 
+    bool darkMode = settings->darkMode();
+
+    // Set language path based on theme,
+    // dark mode may have its own path
+    //luaLanguagePath = darkMode ? "languages/dark" : "languages";
+    luaLanguagePath = "languages";  // same language lua config for dark/light mode
+    qInfo("Dark mode: %d, Lua language path: %s", darkMode, qUtf8Printable(luaLanguagePath));
+
     connect(this, &NotepadNextApplication::aboutToQuit, this, &NotepadNextApplication::saveSettings);
 
     EditorConfigAppDecorator *ecad = new EditorConfigAppDecorator(this);
     ecad->setEnabled(true);
 
+    // Set up colors language lua scripts, based on dark/light theme
+    setLanguageColors();
+
     luaState->executeFile(":/scripts/init.lua");
     LuaExtension::Instance().Initialise(luaState->L, Q_NULLPTR);
 
@@ -294,7 +309,7 @@ void NotepadNextApplication::setEditorLanguage(ScintillaNext *editor, const QStr
 {
     LuaExtension::Instance().setEditor(editor);
 
-    getLuaState()->execute(QString("languageName = \"%1\"").arg(languageName).toLatin1().constData());
+    getLuaState()->execute(QString("languageName = \"%1\"").arg(languageName));
     const QString lexer = getLuaState()->executeAndReturn<QString>("return languages[languageName].lexer");
 
     editor->languageName = languageName;
@@ -309,8 +324,8 @@ void NotepadNextApplication::setEditorLanguage(ScintillaNext *editor, const QStr
 
     // Dynamic properties can be used to skip part of the default initialization. The value in the
     // property doesn't currently matter, but may be used at a later point.
-    getLuaState()->execute(QString("skip_tabs = %1").arg(editor->QObject::property("nn_skip_usetabs").isValid() ? "true" : "false").toLatin1().constData());
-    getLuaState()->execute(QString("skip_tabwidth = %1").arg(editor->QObject::property("nn_skip_tabwidth").isValid() ? "true" : "false").toLatin1().constData());
+    getLuaState()->execute(QString("skip_tabs = %1").arg(editor->QObject::property("nn_skip_usetabs").isValid() ? "true" : "false"));
+    getLuaState()->execute(QString("skip_tabwidth = %1").arg(editor->QObject::property("nn_skip_tabwidth").isValid() ? "true" : "false"));
 
     getLuaState()->execute(R"(
         local L = languages[languageName]
@@ -522,3 +537,32 @@ MainWindow *NotepadNextApplication::createNewWindow()
 
     return window;
 }
+
+/**
+ * Build a Lua assignment statement: var = rgb
+ */
+static QString buildLuaAssignment(QString var, long rgb)
+{
+    return QString("%1=0x%2").arg(var).arg(rgb2bgr(rgb), 0, 16);
+}
+
+/**
+ * Set languages colors based dark/light mode settings
+ */
+void NotepadNextApplication::setLanguageColors()
+{
+    bool darkMode = settings->darkMode();
+
+    // Set language highlighting colors based on theme
+    long defaultFgColor  = darkMode ? DARK_DEFAULT_FG : LIGHT_DEFAULT_FG;
+    long defaultBgColor  = darkMode ? DARK_DEFAULT_BG : LIGHT_DEFAULT_BG;
+    long instructionColor= darkMode ? DARK_INTRUCTION_COLOR : LIGHT_INTRUCTION_COLOR;
+    long operatorColor   = darkMode ? DARK_OPERATOR_COLOR : LIGHT_OPERATOR_COLOR;
+    long typeColor       = darkMode ? DARK_TYPE_COLOR : LIGHT_TYPE_COLOR;
+
+    luaState->execute(buildLuaAssignment("defaultFg", defaultFgColor));
+    luaState->execute(buildLuaAssignment("defaultBg", defaultBgColor));
+    luaState->execute(buildLuaAssignment("InstructionColor", instructionColor));
+    luaState->execute(buildLuaAssignment("OperatorColor", operatorColor));
+    luaState->execute(buildLuaAssignment("TypeColor", typeColor));
+}