diff --git a/src/NotepadNext/ApplicationSettings.cpp b/src/NotepadNext/ApplicationSettings.cpp index 6f18558eb..059bedffd 100644 --- a/src/NotepadNext/ApplicationSettings.cpp +++ b/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) diff --git a/src/NotepadNext/ApplicationSettings.h b/src/NotepadNext/ApplicationSettings.h index 3150b14d9..cfa0eceec 100644 --- a/src/NotepadNext/ApplicationSettings.h +++ b/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) }; diff --git a/src/NotepadNext/EditorManager.cpp b/src/NotepadNext/EditorManager.cpp index b6e91ee63..b6d132679 100644 --- a/src/NotepadNext/EditorManager.cpp +++ b/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> it(editors); diff --git a/src/NotepadNext/EditorManager.h b/src/NotepadNext/EditorManager.h index 68fc960b6..210fb3501 100644 --- a/src/NotepadNext/EditorManager.h +++ b/src/NotepadNext/EditorManager.h @@ -47,6 +47,7 @@ class EditorManager : public QObject private: void setupEditor(ScintillaNext *editor); + void setupEditorTheme(ScintillaNext *editor); void purgeOldEditorPointers(); QList> getEditors(); diff --git a/src/NotepadNext/LuaState.cpp b/src/NotepadNext/LuaState.cpp index 6792a4368..1b175da13 100644 --- a/src/NotepadNext/LuaState.cpp +++ b/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); } + diff --git a/src/NotepadNext/LuaState.h b/src/NotepadNext/LuaState.h index 60cf84a81..f22226b3d 100644 --- a/src/NotepadNext/LuaState.h +++ b/src/NotepadNext/LuaState.h @@ -27,6 +27,8 @@ struct lua_State; +extern QString luaLanguagePath; + class LuaState { public: @@ -34,6 +36,7 @@ class LuaState ~LuaState(); void execute(const char *statement, bool clear = true); + void execute(const QString& statement); void executeFile(const QString &fileName); template @@ -44,7 +47,6 @@ class LuaState void raiseError(const char *errorMessage = Q_NULLPTR); lua_State *L = Q_NULLPTR; - private: }; diff --git a/src/NotepadNext/NotepadNext.pro b/src/NotepadNext/NotepadNext.pro index 717d52dd1..1f1ced1fd 100644 --- a/src/NotepadNext/NotepadNext.pro +++ b/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 diff --git a/src/NotepadNext/NotepadNextApplication.cpp b/src/NotepadNext/NotepadNextApplication.cpp index 3e79b55df..4c0b1c6fa 100644 --- a/src/NotepadNext/NotepadNextApplication.cpp +++ b/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 #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("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)); +} \ No newline at end of file diff --git a/src/NotepadNext/NotepadNextApplication.h b/src/NotepadNext/NotepadNextApplication.h index b4b4aee54..600e83eef 100644 --- a/src/NotepadNext/NotepadNextApplication.h +++ b/src/NotepadNext/NotepadNextApplication.h @@ -64,6 +64,9 @@ class NotepadNextApplication : public SingleApplication QString detectLanguageFromContents(ScintillaNext *editor) const; void sendInfoToPrimaryInstance(); + + // expose this method to make it possible to change theme without restart + void setLanguageColors(); bool isRunningAsAdmin() const; diff --git a/src/NotepadNext/ScintillaNext.cpp b/src/NotepadNext/ScintillaNext.cpp index 48058d35a..761a3eb6a 100644 --- a/src/NotepadNext/ScintillaNext.cpp +++ b/src/NotepadNext/ScintillaNext.cpp @@ -209,7 +209,7 @@ bool ScintillaNext::canSaveToDisk() const return temporary || (bufferType == ScintillaNext::New && modify()) || (bufferType == ScintillaNext::File && modify()) || - (bufferType == ScintillaNext::FileMissing); + (bufferType == ScintillaNext::FileMissing); } void ScintillaNext::setName(const QString &name) diff --git a/src/NotepadNext/ThemeColors.h b/src/NotepadNext/ThemeColors.h new file mode 100644 index 000000000..2b209778d --- /dev/null +++ b/src/NotepadNext/ThemeColors.h @@ -0,0 +1,63 @@ +/* + * This file is part of Notepad Next. + * Copyright 2019 Justin Dailey + * + * @author Wayne Zhang + * + * Notepad Next is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Notepad Next is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Notepad Next. If not, see . + */ + +#ifndef THEME_COLORS_H +#define THEME_COLORS_H + +// ########## color utilities ########## + +/** + * Calculate 'negtive' color, that is, compensation color. + * For example, back's compenstation color is white. + */ +#define invertColor(color) color ^ WHITE + +/** + * Convert RGB color value to BGR, as Lua do the samething, reason unknown. + * To make color RGB values passed from CPP/NotepadNext to Lua scripts the + * same value, convert RGB to BGR: RBB->BGR->BRG = RGB + */ +#define rgb2bgr(x) ((x & 0x0000FF) << 16) | (x & 0x00FF00) | ((x & 0xFF0000) >> 16) + +// ######### color utilities ############# + +#define WHITE 0xFFFFFF +#define BLACK 0x000000 + +#define DARK_DEFAULT_FG WHITE +#define DARK_DEFAULT_BG 0x2D2319 + +#define LIGHT_DEFAULT_FG BLACK +#define LIGHT_DEFAULT_BG WHITE + +// dark theme menu colors +#define DARK_MENU_COLOR 0xE0E1E3 +#define DARK_MENU_BG_COLOR 0x37414F + +#define LIGHT_INTRUCTION_COLOR 0x0000FF // instruction color - blue +#define DARK_INTRUCTION_COLOR 0x00B4F0 // dark mode compensation color + +#define LIGHT_OPERATOR_COLOR 0x800000 // operator color - dark blue +#define DARK_OPERATOR_COLOR WHITE // dark mode compensation color + +#define LIGHT_TYPE_COLOR 0x8000FF // type color +#define DARK_TYPE_COLOR 0xF0B400 // dark mode compenstation color + +#endif \ No newline at end of file diff --git a/src/NotepadNext/dialogs/MainWindow.cpp b/src/NotepadNext/dialogs/MainWindow.cpp index 8ce36adfd..67e44d0b4 100644 --- a/src/NotepadNext/dialogs/MainWindow.cpp +++ b/src/NotepadNext/dialogs/MainWindow.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -84,6 +85,27 @@ #include "FadingIndicator.h" +#include "ThemeColors.h" + +QString loadCssFile(const QString& cssFile) +{ + QFile f(cssFile); + if (!f.exists()) { + qInfo("Stylesheet resource file '%s' not found, no style sheet set", qUtf8Printable(cssFile)); + + return ""; + } + else { + qInfo("Stylesheet resource file '%s' loaded", qUtf8Printable(cssFile)); + + f.open(QFile::ReadOnly); + QTextStream ts(&f); + QString cssContent = ts.readAll(); + f.close(); + + return cssContent; + } +} MainWindow::MainWindow(NotepadNextApplication *app) : ui(new Ui::MainWindow), @@ -789,7 +811,7 @@ MainWindow::MainWindow(NotepadNextApplication *app) : applyStyleSheet(); restoreSettings(); - + initUpdateCheck(); } @@ -825,6 +847,14 @@ void MainWindow::setupLanguageMenu() QStringList language_names = app->getLanguages(); + QString subMenuStyleSheet; // sub menu style sheet, for dark mode only + bool darkMode = app->getSettings()->darkMode(); + if (darkMode) { + subMenuStyleSheet = QString("color:#%1; background-color:#%2") + .arg(DARK_MENU_COLOR, 0, 16) + .arg(DARK_MENU_BG_COLOR, 0, 16); + } + int i = 0; while (i < language_names.size()) { QList actions; @@ -852,6 +882,12 @@ void MainWindow::setupLanguageMenu() QMenu *compactMenu = new QMenu(actions[0]->text().at(0).toUpper()); compactMenu->addActions(actions); ui->menuLanguage->addMenu(compactMenu); + + // Set background color of sub menu, QDarkStyleSheet settings + // doesn't impact sub menu for unknown reason + if(darkMode) { + compactMenu->setStyleSheet(subMenuStyleSheet); + } } i = j; } @@ -1645,13 +1681,17 @@ void MainWindow::applyStyleSheet() { qInfo(Q_FUNC_INFO); - QString sheet; - QFile f(":/stylesheets/npp.css"); - qInfo() << "Loading stylesheet: " << f.fileName(); - - f.open(QFile::ReadOnly); - sheet = f.readAll(); - f.close(); + // Notepad next default style sheet + QString cssContent = loadCssFile(":/stylesheets/npp.css"); + if (app->getSettings()->darkMode()) { + // QDarkStyleSheet dark theme + QString darkCss = loadCssFile(":/qdarkstyle/dark/style.qss"); + cssContent.append(darkCss); + + // further tweak + QString nppDark= loadCssFile(":/stylesheets/npp-dark.css"); + cssContent.append(nppDark); + } // If there is a "custom.css" file where the ini is located, load it as a style sheet addition QString directoryPath = QFileInfo(app->getSettings()->fileName()).absolutePath(); @@ -1661,11 +1701,11 @@ void MainWindow::applyStyleSheet() qInfo() << "Loading stylesheet: " << custom.fileName(); custom.open(QFile::ReadOnly); - sheet += custom.readAll(); + cssContent.append(custom.readAll()); custom.close(); } - setStyleSheet(sheet); + setStyleSheet(cssContent); } void MainWindow::setLanguage(ScintillaNext *editor, const QString &languageName) @@ -2094,3 +2134,8 @@ void MainWindow::languageMenuTriggered() setLanguage(editor, v.toString()); } + +Settings* MainWindow::getSettings() +{ + return app->getSettings(); +} diff --git a/src/NotepadNext/dialogs/MainWindow.h b/src/NotepadNext/dialogs/MainWindow.h index 3470b4e26..ede8e4b3f 100644 --- a/src/NotepadNext/dialogs/MainWindow.h +++ b/src/NotepadNext/dialogs/MainWindow.h @@ -30,6 +30,7 @@ #include "ScintillaNext.h" #include "NppImporter.h" #include "SearchResultsCollector.h" +#include "Settings.h" namespace Ui { class MainWindow; @@ -125,6 +126,8 @@ public slots: void switchToEditor(const ScintillaNext *editor); + Settings* getSettings(); + signals: void editorActivated(ScintillaNext *editor); void aboutToClose(); diff --git a/src/NotepadNext/dialogs/PreferencesDialog.cpp b/src/NotepadNext/dialogs/PreferencesDialog.cpp index c58fe7cb0..95f9229eb 100644 --- a/src/NotepadNext/dialogs/PreferencesDialog.cpp +++ b/src/NotepadNext/dialogs/PreferencesDialog.cpp @@ -44,6 +44,7 @@ PreferencesDialog::PreferencesDialog(ApplicationSettings *settings, QWidget *par MapSettingToCheckBox(ui->checkBoxRecenterSearchDialog, &ApplicationSettings::centerSearchDialog, &ApplicationSettings::setCenterSearchDialog, &ApplicationSettings::centerSearchDialogChanged); MapSettingToGroupBox(ui->gbxRestorePreviousSession, &ApplicationSettings::restorePreviousSession, &ApplicationSettings::setRestorePreviousSession, &ApplicationSettings::restorePreviousSessionChanged); + connect(ui->gbxRestorePreviousSession, &QGroupBox::toggled, this, [=](bool checked) { if (!checked) { ui->checkBoxUnsavedFiles->setChecked(false); @@ -66,6 +67,8 @@ PreferencesDialog::PreferencesDialog(ApplicationSettings *settings, QWidget *par }); MapSettingToCheckBox(ui->checkBoxExitOnLastTabClosed, &ApplicationSettings::exitOnLastTabClosed, &ApplicationSettings::setExitOnLastTabClosed, &ApplicationSettings::exitOnLastTabClosedChanged); + + MapSettingToCheckBox(ui->checkBoxDarkMode, &ApplicationSettings::darkMode, &ApplicationSettings::setDarkMode, &ApplicationSettings::darModeChanged); ui->fcbDefaultFont->setCurrentFont(QFont(settings->fontName())); connect(ui->fcbDefaultFont, &QFontComboBox::currentFontChanged, this, [=](const QFont &f) { diff --git a/src/NotepadNext/dialogs/PreferencesDialog.ui b/src/NotepadNext/dialogs/PreferencesDialog.ui index ee7df5ec5..ce2cadf59 100644 --- a/src/NotepadNext/dialogs/PreferencesDialog.ui +++ b/src/NotepadNext/dialogs/PreferencesDialog.ui @@ -37,6 +37,13 @@ + + + + Dark Mode + + + diff --git a/src/NotepadNext/docks/LuaConsoleDock.cpp b/src/NotepadNext/docks/LuaConsoleDock.cpp index 722b7fa17..a3a9814c2 100644 --- a/src/NotepadNext/docks/LuaConsoleDock.cpp +++ b/src/NotepadNext/docks/LuaConsoleDock.cpp @@ -24,6 +24,7 @@ #include "ILexer.h" #include "Lexilla.h" #include "SciLexer.h" +#include "MainWindow.h" #include "LuaState.h" @@ -31,6 +32,8 @@ #include "LuaExtension.h" +#include "ThemeColors.h" + #include #include @@ -88,6 +91,7 @@ LuaConsoleDock::LuaConsoleDock(LuaState *l, QWidget *parent) : ui(new Ui::LuaConsoleDock) { L = l; + darkMode = ((MainWindow*)parent)->getSettings()->darkMode(); // Override print to print to the console lua_pushlightuserdata(L->L, this); @@ -154,6 +158,7 @@ LuaConsoleDock::LuaConsoleDock(LuaState *l, QWidget *parent) : input->setMarginTypeN(1, SC_MARGIN_RTEXT); input->styleSetBold(STYLE_LINENUMBER, true); input->setMarginLeft(2); + input->setCaretFore(DARK_DEFAULT_FG); input->clearCmdKey('Q' + (SCMOD_CTRL << 16)); input->clearCmdKey('W' + (SCMOD_CTRL << 16)); @@ -185,9 +190,12 @@ LuaConsoleDock::LuaConsoleDock(LuaState *l, QWidget *parent) : output->styleSetFore(39, 0x0000FF); // For error messages + int minHeight = input->textHeight(0); + if(darkMode) minHeight *= 2; // double height for dark mode, smaller in dark + input->setExtraAscent(2); input->setExtraDescent(2); - input->setMaximumHeight(input->textHeight(0)); + input->setMaximumHeight(minHeight); input->installEventFilter(this); connect(input, &ScintillaNext::updateUi, [=](Scintilla::Update flags) { @@ -319,42 +327,76 @@ void LuaConsoleDock::setupStyle(ScintillaNext *editor) { editor->setEOLMode(SC_EOL_CRLF); - editor->styleSetFore(STYLE_DEFAULT, 0x000000); - editor->styleSetBack(STYLE_DEFAULT, 0xFFFFFF); editor->styleSetFont(STYLE_DEFAULT, "Courier New"); - editor->styleSetSize(STYLE_DEFAULT, 10); + editor->styleSetSize(STYLE_DEFAULT, 11); // 10 too small on MacOS at least editor->styleClearAll(); // Setup the margins - editor->setMarginWidthN(0, 0); - editor->setMarginWidthN(2, 0); - editor->setMarginWidthN(3, 0); - editor->setMarginWidthN(4, 0); + int margin = 0; + editor->setMarginWidthN(0, margin); + editor->setMarginWidthN(2, margin); + editor->setMarginWidthN(3, margin); + editor->setMarginWidthN(4, margin); editor->setCodePage(SC_CP_UTF8); - editor->styleSetFore(SCE_LUA_COMMENT, 0x008000); - editor->styleSetFore(SCE_LUA_COMMENTLINE, 0x008000); - editor->styleSetFore(SCE_LUA_COMMENTDOC, 0x808000); - editor->styleSetFore(SCE_LUA_LITERALSTRING, 0x4A0095); - editor->styleSetFore(SCE_LUA_PREPROCESSOR, 0x004080); // Technically not used since this is lua 5+ - editor->styleSetFore(SCE_LUA_WORD, 0xFF0000); editor->styleSetBold(SCE_LUA_WORD, 1); // for SCI_SETKEYWORDS, 0 - editor->styleSetFore(SCE_LUA_NUMBER, 0x0080FF); - editor->styleSetFore(SCE_LUA_STRING, 0x808080); - editor->styleSetFore(SCE_LUA_CHARACTER, 0x808080); - editor->styleSetFore(SCE_LUA_OPERATOR, 0x800000); editor->styleSetBold(SCE_LUA_OPERATOR, 1); - editor->styleSetFore(SCE_LUA_WORD2, 0xC08000); editor->styleSetBold(SCE_LUA_WORD2, 1); // for SCI_SETKEYWORDS, 1 - editor->styleSetFore(SCE_LUA_WORD3, 0xFF0080); editor->styleSetBold(SCE_LUA_WORD3, 1); // for SCI_SETKEYWORDS, 2 - editor->styleSetFore(SCE_LUA_WORD4, 0xA00000); editor->styleSetBold(SCE_LUA_WORD4, 1); editor->styleSetItalic(SCE_LUA_WORD4, 1); // for SCI_SETKEYWORDS, 3 - editor->styleSetFore(SCE_LUA_LABEL, 0x008080); editor->styleSetBold(SCE_LUA_LABEL, 1); - editor->styleSetFore(SCE_LUA_WORD5, 0x004080); // for SCI_SETKEYWORDS, 4, Scintilla defines editor->styleSetBold(SCE_LUA_WORD5, 1); - editor->styleSetFore(SCE_LUA_WORD6, 0x004080); // for SCI_SETKEYWORDS, 5, Notepad++ defines editor->styleSetBold(SCE_LUA_WORD6, 1); + + // set up colors + int defaultFg = darkMode ? DARK_DEFAULT_FG : LIGHT_DEFAULT_FG; + int defaultBg = darkMode ? DARK_DEFAULT_BG : LIGHT_DEFAULT_BG; + + editor->styleSetFore(STYLE_DEFAULT, defaultFg); + editor->styleSetBack(STYLE_DEFAULT, defaultBg); + + if(darkMode){ + // set back ground color, default + for(int i = SCE_LUA_DEFAULT; i <= SCE_LUA_LABEL; i++){ + editor->styleSetFore(i, defaultFg); + editor->styleSetBack(i, DARK_DEFAULT_BG); + } + + int commentColor = 0x808000; + editor->styleSetFore(SCE_LUA_COMMENT, commentColor); + editor->styleSetFore(SCE_LUA_COMMENTLINE, commentColor); + editor->styleSetFore(SCE_LUA_COMMENTDOC, commentColor); + editor->styleSetFore(SCE_LUA_LITERALSTRING, 0x4A0095); + editor->styleSetFore(SCE_LUA_PREPROCESSOR, 0x004080); // Technically not used since this is lua 5+ + editor->styleSetFore(SCE_LUA_WORD, 0xFF0000); + editor->styleSetFore(SCE_LUA_NUMBER, 0x0080FF); + editor->styleSetFore(SCE_LUA_STRING, 0x808080); + editor->styleSetFore(SCE_LUA_CHARACTER, 0x808080); + editor->styleSetFore(SCE_LUA_OPERATOR, 0x800000); + editor->styleSetFore(SCE_LUA_WORD2, 0xC08000); + editor->styleSetFore(SCE_LUA_WORD3, 0xFF0080); + editor->styleSetFore(SCE_LUA_WORD4, DARK_DEFAULT_FG); + editor->styleSetFore(SCE_LUA_LABEL, 0x008080); + editor->styleSetFore(SCE_LUA_WORD5, 0x004080); // for SCI_SETKEYWORDS, 4, Scintilla defines + editor->styleSetFore(SCE_LUA_WORD6, 0x004080); // for SCI_SETKEYWORDS, 5, Notepad++ defines + } + else { + editor->styleSetFore(SCE_LUA_COMMENT, 0x008000); + editor->styleSetFore(SCE_LUA_COMMENTLINE, 0x008000); + editor->styleSetFore(SCE_LUA_COMMENTDOC, 0x808000); + editor->styleSetFore(SCE_LUA_LITERALSTRING, 0x4A0095); + editor->styleSetFore(SCE_LUA_PREPROCESSOR, 0x004080); // Technically not used since this is lua 5+ + editor->styleSetFore(SCE_LUA_WORD, 0xFF0000); + editor->styleSetFore(SCE_LUA_NUMBER, 0x0080FF); + editor->styleSetFore(SCE_LUA_STRING, 0x808080); + editor->styleSetFore(SCE_LUA_CHARACTER, 0x808080); + editor->styleSetFore(SCE_LUA_OPERATOR, 0x800000); + editor->styleSetFore(SCE_LUA_WORD2, 0xC08000); + editor->styleSetFore(SCE_LUA_WORD3, 0xFF0080); + editor->styleSetFore(SCE_LUA_WORD4, 0x000000); + editor->styleSetFore(SCE_LUA_LABEL, 0x008080); + editor->styleSetFore(SCE_LUA_WORD5, 0x004080); // for SCI_SETKEYWORDS, 4, Scintilla defines + editor->styleSetFore(SCE_LUA_WORD6, 0x004080); // for SCI_SETKEYWORDS, 5, Notepad++ defines + } } diff --git a/src/NotepadNext/docks/LuaConsoleDock.h b/src/NotepadNext/docks/LuaConsoleDock.h index 3ca73ebe7..13e8b3150 100644 --- a/src/NotepadNext/docks/LuaConsoleDock.h +++ b/src/NotepadNext/docks/LuaConsoleDock.h @@ -53,6 +53,8 @@ public slots: ScintillaNext *output; ScintillaNext *input; + bool darkMode = false; + void setupStyle(ScintillaNext *editor); }; diff --git a/src/NotepadNext/languages/actionscript.lua b/src/NotepadNext/languages/actionscript.lua index f107c958f..3362b3b19 100644 --- a/src/NotepadNext/languages/actionscript.lua +++ b/src/NotepadNext/languages/actionscript.lua @@ -17,103 +17,108 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["FUNCTION"] = { id = 20, fgColor = rgb(0x95004A), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT"] = { id = 23, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT DOC"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), + }, + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/ada.lua b/src/NotepadNext/languages/ada.lua index 0e149608e..89ab0204c 100644 --- a/src/NotepadNext/languages/ada.lua +++ b/src/NotepadNext/languages/ada.lua @@ -17,56 +17,56 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 1, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 2, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DELIMITER"] = { id = 4, fgColor = rgb(0xFF8080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["CHARACTER"] = { id = 5, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT LINE"] = { id = 10, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ILLEGAL"] = { id = 11, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/asm.lua b/src/NotepadNext/languages/asm.lua index 60f48ef90..846a832f7 100644 --- a/src/NotepadNext/languages/asm.lua +++ b/src/NotepadNext/languages/asm.lua @@ -20,45 +20,45 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 4, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CPU INSTRUCTION"] = { id = 6, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MATH INSTRUCTION"] = { id = 7, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["REGISTER"] = { @@ -70,28 +70,28 @@ L.styles = { ["DIRECTIVE"] = { id = 9, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DIRECTIVE OPERAND"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT BLOCK"] = { id = 11, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 12, fgColor = rgb(0x808000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["EXT INSTRUCTION"] = { id = 14, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/asn1.lua b/src/NotepadNext/languages/asn1.lua index d468aa364..fdd2e557b 100644 --- a/src/NotepadNext/languages/asn1.lua +++ b/src/NotepadNext/languages/asn1.lua @@ -16,60 +16,60 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIERS"] = { id = 2, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DOUBLE QUOTED STRING"] = { id = 3, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMERIC OID DEFINITION"] = { id = 4, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NON OID NUMBERS"] = { id = 5, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORDS"] = { id = 6, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ATTRIBUTES"] = { id = 7, fgColor = rgb(0xF07800), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DESCRIPTORS"] = { id = 8, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TYPES"] = { id = 9, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATORS"] = { id = 10, fgColor = rgb(0x222222), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/asp.lua b/src/NotepadNext/languages/asp.lua index b55989cea..dfb09b112 100644 --- a/src/NotepadNext/languages/asp.lua +++ b/src/NotepadNext/languages/asp.lua @@ -15,7 +15,7 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 81, - fgColor = rgb(0x8000FF), + fgColor = rgb(TypeColor), bgColor = rgb(0xC4F9FD), }, ["COMMENTLINE"] = { @@ -30,7 +30,7 @@ L.styles = { }, ["WORD"] = { id = 84, - fgColor = rgb(0x000080), + fgColor = rgb(OperatorColor), bgColor = rgb(0xC4F9FD), fontStyle = 1, }, @@ -41,18 +41,18 @@ L.styles = { }, ["IDENTIFIER"] = { id = 86, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xC4F9FD), }, ["ASPSYMBOL"] = { id = 15, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFFFF00), fontStyle = 1, }, ["SCRIPTTYPE"] = { id = 16, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFFC000), }, } diff --git a/src/NotepadNext/languages/autoit.lua b/src/NotepadNext/languages/autoit.lua index 33c451a36..f19db8c48 100644 --- a/src/NotepadNext/languages/autoit.lua +++ b/src/NotepadNext/languages/autoit.lua @@ -21,81 +21,81 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["FUNCTION"] = { id = 4, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MACRO"] = { id = 6, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 8, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VARIABLE"] = { id = 9, fgColor = rgb(0xFF0080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["SENT"] = { id = 10, fgColor = rgb(0x8080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 11, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SPECIAL"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["EXPAND"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMOBJ"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/avs.lua b/src/NotepadNext/languages/avs.lua index c605b7c0f..0c3a2ed21 100644 --- a/src/NotepadNext/languages/avs.lua +++ b/src/NotepadNext/languages/avs.lua @@ -21,86 +21,86 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 32, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["WHITE SPACE"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT: /* */"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT: [* *]"] = { id = 2, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LINE COMMENT: #"] = { id = 3, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATORS"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIERS"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DOUBLE QUOTED STRING"] = { id = 7, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING WITH THREE DOUBLE QUOTES"] = { id = 8, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD"] = { id = 9, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FILTER"] = { id = 10, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PLUGIN"] = { id = 11, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION"] = { id = 12, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CLIP PROPERTIES"] = { id = 13, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["USER DEFINED"] = { id = 14, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/baanc.lua b/src/NotepadNext/languages/baanc.lua index cddc78727..06c098721 100644 --- a/src/NotepadNext/languages/baanc.lua +++ b/src/NotepadNext/languages/baanc.lua @@ -24,13 +24,13 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x808040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 3, }, ["COMMENT DOC"] = { @@ -42,66 +42,66 @@ L.styles = { ["NUMBER"] = { id = 3, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS"] = { id = 4, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING"] = { id = 5, fgColor = rgb(0xFF0080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREPROCESSOR"] = { id = 6, fgColor = rgb(0x0000A0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATOR"] = { id = 7, fgColor = rgb(0x800040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["STRING EOL NC"] = { id = 9, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xE0C0E0), fontStyle = 3, }, ["FUNCTIONS"] = { id = 10, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTIONS ABRIDGED"] = { id = 11, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SUB SECTIONS"] = { id = 12, fgColor = rgb(0xFF4500), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MAIN SECTIONS"] = { id = 13, fgColor = rgb(0x800080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREDEFINED VARIABLE"] = { @@ -118,7 +118,7 @@ L.styles = { }, ["ENUM DOMAINS"] = { id = 16, - fgColor = rgb(0x000080), + fgColor = rgb(OperatorColor), bgColor = rgb(0xFFFF80), fontStyle = 1, }, @@ -131,43 +131,43 @@ L.styles = { ["TABLE DEFINITIONS"] = { id = 18, fgColor = rgb(0x9932CC), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 5, }, ["TABLE SQL"] = { id = 19, fgColor = rgb(0x8A2BE2), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DLL FUNCTIONS"] = { id = 20, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DOMAIN DEFINITIONS"] = { id = 21, fgColor = rgb(0xB8860B), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 5, }, ["FUNCTION DEFINITIONS"] = { id = 22, fgColor = rgb(0xB22222), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 5, }, ["OBJECT DEFINITIONS"] = { id = 23, fgColor = rgb(0x8080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 5, }, ["PREPROC DEFINITIONS"] = { id = 24, fgColor = rgb(0x556B2F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 5, }, } diff --git a/src/NotepadNext/languages/bash.lua b/src/NotepadNext/languages/bash.lua index 1eee288ab..a0548234d 100644 --- a/src/NotepadNext/languages/bash.lua +++ b/src/NotepadNext/languages/bash.lua @@ -29,45 +29,45 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["ERROR"] = { id = 1, - fgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultBg), bgColor = rgb(0xFF0000), }, ["INSTRUCTION WORD"] = { id = 4, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 3, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 5, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 7, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["SCALAR"] = { id = 9, @@ -78,7 +78,7 @@ L.styles = { ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PARAM"] = { id = 10, diff --git a/src/NotepadNext/languages/batch.lua b/src/NotepadNext/languages/batch.lua index 96950dac7..6b1b7d016 100644 --- a/src/NotepadNext/languages/batch.lua +++ b/src/NotepadNext/languages/batch.lua @@ -17,18 +17,18 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORDS"] = { id = 2, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["LABEL"] = { @@ -40,12 +40,12 @@ L.styles = { ["HIDE SYMBOL"] = { id = 4, fgColor = rgb(0xFF00FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMAND"] = { id = 5, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VARIABLE"] = { id = 6, @@ -56,7 +56,7 @@ L.styles = { ["OPERATOR"] = { id = 7, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/blitzbasic.lua b/src/NotepadNext/languages/blitzbasic.lua index e071944b3..6b3f16a65 100644 --- a/src/NotepadNext/languages/blitzbasic.lua +++ b/src/NotepadNext/languages/blitzbasic.lua @@ -18,58 +18,58 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD1"] = { id = 3, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 4, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEYWORD2"] = { id = 10, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD3"] = { id = 11, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD4"] = { id = 12, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 15, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ERROR"] = { id = 16, @@ -79,12 +79,12 @@ L.styles = { ["HEXNUMBER"] = { id = 17, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BINNUMBER"] = { id = 18, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/c.lua b/src/NotepadNext/languages/c.lua index 0db78eddd..8541de356 100644 --- a/src/NotepadNext/languages/c.lua +++ b/src/NotepadNext/languages/c.lua @@ -15,99 +15,104 @@ L.keywords = { } L.styles = { + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), + }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT"] = { id = 23, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT DOC"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/caml.lua b/src/NotepadNext/languages/caml.lua index d8dc26c17..0d71fe9ab 100644 --- a/src/NotepadNext/languages/caml.lua +++ b/src/NotepadNext/languages/caml.lua @@ -18,81 +18,81 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 1, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["TAGNAME"] = { id = 2, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 3, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["BUILIN FUNC & TYPE"] = { id = 4, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["TYPE"] = { id = 5, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["LINENUM"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATOR"] = { id = 7, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 8, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 9, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 11, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 12, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 13, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 14, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/cmake.lua b/src/NotepadNext/languages/cmake.lua index fb918bfb7..eda83db3a 100644 --- a/src/NotepadNext/languages/cmake.lua +++ b/src/NotepadNext/languages/cmake.lua @@ -17,75 +17,75 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING D"] = { id = 2, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING L"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["STRING R"] = { id = 4, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 4, }, ["COMMAND"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PARAMETER"] = { id = 6, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["VARIABLE"] = { id = 7, fgColor = rgb(0xFF8040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["USER DEFINED"] = { id = 8, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["WHILEDEF"] = { id = 9, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FOREACHDEF"] = { id = 10, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IFDEF"] = { id = 11, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MACRODEF"] = { id = 12, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING VARIABLE"] = { @@ -97,7 +97,7 @@ L.styles = { ["NUMBER"] = { id = 14, fgColor = rgb(0x804040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/cobol.lua b/src/NotepadNext/languages/cobol.lua index 029ebc4be..b1c4334d4 100644 --- a/src/NotepadNext/languages/cobol.lua +++ b/src/NotepadNext/languages/cobol.lua @@ -25,81 +25,81 @@ L.styles = { ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DECLARATION"] = { id = 5, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["INSTRUCTION WORD"] = { id = 16, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD"] = { id = 8, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/coffeescript.lua b/src/NotepadNext/languages/coffeescript.lua index 5989fb2e5..d3a147636 100644 --- a/src/NotepadNext/languages/coffeescript.lua +++ b/src/NotepadNext/languages/coffeescript.lua @@ -19,108 +19,108 @@ L.styles = { ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREDEFINED CONSTANT"] = { id = 19, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT BLOCK"] = { id = 22, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VERBOSE REGEX"] = { id = 23, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 3, }, ["VERBOSE REGEX COMMENT"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/cpp.lua b/src/NotepadNext/languages/cpp.lua index 57b5445c7..f96d8096d 100644 --- a/src/NotepadNext/languages/cpp.lua +++ b/src/NotepadNext/languages/cpp.lua @@ -29,104 +29,109 @@ L.keywords = { } L.styles = { + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), + }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT"] = { id = 23, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT DOC"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TASK MARKER"] = { id = 26, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/cs.lua b/src/NotepadNext/languages/cs.lua index 0708fd553..d3e5321c3 100644 --- a/src/NotepadNext/languages/cs.lua +++ b/src/NotepadNext/languages/cs.lua @@ -14,99 +14,104 @@ L.keywords = { } L.styles = { + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), + }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT"] = { id = 23, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT DOC"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/csound.lua b/src/NotepadNext/languages/csound.lua index 90b09247c..378878a60 100644 --- a/src/NotepadNext/languages/csound.lua +++ b/src/NotepadNext/languages/csound.lua @@ -19,84 +19,84 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x669999), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0x339933), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 3, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTR"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["OPCODE"] = { id = 6, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["HEADER STATEMENT"] = { id = 7, fgColor = rgb(0xCC2200), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["USER KEYWORDS"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT BLOCK"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["PARAMETER"] = { id = 10, fgColor = rgb(0x660099), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["A-RATE VARIABLE"] = { id = 11, fgColor = rgb(0x660099), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["K-RATE VARIABLE"] = { id = 12, fgColor = rgb(0x660099), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["I-RATE VARIABLE"] = { id = 13, fgColor = rgb(0x660099), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["GLOBAL VARIABLE"] = { id = 14, fgColor = rgb(0x660099), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["END OF LINE WHERE STRING IS NOT CLOSED"] = { id = 15, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xE0C0E0), }, } diff --git a/src/NotepadNext/languages/css.lua b/src/NotepadNext/languages/css.lua index c226574b7..efba372c6 100644 --- a/src/NotepadNext/languages/css.lua +++ b/src/NotepadNext/languages/css.lua @@ -14,74 +14,74 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["TAG"] = { id = 1, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["CLASS"] = { id = 2, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PSEUDOCLASS"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["UNKNOWN_PSEUDOCLASS"] = { id = 4, fgColor = rgb(0xFF8080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 6, fgColor = rgb(0x8080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["UNKNOWN_IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["VALUE"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 9, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ID"] = { id = 10, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IMPORTANT"] = { id = 11, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DIRECTIVE"] = { id = 12, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/d.lua b/src/NotepadNext/languages/d.lua index 1b021587d..301de4707 100644 --- a/src/NotepadNext/languages/d.lua +++ b/src/NotepadNext/languages/d.lua @@ -16,116 +16,116 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 6, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEWORD1"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEWORD2"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEWORD3"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEWORD4"] = { id = 20, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEWORD5"] = { id = 21, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEWORD6"] = { id = 22, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 5, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 10, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 12, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 13, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT NESTED"] = { id = 4, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 16, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING B"] = { id = 18, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING R"] = { id = 19, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/diff.lua b/src/NotepadNext/languages/diff.lua index f3ad42a88..453bec4bb 100644 --- a/src/NotepadNext/languages/diff.lua +++ b/src/NotepadNext/languages/diff.lua @@ -13,39 +13,39 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMAND"] = { id = 2, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["HEADER"] = { id = 3, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["POSITION"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DELETED"] = { id = 5, fgColor = rgb(0x808040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ADDED"] = { id = 6, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/erlang.lua b/src/NotepadNext/languages/erlang.lua index 0f790a2b9..75d7f8f2e 100644 --- a/src/NotepadNext/languages/erlang.lua +++ b/src/NotepadNext/languages/erlang.lua @@ -21,138 +21,138 @@ L.keywords = { L.styles = { ["DEFAULT STYLE"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DEFAULT COMMENT"] = { id = 1, fgColor = rgb(0xd00000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["FUNCTION COMMENT"] = { id = 14, fgColor = rgb(0x3f5fbf), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MODULE COMMENT"] = { id = 15, fgColor = rgb(0x3f5fbf), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOCUMENTATION HELPER IN COMMENT"] = { id = 16, fgColor = rgb(0x3f5fbf), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DOCUMENTATION MACRO IN COMMENT"] = { id = 17, fgColor = rgb(0x3f5fbf), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 3, }, ["VARIABLE"] = { id = 2, fgColor = rgb(0x7f0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 3, fgColor = rgb(0x007f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 5, fgColor = rgb(0xff901e), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 9, fgColor = rgb(0x007f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MACRO"] = { id = 10, fgColor = rgb(0x7f007f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MACRO QUOTED"] = { id = 19, fgColor = rgb(0x7f007f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECORD"] = { id = 11, fgColor = rgb(0x7f7f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["RECORD QUOTED"] = { id = 20, fgColor = rgb(0x7f7f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["ATOM"] = { id = 7, fgColor = rgb(0x7f7f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ATOM QUOTED"] = { id = 18, fgColor = rgb(0x7f7f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NODE NAME"] = { id = 13, fgColor = rgb(0x007f7f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NODE NAME QUOTED"] = { id = 21, fgColor = rgb(0x007f7f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RESERVED WORDS"] = { id = 4, fgColor = rgb(0x00007f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["BUILT-IN FUNCTIONS"] = { id = 22, - fgColor = rgb(0x0000ff), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION NAME"] = { id = 8, fgColor = rgb(0x00007f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MODULE NAME"] = { id = 23, fgColor = rgb(0x00cccc), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MODULE ATTRIBUTES"] = { id = 24, fgColor = rgb(0x007f7f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 12, fgColor = rgb(0x007f7f), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATORS"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["UNKNOWN: ERROR"] = { id = 31, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFF0000), }, } diff --git a/src/NotepadNext/languages/escript.lua b/src/NotepadNext/languages/escript.lua index a648d95e4..38931358c 100644 --- a/src/NotepadNext/languages/escript.lua +++ b/src/NotepadNext/languages/escript.lua @@ -18,63 +18,63 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LINE COMMENT"] = { id = 2, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOC COMMENT"] = { id = 3, fgColor = rgb(0x3F703F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD"] = { id = 5, fgColor = rgb(0xFF4000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOUBLE QUOTED STRING"] = { id = 6, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATORS"] = { id = 7, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIERS"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["BRACES"] = { id = 9, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["KEYWORDS2"] = { id = 10, fgColor = rgb(0xB00040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORDS3"] = { id = 11, fgColor = rgb(0xB00040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/forth.lua b/src/NotepadNext/languages/forth.lua index 43b0daf35..7a0d36668 100644 --- a/src/NotepadNext/languages/forth.lua +++ b/src/NotepadNext/languages/forth.lua @@ -20,69 +20,69 @@ L.keywords = { L.styles = { ["WHITESPACE"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x009933), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ML COMMENT"] = { id = 2, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 3, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["CONTROL"] = { id = 4, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DEFWORDS"] = { id = 6, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREWORD1"] = { id = 7, fgColor = rgb(0xCC3300), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREWORD2"] = { id = 8, fgColor = rgb(0x996633), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 9, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOUBLE QUOTED STRING"] = { id = 10, fgColor = rgb(0xCC3300), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LOCALE"] = { id = 11, fgColor = rgb(0x0000CC), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/fortran.lua b/src/NotepadNext/languages/fortran.lua index 8ba35d3a3..ebc0eebed 100644 --- a/src/NotepadNext/languages/fortran.lua +++ b/src/NotepadNext/languages/fortran.lua @@ -22,79 +22,79 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING2"] = { id = 4, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 8, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION1"] = { id = 9, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION2"] = { id = 10, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREPROCESSOR"] = { id = 11, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR2"] = { id = 12, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 13, - fgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultBg), bgColor = rgb(0xFF80FF), fontStyle = 1, }, ["CONTINUATION"] = { id = 14, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/fortran77.lua b/src/NotepadNext/languages/fortran77.lua index 37807c60f..3d6af3e2e 100644 --- a/src/NotepadNext/languages/fortran77.lua +++ b/src/NotepadNext/languages/fortran77.lua @@ -17,79 +17,79 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING2"] = { id = 4, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 8, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION1"] = { id = 9, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION2"] = { id = 10, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREPROCESSOR"] = { id = 11, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR2"] = { id = 12, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 13, - fgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultBg), bgColor = rgb(0xFF80FF), fontStyle = 1, }, ["CONTINUATION"] = { id = 14, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/freebasic.lua b/src/NotepadNext/languages/freebasic.lua index 3644a24fb..d00f5e7dd 100644 --- a/src/NotepadNext/languages/freebasic.lua +++ b/src/NotepadNext/languages/freebasic.lua @@ -19,64 +19,64 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD1"] = { id = 3, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING"] = { id = 4, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 5, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEYWORD2"] = { id = 10, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD3"] = { id = 11, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD4"] = { id = 12, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 15, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ERROR"] = { id = 16, @@ -86,12 +86,12 @@ L.styles = { ["HEXNUMBER"] = { id = 17, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BINNUMBER"] = { id = 18, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/go.lua b/src/NotepadNext/languages/go.lua index 531af1bd0..9f4499121 100644 --- a/src/NotepadNext/languages/go.lua +++ b/src/NotepadNext/languages/go.lua @@ -20,104 +20,109 @@ L.keywords = { } L.styles = { + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), + }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT"] = { id = 23, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT DOC"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TASK MARKER"] = { id = 26, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/gui4cli.lua b/src/NotepadNext/languages/gui4cli.lua index af979a5af..591aab219 100644 --- a/src/NotepadNext/languages/gui4cli.lua +++ b/src/NotepadNext/languages/gui4cli.lua @@ -15,55 +15,55 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["GLOBAL"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["EVENT"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["ATTRIBUTE"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["CONTROL"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["COMMAND"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/haskell.lua b/src/NotepadNext/languages/haskell.lua index 7efad65a6..802643b15 100644 --- a/src/NotepadNext/languages/haskell.lua +++ b/src/NotepadNext/languages/haskell.lua @@ -17,90 +17,90 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 1, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEYWORD"] = { id = 2, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 3, fgColor = rgb(0x800080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 4, fgColor = rgb(0xCA6500), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 5, fgColor = rgb(0xCA6500), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CLASS"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MODULE"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CAPITAL"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DATA"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IMPORT"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 11, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), }, ["INSTANCE"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENTLINE"] = { id = 13, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENTBLOCK"] = { id = 14, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENTBLOCK2"] = { id = 15, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENTBLOCK3"] = { id = 16, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/html.lua b/src/NotepadNext/languages/html.lua index 7cae89489..0035a4a9f 100644 --- a/src/NotepadNext/languages/html.lua +++ b/src/NotepadNext/languages/html.lua @@ -25,60 +25,60 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF) + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg) }, ["COMMENT"] = { id = 9, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 5, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOUBLESTRING"] = { id = 6, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SINGLESTRING"] = { id = 7, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TAG"] = { id = 1, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["TAGEND"] = { id = 11, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["TAGUNKNOWN"] = { id = 2, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["ATTRIBUTE"] = { id = 3, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ATTRIBUTEUNKNOWN"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CDATA"] = { id = 17, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VALUE"] = { id = 19, @@ -87,38 +87,38 @@ L.styles = { }, ["ENTITY"] = { id = 10, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFEFDE0), fontStyle = 2, }, ["SGML_DEFAULT"] = { id = 21, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SGML_COMMAND"] = { id = 22, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SGML_PARAM"] = { id = 23, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SGML_DOUBLESTRING"] = { id = 24, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SGML_COMMENT"] = { id = 29, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/ihex.lua b/src/NotepadNext/languages/ihex.lua index 7f418daa4..e2c84c2c0 100644 --- a/src/NotepadNext/languages/ihex.lua +++ b/src/NotepadNext/languages/ihex.lua @@ -12,29 +12,29 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["RECSTART"] = { id = 1, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECTYPE"] = { id = 2, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECTYPE_UNKNOWN"] = { id = 3, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["BYTECOUNT"] = { id = 4, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BYTECOUNT_WRONG"] = { id = 5, @@ -44,55 +44,55 @@ L.styles = { ["NOADDRESS"] = { id = 6, fgColor = rgb(0x7F00FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DATAADDRESS"] = { id = 7, fgColor = rgb(0x007FFF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STARTADDRESS"] = { id = 9, fgColor = rgb(0x007FFF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ADDRESSFIELD_UNKNOWN"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["EXTENDEDADDRESS"] = { id = 11, fgColor = rgb(0x007FFF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DATA_ODD"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DATA_EVEN"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DATA_UNKNOWN"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["DATA_EMPTY"] = { id = 15, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CHECKSUM"] = { id = 16, fgColor = rgb(0x00BF00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHECKSUM_WRONG"] = { id = 17, @@ -101,8 +101,8 @@ L.styles = { }, ["GARBAGE"] = { id = 18, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, } diff --git a/src/NotepadNext/languages/ini.lua b/src/NotepadNext/languages/ini.lua index 53fbb7ecb..dc072bc5c 100644 --- a/src/NotepadNext/languages/ini.lua +++ b/src/NotepadNext/languages/ini.lua @@ -21,35 +21,35 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SECTION"] = { id = 2, - fgColor = rgb(0x8000FF), + fgColor = rgb(TypeColor), bgColor = rgb(0xF2F4FF), fontStyle = 9, }, ["ASSIGNMENT"] = { id = 3, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DEFVAL"] = { id = 4, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEY"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 2, }, } diff --git a/src/NotepadNext/languages/inno.lua b/src/NotepadNext/languages/inno.lua index 80a3b96d1..4904e53fa 100644 --- a/src/NotepadNext/languages/inno.lua +++ b/src/NotepadNext/languages/inno.lua @@ -20,53 +20,53 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD"] = { id = 2, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PARAMETER"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SECTION"] = { id = 4, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREPROCESSOR"] = { id = 5, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PREPROCESSOR INLINE"] = { id = 6, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT PASCAL"] = { id = 7, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD PASCAL"] = { id = 8, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD USER"] = { @@ -78,17 +78,17 @@ L.styles = { ["STRING DOUBLE"] = { id = 10, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING SINGLE"] = { id = 11, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/java.lua b/src/NotepadNext/languages/java.lua index 953d6c27c..0ad80f820 100644 --- a/src/NotepadNext/languages/java.lua +++ b/src/NotepadNext/languages/java.lua @@ -21,94 +21,99 @@ L.keywords = { } L.styles = { + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), + }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TASK MARKER"] = { id = 26, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/javascript.lua b/src/NotepadNext/languages/javascript.lua index 882828b7f..6dd4daf15 100644 --- a/src/NotepadNext/languages/javascript.lua +++ b/src/NotepadNext/languages/javascript.lua @@ -25,95 +25,100 @@ L.keywords = { } L.styles = { + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), + }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["WINDOW INSTRUCTION"] = { id = 19, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRINGRAW"] = { id = 20, - fgColor = rgb(0x000080), + fgColor = rgb(OperatorColor), bgColor = rgb(0xC0C0C0), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/json.lua b/src/NotepadNext/languages/json.lua index b7a0ab62d..b8a085dab 100644 --- a/src/NotepadNext/languages/json.lua +++ b/src/NotepadNext/languages/json.lua @@ -23,71 +23,71 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 1, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 2, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRINGEOL"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PROPERTYNAME"] = { id = 4, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["ESCAPESEQUENCE"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["LINECOMMENT"] = { id = 6, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BLOCKCOMMENT"] = { id = 7, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["URI"] = { id = 9, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["COMPACTIRI"] = { id = 10, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD"] = { id = 11, fgColor = rgb(0x18AF8A), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["LDKEYWORD"] = { id = 12, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ERROR"] = { id = 13, diff --git a/src/NotepadNext/languages/kix.lua b/src/NotepadNext/languages/kix.lua index b5e6da666..0336287e9 100644 --- a/src/NotepadNext/languages/kix.lua +++ b/src/NotepadNext/languages/kix.lua @@ -15,54 +15,54 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 31, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 2, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING2"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VAR"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["MACRO"] = { id = 6, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 7, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION"] = { id = 8, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 9, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/latex.lua b/src/NotepadNext/languages/latex.lua index 1f2af6964..f817c0262 100644 --- a/src/NotepadNext/languages/latex.lua +++ b/src/NotepadNext/languages/latex.lua @@ -15,71 +15,71 @@ L.keywords = { L.styles = { ["WHITE SPACE"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMAND"] = { id = 1, fgColor = rgb(0xAA0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TAG OPENING"] = { id = 2, fgColor = rgb(0x880088), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MATH INLINE"] = { id = 3, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 4, fgColor = rgb(0x00AA00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TAG CLOSING"] = { id = 5, fgColor = rgb(0x880088), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MATH BLOCK"] = { id = 6, fgColor = rgb(0x0000AA), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT BLOCK"] = { id = 7, fgColor = rgb(0x00AA00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VERBATIM SEGMENT"] = { id = 8, fgColor = rgb(0x666666), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SHORT COMMAND"] = { id = 9, fgColor = rgb(0xAA6600), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SPECIAL CHAR"] = { id = 10, fgColor = rgb(0xAAAA00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMAND OPTIONAL ARGUMENT"] = { id = 11, fgColor = rgb(0xFF9900), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SYNTAX ERROR"] = { id = 12, - fgColor = rgb(0xffffff), + fgColor = rgb(defaultBg), bgColor = rgb(0xff0000), }, } diff --git a/src/NotepadNext/languages/less.lua b/src/NotepadNext/languages/less.lua index f66c549ce..39f671a63 100644 --- a/src/NotepadNext/languages/less.lua +++ b/src/NotepadNext/languages/less.lua @@ -20,74 +20,74 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["TAG"] = { id = 1, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["CLASS"] = { id = 2, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PSEUDOCLASS"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["UNKNOWN_PSEUDOCLASS"] = { id = 4, fgColor = rgb(0xFF8080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 6, fgColor = rgb(0x8080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["UNKNOWN_IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["VALUE"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 9, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ID"] = { id = 10, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IMPORTANT"] = { id = 11, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DIRECTIVE"] = { id = 12, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/lisp.lua b/src/NotepadNext/languages/lisp.lua index 445ae59c0..3a72bb139 100644 --- a/src/NotepadNext/languages/lisp.lua +++ b/src/NotepadNext/languages/lisp.lua @@ -17,62 +17,62 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENTLINE"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["FUNCTION WORD"] = { id = 3, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION WORD2"] = { id = 4, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SYMBOL"] = { id = 5, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SPECIAL"] = { id = 11, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 12, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/lua.lua b/src/NotepadNext/languages/lua.lua index c02f4782f..b8fd3596f 100644 --- a/src/NotepadNext/languages/lua.lua +++ b/src/NotepadNext/languages/lua.lua @@ -18,88 +18,88 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LITERALSTRING"] = { id = 8, fgColor = rgb(0x95004A), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNC1"] = { id = 13, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNC2"] = { id = 14, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNC3"] = { id = 15, fgColor = rgb(0x0000A0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 3, }, ["IDENTIFIER"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 20, fgColor = rgb(0x808000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/makefile.lua b/src/NotepadNext/languages/makefile.lua index d981b4fba..f6cb57ee7 100644 --- a/src/NotepadNext/languages/makefile.lua +++ b/src/NotepadNext/languages/makefile.lua @@ -12,44 +12,46 @@ L.extensions = { L.keywords = { } + L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 2, - fgColor = rgb(0x000080), + fgColor = rgb(OperatorColor), bgColor = rgb(0xC0C0C0), fontStyle = 1, }, ["IDENTIFIER"] = { id = 3, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TARGET"] = { id = 5, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDEOL"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, } + return L diff --git a/src/NotepadNext/languages/markdown.lua b/src/NotepadNext/languages/markdown.lua index 38bcb1ab5..905b7303c 100644 --- a/src/NotepadNext/languages/markdown.lua +++ b/src/NotepadNext/languages/markdown.lua @@ -12,88 +12,88 @@ L.extensions = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["SCE_MARKDOWN_STRONG1"] = { id = 2, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_STRONG2"] = { id = 3, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_EM1"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["SCE_MARKDOWN_EM2"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["SCE_MARKDOWN_HEADER1"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_HEADER2"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_HEADER3"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_HEADER4"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_HEADER5"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_HEADER6"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_PRECHAR"] = { id = 12, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xEEEEAA), }, ["SCE_MARKDOWN_ULIST_ITEM"] = { id = 13, fgColor = rgb(0x555555), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SCE_MARKDOWN_OLIST_ITEM"] = { id = 14, fgColor = rgb(0x555555), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SCE_MARKDOWN_OLIST_ITEM"] = { id = 15, fgColor = rgb(0x000088), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SCE_MARKDOWN_STRIKEOUT"] = { id = 16, @@ -103,13 +103,13 @@ L.styles = { ["SCE_MARKDOWN_HRULE"] = { id = 17, fgColor = rgb(0x555555), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SCE_MARKDOWN_LINK"] = { id = 18, fgColor = rgb(0x0000AA), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 4, }, ["SCE_MARKDOWN_CODE"] = { diff --git a/src/NotepadNext/languages/matlab.lua b/src/NotepadNext/languages/matlab.lua index 0ed044378..6c69c7f2f 100644 --- a/src/NotepadNext/languages/matlab.lua +++ b/src/NotepadNext/languages/matlab.lua @@ -15,50 +15,50 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMAND"] = { id = 2, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 4, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING"] = { id = 5, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DOUBLE QUOTE STRING"] = { id = 8, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/mmixal.lua b/src/NotepadNext/languages/mmixal.lua index 048b8ed81..4c37394b7 100644 --- a/src/NotepadNext/languages/mmixal.lua +++ b/src/NotepadNext/languages/mmixal.lua @@ -17,33 +17,33 @@ L.keywords = { L.styles = { ["DIVSION OF LEADING WHITESPACE IN LINE"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 2, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["OPCODE"] = { id = 3, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DIVISION BETWEEN LABEL AND OPCODE"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["VALID OPCODE"] = { id = 5, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["UNKNOWN OPCODE"] = { @@ -53,59 +53,59 @@ L.styles = { }, ["DIVISION BETWEEN OPCODE AND OPERANDS"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DIVISION OF OPERANDS"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 9, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["REFERENCE (TO A LABEL)"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CHAR"] = { id = 11, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 12, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["REGISTER"] = { id = 13, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HEXADECIMAL NUMBER"] = { id = 14, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 15, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SYMBOL"] = { id = 16, fgColor = rgb(0xFF7777), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT OTHERWISE"] = { id = 17, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/nfo.lua b/src/NotepadNext/languages/nfo.lua index f461e430e..6a0d2df86 100644 --- a/src/NotepadNext/languages/nfo.lua +++ b/src/NotepadNext/languages/nfo.lua @@ -13,7 +13,7 @@ L.styles = { ["DEFAULT"] = { id = 32, fgColor = rgb(0x2E2E2E), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/nimrod.lua b/src/NotepadNext/languages/nimrod.lua index 5e70e94e8..5ef14e1e2 100644 --- a/src/NotepadNext/languages/nimrod.lua +++ b/src/NotepadNext/languages/nimrod.lua @@ -16,86 +16,86 @@ L.styles = { ["WHITE SPACE"] = { id = 0, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 3, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SINGLE QUOTED STRING"] = { id = 4, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD"] = { id = 5, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TRIPLE QUOTES"] = { id = 6, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TRIPLE DOUBLE QUOTES"] = { id = 7, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CLASS NAME DEFINITION"] = { id = 8, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION OR METHOD NAME DEFINITION"] = { id = 9, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATORS"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIERS"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT-BLOCKS"] = { id = 12, fgColor = rgb(0x7F7F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["END OF LINE WHERE STRING IS NOT CLOSED"] = { id = 13, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xE0C0E0), }, ["HIGHLIGHTED IDENTIFIERS"] = { id = 14, fgColor = rgb(0x407090), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DECORATORS"] = { id = 15, fgColor = rgb(0x805000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/nncrontab.lua b/src/NotepadNext/languages/nncrontab.lua index f809a429b..2b8944b5d 100644 --- a/src/NotepadNext/languages/nncrontab.lua +++ b/src/NotepadNext/languages/nncrontab.lua @@ -18,13 +18,13 @@ L.keywords = { L.styles = { ["WHITESPACE"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TASK START/END"] = { id = 2, @@ -34,45 +34,45 @@ L.styles = { ["SECTION KEYWORDS"] = { id = 3, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["MODIFICATORS"] = { id = 5, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["ASTERISK"] = { id = 6, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFFE0FF), fontStyle = 1, }, ["NUMBER"] = { id = 7, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOUBLE QUOTED STRING"] = { id = 8, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ENVIRONMENT VARIABLE"] = { id = 9, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFFFFE0), }, ["IDENTIFIER"] = { id = 10, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFF0000), }, } diff --git a/src/NotepadNext/languages/nsis.lua b/src/NotepadNext/languages/nsis.lua index 6bc32f342..460622c53 100644 --- a/src/NotepadNext/languages/nsis.lua +++ b/src/NotepadNext/languages/nsis.lua @@ -19,13 +19,13 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENTLINE"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING DOUBLE QUOTE"] = { id = 2, @@ -34,23 +34,23 @@ L.styles = { }, ["STRING LEFT QUOTE"] = { id = 3, - fgColor = rgb(0x000080), + fgColor = rgb(OperatorColor), bgColor = rgb(0xC0C0C0), }, ["STRING RIGHT QUOTE"] = { id = 4, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xC0C0C0), }, ["FUNCTION"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["VARIABLE"] = { id = 6, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 7, @@ -65,25 +65,25 @@ L.styles = { }, ["SECTION"] = { id = 9, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SUBSECTION"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IF DEFINE"] = { id = 11, fgColor = rgb(0x808040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MACRO"] = { id = 12, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING VAR"] = { @@ -94,30 +94,30 @@ L.styles = { ["NUMBER"] = { id = 14, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SECTION GROUP"] = { id = 15, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PAGE EX"] = { id = 16, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION DEFINITIONS"] = { id = 17, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 18, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/objc.lua b/src/NotepadNext/languages/objc.lua index 77183db10..3e59a37f8 100644 --- a/src/NotepadNext/languages/objc.lua +++ b/src/NotepadNext/languages/objc.lua @@ -19,98 +19,98 @@ L.styles = { ["DIRECTIVE"] = { id = 19, fgColor = rgb(0xA001D6), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["QUALIFIER"] = { id = 20, fgColor = rgb(0x95004A), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/oscript.lua b/src/NotepadNext/languages/oscript.lua index 89531d28f..79ddcd72a 100644 --- a/src/NotepadNext/languages/oscript.lua +++ b/src/NotepadNext/languages/oscript.lua @@ -20,100 +20,100 @@ L.keywords = { L.styles = { ["DEFAULT TEXT STYLE"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["SINGLE-LINE COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MULTI-LINE COMMENT"] = { id = 2, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["#IFDEF DOC AND #ENDIF"] = { id = 3, fgColor = rgb(0x3F703F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR DIRECTIVE"] = { id = 4, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 5, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING SINGLE QUOTES"] = { id = 6, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING DOUBLE QUOTES"] = { id = 7, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CONSTANT LITERAL"] = { id = 8, fgColor = rgb(0xFF7F3F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["SERVER-GLOBAL VARIABLE (PREFIXED BY $)"] = { id = 10, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LANGUAGE NATIVE KEYWORD OR RESERVED WORD"] = { id = 11, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATOR; EITHER SYMBOLIC OR LITERAL"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["LABEL TO JUMP TO WITH THE GOTO STATEMENT"] = { id = 13, fgColor = rgb(0xFF00FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TYPE"] = { id = 14, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["FUNCTION"] = { id = 15, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["STATIC BUILT-IN OBJECT"] = { id = 16, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OBJECT PROPERTY"] = { id = 17, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["OBJECT METHOD"] = { id = 18, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/pascal.lua b/src/NotepadNext/languages/pascal.lua index ed2129a95..604060d88 100644 --- a/src/NotepadNext/languages/pascal.lua +++ b/src/NotepadNext/languages/pascal.lua @@ -20,74 +20,74 @@ L.styles = { ["DEFAULT"] = { id = 0, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 1, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 3, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 4, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 5, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR2"] = { id = 6, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 7, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HEX NUMBER"] = { id = 8, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 9, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING"] = { id = 10, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 12, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 13, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["ASM"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/perl.lua b/src/NotepadNext/languages/perl.lua index b28111768..71c860c92 100644 --- a/src/NotepadNext/languages/perl.lua +++ b/src/NotepadNext/languages/perl.lua @@ -22,38 +22,38 @@ L.styles = { ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 0, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["REGEX"] = { @@ -64,54 +64,54 @@ L.styles = { ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SCALAR"] = { id = 12, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ARRAY"] = { id = 13, fgColor = rgb(0xCF34CF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HASH"] = { id = 14, fgColor = rgb(0x8080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SYMBOL TABLE"] = { id = 15, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PUNCTUATION"] = { id = 8, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["POD"] = { id = 3, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["ERROR"] = { id = 1, fgColor = rgb(0xFF80C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 3, }, ["LONGQUOTE"] = { id = 19, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DATASECTION"] = { id = 21, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["REGSUBST"] = { id = 18, diff --git a/src/NotepadNext/languages/php.lua b/src/NotepadNext/languages/php.lua index cb1b302c4..9ce852eb0 100644 --- a/src/NotepadNext/languages/php.lua +++ b/src/NotepadNext/languages/php.lua @@ -30,7 +30,7 @@ L.styles = { }, ["DEFAULT"] = { id = 118, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFEFCF5), }, ["STRING"] = { @@ -57,7 +57,7 @@ L.styles = { }, ["WORD"] = { id = 121, - fgColor = rgb(0x0000FF), + fgColor = rgb(InstructionColor), bgColor = rgb(0xFEFCF5), fontStyle = 1, }, @@ -68,7 +68,7 @@ L.styles = { }, ["VARIABLE"] = { id = 123, - fgColor = rgb(0x000080), + fgColor = rgb(OperatorColor), bgColor = rgb(0xFEFCF5), }, ["COMMENT"] = { @@ -83,7 +83,7 @@ L.styles = { }, ["OPERATOR"] = { id = 127, - fgColor = rgb(0x8000FF), + fgColor = rgb(TypeColor), bgColor = rgb(0xFEFCF5), }, } diff --git a/src/NotepadNext/languages/postscript.lua b/src/NotepadNext/languages/postscript.lua index f0a2786bd..4933636e9 100644 --- a/src/NotepadNext/languages/postscript.lua +++ b/src/NotepadNext/languages/postscript.lua @@ -18,89 +18,89 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DSC COMMENT"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DSC VALUE"] = { id = 3, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["Name"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION"] = { id = 6, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["LITERAL"] = { id = 7, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IMMEVAL"] = { id = 8, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PAREN ARRAY"] = { id = 9, fgColor = rgb(0xFF00FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PAREN DICT"] = { id = 10, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PAREN PROC"] = { id = 11, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TEXT"] = { id = 12, fgColor = rgb(0x808000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HEX STRING"] = { id = 13, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BASE85 STRING"] = { id = 14, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BAD STRING CHAR"] = { id = 15, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/powershell.lua b/src/NotepadNext/languages/powershell.lua index a790112ea..c7906b331 100644 --- a/src/NotepadNext/languages/powershell.lua +++ b/src/NotepadNext/languages/powershell.lua @@ -19,76 +19,76 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 2, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VARIABLE"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["INSTRUCTION WORD"] = { id = 8, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["CMDLET"] = { id = 9, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["ALIAS"] = { id = 10, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT STREAM"] = { id = 13, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HERE STRING"] = { id = 14, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HERE CHARACTER"] = { id = 15, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 16, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/props.lua b/src/NotepadNext/languages/props.lua index eee22f360..4cb72a980 100644 --- a/src/NotepadNext/languages/props.lua +++ b/src/NotepadNext/languages/props.lua @@ -14,35 +14,35 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SECTION"] = { id = 2, - fgColor = rgb(0x8000FF), + fgColor = rgb(TypeColor), bgColor = rgb(0xF2F4FF), fontStyle = 1, }, ["ASSIGNMENT"] = { id = 3, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DEFVAL"] = { id = 4, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEY"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 2, }, } diff --git a/src/NotepadNext/languages/purebasic.lua b/src/NotepadNext/languages/purebasic.lua index 306ace690..62d9118a3 100644 --- a/src/NotepadNext/languages/purebasic.lua +++ b/src/NotepadNext/languages/purebasic.lua @@ -18,63 +18,63 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD1"] = { id = 3, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 4, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEYWORD2"] = { id = 10, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD3"] = { id = 11, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD4"] = { id = 12, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CONSTANT"] = { id = 13, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LABEL"] = { id = 15, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ERROR"] = { id = 16, @@ -84,12 +84,12 @@ L.styles = { ["HEXNUMBER"] = { id = 17, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BINNUMBER"] = { id = 18, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/python.lua b/src/NotepadNext/languages/python.lua index 5b3fe0ac9..c13a9a600 100644 --- a/src/NotepadNext/languages/python.lua +++ b/src/NotepadNext/languages/python.lua @@ -30,103 +30,103 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENTLINE"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 3, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 4, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORDS"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["BUILTINS"] = { id = 14, fgColor = rgb(0x880088), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TRIPLE"] = { id = 6, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TRIPLEDOUBLE"] = { id = 7, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CLASSNAME"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DEFNAME"] = { id = 9, fgColor = rgb(0xFF00FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENTBLOCK"] = { id = 12, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DECORATOR"] = { id = 15, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["F STRING"] = { id = 16, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["F CHARACTER"] = { id = 17, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["F TRIPLE"] = { id = 18, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["F TRIPLEDOUBLE"] = { id = 19, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/r.lua b/src/NotepadNext/languages/r.lua index e76b574c7..b7595e1fd 100644 --- a/src/NotepadNext/languages/r.lua +++ b/src/NotepadNext/languages/r.lua @@ -19,60 +19,60 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 2, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["BASE WORD"] = { id = 3, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["KEYWORD"] = { id = 4, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 5, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING2"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 8, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["INFIX"] = { id = 10, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/rc.lua b/src/NotepadNext/languages/rc.lua index 152461039..e8abe3e9d 100644 --- a/src/NotepadNext/languages/rc.lua +++ b/src/NotepadNext/languages/rc.lua @@ -16,96 +16,96 @@ L.styles = { ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT"] = { id = 23, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT DOC"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/rebol.lua b/src/NotepadNext/languages/rebol.lua index b02d4bd46..fc455262a 100644 --- a/src/NotepadNext/languages/rebol.lua +++ b/src/NotepadNext/languages/rebol.lua @@ -23,154 +23,154 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 32, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["ANY OTHER TEXT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["LINE COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BLOCK COMMENT"] = { id = 2, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREFACE"] = { id = 3, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["OPERATORS"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["CHARACTERS"] = { id = 5, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING WITH QUOTES"] = { id = 6, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING WITH BRACES"] = { id = 7, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 8, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PAIR ( 800X600 )"] = { id = 9, fgColor = rgb(0x005090), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TUPLE ( 127.0.0.1 )"] = { id = 10, fgColor = rgb(0x005090), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BINARY ( 16#{1A803F59} )"] = { id = 11, fgColor = rgb(0xC000C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MONEY"] = { id = 12, fgColor = rgb(0x003070), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ISSUE { #123-CD-456 }"] = { id = 13, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["TAG { }"] = { id = 14, fgColor = rgb(0xC00000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["FILE { %/C/WINNT/SOME.DLL }"] = { id = 15, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["EMAIL { JOE@MAIL.DOM }"] = { id = 16, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["URL { FTP://THERE.DOM }"] = { id = 17, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DATE { 17-FEB-2004 1/3/99 }"] = { id = 18, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["TIME { 12:30 11:22:59 01:59:59.123 }"] = { id = 19, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["IDENTIFIERS"] = { id = 20, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEYWORD (ALL)"] = { id = 21, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD (TEST FUNCTIONS)"] = { id = 22, fgColor = rgb(0x8000C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD (DATATYPES)"] = { id = 23, fgColor = rgb(0x800060), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD 4"] = { id = 24, fgColor = rgb(0xDD9900), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD 5"] = { id = 25, fgColor = rgb(0xDD9900), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD 6"] = { id = 26, fgColor = rgb(0xDD9900), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD 7"] = { id = 27, fgColor = rgb(0xDD9900), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/registry.lua b/src/NotepadNext/languages/registry.lua index 626e20486..8e0297580 100644 --- a/src/NotepadNext/languages/registry.lua +++ b/src/NotepadNext/languages/registry.lua @@ -14,75 +14,75 @@ L.keywords = { L.styles = { ["DEFAULT STYLE"] = { id = 32, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VALUE NAME"] = { id = 2, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 3, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HEX DIGIT"] = { id = 4, fgColor = rgb(0x7F0B0C), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["VALUE TYPE"] = { id = 5, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["ADDED KEY"] = { id = 6, fgColor = rgb(0x530155), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["REMOVED KEY"] = { id = 7, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ESCAPED CHARACTERS IN STRINGS"] = { id = 8, fgColor = rgb(0x7D8187), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["GUID IN KEY PATH"] = { id = 9, fgColor = rgb(0x7B5F15), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["GUID IN STRING"] = { id = 10, fgColor = rgb(0x7B5F15), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PARAMETER"] = { id = 11, fgColor = rgb(0x0B6561), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATORS"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, } diff --git a/src/NotepadNext/languages/ruby.lua b/src/NotepadNext/languages/ruby.lua index d5179221f..0b1641cea 100644 --- a/src/NotepadNext/languages/ruby.lua +++ b/src/NotepadNext/languages/ruby.lua @@ -16,18 +16,18 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["ERROR"] = { id = 1, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENTLINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["POD"] = { id = 3, @@ -37,28 +37,28 @@ L.styles = { ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CLASS NAME"] = { id = 8, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DEF NAME"] = { @@ -69,46 +69,46 @@ L.styles = { }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 12, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["GLOBAL"] = { id = 13, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SYMBOL"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["MODULE NAME"] = { id = 15, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["INSTANCE VAR"] = { id = 16, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CLASS VAR"] = { id = 17, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["BACKTICKS"] = { id = 18, @@ -123,7 +123,7 @@ L.styles = { ["STRING Q"] = { id = 24, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/rust.lua b/src/NotepadNext/languages/rust.lua index f46e982e5..1b0728631 100644 --- a/src/NotepadNext/languages/rust.lua +++ b/src/NotepadNext/languages/rust.lua @@ -21,135 +21,135 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 32, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["WHITESPACE"] = { id = 0, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BLOCK COMMENT"] = { id = 1, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LINE COMMENT"] = { id = 2, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BLOCK DOC COMMENT"] = { id = 3, fgColor = rgb(0x3F703F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LINE DOC COMMENT"] = { id = 4, fgColor = rgb(0x3F703F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 5, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORDS 1"] = { id = 6, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS 2"] = { id = 7, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS 3"] = { id = 8, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORDS 4"] = { id = 9, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS 5"] = { id = 10, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS 6"] = { id = 11, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORDS 7"] = { id = 12, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["REGULAR STRING"] = { id = 13, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RAW STRING"] = { id = 14, fgColor = rgb(0xB090B0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 15, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 16, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 17, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["LIFETIME"] = { id = 18, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MACRO"] = { id = 19, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LEXICAL ERROR"] = { id = 20, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xE0C0E0), }, ["BYTE STRING"] = { id = 21, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RAW BYTE STRING"] = { id = 22, fgColor = rgb(0xB090B0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BYTE CHARACTER"] = { id = 23, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/scheme.lua b/src/NotepadNext/languages/scheme.lua index dc88a8539..d1754612d 100644 --- a/src/NotepadNext/languages/scheme.lua +++ b/src/NotepadNext/languages/scheme.lua @@ -18,62 +18,62 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENTLINE"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["FUNCTION WORD"] = { id = 3, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["FUNCTION WORD2"] = { id = 4, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SYMBOL"] = { id = 5, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 9, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SPECIAL"] = { id = 11, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 12, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/scss.lua b/src/NotepadNext/languages/scss.lua index 966844e4f..e19de3cd0 100644 --- a/src/NotepadNext/languages/scss.lua +++ b/src/NotepadNext/languages/scss.lua @@ -20,74 +20,74 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["TAG"] = { id = 1, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["CLASS"] = { id = 2, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PSEUDOCLASS"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["UNKNOWN_PSEUDOCLASS"] = { id = 4, fgColor = rgb(0xFF8080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 6, fgColor = rgb(0x8080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["UNKNOWN_IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["VALUE"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 9, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ID"] = { id = 10, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IMPORTANT"] = { id = 11, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DIRECTIVE"] = { id = 12, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/smalltalk.lua b/src/NotepadNext/languages/smalltalk.lua index f6b75c4aa..714f994b3 100644 --- a/src/NotepadNext/languages/smalltalk.lua +++ b/src/NotepadNext/languages/smalltalk.lua @@ -13,39 +13,39 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 1, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 3, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SYMBOL"] = { id = 4, fgColor = rgb(0x408080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["BINARY"] = { id = 5, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), }, ["BOOL"] = { id = 6, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["SELF"] = { id = 7, @@ -62,43 +62,43 @@ L.styles = { ["NIL"] = { id = 9, fgColor = rgb(0x8080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["GLOBAL"] = { id = 10, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RETURN"] = { id = 11, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SPECIAL"] = { id = 12, fgColor = rgb(0x808000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KWS END"] = { id = 13, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ASSIGN"] = { id = 14, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 15, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SPECIAL SELECTOR"] = { id = 16, fgColor = rgb(0xFF80C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/spice.lua b/src/NotepadNext/languages/spice.lua index 3b2b971ef..9ac4788d4 100644 --- a/src/NotepadNext/languages/spice.lua +++ b/src/NotepadNext/languages/spice.lua @@ -19,49 +19,49 @@ L.styles = { ["DEFAULT"] = { id = 0, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIERS"] = { id = 1, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["KEYWORD"] = { id = 2, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["KEYWORD2"] = { id = 3, fgColor = rgb(0x00007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD3"] = { id = 4, fgColor = rgb(0x0040E0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 5, fgColor = rgb(0x007F7F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATORS (DELIMITERS)"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VALUE"] = { id = 7, fgColor = rgb(0x7F007F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 8, fgColor = rgb(0x007F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/sql.lua b/src/NotepadNext/languages/sql.lua index 53b8f58a2..ec9985f4c 100644 --- a/src/NotepadNext/languages/sql.lua +++ b/src/NotepadNext/languages/sql.lua @@ -17,61 +17,71 @@ L.keywords = { L.styles = { ["KEYWORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["USER1"] = { id = 16, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD2"] = { id = 19, fgColor = rgb(0x800080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING2"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["Q OPERATOR"] = { id = 24, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), + }, + ["WHITE SPACE"] = { + id = 0, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), + }, + ["DEFAULT"] = { + id = 11, + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/srec.lua b/src/NotepadNext/languages/srec.lua index 817a69b4b..76570c944 100644 --- a/src/NotepadNext/languages/srec.lua +++ b/src/NotepadNext/languages/srec.lua @@ -15,29 +15,29 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["RECSTART"] = { id = 1, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECTYPE"] = { id = 2, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECTYPE_UNKNOWN"] = { id = 3, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["BYTECOUNT"] = { id = 4, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BYTECOUNT_WRONG"] = { id = 5, @@ -47,55 +47,55 @@ L.styles = { ["NOADDRESS"] = { id = 6, fgColor = rgb(0x7F00FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DATAADDRESS"] = { id = 7, fgColor = rgb(0x007FFF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECCOUNT"] = { id = 8, fgColor = rgb(0x7F00FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STARTADDRESS"] = { id = 9, fgColor = rgb(0x007FFF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ADDRESSFIELD_UNKNOWN"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["DATA_ODD"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DATA_EVEN"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["DATA_UNKNOWN"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["DATA_EMPTY"] = { id = 15, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CHECKSUM"] = { id = 16, fgColor = rgb(0x00BF00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHECKSUM_WRONG"] = { id = 17, @@ -104,8 +104,8 @@ L.styles = { }, ["GARBAGE"] = { id = 18, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, } diff --git a/src/NotepadNext/languages/swift.lua b/src/NotepadNext/languages/swift.lua index 60d8b0f6c..6150afa20 100644 --- a/src/NotepadNext/languages/swift.lua +++ b/src/NotepadNext/languages/swift.lua @@ -18,96 +18,96 @@ L.styles = { ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DEFAULT"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 16, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["VERBATIM"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["REGEX"] = { id = 14, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE DOC"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT DOC KEYWORD"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT DOC KEYWORD ERROR"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT"] = { id = 23, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR COMMENT DOC"] = { id = 24, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/tcl.lua b/src/NotepadNext/languages/tcl.lua index 5f435e759..d58b8cbe4 100644 --- a/src/NotepadNext/languages/tcl.lua +++ b/src/NotepadNext/languages/tcl.lua @@ -18,88 +18,88 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["MODIFIER"] = { id = 10, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["EXPAND"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 12, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TYPE WORD"] = { id = 13, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SUB BRACE"] = { id = 9, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SUBSTITUTION"] = { id = 8, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["WORD IN QUOTE"] = { id = 4, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IN QUOTE"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT BOX"] = { id = 17, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["BLOCK COMMENT"] = { id = 18, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/tehex.lua b/src/NotepadNext/languages/tehex.lua index 3d1732003..9a3dde672 100644 --- a/src/NotepadNext/languages/tehex.lua +++ b/src/NotepadNext/languages/tehex.lua @@ -12,29 +12,29 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["RECSTART"] = { id = 1, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECTYPE"] = { id = 2, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["RECTYPE_UNKNOWN"] = { id = 3, fgColor = rgb(0x7F0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["BYTECOUNT"] = { id = 4, fgColor = rgb(0x7F7F00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BYTECOUNT_WRONG"] = { id = 5, @@ -44,34 +44,34 @@ L.styles = { ["DATAADDRESS"] = { id = 7, fgColor = rgb(0x007FFF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STARTADDRESS"] = { id = 9, fgColor = rgb(0x007FFF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ADDRESSFIELD_UNKNOWN"] = { id = 10, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["DATA_ODD"] = { id = 12, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DATA_EVEN"] = { id = 13, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["CHECKSUM"] = { id = 16, fgColor = rgb(0x00BF00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHECKSUM_WRONG"] = { id = 17, @@ -80,8 +80,8 @@ L.styles = { }, ["GARBAGE"] = { id = 18, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 2, }, } diff --git a/src/NotepadNext/languages/tex.lua b/src/NotepadNext/languages/tex.lua index 0dabb8b8c..d4433de17 100644 --- a/src/NotepadNext/languages/tex.lua +++ b/src/NotepadNext/languages/tex.lua @@ -14,36 +14,36 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["SPECIAL"] = { id = 1, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["GROUP"] = { id = 2, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SYMBOL"] = { id = 3, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMAND"] = { id = 4, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TEXT"] = { id = 5, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/text.lua b/src/NotepadNext/languages/text.lua index 5852e0aff..c88a36b30 100644 --- a/src/NotepadNext/languages/text.lua +++ b/src/NotepadNext/languages/text.lua @@ -14,8 +14,8 @@ L.extensions = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 0, }, } diff --git a/src/NotepadNext/languages/txt2tags.lua b/src/NotepadNext/languages/txt2tags.lua index 2f614fa1b..a329a23f4 100644 --- a/src/NotepadNext/languages/txt2tags.lua +++ b/src/NotepadNext/languages/txt2tags.lua @@ -14,143 +14,143 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["SPECIAL"] = { id = 1, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["STRONG"] = { id = 2, fgColor = rgb(0x445675), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STRONG 2 (NOT USED)"] = { id = 3, fgColor = rgb(0x445675), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["EM1 (ITALIC)"] = { id = 4, fgColor = rgb(0x653A39), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["EM2 (UNDERLINE)"] = { id = 5, fgColor = rgb(0x386742), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["H1"] = { id = 6, fgColor = rgb(0xE20700), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["H2"] = { id = 7, fgColor = rgb(0xE20700), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["H3"] = { id = 8, fgColor = rgb(0xA81D05), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["H4"] = { id = 9, fgColor = rgb(0x871704), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["H5"] = { id = 10, fgColor = rgb(0x871704), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["H6"] = { id = 11, fgColor = rgb(0x871704), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["PRECHAR (NOT USED)"] = { id = 12, fgColor = rgb(0x871704), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["ULIST"] = { id = 13, fgColor = rgb(0xE300EE), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OLIST"] = { id = 14, fgColor = rgb(0xE300EE), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["BLOCKQUOTE"] = { id = 15, fgColor = rgb(0x015F52), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRIKEOUT"] = { id = 16, fgColor = rgb(0x644A9B), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["HRULE"] = { id = 17, fgColor = rgb(0xff901e), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["LINK"] = { id = 18, fgColor = rgb(0x0930DE), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 2, }, ["CODE"] = { id = 19, fgColor = rgb(0x009f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CODE2"] = { id = 20, fgColor = rgb(0x009f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CODEBLOCK"] = { id = 21, fgColor = rgb(0x005f00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 22, fgColor = rgb(0x777777), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPTION"] = { id = 23, fgColor = rgb(0xC0036E), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROC"] = { id = 24, fgColor = rgb(0x848B00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["POSTPROC"] = { id = 25, fgColor = rgb(0xC05600), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/vb.lua b/src/NotepadNext/languages/vb.lua index 172cf014e..0c85e9590 100644 --- a/src/NotepadNext/languages/vb.lua +++ b/src/NotepadNext/languages/vb.lua @@ -16,45 +16,45 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 7, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 2, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["WORD"] = { id = 3, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 4, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 5, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["DATE"] = { id = 8, fgColor = rgb(0x00FF00), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/verilog.lua b/src/NotepadNext/languages/verilog.lua index 9beacc63d..1045c61ce 100644 --- a/src/NotepadNext/languages/verilog.lua +++ b/src/NotepadNext/languages/verilog.lua @@ -19,70 +19,70 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 11, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["TAGNAME"] = { id = 2, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 5, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["KEYWORD"] = { id = 7, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 10, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["PREPROCESSOR"] = { id = 9, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 6, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE BANG"] = { id = 3, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["USER"] = { id = 19, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/vhdl.lua b/src/NotepadNext/languages/vhdl.lua index c234f4bfe..8af02b216 100644 --- a/src/NotepadNext/languages/vhdl.lua +++ b/src/NotepadNext/languages/vhdl.lua @@ -21,55 +21,55 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LIne"] = { id = 2, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE BANG"] = { id = 15, fgColor = rgb(0x008080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 3, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 4, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 5, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["IDENTIFIER"] = { id = 6, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["INSTRUCTION"] = { id = 8, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STD OPERATOR"] = { id = 9, fgColor = rgb(0x0080C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["ATTRIBUTE"] = { @@ -81,23 +81,23 @@ L.styles = { ["STD FUNCTION"] = { id = 11, fgColor = rgb(0x0080FF), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["STD PACKAGE"] = { id = 12, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STD TYPE"] = { id = 13, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), }, ["USER DEFINE"] = { id = 14, fgColor = rgb(0xB5E71F), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/languages/visualprolog.lua b/src/NotepadNext/languages/visualprolog.lua index e4346b36a..67547b797 100644 --- a/src/NotepadNext/languages/visualprolog.lua +++ b/src/NotepadNext/languages/visualprolog.lua @@ -22,117 +22,117 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["MAJOR"] = { id = 1, fgColor = rgb(0x808000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["MINOR"] = { id = 2, fgColor = rgb(0x333399), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DIRECTIVE"] = { id = 3, fgColor = rgb(0x800080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT BLOCK"] = { id = 4, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT LINE"] = { id = 5, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT KEY"] = { id = 6, fgColor = rgb(0x8050A0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["COMMENT KEY ERROR"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 8, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["VARIABLE"] = { id = 9, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ANONYMOUS"] = { id = 10, fgColor = rgb(0xA0A0C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 11, fgColor = rgb(0x0000C0), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["OPERATOR"] = { id = 12, fgColor = rgb(0xA00000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER"] = { id = 13, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER TOO MANY"] = { id = 14, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["CHARACTER ESCAPE ERROR"] = { id = 15, fgColor = rgb(0x800000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING"] = { id = 16, fgColor = rgb(0x3898B2), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING ESCAPE"] = { id = 17, fgColor = rgb(0xFF8040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING ESCAPE ERROR"] = { id = 18, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING EOL OPEN"] = { id = 19, - fgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultBg), bgColor = rgb(0xFF4040), }, ["STRING VERBATIM"] = { id = 20, fgColor = rgb(0x8064A2), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING VERBATIM SPECIAL"] = { id = 21, fgColor = rgb(0x800040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["STRING VERBATIM EOL"] = { id = 22, - fgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultBg), bgColor = rgb(0xFF8000), }, } diff --git a/src/NotepadNext/languages/xml.lua b/src/NotepadNext/languages/xml.lua index f982664fb..f5ee08c83 100644 --- a/src/NotepadNext/languages/xml.lua +++ b/src/NotepadNext/languages/xml.lua @@ -54,70 +54,70 @@ L.styles = { }, ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 9, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["NUMBER"] = { id = 5, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOUBLESTRING"] = { id = 6, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["SINGLESTRING"] = { id = 7, - fgColor = rgb(0x8000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(TypeColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["TAG"] = { id = 1, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["TAGEND"] = { id = 11, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["TAGUNKNOWN"] = { id = 2, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["ATTRIBUTE"] = { id = 3, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ATTRIBUTEUNKNOWN"] = { id = 4, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["SGMLDEFAULT"] = { id = 21, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xA6CAF0), }, ["CDATA"] = { id = 17, fgColor = rgb(0xFF8000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["ENTITY"] = { id = 10, - fgColor = rgb(0x000000), + fgColor = rgb(defaultFg), bgColor = rgb(0xFEFDE0), fontStyle = 2, }, diff --git a/src/NotepadNext/languages/yaml.lua b/src/NotepadNext/languages/yaml.lua index 445cc421f..6767e382e 100644 --- a/src/NotepadNext/languages/yaml.lua +++ b/src/NotepadNext/languages/yaml.lua @@ -16,51 +16,51 @@ L.keywords = { L.styles = { ["DEFAULT"] = { id = 0, - fgColor = rgb(0x000000), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(defaultFg), + bgColor = rgb(defaultBg), }, ["IDENTIFIER"] = { id = 2, - fgColor = rgb(0x000080), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(OperatorColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["COMMENT"] = { id = 1, fgColor = rgb(0x008000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["INSTRUCTION WORD"] = { id = 3, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["NUMBER"] = { id = 4, fgColor = rgb(0xFF8040), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["REFERENCE"] = { id = 5, fgColor = rgb(0x804000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, ["DOCUMENT"] = { id = 6, - fgColor = rgb(0x0000FF), - bgColor = rgb(0xFFFFFF), + fgColor = rgb(InstructionColor), + bgColor = rgb(defaultBg), }, ["TEXT"] = { id = 7, fgColor = rgb(0x808080), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), fontStyle = 1, }, ["ERROR"] = { id = 8, fgColor = rgb(0xFF0000), - bgColor = rgb(0xFFFFFF), + bgColor = rgb(defaultBg), }, } return L diff --git a/src/NotepadNext/qdarkstyle/dark/rc/.keep b/src/NotepadNext/qdarkstyle/dark/rc/.keep new file mode 100644 index 000000000..8d1c8b69c --- /dev/null +++ b/src/NotepadNext/qdarkstyle/dark/rc/.keep @@ -0,0 +1 @@ + diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down.png new file mode 100644 index 000000000..5575ab5ce Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down@2x.png new file mode 100644 index 000000000..4596a5ce8 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_disabled.png new file mode 100644 index 000000000..bdf8c1abb Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_disabled@2x.png new file mode 100644 index 000000000..dc1bcb524 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_focus.png new file mode 100644 index 000000000..94fcdc359 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_focus@2x.png new file mode 100644 index 000000000..2b12f74d0 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_pressed.png new file mode 100644 index 000000000..4058c58b3 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_pressed@2x.png new file mode 100644 index 000000000..d43b0affa Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_down_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left.png new file mode 100644 index 000000000..7fbc35065 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left@2x.png new file mode 100644 index 000000000..dc649ca70 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_disabled.png new file mode 100644 index 000000000..fa3b282cc Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_disabled@2x.png new file mode 100644 index 000000000..87c928ea3 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_focus.png new file mode 100644 index 000000000..52a0d9102 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_focus@2x.png new file mode 100644 index 000000000..0ee702924 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_pressed.png new file mode 100644 index 000000000..c04ce0943 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_pressed@2x.png new file mode 100644 index 000000000..02218c80d Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_left_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right.png new file mode 100644 index 000000000..fd31b4f2a Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right@2x.png new file mode 100644 index 000000000..4dbc93120 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_disabled.png new file mode 100644 index 000000000..bb4cdb036 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_disabled@2x.png new file mode 100644 index 000000000..50f173096 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_focus.png new file mode 100644 index 000000000..9dd8f0f0b Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_focus@2x.png new file mode 100644 index 000000000..1ac9d5c9e Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_pressed.png new file mode 100644 index 000000000..8ce10fcbe Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_pressed@2x.png new file mode 100644 index 000000000..86e3b9286 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_right_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up.png new file mode 100644 index 000000000..2ea571e47 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up@2x.png new file mode 100644 index 000000000..51b1d7234 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_disabled.png new file mode 100644 index 000000000..146b65f16 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_disabled@2x.png new file mode 100644 index 000000000..cacee7f74 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_focus.png new file mode 100644 index 000000000..ab33162c7 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_focus@2x.png new file mode 100644 index 000000000..0c8ef33f4 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_pressed.png new file mode 100644 index 000000000..c3368d096 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_pressed@2x.png new file mode 100644 index 000000000..a63819665 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/arrow_up_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon.png new file mode 100644 index 000000000..1aeed5554 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon@2x.png new file mode 100644 index 000000000..f42fc6610 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_disabled.png new file mode 100644 index 000000000..1aeed5554 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_disabled@2x.png new file mode 100644 index 000000000..f42fc6610 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_focus.png new file mode 100644 index 000000000..1aeed5554 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_focus@2x.png new file mode 100644 index 000000000..f42fc6610 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_pressed.png new file mode 100644 index 000000000..1aeed5554 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/base_icon_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_pressed@2x.png new file mode 100644 index 000000000..f42fc6610 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/base_icon_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed.png new file mode 100644 index 000000000..d484c324b Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed@2x.png new file mode 100644 index 000000000..f49651b70 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_disabled.png new file mode 100644 index 000000000..aa622523c Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_disabled@2x.png new file mode 100644 index 000000000..ac318f5b1 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_focus.png new file mode 100644 index 000000000..0a98eab66 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_focus@2x.png new file mode 100644 index 000000000..39fd0d0e2 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_pressed.png new file mode 100644 index 000000000..049f4bfe5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_pressed@2x.png new file mode 100644 index 000000000..f58ae2238 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_closed_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end.png new file mode 100644 index 000000000..210984565 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end@2x.png new file mode 100644 index 000000000..91f3bd02d Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_disabled.png new file mode 100644 index 000000000..fe819bc14 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_disabled@2x.png new file mode 100644 index 000000000..580247709 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_focus.png new file mode 100644 index 000000000..9a978c0cc Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_focus@2x.png new file mode 100644 index 000000000..ece9b825d Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_pressed.png new file mode 100644 index 000000000..1d4050997 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_end_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_pressed@2x.png new file mode 100644 index 000000000..4822745c4 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_end_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line.png new file mode 100644 index 000000000..75cc027f8 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line@2x.png new file mode 100644 index 000000000..727370558 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_disabled.png new file mode 100644 index 000000000..01c6cffa7 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_disabled@2x.png new file mode 100644 index 000000000..57789e942 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_focus.png new file mode 100644 index 000000000..599626230 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_focus@2x.png new file mode 100644 index 000000000..34e7d603f Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_pressed.png new file mode 100644 index 000000000..6a54b0948 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_line_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_pressed@2x.png new file mode 100644 index 000000000..fb74fd324 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_line_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more.png new file mode 100644 index 000000000..045f963fa Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more@2x.png new file mode 100644 index 000000000..ccde09316 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_disabled.png new file mode 100644 index 000000000..8630b91c9 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_disabled@2x.png new file mode 100644 index 000000000..37d2cdbbd Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_focus.png new file mode 100644 index 000000000..38067367f Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_focus@2x.png new file mode 100644 index 000000000..d80ccb8cc Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_pressed.png new file mode 100644 index 000000000..a306eb288 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_more_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_pressed@2x.png new file mode 100644 index 000000000..7044b2822 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_more_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open.png new file mode 100644 index 000000000..445ec7181 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open@2x.png new file mode 100644 index 000000000..febb31878 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_disabled.png new file mode 100644 index 000000000..3b840d767 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_disabled@2x.png new file mode 100644 index 000000000..d6c5b40ed Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_focus.png new file mode 100644 index 000000000..fecf8733e Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_focus@2x.png new file mode 100644 index 000000000..296d17553 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_pressed.png new file mode 100644 index 000000000..8a7cffab5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/branch_open_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_pressed@2x.png new file mode 100644 index 000000000..24e282c85 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/branch_open_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked.png new file mode 100644 index 000000000..aa5f56720 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked@2x.png new file mode 100644 index 000000000..60b4fb2ae Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_disabled.png new file mode 100644 index 000000000..208f3709e Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_disabled@2x.png new file mode 100644 index 000000000..7c8ad0c58 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_focus.png new file mode 100644 index 000000000..a35def37f Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_focus@2x.png new file mode 100644 index 000000000..925cd3620 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_pressed.png new file mode 100644 index 000000000..f95dc13eb Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_pressed@2x.png new file mode 100644 index 000000000..641c047ae Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_checked_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate.png new file mode 100644 index 000000000..02de1ad2c Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate@2x.png new file mode 100644 index 000000000..8fabf6ea4 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_disabled.png new file mode 100644 index 000000000..df99affe0 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_disabled@2x.png new file mode 100644 index 000000000..3102eaa3f Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_focus.png new file mode 100644 index 000000000..370454348 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_focus@2x.png new file mode 100644 index 000000000..8da0a8c98 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_pressed.png new file mode 100644 index 000000000..b971d7fae Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_pressed@2x.png new file mode 100644 index 000000000..9e37b8433 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_indeterminate_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked.png new file mode 100644 index 000000000..80bcf2b66 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked@2x.png new file mode 100644 index 000000000..df0fa4d5a Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_disabled.png new file mode 100644 index 000000000..ede58c818 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_disabled@2x.png new file mode 100644 index 000000000..6721b38f5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_focus.png new file mode 100644 index 000000000..3883d2d5a Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_focus@2x.png new file mode 100644 index 000000000..35c061c0d Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_pressed.png new file mode 100644 index 000000000..d98639eed Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_pressed@2x.png new file mode 100644 index 000000000..88a52460d Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/checkbox_unchecked_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal.png new file mode 100644 index 000000000..bc858c8d0 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal@2x.png new file mode 100644 index 000000000..7ea4f9c1c Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_disabled.png new file mode 100644 index 000000000..72e073a78 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_disabled@2x.png new file mode 100644 index 000000000..09a439df9 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_focus.png new file mode 100644 index 000000000..c84512bb5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_focus@2x.png new file mode 100644 index 000000000..8dd58f609 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_pressed.png new file mode 100644 index 000000000..7ca2605bd Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_pressed@2x.png new file mode 100644 index 000000000..bd9661781 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_horizontal_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical.png new file mode 100644 index 000000000..49a910526 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical@2x.png new file mode 100644 index 000000000..cbb017ee6 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_disabled.png new file mode 100644 index 000000000..965854688 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_disabled@2x.png new file mode 100644 index 000000000..7836a9465 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_focus.png new file mode 100644 index 000000000..512ee7d23 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_focus@2x.png new file mode 100644 index 000000000..af503251d Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_pressed.png new file mode 100644 index 000000000..b8dd21535 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_pressed@2x.png new file mode 100644 index 000000000..e1d43a83e Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/line_vertical_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked.png new file mode 100644 index 000000000..2a1d26a4f Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked@2x.png new file mode 100644 index 000000000..eb2cbb46c Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_disabled.png new file mode 100644 index 000000000..f78c15360 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_disabled@2x.png new file mode 100644 index 000000000..30168e86b Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_focus.png new file mode 100644 index 000000000..6d9c9801c Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_focus@2x.png new file mode 100644 index 000000000..63476a075 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_pressed.png new file mode 100644 index 000000000..421ecb44a Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_pressed@2x.png new file mode 100644 index 000000000..9030e1013 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_checked_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked.png new file mode 100644 index 000000000..23b06ced3 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked@2x.png new file mode 100644 index 000000000..41e790ac7 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_disabled.png new file mode 100644 index 000000000..075ca8557 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_disabled@2x.png new file mode 100644 index 000000000..61cd48ffe Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_focus.png new file mode 100644 index 000000000..d58758039 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_focus@2x.png new file mode 100644 index 000000000..0f12c860b Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_pressed.png new file mode 100644 index 000000000..37c09a6d8 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_pressed@2x.png new file mode 100644 index 000000000..9e424e4b3 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/radio_unchecked_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal.png new file mode 100644 index 000000000..9d2f51f06 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal@2x.png new file mode 100644 index 000000000..c35b46532 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled.png new file mode 100644 index 000000000..013ac4578 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled@2x.png new file mode 100644 index 000000000..f713dd4d0 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_focus.png new file mode 100644 index 000000000..6d0d42588 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_focus@2x.png new file mode 100644 index 000000000..0a5ca39b1 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed.png new file mode 100644 index 000000000..e414c0c52 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed@2x.png new file mode 100644 index 000000000..e8e8af20f Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical.png new file mode 100644 index 000000000..140846d75 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical@2x.png new file mode 100644 index 000000000..7edf454a3 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_disabled.png new file mode 100644 index 000000000..5cd85dd72 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_disabled@2x.png new file mode 100644 index 000000000..07d5ae1bf Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_focus.png new file mode 100644 index 000000000..9aac0365a Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_focus@2x.png new file mode 100644 index 000000000..c3b1d1805 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_pressed.png new file mode 100644 index 000000000..30b3921e2 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_pressed@2x.png new file mode 100644 index 000000000..bd0120745 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_move_vertical_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal.png new file mode 100644 index 000000000..96e2689ff Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal@2x.png new file mode 100644 index 000000000..5944e44c9 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled.png new file mode 100644 index 000000000..941e14509 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled@2x.png new file mode 100644 index 000000000..e44a33be6 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus.png new file mode 100644 index 000000000..590b31471 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus@2x.png new file mode 100644 index 000000000..ca88313f6 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed.png new file mode 100644 index 000000000..38004682a Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed@2x.png new file mode 100644 index 000000000..d4b88c047 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical.png new file mode 100644 index 000000000..b503c8093 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical@2x.png new file mode 100644 index 000000000..2725a7fa1 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled.png new file mode 100644 index 000000000..6aa1fbdd7 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled@2x.png new file mode 100644 index 000000000..8e54cfa8e Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_focus.png new file mode 100644 index 000000000..fcdfc0f21 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_focus@2x.png new file mode 100644 index 000000000..51b083965 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed.png new file mode 100644 index 000000000..9d6f84d51 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed@2x.png new file mode 100644 index 000000000..3876a8e87 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent.png new file mode 100644 index 000000000..3a95111e5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent@2x.png new file mode 100644 index 000000000..4c4b95225 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent_disabled.png new file mode 100644 index 000000000..3a95111e5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent_disabled@2x.png new file mode 100644 index 000000000..4c4b95225 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent_focus.png new file mode 100644 index 000000000..3a95111e5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent_focus@2x.png new file mode 100644 index 000000000..4c4b95225 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent_pressed.png new file mode 100644 index 000000000..3a95111e5 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/transparent_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/transparent_pressed@2x.png new file mode 100644 index 000000000..4c4b95225 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/transparent_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close.png new file mode 100644 index 000000000..0115ca3f3 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close@2x.png new file mode 100644 index 000000000..41dcd8160 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close_disabled.png new file mode 100644 index 000000000..55144fff8 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close_disabled@2x.png new file mode 100644 index 000000000..766aef7c1 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close_focus.png new file mode 100644 index 000000000..61df25f82 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close_focus@2x.png new file mode 100644 index 000000000..2ea50b1a9 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close_pressed.png new file mode 100644 index 000000000..042311def Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_close_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_close_pressed@2x.png new file mode 100644 index 000000000..b54d9a16d Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_close_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip.png new file mode 100644 index 000000000..9ea1c438f Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip@2x.png new file mode 100644 index 000000000..b31309e8b Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_disabled.png new file mode 100644 index 000000000..b66e23b99 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_disabled@2x.png new file mode 100644 index 000000000..ee3d0ba88 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_focus.png new file mode 100644 index 000000000..400af158c Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_focus@2x.png new file mode 100644 index 000000000..83c9ec634 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_pressed.png new file mode 100644 index 000000000..f71dd8c9a Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_grip_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_pressed@2x.png new file mode 100644 index 000000000..109878a35 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_grip_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize.png new file mode 100644 index 000000000..07517b943 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize@2x.png new file mode 100644 index 000000000..434bb07cd Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_disabled.png new file mode 100644 index 000000000..a1ee4aeda Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_disabled@2x.png new file mode 100644 index 000000000..8454ad832 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_focus.png new file mode 100644 index 000000000..3b56123f1 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_focus@2x.png new file mode 100644 index 000000000..a66fb71ec Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_pressed.png new file mode 100644 index 000000000..9b70c0ade Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_pressed@2x.png new file mode 100644 index 000000000..5750a8e7e Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_minimize_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock.png new file mode 100644 index 000000000..9be9cdf77 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock@2x.png new file mode 100644 index 000000000..40345ab94 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock_disabled.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_disabled.png new file mode 100644 index 000000000..ea92aee04 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_disabled.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock_disabled@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_disabled@2x.png new file mode 100644 index 000000000..fb8d5483c Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_disabled@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock_focus.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_focus.png new file mode 100644 index 000000000..5b0338d9b Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_focus.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock_focus@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_focus@2x.png new file mode 100644 index 000000000..9fea75b09 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_focus@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock_pressed.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_pressed.png new file mode 100644 index 000000000..4bc657b21 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_pressed.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/rc/window_undock_pressed@2x.png b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_pressed@2x.png new file mode 100644 index 000000000..2ea0c2c71 Binary files /dev/null and b/src/NotepadNext/qdarkstyle/dark/rc/window_undock_pressed@2x.png differ diff --git a/src/NotepadNext/qdarkstyle/dark/style.qrc b/src/NotepadNext/qdarkstyle/dark/style.qrc new file mode 100644 index 000000000..d74dee00a --- /dev/null +++ b/src/NotepadNext/qdarkstyle/dark/style.qrc @@ -0,0 +1,217 @@ + +<RCC warning="WARNING! File created programmatically. All changes made in this file will be lost!"> + <qresource prefix="qss_icons/dark"> + <file>rc/.keep</file> + <file>rc/arrow_down.png</file> + <file>rc/arrow_down@2x.png</file> + <file>rc/arrow_down_disabled.png</file> + <file>rc/arrow_down_disabled@2x.png</file> + <file>rc/arrow_down_focus.png</file> + <file>rc/arrow_down_focus@2x.png</file> + <file>rc/arrow_down_pressed.png</file> + <file>rc/arrow_down_pressed@2x.png</file> + <file>rc/arrow_left.png</file> + <file>rc/arrow_left@2x.png</file> + <file>rc/arrow_left_disabled.png</file> + <file>rc/arrow_left_disabled@2x.png</file> + <file>rc/arrow_left_focus.png</file> + <file>rc/arrow_left_focus@2x.png</file> + <file>rc/arrow_left_pressed.png</file> + <file>rc/arrow_left_pressed@2x.png</file> + <file>rc/arrow_right.png</file> + <file>rc/arrow_right@2x.png</file> + <file>rc/arrow_right_disabled.png</file> + <file>rc/arrow_right_disabled@2x.png</file> + <file>rc/arrow_right_focus.png</file> + <file>rc/arrow_right_focus@2x.png</file> + <file>rc/arrow_right_pressed.png</file> + <file>rc/arrow_right_pressed@2x.png</file> + <file>rc/arrow_up.png</file> + <file>rc/arrow_up@2x.png</file> + <file>rc/arrow_up_disabled.png</file> + <file>rc/arrow_up_disabled@2x.png</file> + <file>rc/arrow_up_focus.png</file> + <file>rc/arrow_up_focus@2x.png</file> + <file>rc/arrow_up_pressed.png</file> + <file>rc/arrow_up_pressed@2x.png</file> + <file>rc/base_icon.png</file> + <file>rc/base_icon@2x.png</file> + <file>rc/base_icon_disabled.png</file> + <file>rc/base_icon_disabled@2x.png</file> + <file>rc/base_icon_focus.png</file> + <file>rc/base_icon_focus@2x.png</file> + <file>rc/base_icon_pressed.png</file> + <file>rc/base_icon_pressed@2x.png</file> + <file>rc/branch_closed.png</file> + <file>rc/branch_closed@2x.png</file> + <file>rc/branch_closed_disabled.png</file> + <file>rc/branch_closed_disabled@2x.png</file> + <file>rc/branch_closed_focus.png</file> + <file>rc/branch_closed_focus@2x.png</file> + <file>rc/branch_closed_pressed.png</file> + <file>rc/branch_closed_pressed@2x.png</file> + <file>rc/branch_end.png</file> + <file>rc/branch_end@2x.png</file> + <file>rc/branch_end_disabled.png</file> + <file>rc/branch_end_disabled@2x.png</file> + <file>rc/branch_end_focus.png</file> + <file>rc/branch_end_focus@2x.png</file> + <file>rc/branch_end_pressed.png</file> + <file>rc/branch_end_pressed@2x.png</file> + <file>rc/branch_line.png</file> + <file>rc/branch_line@2x.png</file> + <file>rc/branch_line_disabled.png</file> + <file>rc/branch_line_disabled@2x.png</file> + <file>rc/branch_line_focus.png</file> + <file>rc/branch_line_focus@2x.png</file> + <file>rc/branch_line_pressed.png</file> + <file>rc/branch_line_pressed@2x.png</file> + <file>rc/branch_more.png</file> + <file>rc/branch_more@2x.png</file> + <file>rc/branch_more_disabled.png</file> + <file>rc/branch_more_disabled@2x.png</file> + <file>rc/branch_more_focus.png</file> + <file>rc/branch_more_focus@2x.png</file> + <file>rc/branch_more_pressed.png</file> + <file>rc/branch_more_pressed@2x.png</file> + <file>rc/branch_open.png</file> + <file>rc/branch_open@2x.png</file> + <file>rc/branch_open_disabled.png</file> + <file>rc/branch_open_disabled@2x.png</file> + <file>rc/branch_open_focus.png</file> + <file>rc/branch_open_focus@2x.png</file> + <file>rc/branch_open_pressed.png</file> + <file>rc/branch_open_pressed@2x.png</file> + <file>rc/checkbox_checked.png</file> + <file>rc/checkbox_checked@2x.png</file> + <file>rc/checkbox_checked_disabled.png</file> + <file>rc/checkbox_checked_disabled@2x.png</file> + <file>rc/checkbox_checked_focus.png</file> + <file>rc/checkbox_checked_focus@2x.png</file> + <file>rc/checkbox_checked_pressed.png</file> + <file>rc/checkbox_checked_pressed@2x.png</file> + <file>rc/checkbox_indeterminate.png</file> + <file>rc/checkbox_indeterminate@2x.png</file> + <file>rc/checkbox_indeterminate_disabled.png</file> + <file>rc/checkbox_indeterminate_disabled@2x.png</file> + <file>rc/checkbox_indeterminate_focus.png</file> + <file>rc/checkbox_indeterminate_focus@2x.png</file> + <file>rc/checkbox_indeterminate_pressed.png</file> + <file>rc/checkbox_indeterminate_pressed@2x.png</file> + <file>rc/checkbox_unchecked.png</file> + <file>rc/checkbox_unchecked@2x.png</file> + <file>rc/checkbox_unchecked_disabled.png</file> + <file>rc/checkbox_unchecked_disabled@2x.png</file> + <file>rc/checkbox_unchecked_focus.png</file> + <file>rc/checkbox_unchecked_focus@2x.png</file> + <file>rc/checkbox_unchecked_pressed.png</file> + <file>rc/checkbox_unchecked_pressed@2x.png</file> + <file>rc/line_horizontal.png</file> + <file>rc/line_horizontal@2x.png</file> + <file>rc/line_horizontal_disabled.png</file> + <file>rc/line_horizontal_disabled@2x.png</file> + <file>rc/line_horizontal_focus.png</file> + <file>rc/line_horizontal_focus@2x.png</file> + <file>rc/line_horizontal_pressed.png</file> + <file>rc/line_horizontal_pressed@2x.png</file> + <file>rc/line_vertical.png</file> + <file>rc/line_vertical@2x.png</file> + <file>rc/line_vertical_disabled.png</file> + <file>rc/line_vertical_disabled@2x.png</file> + <file>rc/line_vertical_focus.png</file> + <file>rc/line_vertical_focus@2x.png</file> + <file>rc/line_vertical_pressed.png</file> + <file>rc/line_vertical_pressed@2x.png</file> + <file>rc/radio_checked.png</file> + <file>rc/radio_checked@2x.png</file> + <file>rc/radio_checked_disabled.png</file> + <file>rc/radio_checked_disabled@2x.png</file> + <file>rc/radio_checked_focus.png</file> + <file>rc/radio_checked_focus@2x.png</file> + <file>rc/radio_checked_pressed.png</file> + <file>rc/radio_checked_pressed@2x.png</file> + <file>rc/radio_unchecked.png</file> + <file>rc/radio_unchecked@2x.png</file> + <file>rc/radio_unchecked_disabled.png</file> + <file>rc/radio_unchecked_disabled@2x.png</file> + <file>rc/radio_unchecked_focus.png</file> + <file>rc/radio_unchecked_focus@2x.png</file> + <file>rc/radio_unchecked_pressed.png</file> + <file>rc/radio_unchecked_pressed@2x.png</file> + <file>rc/toolbar_move_horizontal.png</file> + <file>rc/toolbar_move_horizontal@2x.png</file> + <file>rc/toolbar_move_horizontal_disabled.png</file> + <file>rc/toolbar_move_horizontal_disabled@2x.png</file> + <file>rc/toolbar_move_horizontal_focus.png</file> + <file>rc/toolbar_move_horizontal_focus@2x.png</file> + <file>rc/toolbar_move_horizontal_pressed.png</file> + <file>rc/toolbar_move_horizontal_pressed@2x.png</file> + <file>rc/toolbar_move_vertical.png</file> + <file>rc/toolbar_move_vertical@2x.png</file> + <file>rc/toolbar_move_vertical_disabled.png</file> + <file>rc/toolbar_move_vertical_disabled@2x.png</file> + <file>rc/toolbar_move_vertical_focus.png</file> + <file>rc/toolbar_move_vertical_focus@2x.png</file> + <file>rc/toolbar_move_vertical_pressed.png</file> + <file>rc/toolbar_move_vertical_pressed@2x.png</file> + <file>rc/toolbar_separator_horizontal.png</file> + <file>rc/toolbar_separator_horizontal@2x.png</file> + <file>rc/toolbar_separator_horizontal_disabled.png</file> + <file>rc/toolbar_separator_horizontal_disabled@2x.png</file> + <file>rc/toolbar_separator_horizontal_focus.png</file> + <file>rc/toolbar_separator_horizontal_focus@2x.png</file> + <file>rc/toolbar_separator_horizontal_pressed.png</file> + <file>rc/toolbar_separator_horizontal_pressed@2x.png</file> + <file>rc/toolbar_separator_vertical.png</file> + <file>rc/toolbar_separator_vertical@2x.png</file> + <file>rc/toolbar_separator_vertical_disabled.png</file> + <file>rc/toolbar_separator_vertical_disabled@2x.png</file> + <file>rc/toolbar_separator_vertical_focus.png</file> + <file>rc/toolbar_separator_vertical_focus@2x.png</file> + <file>rc/toolbar_separator_vertical_pressed.png</file> + <file>rc/toolbar_separator_vertical_pressed@2x.png</file> + <file>rc/transparent.png</file> + <file>rc/transparent@2x.png</file> + <file>rc/transparent_disabled.png</file> + <file>rc/transparent_disabled@2x.png</file> + <file>rc/transparent_focus.png</file> + <file>rc/transparent_focus@2x.png</file> + <file>rc/transparent_pressed.png</file> + <file>rc/transparent_pressed@2x.png</file> + <file>rc/window_close.png</file> + <file>rc/window_close@2x.png</file> + <file>rc/window_close_disabled.png</file> + <file>rc/window_close_disabled@2x.png</file> + <file>rc/window_close_focus.png</file> + <file>rc/window_close_focus@2x.png</file> + <file>rc/window_close_pressed.png</file> + <file>rc/window_close_pressed@2x.png</file> + <file>rc/window_grip.png</file> + <file>rc/window_grip@2x.png</file> + <file>rc/window_grip_disabled.png</file> + <file>rc/window_grip_disabled@2x.png</file> + <file>rc/window_grip_focus.png</file> + <file>rc/window_grip_focus@2x.png</file> + <file>rc/window_grip_pressed.png</file> + <file>rc/window_grip_pressed@2x.png</file> + <file>rc/window_minimize.png</file> + <file>rc/window_minimize@2x.png</file> + <file>rc/window_minimize_disabled.png</file> + <file>rc/window_minimize_disabled@2x.png</file> + <file>rc/window_minimize_focus.png</file> + <file>rc/window_minimize_focus@2x.png</file> + <file>rc/window_minimize_pressed.png</file> + <file>rc/window_minimize_pressed@2x.png</file> + <file>rc/window_undock.png</file> + <file>rc/window_undock@2x.png</file> + <file>rc/window_undock_disabled.png</file> + <file>rc/window_undock_disabled@2x.png</file> + <file>rc/window_undock_focus.png</file> + <file>rc/window_undock_focus@2x.png</file> + <file>rc/window_undock_pressed.png</file> + <file>rc/window_undock_pressed@2x.png</file> + </qresource> + <qresource prefix="qdarkstyle/dark"> + <file>style.qss</file> + </qresource> +</RCC> diff --git a/src/NotepadNext/qdarkstyle/dark/style.qss b/src/NotepadNext/qdarkstyle/dark/style.qss new file mode 100644 index 000000000..b392674fd --- /dev/null +++ b/src/NotepadNext/qdarkstyle/dark/style.qss @@ -0,0 +1,2212 @@ +/* --------------------------------------------------------------------------- + + WARNING! File created programmatically. All changes made in this file will be lost! + + Created by the qtsass compiler v0.3.0 + + The definitions are in the "qdarkstyle.qss._styles.scss" module + +--------------------------------------------------------------------------- */ +/* Light Style - QDarkStyleSheet ------------------------------------------ */ +/* + +See Qt documentation: + + - https://doc.qt.io/qt-5/stylesheet.html + - https://doc.qt.io/qt-5/stylesheet-reference.html + - https://doc.qt.io/qt-5/stylesheet-examples.html + +--------------------------------------------------------------------------- */ +/* Reset elements ------------------------------------------------------------ + +Resetting everything helps to unify styles across different operating systems + +--------------------------------------------------------------------------- */ +* { + padding: 0px; + margin: 0px; + border: 0px; + border-style: none; + border-image: none; + outline: 0; +} + +/* specific reset for elements inside QToolBar */ +QToolBar * { + margin: 0px; + padding: 0px; +} + +/* QWidget ---------------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QWidget { + background-color: #19232D; + border: 0px solid #455364; + padding: 0px; + color: #E0E1E3; + selection-background-color: #346792; + selection-color: #E0E1E3; +} + +QWidget:disabled { + background-color: #19232D; + color: #9DA9B5; + selection-background-color: #26486B; + selection-color: #9DA9B5; +} + +QWidget::item:selected { + background-color: #346792; +} + +QWidget::item:hover:!selected { + background-color: #1A72BB; +} + +/* QMainWindow ------------------------------------------------------------ + +This adjusts the splitter in the dock widget, not qsplitter +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmainwindow + +--------------------------------------------------------------------------- */ +QMainWindow::separator { + background-color: #455364; + border: 0px solid #19232D; + spacing: 0px; + padding: 2px; +} + +QMainWindow::separator:hover { + background-color: #60798B; + border: 0px solid #1A72BB; +} + +QMainWindow::separator:horizontal { + width: 5px; + margin-top: 2px; + margin-bottom: 2px; + image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png"); +} + +QMainWindow::separator:vertical { + height: 5px; + margin-left: 2px; + margin-right: 2px; + image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png"); +} + +/* QToolTip --------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtooltip + +--------------------------------------------------------------------------- */ +QToolTip { + background-color: #346792; + color: #E0E1E3; + /* If you remove the border property, background stops working on Windows */ + border: none; + /* Remove padding, for fix combo box tooltip */ + padding: 0px; + /* Remove opacity, fix #174 - may need to use RGBA */ +} + +/* QStatusBar ------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar + +--------------------------------------------------------------------------- */ +QStatusBar { + border: 1px solid #455364; + /* Fixes Spyder #9120, #9121 */ + background: #455364; + /* Fixes #205, white vertical borders separating items */ +} + +QStatusBar::item { + border: none; +} + +QStatusBar QToolTip { + background-color: #1A72BB; + border: 1px solid #19232D; + color: #19232D; + /* Remove padding, for fix combo box tooltip */ + padding: 0px; + /* Reducing transparency to read better */ + opacity: 230; +} + +QStatusBar QLabel { + /* Fixes Spyder #9120, #9121 */ + background: transparent; +} + +/* QCheckBox -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcheckbox + +--------------------------------------------------------------------------- */ +QCheckBox { + background-color: #19232D; + color: #E0E1E3; + spacing: 4px; + outline: none; + padding-top: 4px; + padding-bottom: 4px; +} + +QCheckBox:focus { + border: none; +} + +QCheckBox QWidget:disabled { + background-color: #19232D; + color: #9DA9B5; +} + +QCheckBox::indicator { + margin-left: 2px; + height: 14px; + width: 14px; +} + +QCheckBox::indicator:unchecked { + image: url(":/qss_icons/dark/rc/checkbox_unchecked.png"); +} + +QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png"); +} + +QCheckBox::indicator:unchecked:disabled { + image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png"); +} + +QCheckBox::indicator:checked { + image: url(":/qss_icons/dark/rc/checkbox_checked.png"); +} + +QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:focus, QCheckBox::indicator:checked:pressed { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png"); +} + +QCheckBox::indicator:checked:disabled { + image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png"); +} + +QCheckBox::indicator:indeterminate { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png"); +} + +QCheckBox::indicator:indeterminate:disabled { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png"); +} + +QCheckBox::indicator:indeterminate:focus, QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png"); +} + +/* QGroupBox -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox + +--------------------------------------------------------------------------- */ +QGroupBox { + font-weight: bold; + border: 1px solid #455364; + border-radius: 4px; + padding: 2px; + margin-top: 6px; + margin-bottom: 4px; +} + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top left; + left: 4px; + padding-left: 2px; + padding-right: 4px; + padding-top: -4px; +} + +QGroupBox::indicator { + margin-left: 2px; + margin-top: 2px; + padding: 0; + height: 14px; + width: 14px; +} + +QGroupBox::indicator:unchecked { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_unchecked.png"); +} + +QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, QGroupBox::indicator:unchecked:pressed { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png"); +} + +QGroupBox::indicator:unchecked:disabled { + image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png"); +} + +QGroupBox::indicator:checked { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_checked.png"); +} + +QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, QGroupBox::indicator:checked:pressed { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png"); +} + +QGroupBox::indicator:checked:disabled { + image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png"); +} + +/* QRadioButton ----------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qradiobutton + +--------------------------------------------------------------------------- */ +QRadioButton { + background-color: #19232D; + color: #E0E1E3; + spacing: 4px; + padding-top: 4px; + padding-bottom: 4px; + border: none; + outline: none; +} + +QRadioButton:focus { + border: none; +} + +QRadioButton:disabled { + background-color: #19232D; + color: #9DA9B5; + border: none; + outline: none; +} + +QRadioButton QWidget { + background-color: #19232D; + color: #E0E1E3; + spacing: 0px; + padding: 0px; + outline: none; + border: none; +} + +QRadioButton::indicator { + border: none; + outline: none; + margin-left: 2px; + height: 14px; + width: 14px; +} + +QRadioButton::indicator:unchecked { + image: url(":/qss_icons/dark/rc/radio_unchecked.png"); +} + +QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:focus, QRadioButton::indicator:unchecked:pressed { + border: none; + outline: none; + image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png"); +} + +QRadioButton::indicator:unchecked:disabled { + image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png"); +} + +QRadioButton::indicator:checked { + border: none; + outline: none; + image: url(":/qss_icons/dark/rc/radio_checked.png"); +} + +QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:focus, QRadioButton::indicator:checked:pressed { + border: none; + outline: none; + image: url(":/qss_icons/dark/rc/radio_checked_focus.png"); +} + +QRadioButton::indicator:checked:disabled { + outline: none; + image: url(":/qss_icons/dark/rc/radio_checked_disabled.png"); +} + +/* QMenuBar --------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar + +--------------------------------------------------------------------------- */ +QMenuBar { + background-color: #455364; + padding: 2px; + border: 1px solid #19232D; + color: #E0E1E3; + selection-background-color: #1A72BB; +} + +QMenuBar:focus { + border: 1px solid #346792; +} + +QMenuBar::item { + background: transparent; + padding: 4px; +} + +QMenuBar::item:selected { + padding: 4px; + background: transparent; + border: 0px solid #455364; + background-color: #1A72BB; +} + +QMenuBar::item:pressed { + padding: 4px; + border: 0px solid #455364; + background-color: #1A72BB; + color: #E0E1E3; + margin-bottom: 0px; + padding-bottom: 0px; +} + +/* QMenu ------------------------------------------------------------------ + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu + +--------------------------------------------------------------------------- */ +QMenu { + border: 0px solid #455364; + color: #E0E1E3; + margin: 0px; + background-color: #37414F; + selection-background-color: #1A72BB; +} + +QMenu::separator { + height: 1px; + background-color: #60798B; + color: #E0E1E3; +} + +QMenu::item { + background-color: #37414F; + padding: 4px 24px 4px 28px; + /* Reserve space for selection border */ + border: 1px transparent #455364; +} + +QMenu::item:selected { + color: #E0E1E3; + background-color: #1A72BB; +} + +QMenu::item:pressed { + background-color: #1A72BB; +} + +QMenu::icon { + padding-left: 10px; + width: 14px; + height: 14px; +} + +QMenu::indicator { + padding-left: 8px; + width: 12px; + height: 12px; + /* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */ + /* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */ +} + +QMenu::indicator:non-exclusive:unchecked { + image: url(":/qss_icons/dark/rc/checkbox_unchecked.png"); +} + +QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png"); +} + +QMenu::indicator:non-exclusive:unchecked:disabled { + image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png"); +} + +QMenu::indicator:non-exclusive:checked { + image: url(":/qss_icons/dark/rc/checkbox_checked.png"); +} + +QMenu::indicator:non-exclusive:checked:hover, QMenu::indicator:non-exclusive:checked:focus, QMenu::indicator:non-exclusive:checked:pressed { + border: none; + image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png"); +} + +QMenu::indicator:non-exclusive:checked:disabled { + image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png"); +} + +QMenu::indicator:non-exclusive:indeterminate { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png"); +} + +QMenu::indicator:non-exclusive:indeterminate:disabled { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png"); +} + +QMenu::indicator:non-exclusive:indeterminate:focus, QMenu::indicator:non-exclusive:indeterminate:hover, QMenu::indicator:non-exclusive:indeterminate:pressed { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png"); +} + +QMenu::indicator:exclusive:unchecked { + image: url(":/qss_icons/dark/rc/radio_unchecked.png"); +} + +QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked:focus, QMenu::indicator:exclusive:unchecked:pressed { + border: none; + outline: none; + image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png"); +} + +QMenu::indicator:exclusive:unchecked:disabled { + image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png"); +} + +QMenu::indicator:exclusive:checked { + border: none; + outline: none; + image: url(":/qss_icons/dark/rc/radio_checked.png"); +} + +QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed { + border: none; + outline: none; + image: url(":/qss_icons/dark/rc/radio_checked_focus.png"); +} + +QMenu::indicator:exclusive:checked:disabled { + outline: none; + image: url(":/qss_icons/dark/rc/radio_checked_disabled.png"); +} + +QMenu::right-arrow { + margin: 5px; + padding-left: 12px; + image: url(":/qss_icons/dark/rc/arrow_right.png"); + height: 12px; + width: 12px; +} + +/* QAbstractItemView ------------------------------------------------------ + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox + +--------------------------------------------------------------------------- */ +QAbstractItemView { + alternate-background-color: #19232D; + color: #E0E1E3; + border: 1px solid #455364; + border-radius: 4px; +} + +QAbstractItemView QLineEdit { + padding: 2px; +} + +/* QAbstractScrollArea ---------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea + +--------------------------------------------------------------------------- */ +QAbstractScrollArea { + background-color: #19232D; + border: 1px solid #455364; + border-radius: 4px; + /* fix #159 */ + padding: 2px; + /* remove min-height to fix #244 */ + color: #E0E1E3; +} + +QAbstractScrollArea:disabled { + color: #9DA9B5; +} + +/* QScrollArea ------------------------------------------------------------ + +--------------------------------------------------------------------------- */ +QScrollArea QWidget QWidget:disabled { + background-color: #19232D; +} + +/* QScrollBar ------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qscrollbar + +--------------------------------------------------------------------------- */ +QScrollBar:horizontal { + height: 16px; + margin: 2px 16px 2px 16px; + border: 1px solid #455364; + border-radius: 4px; + background-color: #19232D; +} + +QScrollBar:vertical { + background-color: #19232D; + width: 16px; + margin: 16px 2px 16px 2px; + border: 1px solid #455364; + border-radius: 4px; +} + +QScrollBar::handle:horizontal { + background-color: #60798B; + border: 1px solid #455364; + border-radius: 4px; + min-width: 8px; +} + +QScrollBar::handle:horizontal:hover { + background-color: #346792; + border: #346792; + border-radius: 4px; + min-width: 8px; +} + +QScrollBar::handle:horizontal:focus { + border: 1px solid #1A72BB; +} + +QScrollBar::handle:vertical { + background-color: #60798B; + border: 1px solid #455364; + min-height: 8px; + border-radius: 4px; +} + +QScrollBar::handle:vertical:hover { + background-color: #346792; + border: #346792; + border-radius: 4px; + min-height: 8px; +} + +QScrollBar::handle:vertical:focus { + border: 1px solid #1A72BB; +} + +QScrollBar::add-line:horizontal { + margin: 0px 0px 0px 0px; + border-image: url(":/qss_icons/dark/rc/arrow_right_disabled.png"); + height: 12px; + width: 12px; + subcontrol-position: right; + subcontrol-origin: margin; +} + +QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on { + border-image: url(":/qss_icons/dark/rc/arrow_right.png"); + height: 12px; + width: 12px; + subcontrol-position: right; + subcontrol-origin: margin; +} + +QScrollBar::add-line:vertical { + margin: 3px 0px 3px 0px; + border-image: url(":/qss_icons/dark/rc/arrow_down_disabled.png"); + height: 12px; + width: 12px; + subcontrol-position: bottom; + subcontrol-origin: margin; +} + +QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on { + border-image: url(":/qss_icons/dark/rc/arrow_down.png"); + height: 12px; + width: 12px; + subcontrol-position: bottom; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:horizontal { + margin: 0px 3px 0px 3px; + border-image: url(":/qss_icons/dark/rc/arrow_left_disabled.png"); + height: 12px; + width: 12px; + subcontrol-position: left; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on { + border-image: url(":/qss_icons/dark/rc/arrow_left.png"); + height: 12px; + width: 12px; + subcontrol-position: left; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:vertical { + margin: 3px 0px 3px 0px; + border-image: url(":/qss_icons/dark/rc/arrow_up_disabled.png"); + height: 12px; + width: 12px; + subcontrol-position: top; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on { + border-image: url(":/qss_icons/dark/rc/arrow_up.png"); + height: 12px; + width: 12px; + subcontrol-position: top; + subcontrol-origin: margin; +} + +QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal { + background: none; +} + +QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { + background: none; +} + +QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { + background: none; +} + +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { + background: none; +} + +/* QTextEdit -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets + +--------------------------------------------------------------------------- */ +QTextEdit { + background-color: #19232D; + color: #E0E1E3; + border-radius: 4px; + border: 1px solid #455364; +} + +QTextEdit:focus { + border: 1px solid #1A72BB; +} + +QTextEdit:selected { + background: #346792; + color: #455364; +} + +/* QPlainTextEdit --------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QPlainTextEdit { + background-color: #19232D; + color: #E0E1E3; + border-radius: 4px; + border: 1px solid #455364; +} + +QPlainTextEdit:focus { + border: 1px solid #1A72BB; +} + +QPlainTextEdit:selected { + background: #346792; + color: #455364; +} + +/* QSizeGrip -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsizegrip + +--------------------------------------------------------------------------- */ +QSizeGrip { + background: transparent; + width: 12px; + height: 12px; + image: url(":/qss_icons/dark/rc/window_grip.png"); +} + +/* QStackedWidget --------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QStackedWidget { + padding: 2px; + border: 1px solid #455364; + border: 1px solid #19232D; +} + +/* QToolBar --------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbar + +--------------------------------------------------------------------------- */ +QToolBar { + background-color: #455364; + border-bottom: 1px solid #19232D; + padding: 1px; + font-weight: bold; + spacing: 2px; +} + +QToolBar:disabled { + /* Fixes #272 */ + background-color: #455364; +} + +QToolBar::handle:horizontal { + width: 16px; + image: url(":/qss_icons/dark/rc/toolbar_move_horizontal.png"); +} + +QToolBar::handle:vertical { + height: 16px; + image: url(":/qss_icons/dark/rc/toolbar_move_vertical.png"); +} + +QToolBar::separator:horizontal { + width: 16px; + image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png"); +} + +QToolBar::separator:vertical { + height: 16px; + image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png"); +} + +QToolButton#qt_toolbar_ext_button { + background: #455364; + border: 0px; + color: #E0E1E3; + image: url(":/qss_icons/dark/rc/arrow_right.png"); +} + +/* QAbstractSpinBox ------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QAbstractSpinBox { + background-color: #19232D; + border: 1px solid #455364; + color: #E0E1E3; + /* This fixes 103, 111 */ + padding-top: 2px; + /* This fixes 103, 111 */ + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; + border-radius: 4px; + /* min-width: 5px; removed to fix 109 */ +} + +QAbstractSpinBox:up-button { + background-color: transparent #19232D; + subcontrol-origin: border; + subcontrol-position: top right; + border-left: 1px solid #455364; + border-bottom: 1px solid #455364; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + margin: 1px; + width: 12px; + margin-bottom: -1px; +} + +QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off { + image: url(":/qss_icons/dark/rc/arrow_up_disabled.png"); + height: 8px; + width: 8px; +} + +QAbstractSpinBox::up-arrow:hover { + image: url(":/qss_icons/dark/rc/arrow_up.png"); +} + +QAbstractSpinBox:down-button { + background-color: transparent #19232D; + subcontrol-origin: border; + subcontrol-position: bottom right; + border-left: 1px solid #455364; + border-top: 1px solid #455364; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + margin: 1px; + width: 12px; + margin-top: -1px; +} + +QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off { + image: url(":/qss_icons/dark/rc/arrow_down_disabled.png"); + height: 8px; + width: 8px; +} + +QAbstractSpinBox::down-arrow:hover { + image: url(":/qss_icons/dark/rc/arrow_down.png"); +} + +QAbstractSpinBox:hover { + border: 1px solid #346792; + color: #E0E1E3; +} + +QAbstractSpinBox:focus { + border: 1px solid #1A72BB; +} + +QAbstractSpinBox:selected { + background: #346792; + color: #455364; +} + +/* ------------------------------------------------------------------------ */ +/* DISPLAYS --------------------------------------------------------------- */ +/* ------------------------------------------------------------------------ */ +/* QLabel ----------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe + +--------------------------------------------------------------------------- */ +QLabel { + background-color: #19232D; + border: 0px solid #455364; + padding: 2px; + margin: 0px; + color: #E0E1E3; +} + +QLabel:disabled { + background-color: #19232D; + border: 0px solid #455364; + color: #9DA9B5; +} + +/* QTextBrowser ----------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea + +--------------------------------------------------------------------------- */ +QTextBrowser { + background-color: #19232D; + border: 1px solid #455364; + color: #E0E1E3; + border-radius: 4px; +} + +QTextBrowser:disabled { + background-color: #19232D; + border: 1px solid #455364; + color: #9DA9B5; + border-radius: 4px; +} + +QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed { + border: 1px solid #455364; +} + +/* QGraphicsView ---------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QGraphicsView { + background-color: #19232D; + border: 1px solid #455364; + color: #E0E1E3; + border-radius: 4px; +} + +QGraphicsView:disabled { + background-color: #19232D; + border: 1px solid #455364; + color: #9DA9B5; + border-radius: 4px; +} + +QGraphicsView:hover, QGraphicsView:!hover, QGraphicsView:selected, QGraphicsView:pressed { + border: 1px solid #455364; +} + +/* QCalendarWidget -------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QCalendarWidget { + border: 1px solid #455364; + border-radius: 4px; +} + +QCalendarWidget:disabled { + background-color: #19232D; + color: #9DA9B5; +} + +/* QLCDNumber ------------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QLCDNumber { + background-color: #19232D; + color: #E0E1E3; +} + +QLCDNumber:disabled { + background-color: #19232D; + color: #9DA9B5; +} + +/* QProgressBar ----------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qprogressbar + +--------------------------------------------------------------------------- */ +QProgressBar { + background-color: #19232D; + border: 1px solid #455364; + color: #E0E1E3; + border-radius: 4px; + text-align: center; +} + +QProgressBar:disabled { + background-color: #19232D; + border: 1px solid #455364; + color: #9DA9B5; + border-radius: 4px; + text-align: center; +} + +QProgressBar::chunk { + background-color: #346792; + color: #19232D; + border-radius: 4px; +} + +QProgressBar::chunk:disabled { + background-color: #26486B; + color: #9DA9B5; + border-radius: 4px; +} + +/* ------------------------------------------------------------------------ */ +/* BUTTONS ---------------------------------------------------------------- */ +/* ------------------------------------------------------------------------ */ +/* QPushButton ------------------------------------------------------------ + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton + +--------------------------------------------------------------------------- */ +QPushButton { + background-color: #455364; + color: #E0E1E3; + border-radius: 4px; + padding: 2px; + outline: none; + border: none; +} + +QPushButton:disabled { + background-color: #455364; + color: #9DA9B5; + border-radius: 4px; + padding: 2px; +} + +QPushButton:checked { + background-color: #60798B; + border-radius: 4px; + padding: 2px; + outline: none; +} + +QPushButton:checked:disabled { + background-color: #60798B; + color: #9DA9B5; + border-radius: 4px; + padding: 2px; + outline: none; +} + +QPushButton:checked:selected { + background: #60798B; +} + +QPushButton:hover { + background-color: #54687A; + color: #E0E1E3; +} + +QPushButton:pressed { + background-color: #60798B; +} + +QPushButton:selected { + background: #60798B; + color: #E0E1E3; +} + +QPushButton::menu-indicator { + subcontrol-origin: padding; + subcontrol-position: bottom right; + bottom: 4px; +} + +QDialogButtonBox QPushButton { + /* Issue #194 #248 - Special case of QPushButton inside dialogs, for better UI */ + min-width: 80px; +} + +/* QToolButton ------------------------------------------------------------ + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton + +--------------------------------------------------------------------------- */ +QToolButton { + background-color: #455364; + color: #E0E1E3; + border-radius: 4px; + padding: 2px; + outline: none; + border: none; + /* The subcontrols below are used only in the DelayedPopup mode */ + /* The subcontrols below are used only in the MenuButtonPopup mode */ + /* The subcontrol below is used only in the InstantPopup or DelayedPopup mode */ +} + +QToolButton:disabled { + background-color: #455364; + color: #9DA9B5; + border-radius: 4px; + padding: 2px; +} + +QToolButton:checked { + background-color: #60798B; + border-radius: 4px; + padding: 2px; + outline: none; +} + +QToolButton:checked:disabled { + background-color: #60798B; + color: #9DA9B5; + border-radius: 4px; + padding: 2px; + outline: none; +} + +QToolButton:checked:hover { + background-color: #54687A; + color: #E0E1E3; +} + +QToolButton:checked:pressed { + background-color: #60798B; +} + +QToolButton:checked:selected { + background: #60798B; + color: #E0E1E3; +} + +QToolButton:hover { + background-color: #54687A; + color: #E0E1E3; +} + +QToolButton:pressed { + background-color: #60798B; +} + +QToolButton:selected { + background: #60798B; + color: #E0E1E3; +} + +QToolButton[popupMode="0"] { + /* Only for DelayedPopup */ + padding-right: 2px; +} + +QToolButton[popupMode="1"] { + /* Only for MenuButtonPopup */ + padding-right: 20px; +} + +QToolButton[popupMode="1"]::menu-button { + border: none; +} + +QToolButton[popupMode="1"]::menu-button:hover { + border: none; + border-left: 1px solid #455364; + border-radius: 0; +} + +QToolButton[popupMode="2"] { + /* Only for InstantPopup */ + padding-right: 2px; +} + +QToolButton::menu-button { + padding: 2px; + border-radius: 4px; + width: 12px; + border: none; + outline: none; +} + +QToolButton::menu-button:hover { + border: 1px solid #346792; +} + +QToolButton::menu-button:checked:hover { + border: 1px solid #346792; +} + +QToolButton::menu-indicator { + image: url(":/qss_icons/dark/rc/arrow_down.png"); + height: 8px; + width: 8px; + top: 0; + /* Exclude a shift for better image */ + left: -2px; + /* Shift it a bit */ +} + +QToolButton::menu-arrow { + image: url(":/qss_icons/dark/rc/arrow_down.png"); + height: 8px; + width: 8px; +} + +QToolButton::menu-arrow:hover { + image: url(":/qss_icons/dark/rc/arrow_down_focus.png"); +} + +/* QCommandLinkButton ----------------------------------------------------- + +--------------------------------------------------------------------------- */ +QCommandLinkButton { + background-color: transparent; + border: 1px solid #455364; + color: #E0E1E3; + border-radius: 4px; + padding: 0px; + margin: 0px; +} + +QCommandLinkButton:disabled { + background-color: transparent; + color: #9DA9B5; +} + +/* ------------------------------------------------------------------------ */ +/* INPUTS - NO FIELDS ----------------------------------------------------- */ +/* ------------------------------------------------------------------------ */ +/* QComboBox -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox + +--------------------------------------------------------------------------- */ +QComboBox { + border: 1px solid #455364; + border-radius: 4px; + selection-background-color: #346792; + padding-left: 4px; + padding-right: 4px; + /* padding-right = 36; 4 + 16*2 See scrollbar size */ + /* changed to 4px to fix #239 */ + /* Fixes #103, #111 */ + min-height: 1.5em; + /* padding-top: 2px; removed to fix #132 */ + /* padding-bottom: 2px; removed to fix #132 */ + /* min-width: 75px; removed to fix #109 */ + /* Needed to remove indicator - fix #132 */ +} + +QComboBox QAbstractItemView { + border: 1px solid #455364; + border-radius: 0; + background-color: #19232D; + selection-background-color: #346792; +} + +QComboBox QAbstractItemView:hover { + background-color: #19232D; + color: #E0E1E3; +} + +QComboBox QAbstractItemView:selected { + background: #346792; + color: #455364; +} + +QComboBox QAbstractItemView:alternate { + background: #19232D; +} + +QComboBox:disabled { + background-color: #19232D; + color: #9DA9B5; +} + +QComboBox:hover { + border: 1px solid #346792; +} + +QComboBox:focus { + border: 1px solid #1A72BB; +} + +QComboBox:on { + selection-background-color: #346792; +} + +QComboBox::indicator { + border: none; + border-radius: 0; + background-color: transparent; + selection-background-color: transparent; + color: transparent; + selection-color: transparent; + /* Needed to remove indicator - fix #132 */ +} + +QComboBox::indicator:alternate { + background: #19232D; +} + +QComboBox::item:alternate { + background: #19232D; +} + +QComboBox::item:checked { + font-weight: bold; +} + +QComboBox::item:selected { + border: 0px solid transparent; +} + +QComboBox::drop-down { + subcontrol-origin: padding; + subcontrol-position: top right; + width: 12px; + border-left: 1px solid #455364; +} + +QComboBox::down-arrow { + image: url(":/qss_icons/dark/rc/arrow_down_disabled.png"); + height: 8px; + width: 8px; +} + +QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus { + image: url(":/qss_icons/dark/rc/arrow_down.png"); +} + +/* QSlider ---------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qslider + +--------------------------------------------------------------------------- */ +QSlider:disabled { + background: #19232D; +} + +QSlider:focus { + border: none; +} + +QSlider::groove:horizontal { + background: #455364; + border: 1px solid #455364; + height: 4px; + margin: 0px; + border-radius: 4px; +} + +QSlider::groove:vertical { + background: #455364; + border: 1px solid #455364; + width: 4px; + margin: 0px; + border-radius: 4px; +} + +QSlider::add-page:vertical { + background: #346792; + border: 1px solid #455364; + width: 4px; + margin: 0px; + border-radius: 4px; +} + +QSlider::add-page:vertical :disabled { + background: #26486B; +} + +QSlider::sub-page:horizontal { + background: #346792; + border: 1px solid #455364; + height: 4px; + margin: 0px; + border-radius: 4px; +} + +QSlider::sub-page:horizontal:disabled { + background: #26486B; +} + +QSlider::handle:horizontal { + background: #9DA9B5; + border: 1px solid #455364; + width: 8px; + height: 8px; + margin: -8px 0px; + border-radius: 4px; +} + +QSlider::handle:horizontal:hover { + background: #346792; + border: 1px solid #346792; +} + +QSlider::handle:horizontal:focus { + border: 1px solid #1A72BB; +} + +QSlider::handle:vertical { + background: #9DA9B5; + border: 1px solid #455364; + width: 8px; + height: 8px; + margin: 0 -8px; + border-radius: 4px; +} + +QSlider::handle:vertical:hover { + background: #346792; + border: 1px solid #346792; +} + +QSlider::handle:vertical:focus { + border: 1px solid #1A72BB; +} + +/* QLineEdit -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlineedit + +--------------------------------------------------------------------------- */ +QLineEdit { + background-color: #19232D; + padding-top: 2px; + /* This QLineEdit fix 103, 111 */ + padding-bottom: 2px; + /* This QLineEdit fix 103, 111 */ + padding-left: 4px; + padding-right: 4px; + border-style: solid; + border: 1px solid #455364; + border-radius: 4px; + color: #E0E1E3; +} + +QLineEdit:disabled { + background-color: #19232D; + color: #9DA9B5; +} + +QLineEdit:hover { + border: 1px solid #346792; + color: #E0E1E3; +} + +QLineEdit:focus { + border: 1px solid #1A72BB; +} + +QLineEdit:selected { + background-color: #346792; + color: #455364; +} + +/* QTabWiget -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar + +--------------------------------------------------------------------------- */ +QTabWidget { + padding: 2px; + selection-background-color: #455364; +} + +QTabWidget QWidget { + /* Fixes #189 */ + border-radius: 4px; +} + +QTabWidget::pane { + border: 1px solid #455364; + border-radius: 4px; + margin: 0px; + /* Fixes double border inside pane with pyqt5 */ + padding: 0px; +} + +QTabWidget::pane:selected { + background-color: #455364; + border: 1px solid #346792; +} + +/* QTabBar ---------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar + +--------------------------------------------------------------------------- */ +QTabBar, QDockWidget QTabBar { + qproperty-drawBase: 0; + border-radius: 4px; + margin: 0px; + padding: 2px; + border: 0; + /* left: 5px; move to the right by 5px - removed for fix */ +} + +QTabBar::close-button, QDockWidget QTabBar::close-button { + border: 0; + margin: 0; + padding: 4px; + image: url(":/qss_icons/dark/rc/window_close.png"); +} + +QTabBar::close-button:hover, QDockWidget QTabBar::close-button:hover { + image: url(":/qss_icons/dark/rc/window_close_focus.png"); +} + +QTabBar::close-button:pressed, QDockWidget QTabBar::close-button:pressed { + image: url(":/qss_icons/dark/rc/window_close_pressed.png"); +} + +QTabBar::tab, QDockWidget QTabBar::tab { + /* !selected and disabled ----------------------------------------- */ + /* selected ------------------------------------------------------- */ +} + +QTabBar::tab:top:selected:disabled, QDockWidget QTabBar::tab:top:selected:disabled { + border-bottom: 3px solid #26486B; + color: #9DA9B5; + background-color: #455364; +} + +QTabBar::tab:bottom:selected:disabled, QDockWidget QTabBar::tab:bottom:selected:disabled { + border-top: 3px solid #26486B; + color: #9DA9B5; + background-color: #455364; +} + +QTabBar::tab:left:selected:disabled, QDockWidget QTabBar::tab:left:selected:disabled { + border-right: 3px solid #26486B; + color: #9DA9B5; + background-color: #455364; +} + +QTabBar::tab:right:selected:disabled, QDockWidget QTabBar::tab:right:selected:disabled { + border-left: 3px solid #26486B; + color: #9DA9B5; + background-color: #455364; +} + +QTabBar::tab:top:!selected:disabled, QDockWidget QTabBar::tab:top:!selected:disabled { + border-bottom: 3px solid #19232D; + color: #9DA9B5; + background-color: #19232D; +} + +QTabBar::tab:bottom:!selected:disabled, QDockWidget QTabBar::tab:bottom:!selected:disabled { + border-top: 3px solid #19232D; + color: #9DA9B5; + background-color: #19232D; +} + +QTabBar::tab:left:!selected:disabled, QDockWidget QTabBar::tab:left:!selected:disabled { + border-right: 3px solid #19232D; + color: #9DA9B5; + background-color: #19232D; +} + +QTabBar::tab:right:!selected:disabled, QDockWidget QTabBar::tab:right:!selected:disabled { + border-left: 3px solid #19232D; + color: #9DA9B5; + background-color: #19232D; +} + +QTabBar::tab:top:!selected, QDockWidget QTabBar::tab:top:!selected { + border-bottom: 2px solid #19232D; + margin-top: 2px; +} + +QTabBar::tab:bottom:!selected, QDockWidget QTabBar::tab:bottom:!selected { + border-top: 2px solid #19232D; + margin-bottom: 2px; +} + +QTabBar::tab:left:!selected, QDockWidget QTabBar::tab:left:!selected { + border-left: 2px solid #19232D; + margin-right: 2px; +} + +QTabBar::tab:right:!selected, QDockWidget QTabBar::tab:right:!selected { + border-right: 2px solid #19232D; + margin-left: 2px; +} + +QTabBar::tab:top, QDockWidget QTabBar::tab:top { + background-color: #455364; + margin-left: 2px; + padding-left: 4px; + padding-right: 4px; + padding-top: 2px; + padding-bottom: 2px; + min-width: 5px; + border-bottom: 3px solid #455364; + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} + +QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected { + background-color: #54687A; + border-bottom: 3px solid #259AE9; + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} + +QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover { + border: 1px solid #1A72BB; + border-bottom: 3px solid #1A72BB; + /* Fixes spyder-ide/spyder#9766 and #243 */ + padding-left: 3px; + padding-right: 3px; +} + +QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom { + border-top: 3px solid #455364; + background-color: #455364; + margin-left: 2px; + padding-left: 4px; + padding-right: 4px; + padding-top: 2px; + padding-bottom: 2px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + min-width: 5px; +} + +QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected { + background-color: #54687A; + border-top: 3px solid #259AE9; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} + +QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover { + border: 1px solid #1A72BB; + border-top: 3px solid #1A72BB; + /* Fixes spyder-ide/spyder#9766 and #243 */ + padding-left: 3px; + padding-right: 3px; +} + +QTabBar::tab:left, QDockWidget QTabBar::tab:left { + background-color: #455364; + margin-top: 2px; + padding-left: 2px; + padding-right: 2px; + padding-top: 4px; + padding-bottom: 4px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + min-height: 5px; +} + +QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected { + background-color: #54687A; + border-right: 3px solid #259AE9; +} + +QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover { + border: 1px solid #1A72BB; + border-right: 3px solid #1A72BB; + /* Fixes different behavior #271 */ + margin-right: 0px; + padding-right: -1px; +} + +QTabBar::tab:right, QDockWidget QTabBar::tab:right { + background-color: #455364; + margin-top: 2px; + padding-left: 2px; + padding-right: 2px; + padding-top: 4px; + padding-bottom: 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + min-height: 5px; +} + +QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected { + background-color: #54687A; + border-left: 3px solid #259AE9; +} + +QTabBar::tab:right:!selected:hover, QDockWidget QTabBar::tab:right:!selected:hover { + border: 1px solid #1A72BB; + border-left: 3px solid #1A72BB; + /* Fixes different behavior #271 */ + margin-left: 0px; + padding-left: 0px; +} + +QTabBar QToolButton, QDockWidget QTabBar QToolButton { + /* Fixes #136 */ + background-color: #455364; + height: 12px; + width: 12px; +} + +QTabBar QToolButton:pressed, QDockWidget QTabBar QToolButton:pressed { + background-color: #455364; +} + +QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover { + border: 1px solid #346792; +} + +QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled { + image: url(":/qss_icons/dark/rc/arrow_left.png"); +} + +QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled { + image: url(":/qss_icons/dark/rc/arrow_left_disabled.png"); +} + +QTabBar QToolButton::right-arrow:enabled, QDockWidget QTabBar QToolButton::right-arrow:enabled { + image: url(":/qss_icons/dark/rc/arrow_right.png"); +} + +QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::right-arrow:disabled { + image: url(":/qss_icons/dark/rc/arrow_right_disabled.png"); +} + +/* QDockWiget ------------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QDockWidget { + outline: 1px solid #455364; + background-color: #19232D; + border: 1px solid #455364; + border-radius: 4px; + titlebar-close-icon: url(":/qss_icons/dark/rc/transparent.png"); + titlebar-normal-icon: url(":/qss_icons/dark/rc/transparent.png"); +} + +QDockWidget::title { + /* Better size for title bar */ + padding: 3px; + spacing: 4px; + border: none; + background-color: #455364; +} + +QDockWidget::close-button { + icon-size: 12px; + border: none; + background: transparent; + background-image: transparent; + border: 0; + margin: 0; + padding: 0; + image: url(":/qss_icons/dark/rc/window_close.png"); +} + +QDockWidget::close-button:hover { + image: url(":/qss_icons/dark/rc/window_close_focus.png"); +} + +QDockWidget::close-button:pressed { + image: url(":/qss_icons/dark/rc/window_close_pressed.png"); +} + +QDockWidget::float-button { + icon-size: 12px; + border: none; + background: transparent; + background-image: transparent; + border: 0; + margin: 0; + padding: 0; + image: url(":/qss_icons/dark/rc/window_undock.png"); +} + +QDockWidget::float-button:hover { + image: url(":/qss_icons/dark/rc/window_undock_focus.png"); +} + +QDockWidget::float-button:pressed { + image: url(":/qss_icons/dark/rc/window_undock_pressed.png"); +} + +/* QTreeView QListView QTableView ----------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtreeview +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview + +--------------------------------------------------------------------------- */ +QTreeView:branch:selected, QTreeView:branch:hover { + background: url(":/qss_icons/dark/rc/transparent.png"); +} + +QTreeView:branch:has-siblings:!adjoins-item { + border-image: url(":/qss_icons/dark/rc/branch_line.png") 0; +} + +QTreeView:branch:has-siblings:adjoins-item { + border-image: url(":/qss_icons/dark/rc/branch_more.png") 0; +} + +QTreeView:branch:!has-children:!has-siblings:adjoins-item { + border-image: url(":/qss_icons/dark/rc/branch_end.png") 0; +} + +QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings { + border-image: none; + image: url(":/qss_icons/dark/rc/branch_closed.png"); +} + +QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings { + border-image: none; + image: url(":/qss_icons/dark/rc/branch_open.png"); +} + +QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover { + image: url(":/qss_icons/dark/rc/branch_closed_focus.png"); +} + +QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover { + image: url(":/qss_icons/dark/rc/branch_open_focus.png"); +} + +QTreeView::indicator:checked, +QListView::indicator:checked, +QTableView::indicator:checked, +QColumnView::indicator:checked { + image: url(":/qss_icons/dark/rc/checkbox_checked.png"); +} + +QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed, +QListView::indicator:checked:hover, +QListView::indicator:checked:focus, +QListView::indicator:checked:pressed, +QTableView::indicator:checked:hover, +QTableView::indicator:checked:focus, +QTableView::indicator:checked:pressed, +QColumnView::indicator:checked:hover, +QColumnView::indicator:checked:focus, +QColumnView::indicator:checked:pressed { + image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png"); +} + +QTreeView::indicator:unchecked, +QListView::indicator:unchecked, +QTableView::indicator:unchecked, +QColumnView::indicator:unchecked { + image: url(":/qss_icons/dark/rc/checkbox_unchecked.png"); +} + +QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed, +QListView::indicator:unchecked:hover, +QListView::indicator:unchecked:focus, +QListView::indicator:unchecked:pressed, +QTableView::indicator:unchecked:hover, +QTableView::indicator:unchecked:focus, +QTableView::indicator:unchecked:pressed, +QColumnView::indicator:unchecked:hover, +QColumnView::indicator:unchecked:focus, +QColumnView::indicator:unchecked:pressed { + image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png"); +} + +QTreeView::indicator:indeterminate, +QListView::indicator:indeterminate, +QTableView::indicator:indeterminate, +QColumnView::indicator:indeterminate { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png"); +} + +QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed, +QListView::indicator:indeterminate:hover, +QListView::indicator:indeterminate:focus, +QListView::indicator:indeterminate:pressed, +QTableView::indicator:indeterminate:hover, +QTableView::indicator:indeterminate:focus, +QTableView::indicator:indeterminate:pressed, +QColumnView::indicator:indeterminate:hover, +QColumnView::indicator:indeterminate:focus, +QColumnView::indicator:indeterminate:pressed { + image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png"); +} + +QTreeView, +QListView, +QTableView, +QColumnView { + background-color: #19232D; + border: 1px solid #455364; + color: #E0E1E3; + gridline-color: #455364; + border-radius: 4px; +} + +QTreeView:disabled, +QListView:disabled, +QTableView:disabled, +QColumnView:disabled { + background-color: #19232D; + color: #9DA9B5; +} + +QTreeView:selected, +QListView:selected, +QTableView:selected, +QColumnView:selected { + background-color: #346792; + color: #455364; +} + +QTreeView:focus, +QListView:focus, +QTableView:focus, +QColumnView:focus { + border: 1px solid #1A72BB; +} + +QTreeView::item:pressed, +QListView::item:pressed, +QTableView::item:pressed, +QColumnView::item:pressed { + background-color: #346792; +} + +QTreeView::item:selected:active, +QListView::item:selected:active, +QTableView::item:selected:active, +QColumnView::item:selected:active { + background-color: #346792; +} + +QTreeView::item:selected:!active, +QListView::item:selected:!active, +QTableView::item:selected:!active, +QColumnView::item:selected:!active { + color: #E0E1E3; + background-color: #37414F; +} + +QTreeView::item:!selected:hover, +QListView::item:!selected:hover, +QTableView::item:!selected:hover, +QColumnView::item:!selected:hover { + outline: 0; + color: #E0E1E3; + background-color: #37414F; +} + +QTableCornerButton::section { + background-color: #19232D; + border: 1px transparent #455364; + border-radius: 0px; +} + +/* QHeaderView ------------------------------------------------------------ + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview + +--------------------------------------------------------------------------- */ +QHeaderView { + background-color: #455364; + border: 0px transparent #455364; + padding: 0; + margin: 0; + border-radius: 0; +} + +QHeaderView:disabled { + background-color: #455364; + border: 1px transparent #455364; +} + +QHeaderView::section { + background-color: #455364; + color: #E0E1E3; + border-radius: 0; + text-align: left; + font-size: 13px; +} + +QHeaderView::section::horizontal { + padding-top: 0; + padding-bottom: 0; + padding-left: 4px; + padding-right: 4px; + border-left: 1px solid #19232D; +} + +QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one { + border-left: 1px solid #455364; +} + +QHeaderView::section::horizontal:disabled { + color: #9DA9B5; +} + +QHeaderView::section::vertical { + padding-top: 0; + padding-bottom: 0; + padding-left: 4px; + padding-right: 4px; + border-top: 1px solid #19232D; +} + +QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one { + border-top: 1px solid #455364; +} + +QHeaderView::section::vertical:disabled { + color: #9DA9B5; +} + +QHeaderView::down-arrow { + /* Those settings (border/width/height/background-color) solve bug */ + /* transparent arrow background and size */ + background-color: #455364; + border: none; + height: 12px; + width: 12px; + padding-left: 2px; + padding-right: 2px; + image: url(":/qss_icons/dark/rc/arrow_down.png"); +} + +QHeaderView::up-arrow { + background-color: #455364; + border: none; + height: 12px; + width: 12px; + padding-left: 2px; + padding-right: 2px; + image: url(":/qss_icons/dark/rc/arrow_up.png"); +} + +/* QToolBox -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbox + +--------------------------------------------------------------------------- */ +QToolBox { + padding: 0px; + border: 0px; + border: 1px solid #455364; +} + +QToolBox:selected { + padding: 0px; + border: 2px solid #346792; +} + +QToolBox::tab { + background-color: #19232D; + border: 1px solid #455364; + color: #E0E1E3; + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} + +QToolBox::tab:disabled { + color: #9DA9B5; +} + +QToolBox::tab:selected { + background-color: #60798B; + border-bottom: 2px solid #346792; +} + +QToolBox::tab:selected:disabled { + background-color: #455364; + border-bottom: 2px solid #26486B; +} + +QToolBox::tab:!selected { + background-color: #455364; + border-bottom: 2px solid #455364; +} + +QToolBox::tab:!selected:disabled { + background-color: #19232D; +} + +QToolBox::tab:hover { + border-color: #1A72BB; + border-bottom: 2px solid #1A72BB; +} + +QToolBox QScrollArea QWidget QWidget { + padding: 0px; + border: 0px; + background-color: #19232D; +} + +/* QFrame ----------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe +https://doc.qt.io/qt-5/qframe.html#-prop +https://doc.qt.io/qt-5/qframe.html#details +https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color + +--------------------------------------------------------------------------- */ +/* (dot) .QFrame fix #141, #126, #123 */ +.QFrame { + border-radius: 4px; + border: 1px solid #455364; + /* No frame */ + /* HLine */ + /* HLine */ +} + +.QFrame[frameShape="0"] { + border-radius: 4px; + border: 1px transparent #455364; +} + +.QFrame[frameShape="4"] { + max-height: 2px; + border: none; + background-color: #455364; +} + +.QFrame[frameShape="5"] { + max-width: 2px; + border: none; + background-color: #455364; +} + +/* QSplitter -------------------------------------------------------------- + +https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter + +--------------------------------------------------------------------------- */ +QSplitter { + background-color: #455364; + spacing: 0px; + padding: 0px; + margin: 0px; +} + +QSplitter::handle { + background-color: #455364; + border: 0px solid #19232D; + spacing: 0px; + padding: 1px; + margin: 0px; +} + +QSplitter::handle:hover { + background-color: #9DA9B5; +} + +QSplitter::handle:horizontal { + width: 5px; + image: url(":/qss_icons/dark/rc/line_vertical.png"); +} + +QSplitter::handle:vertical { + height: 5px; + image: url(":/qss_icons/dark/rc/line_horizontal.png"); +} + +/* QDateEdit, QDateTimeEdit ----------------------------------------------- + +--------------------------------------------------------------------------- */ +QDateEdit, QDateTimeEdit { + selection-background-color: #346792; + border-style: solid; + border: 1px solid #455364; + border-radius: 4px; + /* This fixes 103, 111 */ + padding-top: 2px; + /* This fixes 103, 111 */ + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; + min-width: 10px; +} + +QDateEdit:on, QDateTimeEdit:on { + selection-background-color: #346792; +} + +QDateEdit::drop-down, QDateTimeEdit::drop-down { + subcontrol-origin: padding; + subcontrol-position: top right; + width: 12px; + border-left: 1px solid #455364; +} + +QDateEdit::down-arrow, QDateTimeEdit::down-arrow { + image: url(":/qss_icons/dark/rc/arrow_down_disabled.png"); + height: 8px; + width: 8px; +} + +QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, QDateEdit::down-arrow:focus, QDateTimeEdit::down-arrow:on, QDateTimeEdit::down-arrow:hover, QDateTimeEdit::down-arrow:focus { + image: url(":/qss_icons/dark/rc/arrow_down.png"); +} + +QDateEdit QAbstractItemView, QDateTimeEdit QAbstractItemView { + background-color: #19232D; + border-radius: 4px; + border: 1px solid #455364; + selection-background-color: #346792; +} + +/* QAbstractView ---------------------------------------------------------- + +--------------------------------------------------------------------------- */ +QAbstractView:hover { + border: 1px solid #346792; + color: #E0E1E3; +} + +QAbstractView:selected { + background: #346792; + color: #455364; +} + +/* PlotWidget ------------------------------------------------------------- + +--------------------------------------------------------------------------- */ +PlotWidget { + /* Fix cut labels in plots #134 */ + padding: 0px; +} diff --git a/src/NotepadNext/resources.qrc b/src/NotepadNext/resources.qrc index d373be086..7043376d3 100644 --- a/src/NotepadNext/resources.qrc +++ b/src/NotepadNext/resources.qrc @@ -19,6 +19,7 @@ <file>icons/wrap.png</file> <file>icons/find.png</file> <file>stylesheets/npp.css</file> + <file>stylesheets/npp-dark.css</file> <file>icons/findReplace.png</file> <file>icons/readonly.png</file> <file>icons/startRecord.png</file> diff --git a/src/NotepadNext/stylesheets/npp-dark.css b/src/NotepadNext/stylesheets/npp-dark.css new file mode 100644 index 000000000..cdbfbf18c --- /dev/null +++ b/src/NotepadNext/stylesheets/npp-dark.css @@ -0,0 +1,54 @@ +/* Dark mode further tweak, in addition to qdarkstyle */ +/* Separate from qdarkstyle so that qdarkstyle upgrade will not override it */ + +/* NotepadNext tabbar configuration ---------------------------------------- + +----------------------------------------------------------------------------*/ +ads--CDockWidgetTab[activeTab="true"] { + /*background: qlineargradient(spread : pad, x1 : 0, y1 : 0, x2 : 0, y2 : 0.5, stop : 0 + palette(window), stop:1 palette(light));*/ + background: palette(highlight); + color: palette(foreground); +} + +ads--CDockWidgetTab QLabel { + color: palette(dark); +} + +ads--CDockWidgetTab[activeTab="true"] QLabel { + color: palette(foreground); + background: palette(highlight); +} + +ads--CDockWidgetTab { + /* Make tab icons smaller */ + /*qproperty-iconSize: 8px 8px;*/ +} + +#dockWidgetTabLabel { + margin: 0px; + /* Fix tiltle text truncation at header/tail */ + padding: 0px; +} + +#tabCloseButton { + margin: 0px; + padding: 0x; +} + +/* changed for NotepadNext - 'Close without save' button */ +/*QDialogButtonBox QPushButton { + min-width: 160px; +}*/ + +QMessageBox > QDialogButtonBox > QPushButton[text="Close without Saving"] { + /* Avoid save file dialog on Linux close button long text truncation */ + min-width: 160px; +} + +QAbstractScrollArea { + /* Fix NotepadNext editor first character cut-off issue */ + margin-left: -2px; + /* Fix NotepadNext editor first line cut-off issue on Linux */ + margin-top: -2px; +} diff --git a/src/QSimpleUpdater b/src/QSimpleUpdater index e4d8c7384..62e0ce7dd 160000 --- a/src/QSimpleUpdater +++ b/src/QSimpleUpdater @@ -1 +1 @@ -Subproject commit e4d8c73847d02eeafa1052ccb5cb5631ba3c40ae +Subproject commit 62e0ce7dde4c76e7533f2f0ee53f19ee1690c8dd diff --git a/src/ads b/src/ads index 5edbcc197..89ff0ad31 160000 --- a/src/ads +++ b/src/ads @@ -1 +1 @@ -Subproject commit 5edbcc1970bc8858ad09a41f4c3ac1700e489c8b +Subproject commit 89ff0ad311ec0cba7e7685c070d3be3a055cce71 diff --git a/src/singleapplication b/src/singleapplication index 8c48163c4..14e9d1467 160000 --- a/src/singleapplication +++ b/src/singleapplication @@ -1 +1 @@ -Subproject commit 8c48163c4d3fbba603cfe8a5b94046c9dad71825 +Subproject commit 14e9d14675156d3b55473a3b085de0e2a9f75578