diff --git a/PowerEditor/installer/nativeLang/abkhazian.xml b/PowerEditor/installer/nativeLang/abkhazian.xml index fc7954e3a..84306e28d 100644 --- a/PowerEditor/installer/nativeLang/abkhazian.xml +++ b/PowerEditor/installer/nativeLang/abkhazian.xml @@ -897,7 +897,6 @@ Updated to v8.2.1: - diff --git a/PowerEditor/installer/nativeLang/albanian.xml b/PowerEditor/installer/nativeLang/albanian.xml index aa64cba1e..b15d3726c 100644 --- a/PowerEditor/installer/nativeLang/albanian.xml +++ b/PowerEditor/installer/nativeLang/albanian.xml @@ -627,7 +627,6 @@ - diff --git a/PowerEditor/installer/nativeLang/arabic.xml b/PowerEditor/installer/nativeLang/arabic.xml index 42eba803d..5f26b847f 100644 --- a/PowerEditor/installer/nativeLang/arabic.xml +++ b/PowerEditor/installer/nativeLang/arabic.xml @@ -730,7 +730,6 @@ - diff --git a/PowerEditor/installer/nativeLang/aragonese.xml b/PowerEditor/installer/nativeLang/aragonese.xml index 2a1f56ee2..93b70e955 100644 --- a/PowerEditor/installer/nativeLang/aragonese.xml +++ b/PowerEditor/installer/nativeLang/aragonese.xml @@ -587,7 +587,6 @@ By Chesús D. Trigo [xuxinho7@gmail.com] & softaragones [softaragones@soft - diff --git a/PowerEditor/installer/nativeLang/azerbaijani.xml b/PowerEditor/installer/nativeLang/azerbaijani.xml index 7fb5ae0e8..121a9358d 100644 --- a/PowerEditor/installer/nativeLang/azerbaijani.xml +++ b/PowerEditor/installer/nativeLang/azerbaijani.xml @@ -437,7 +437,6 @@ - diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml index efe75ac9b..1ab41fc62 100644 --- a/PowerEditor/installer/nativeLang/basque.xml +++ b/PowerEditor/installer/nativeLang/basque.xml @@ -872,7 +872,6 @@ The comments are here for explanation, it's not necessary to translate them. - diff --git a/PowerEditor/installer/nativeLang/belarusian.xml b/PowerEditor/installer/nativeLang/belarusian.xml index 54b842707..e0e527cb2 100644 --- a/PowerEditor/installer/nativeLang/belarusian.xml +++ b/PowerEditor/installer/nativeLang/belarusian.xml @@ -903,7 +903,6 @@ The comments are here for explanation, it's not necessary to translate them. - diff --git a/PowerEditor/installer/nativeLang/bengali.xml b/PowerEditor/installer/nativeLang/bengali.xml index dd41b01ab..0965680dd 100644 --- a/PowerEditor/installer/nativeLang/bengali.xml +++ b/PowerEditor/installer/nativeLang/bengali.xml @@ -599,7 +599,6 @@ - diff --git a/PowerEditor/installer/nativeLang/breton.xml b/PowerEditor/installer/nativeLang/breton.xml index 9148fe5fc..2587633fe 100644 --- a/PowerEditor/installer/nativeLang/breton.xml +++ b/PowerEditor/installer/nativeLang/breton.xml @@ -720,7 +720,6 @@ - diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index 3bbcd659a..21d02d8e7 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -722,7 +722,6 @@ By Hiro5 - diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml index 15a1dff4b..9ea751ab3 100644 --- a/PowerEditor/installer/nativeLang/chineseSimplified.xml +++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml @@ -1005,7 +1005,6 @@ Translation note: - diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index cf4bf6b85..d0f3c2872 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -931,7 +931,6 @@ The comments are here for explanation, it's not necessary to translate them. - diff --git a/PowerEditor/installer/nativeLang/esperanto.xml b/PowerEditor/installer/nativeLang/esperanto.xml index 39491659b..0a3206da6 100644 --- a/PowerEditor/installer/nativeLang/esperanto.xml +++ b/PowerEditor/installer/nativeLang/esperanto.xml @@ -632,7 +632,6 @@ - diff --git a/PowerEditor/installer/nativeLang/estonian.xml b/PowerEditor/installer/nativeLang/estonian.xml index 4b288af1f..7cbe3e9e6 100644 --- a/PowerEditor/installer/nativeLang/estonian.xml +++ b/PowerEditor/installer/nativeLang/estonian.xml @@ -656,7 +656,6 @@ https://github.com/AndresTraks/ - diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml index 0bae24724..6878dea4e 100644 --- a/PowerEditor/installer/nativeLang/farsi.xml +++ b/PowerEditor/installer/nativeLang/farsi.xml @@ -641,7 +641,6 @@ - diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index 6d801bb7c..dc357b80f 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -883,7 +883,6 @@ Updated to v8.6 fixed version - diff --git a/PowerEditor/installer/nativeLang/friulian.xml b/PowerEditor/installer/nativeLang/friulian.xml index 5fa3e2230..61c1080ab 100644 --- a/PowerEditor/installer/nativeLang/friulian.xml +++ b/PowerEditor/installer/nativeLang/friulian.xml @@ -431,7 +431,6 @@ - diff --git a/PowerEditor/installer/nativeLang/georgian.xml b/PowerEditor/installer/nativeLang/georgian.xml index 830306658..85f9023f0 100644 --- a/PowerEditor/installer/nativeLang/georgian.xml +++ b/PowerEditor/installer/nativeLang/georgian.xml @@ -463,7 +463,6 @@ - diff --git a/PowerEditor/installer/nativeLang/greek.xml b/PowerEditor/installer/nativeLang/greek.xml index cecb1e2df..70f3c8572 100644 --- a/PowerEditor/installer/nativeLang/greek.xml +++ b/PowerEditor/installer/nativeLang/greek.xml @@ -836,7 +836,6 @@ - diff --git a/PowerEditor/installer/nativeLang/gujarati.xml b/PowerEditor/installer/nativeLang/gujarati.xml index d649dddc5..fa2bdd3c0 100644 --- a/PowerEditor/installer/nativeLang/gujarati.xml +++ b/PowerEditor/installer/nativeLang/gujarati.xml @@ -597,7 +597,6 @@ - diff --git a/PowerEditor/installer/nativeLang/hindi.xml b/PowerEditor/installer/nativeLang/hindi.xml index f986fc55c..b72bdc51c 100644 --- a/PowerEditor/installer/nativeLang/hindi.xml +++ b/PowerEditor/installer/nativeLang/hindi.xml @@ -725,7 +725,6 @@ - diff --git a/PowerEditor/installer/nativeLang/hongKongCantonese.xml b/PowerEditor/installer/nativeLang/hongKongCantonese.xml index 31bab3d86..67bce73c1 100644 --- a/PowerEditor/installer/nativeLang/hongKongCantonese.xml +++ b/PowerEditor/installer/nativeLang/hongKongCantonese.xml @@ -1024,7 +1024,6 @@ - diff --git a/PowerEditor/installer/nativeLang/indonesian.xml b/PowerEditor/installer/nativeLang/indonesian.xml index 9f9185399..50a1cb74e 100644 --- a/PowerEditor/installer/nativeLang/indonesian.xml +++ b/PowerEditor/installer/nativeLang/indonesian.xml @@ -922,7 +922,6 @@ Last modified by Sahid A.Z. on 3/3/2023 - diff --git a/PowerEditor/installer/nativeLang/irish.xml b/PowerEditor/installer/nativeLang/irish.xml index 57d9a1b37..a6576b279 100644 --- a/PowerEditor/installer/nativeLang/irish.xml +++ b/PowerEditor/installer/nativeLang/irish.xml @@ -787,7 +787,6 @@ - diff --git a/PowerEditor/installer/nativeLang/kabyle.xml b/PowerEditor/installer/nativeLang/kabyle.xml index 89aac4c30..6cc9a5b42 100644 --- a/PowerEditor/installer/nativeLang/kabyle.xml +++ b/PowerEditor/installer/nativeLang/kabyle.xml @@ -594,7 +594,6 @@ - diff --git a/PowerEditor/installer/nativeLang/kannada.xml b/PowerEditor/installer/nativeLang/kannada.xml index 9003252bc..d1e985a3b 100644 --- a/PowerEditor/installer/nativeLang/kannada.xml +++ b/PowerEditor/installer/nativeLang/kannada.xml @@ -599,7 +599,6 @@ - diff --git a/PowerEditor/installer/nativeLang/kurdish.xml b/PowerEditor/installer/nativeLang/kurdish.xml index 4ca05f7b2..419cf2df4 100644 --- a/PowerEditor/installer/nativeLang/kurdish.xml +++ b/PowerEditor/installer/nativeLang/kurdish.xml @@ -660,7 +660,6 @@ - diff --git a/PowerEditor/installer/nativeLang/kyrgyz.xml b/PowerEditor/installer/nativeLang/kyrgyz.xml index 4a7fd0570..2ffab614e 100644 --- a/PowerEditor/installer/nativeLang/kyrgyz.xml +++ b/PowerEditor/installer/nativeLang/kyrgyz.xml @@ -434,7 +434,6 @@ - diff --git a/PowerEditor/installer/nativeLang/latvian.xml b/PowerEditor/installer/nativeLang/latvian.xml index 58507f1a7..5967d409d 100644 --- a/PowerEditor/installer/nativeLang/latvian.xml +++ b/PowerEditor/installer/nativeLang/latvian.xml @@ -614,7 +614,6 @@ - diff --git a/PowerEditor/installer/nativeLang/ligurian.xml b/PowerEditor/installer/nativeLang/ligurian.xml index 1a62da822..0e117f529 100644 --- a/PowerEditor/installer/nativeLang/ligurian.xml +++ b/PowerEditor/installer/nativeLang/ligurian.xml @@ -442,7 +442,6 @@ - diff --git a/PowerEditor/installer/nativeLang/lithuanian.xml b/PowerEditor/installer/nativeLang/lithuanian.xml index 332a1cd06..f8bc8c471 100644 --- a/PowerEditor/installer/nativeLang/lithuanian.xml +++ b/PowerEditor/installer/nativeLang/lithuanian.xml @@ -686,7 +686,6 @@ - diff --git a/PowerEditor/installer/nativeLang/marathi.xml b/PowerEditor/installer/nativeLang/marathi.xml index 5bbf0659a..47e568e6f 100644 --- a/PowerEditor/installer/nativeLang/marathi.xml +++ b/PowerEditor/installer/nativeLang/marathi.xml @@ -443,7 +443,6 @@ - diff --git a/PowerEditor/installer/nativeLang/mongolian.xml b/PowerEditor/installer/nativeLang/mongolian.xml index 459614212..9a2c8dc60 100644 --- a/PowerEditor/installer/nativeLang/mongolian.xml +++ b/PowerEditor/installer/nativeLang/mongolian.xml @@ -599,7 +599,6 @@ - diff --git a/PowerEditor/installer/nativeLang/nepali.xml b/PowerEditor/installer/nativeLang/nepali.xml index b9c61f971..1fc799092 100644 --- a/PowerEditor/installer/nativeLang/nepali.xml +++ b/PowerEditor/installer/nativeLang/nepali.xml @@ -726,7 +726,6 @@ - diff --git a/PowerEditor/installer/nativeLang/nynorsk.xml b/PowerEditor/installer/nativeLang/nynorsk.xml index 9e17fb6a1..dc2c33956 100644 --- a/PowerEditor/installer/nativeLang/nynorsk.xml +++ b/PowerEditor/installer/nativeLang/nynorsk.xml @@ -466,7 +466,6 @@ - diff --git a/PowerEditor/installer/nativeLang/occitan.xml b/PowerEditor/installer/nativeLang/occitan.xml index 239c19381..8c606cbfe 100644 --- a/PowerEditor/installer/nativeLang/occitan.xml +++ b/PowerEditor/installer/nativeLang/occitan.xml @@ -694,7 +694,6 @@ - diff --git a/PowerEditor/installer/nativeLang/piglatin.xml b/PowerEditor/installer/nativeLang/piglatin.xml index 6074f1c6a..989c7658d 100644 --- a/PowerEditor/installer/nativeLang/piglatin.xml +++ b/PowerEditor/installer/nativeLang/piglatin.xml @@ -708,7 +708,6 @@ - diff --git a/PowerEditor/installer/nativeLang/punjabi.xml b/PowerEditor/installer/nativeLang/punjabi.xml index 8da826489..6761b4cc1 100644 --- a/PowerEditor/installer/nativeLang/punjabi.xml +++ b/PowerEditor/installer/nativeLang/punjabi.xml @@ -630,7 +630,6 @@ - diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml index 26f6d37af..14049f32b 100644 --- a/PowerEditor/installer/nativeLang/romanian.xml +++ b/PowerEditor/installer/nativeLang/romanian.xml @@ -1001,7 +1001,6 @@ - diff --git a/PowerEditor/installer/nativeLang/sardinian.xml b/PowerEditor/installer/nativeLang/sardinian.xml index 13eddb6e8..c38daf360 100644 --- a/PowerEditor/installer/nativeLang/sardinian.xml +++ b/PowerEditor/installer/nativeLang/sardinian.xml @@ -490,7 +490,6 @@ - diff --git a/PowerEditor/installer/nativeLang/sinhala.xml b/PowerEditor/installer/nativeLang/sinhala.xml index daec2b315..2e74be1f3 100644 --- a/PowerEditor/installer/nativeLang/sinhala.xml +++ b/PowerEditor/installer/nativeLang/sinhala.xml @@ -506,7 +506,6 @@ - diff --git a/PowerEditor/installer/nativeLang/spanish_ar.xml b/PowerEditor/installer/nativeLang/spanish_ar.xml index 382c910ba..7045c9503 100644 --- a/PowerEditor/installer/nativeLang/spanish_ar.xml +++ b/PowerEditor/installer/nativeLang/spanish_ar.xml @@ -590,7 +590,6 @@ - diff --git a/PowerEditor/installer/nativeLang/tajikCyrillic.xml b/PowerEditor/installer/nativeLang/tajikCyrillic.xml index 967472a60..c066109ff 100644 --- a/PowerEditor/installer/nativeLang/tajikCyrillic.xml +++ b/PowerEditor/installer/nativeLang/tajikCyrillic.xml @@ -620,7 +620,6 @@ - diff --git a/PowerEditor/installer/nativeLang/tamil.xml b/PowerEditor/installer/nativeLang/tamil.xml index e7dbb89f7..a402458c0 100644 --- a/PowerEditor/installer/nativeLang/tamil.xml +++ b/PowerEditor/installer/nativeLang/tamil.xml @@ -858,7 +858,6 @@ - diff --git a/PowerEditor/installer/nativeLang/tatar.xml b/PowerEditor/installer/nativeLang/tatar.xml index 729490b3a..538ee2492 100644 --- a/PowerEditor/installer/nativeLang/tatar.xml +++ b/PowerEditor/installer/nativeLang/tatar.xml @@ -646,7 +646,6 @@ - diff --git a/PowerEditor/installer/nativeLang/telugu.xml b/PowerEditor/installer/nativeLang/telugu.xml index ed87faba9..f9cca6858 100644 --- a/PowerEditor/installer/nativeLang/telugu.xml +++ b/PowerEditor/installer/nativeLang/telugu.xml @@ -421,7 +421,6 @@ - diff --git a/PowerEditor/installer/nativeLang/thai.xml b/PowerEditor/installer/nativeLang/thai.xml index b1d5f6746..107e3b9ab 100644 --- a/PowerEditor/installer/nativeLang/thai.xml +++ b/PowerEditor/installer/nativeLang/thai.xml @@ -437,7 +437,6 @@ - diff --git a/PowerEditor/installer/nativeLang/uyghur.xml b/PowerEditor/installer/nativeLang/uyghur.xml index d569413f9..ba20d5796 100644 --- a/PowerEditor/installer/nativeLang/uyghur.xml +++ b/PowerEditor/installer/nativeLang/uyghur.xml @@ -446,7 +446,6 @@ - diff --git a/PowerEditor/installer/nativeLang/uzbek.xml b/PowerEditor/installer/nativeLang/uzbek.xml index 0a3c0bcc2..b9e54c14c 100644 --- a/PowerEditor/installer/nativeLang/uzbek.xml +++ b/PowerEditor/installer/nativeLang/uzbek.xml @@ -758,7 +758,6 @@ Updater: Shamsiddinov Zafar - diff --git a/PowerEditor/installer/nativeLang/welsh.xml b/PowerEditor/installer/nativeLang/welsh.xml index a64986c3e..57d074c7c 100644 --- a/PowerEditor/installer/nativeLang/welsh.xml +++ b/PowerEditor/installer/nativeLang/welsh.xml @@ -602,7 +602,6 @@ gan/by Aled Powell - diff --git a/PowerEditor/installer/nativeLang/zulu.xml b/PowerEditor/installer/nativeLang/zulu.xml index fe4d7ef7e..7f8d3ea4a 100644 --- a/PowerEditor/installer/nativeLang/zulu.xml +++ b/PowerEditor/installer/nativeLang/zulu.xml @@ -701,7 +701,6 @@ - diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 70fffead7..09e4e3e33 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -1841,6 +1841,46 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa return TRUE; } + case NPPM_INTERNAL_CHANGESELECTTEXTFORGROUND: + { + StyleArray& stylers = nppParam.getMiscStylerArray(); + + COLORREF selectColorFore = black; + const Style* pStyle = stylers.findByName(L"Selected text colour"); + if (pStyle) + { + selectColorFore = pStyle->_fgColor; + } + + if ((nppParam.getSVP())._selectedTextForegroundSingleColor) + { + _mainEditView.setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore); + _mainEditView.setElementColour(SC_ELEMENT_SELECTION_INACTIVE_TEXT, selectColorFore); + _mainEditView.setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_TEXT, selectColorFore); + + _subEditView.setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore); + _subEditView.setElementColour(SC_ELEMENT_SELECTION_INACTIVE_TEXT, selectColorFore); + _subEditView.setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_TEXT, selectColorFore); + } + else + { + _mainEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_TEXT); + _mainEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_INACTIVE_TEXT); + _mainEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_ADDITIONAL_TEXT); + + _subEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_TEXT); + _subEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_INACTIVE_TEXT); + _subEditView.execute(SCI_RESETELEMENTCOLOUR, SC_ELEMENT_SELECTION_ADDITIONAL_TEXT); + } + + if (_configStyleDlg.isCreated()) + { + _configStyleDlg.syncWithSelFgSingleColorCtrl(); + } + + return TRUE; + } + case NPPM_INTERNAL_SETWORDCHARS: { _mainEditView.setWordChars(); diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 6d7a0d9b1..895ac6e9a 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -1655,20 +1655,6 @@ bool NppParameters::load() delete _pXmlExternalLexerDoc[i]; } - //-------------------------------------------------------------// - // enableSelectFgColor.xml : for per user // - // This empty xml file is optional - user adds this empty file // - // manually in order to set selected text's foreground color. // - //-------------------------------------------------------------// - std::wstring enableSelectFgColorPath = _userPath; - pathAppend(enableSelectFgColorPath, L"enableSelectFgColor.xml"); - - if (doesFileExist(enableSelectFgColorPath.c_str())) - { - _isSelectFgColorEnabled = true; - } - - std::wstring filePath, filePath2, issueFileName; //-------------------------------------------------------------// // nppLogNetworkDriveIssue.xml // @@ -6650,6 +6636,16 @@ void NppParameters::feedScintillaParam(TiXmlNode *node) _svp._rightClickKeepsSelection = false; } + // Make selected text foreground single color + nm = element->Attribute(L"selectedTextForegroundSingleColor"); + if (nm) + { + if (!lstrcmp(nm, L"yes")) + _svp._selectedTextForegroundSingleColor = true; + else if (!lstrcmp(nm, L"no")) + _svp._selectedTextForegroundSingleColor = false; + } + // Disable Advanced Scrolling nm = element->Attribute(L"disableAdvancedScrolling"); if (nm) @@ -7194,6 +7190,7 @@ bool NppParameters::writeScintillaParams() (scintNode->ToElement())->SetAttribute(L"virtualSpace", _svp._virtualSpace ? L"yes" : L"no"); (scintNode->ToElement())->SetAttribute(L"scrollBeyondLastLine", _svp._scrollBeyondLastLine ? L"yes" : L"no"); (scintNode->ToElement())->SetAttribute(L"rightClickKeepsSelection", _svp._rightClickKeepsSelection ? L"yes" : L"no"); + (scintNode->ToElement())->SetAttribute(L"selectedTextForegroundSingleColor", _svp._selectedTextForegroundSingleColor ? L"yes" : L"no"); (scintNode->ToElement())->SetAttribute(L"disableAdvancedScrolling", _svp._disableAdvancedScrolling ? L"yes" : L"no"); (scintNode->ToElement())->SetAttribute(L"wrapSymbolShow", _svp._wrapSymbolShow ? L"show" : L"hide"); (scintNode->ToElement())->SetAttribute(L"Wrap", _svp._doWrap ? L"yes" : L"no"); diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 08797c990..734b06b1c 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -994,6 +994,7 @@ struct ScintillaViewParams bool _virtualSpace = false; bool _scrollBeyondLastLine = true; bool _rightClickKeepsSelection = false; + bool _selectedTextForegroundSingleColor = false; bool _disableAdvancedScrolling = false; bool _doSmoothFont = false; bool _showBorderEdge = true; @@ -1941,7 +1942,6 @@ public: void setAdminMode(bool isAdmin) { _isAdminMode = isAdmin; } bool isAdmin() const { return _isAdminMode; } bool regexBackward4PowerUser() const { return _findHistory._regexBackward4PowerUser; } - bool isSelectFgColorEnabled() const { return _isSelectFgColorEnabled; }; bool isRegForOSAppRestartDisabled() const { return _isRegForOSAppRestartDisabled; }; private: @@ -2008,7 +2008,6 @@ private: bool _isElevationRequired = false; bool _isAdminMode = false; - bool _isSelectFgColorEnabled = false; bool _isRegForOSAppRestartDisabled = false; bool _doNppLogNetworkDriveIssue = false; diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp index 9cde2efe9..146a4fdbd 100644 --- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp @@ -3068,10 +3068,9 @@ void ScintillaEditView::performGlobalStyles() } setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_BACK, selectMultiSelectColorBack); - if (nppParams.isSelectFgColorEnabled()) + if (svp._selectedTextForegroundSingleColor) { - //execute(SCI_SETSELFORE, 1, selectColorFore); - setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore); // SCI_SETSELFORE is deprecated + setElementColour(SC_ELEMENT_SELECTION_TEXT, selectColorFore); setElementColour(SC_ELEMENT_SELECTION_INACTIVE_TEXT, selectColorFore); setElementColour(SC_ELEMENT_SELECTION_ADDITIONAL_TEXT, selectColorFore); } diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 1c3806053..ea58bbc76 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -214,7 +214,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM // Selected text colour style if (style._styleDesc == L"Selected text colour") { - isTextEnabled = NppParameters::getInstance().isSelectFgColorEnabled(); + isTextEnabled = NppParameters::getInstance().getSVP()._selectedTextForegroundSingleColor; } } else if (dlgCtrlID == IDC_BG_STATIC) @@ -1176,6 +1176,20 @@ std::pair WordStyleDlg::goToPreferencesSettings() return result; } +void WordStyleDlg::syncWithSelFgSingleColorCtrl() +{ + const Style& style = getCurrentStyler(); + + // Selected text colour style + if (style._styleDesc == L"Selected text colour") + { + // Only in case that dialog is on "Selected text colour": + // Switch to a section then switch back for refresh current state of "Selected text colour" + goToSection(L"Global Styles:Default Style"); + goToSection(L"Global Styles:Selected text colour"); + } +} + void WordStyleDlg::setVisualFromStyleList() { showGlobalOverrideCtrls(false); @@ -1240,7 +1254,7 @@ void WordStyleDlg::setVisualFromStyleList() { isEnable = false; // disable by default for "Selected text colour" style - if (NppParameters::getInstance().isSelectFgColorEnabled()) + if (NppParameters::getInstance().getSVP()._selectedTextForegroundSingleColor) isEnable = true; } ::EnableWindow(_pFgColour->getHSelf(), isEnable); diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h index a8b4b245c..748da30bb 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h @@ -87,8 +87,9 @@ public : void restoreGlobalOverrideValues(); void addLastThemeEntry(); bool selectThemeByName(const wchar_t* themeName); + void syncWithSelFgSingleColorCtrl(); bool goToSection(const wchar_t* sectionNames); // sectionNames is formed as following: "Language name:Style name" - // ex: "Global Styles:EOL custom color" will set Language on "Global Styles", then set Style on "EOL custom color" if both are found. + // ex: "Global Styles:EOL custom color" will set Language on "Global Styles", then set Style on "EOL custom color" if both are found. private : ColourPicker *_pFgColour = nullptr; diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 64e844ef0..f0eb2bc4d 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -102,9 +102,10 @@ BEGIN CONTROL "Enable virtual space",IDC_CHECK_VIRTUALSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,28,270,10 CONTROL "Make current level folding/unfolding commands toggleable",IDC_CHECK_FOLDINGTOGGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,43,270,10 CONTROL "Keep selection when right-click outside of selection",IDC_CHECK_RIGHTCLICKKEEPSSELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,58,270,10 - CONTROL "Enable scrolling beyond last line",IDC_CHECK_SCROLLBEYONDLASTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,73,270,10 - CONTROL "Disable advanced scrolling feature due to touchpad issue",IDC_CHECK_DISABLEADVANCEDSCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,88,270,10 - CONTROL "Enable Copy/Cut Line without selection",IDC_CHECK_LINECUTCOPYWITHOUTSELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,103,270,10 + CONTROL "Enable Copy/Cut Line without selection",IDC_CHECK_LINECUTCOPYWITHOUTSELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,73,270,10 + CONTROL "Apply custom color to selected text foreground",IDC_CHECK_SELECTEDTEXTSINGLECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,88,270,10 + CONTROL "Enable scrolling beyond last line",IDC_CHECK_SCROLLBEYONDLASTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,103,270,10 + CONTROL "Disable advanced scrolling feature due to touchpad issue",IDC_CHECK_DISABLEADVANCEDSCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,118,270,10 END IDD_PREFERENCE_SUB_EDITING2 DIALOGEX 115, 10, 460, 205 diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 4d4ec5171..b7b7ba330 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -690,14 +690,14 @@ intptr_t CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM case IDC_CHECK_HIDEMENUBAR : { - bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDEMENUBAR, BM_GETCHECK, 0, 0)); + bool isChecked = isCheckedOrNot(IDC_CHECK_HIDEMENUBAR); ::SendMessage(::GetParent(_hParent), NPPM_HIDEMENU, 0, isChecked?TRUE:FALSE); } return TRUE; case IDC_CHECK_HIDERIGHTSHORTCUTSOFMENUBAR: { - bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDERIGHTSHORTCUTSOFMENUBAR, BM_GETCHECK, 0, 0)); + bool isChecked = isCheckedOrNot(IDC_CHECK_HIDERIGHTSHORTCUTSOFMENUBAR); nppGUI._hideMenuRightShortcuts = isChecked; static bool isFirstShow = true; if (isChecked) @@ -918,7 +918,7 @@ intptr_t CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM case IDC_CHECK_HIDE : { - bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDE, BM_GETCHECK, 0, 0)); + bool isChecked = isCheckedOrNot(IDC_CHECK_HIDE); ::SendMessage(::GetParent(_hParent), NPPM_HIDETOOLBAR, 0, isChecked?TRUE:FALSE); } return TRUE; @@ -1032,6 +1032,7 @@ void EditingSubDlg::initScintParam() ::SendDlgItemMessage(_hSelf, IDC_CHECK_VIRTUALSPACE, BM_SETCHECK, svp._virtualSpace, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_SETCHECK, svp._scrollBeyondLastLine, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_SETCHECK, svp._rightClickKeepsSelection, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_SELECTEDTEXTSINGLECOLOR, BM_SETCHECK, svp._selectedTextForegroundSingleColor, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_SETCHECK, svp._disableAdvancedScrolling, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINECUTCOPYWITHOUTSELECTION, BM_SETCHECK, svp._lineCopyCutWithoutSelection, 0); } @@ -1255,7 +1256,7 @@ intptr_t CALLBACK EditingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM switch (wParam) { case IDC_CHECK_SMOOTHFONT: - svp._doSmoothFont = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SMOOTHFONT, BM_GETCHECK, 0, 0)); + svp._doSmoothFont = isCheckedOrNot(IDC_CHECK_SMOOTHFONT); ::SendMessage(::GetParent(_hParent), NPPM_SETSMOOTHFONT, 0, svp._doSmoothFont); return TRUE; @@ -1275,29 +1276,34 @@ intptr_t CALLBACK EditingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM return TRUE; case IDC_CHECK_VIRTUALSPACE: - svp._virtualSpace = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_VIRTUALSPACE, BM_GETCHECK, 0, 0)); + svp._virtualSpace = isCheckedOrNot(IDC_CHECK_VIRTUALSPACE); ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_VIRTUALSPACE, 0, 0); return TRUE; case IDC_CHECK_SCROLLBEYONDLASTLINE: - svp._scrollBeyondLastLine = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_GETCHECK, 0, 0)); + svp._scrollBeyondLastLine = isCheckedOrNot(IDC_CHECK_SCROLLBEYONDLASTLINE); ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SCROLLBEYONDLASTLINE, 0, 0); return TRUE; case IDC_CHECK_LINECUTCOPYWITHOUTSELECTION: { - bool isChecked = BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINECUTCOPYWITHOUTSELECTION, BM_GETCHECK, 0, 0); + bool isChecked = isCheckedOrNot(IDC_CHECK_LINECUTCOPYWITHOUTSELECTION); svp._lineCopyCutWithoutSelection = isChecked; ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINECUTCOPYWITHOUTSELECTION, 0, 0); return TRUE; } case IDC_CHECK_RIGHTCLICKKEEPSSELECTION: - svp._rightClickKeepsSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_GETCHECK, 0, 0)); + svp._rightClickKeepsSelection = isCheckedOrNot(IDC_CHECK_RIGHTCLICKKEEPSSELECTION); + return TRUE; + + case IDC_CHECK_SELECTEDTEXTSINGLECOLOR: + svp._selectedTextForegroundSingleColor = isCheckedOrNot(IDC_CHECK_SELECTEDTEXTSINGLECOLOR); + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_CHANGESELECTTEXTFORGROUND, 0, 0); return TRUE; case IDC_CHECK_DISABLEADVANCEDSCROLL: - svp._disableAdvancedScrolling = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_GETCHECK, 0, 0)); + svp._disableAdvancedScrolling = isCheckedOrNot(IDC_CHECK_DISABLEADVANCEDSCROLL); return TRUE; case IDC_CHECK_FOLDINGTOGGLE: @@ -1478,7 +1484,7 @@ intptr_t CALLBACK Editing2SubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA { case IDC_CHECK_MULTISELECTION: { - svp._multiSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_MULTISELECTION, BM_GETCHECK, 0, 0)); + svp._multiSelection = isCheckedOrNot(IDC_CHECK_MULTISELECTION); if (!svp._multiSelection) { ::SendDlgItemMessage(_hSelf, IDC_CHECK_COLUMN2MULTIEDITING, BM_SETCHECK, FALSE, 0); @@ -1492,7 +1498,7 @@ intptr_t CALLBACK Editing2SubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA case IDC_CHECK_COLUMN2MULTIEDITING: { - svp._columnSel2MultiEdit = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_COLUMN2MULTIEDITING, BM_GETCHECK, 0, 0)); + svp._columnSel2MultiEdit = isCheckedOrNot(IDC_CHECK_COLUMN2MULTIEDITING); } return TRUE; @@ -2385,29 +2391,29 @@ intptr_t CALLBACK MarginsBorderEdgeSubDlg::run_dlgProc(UINT message, WPARAM wPar switch (wParam) { case IDC_CHECK_LINENUMBERMARGE: - svp._lineNumberMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINENUMBERMARGE, BM_GETCHECK, 0, 0)); + svp._lineNumberMarginShow = isCheckedOrNot(IDC_CHECK_LINENUMBERMARGE); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_DYNAMIC), svp._lineNumberMarginShow); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_CONSTANT), svp._lineNumberMarginShow); ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINENUMBER, 0, 0); return TRUE; case IDC_RADIO_DYNAMIC: - svp._lineNumberMarginDynamicWidth = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_RADIO_DYNAMIC, BM_GETCHECK, 0, 0)); + svp._lineNumberMarginDynamicWidth = isCheckedOrNot(IDC_RADIO_DYNAMIC); ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINENUMBER, 0, 0); return TRUE; case IDC_RADIO_CONSTANT: - svp._lineNumberMarginDynamicWidth = !(BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_RADIO_CONSTANT, BM_GETCHECK, 0, 0)); + svp._lineNumberMarginDynamicWidth = !isCheckedOrNot(IDC_RADIO_CONSTANT); ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_LINENUMBER, 0, 0); return TRUE; case IDC_CHECK_BOOKMARKMARGE: - svp._bookMarkMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_BOOKMARKMARGE, BM_GETCHECK, 0, 0)); + svp._bookMarkMarginShow = isCheckedOrNot(IDC_CHECK_BOOKMARKMARGE); ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SYMBOLMARGIN, 0, 0); return TRUE; case IDC_CHECK_CHANGHISTORYMARGIN: { - bool isMaginJustEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYMARGIN, BM_GETCHECK, 0, 0)); - bool isIndicatorAlreadyEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYINDICATOR, BM_GETCHECK, 0, 0)); + bool isMaginJustEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYMARGIN); + bool isIndicatorAlreadyEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYINDICATOR); if (isMaginJustEnabled && !isIndicatorAlreadyEnabled) // In the case that both "in margin" & "in text" were disabled, but "in margin" is just enabled { @@ -2438,8 +2444,8 @@ intptr_t CALLBACK MarginsBorderEdgeSubDlg::run_dlgProc(UINT message, WPARAM wPar case IDC_CHECK_CHANGHISTORYINDICATOR: { - bool isIndicatorJustEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYINDICATOR, BM_GETCHECK, 0, 0)); - bool isMaginAlreadyEnabled = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CHANGHISTORYMARGIN, BM_GETCHECK, 0, 0)); + bool isIndicatorJustEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYINDICATOR); + bool isMaginAlreadyEnabled = isCheckedOrNot(IDC_CHECK_CHANGHISTORYMARGIN); if (isIndicatorJustEnabled && !isMaginAlreadyEnabled) // In the case that both "in margin" & "in text" were disabled, but "in text" is just enabled { @@ -2469,7 +2475,7 @@ intptr_t CALLBACK MarginsBorderEdgeSubDlg::run_dlgProc(UINT message, WPARAM wPar } case IDC_CHECK_NOEDGE: - svp._showBorderEdge = !(BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_NOEDGE, BM_GETCHECK, 0, 0)); + svp._showBorderEdge = !isCheckedOrNot(IDC_CHECK_NOEDGE); ::SendMessage(::GetParent(_hParent), NPPM_SETEDITORBORDEREDGE, 0, svp._showBorderEdge ? TRUE : FALSE); return TRUE; @@ -3006,7 +3012,7 @@ intptr_t CALLBACK NewDocumentSubDlg::run_dlgProc(UINT message, WPARAM wParam, LP return TRUE; case IDC_CHECK_OPENANSIASUTF8 : - ndds._openAnsiAsUtf8 = (BST_CHECKED == ::SendMessage(::GetDlgItem(_hSelf, IDC_CHECK_OPENANSIASUTF8), BM_GETCHECK, 0, 0)); + ndds._openAnsiAsUtf8 = isCheckedOrNot(IDC_CHECK_OPENANSIASUTF8); return TRUE; case IDC_RADIO_OTHERCP : @@ -3985,7 +3991,7 @@ intptr_t CALLBACK LanguageSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA // case IDC_CHECK_LANGMENUCOMPACT: { - nppGUI._isLangMenuCompact = (BST_CHECKED == ::SendMessage(::GetDlgItem(_hSelf, IDC_CHECK_LANGMENUCOMPACT), BM_GETCHECK, 0, 0)); + nppGUI._isLangMenuCompact = isCheckedOrNot(IDC_CHECK_LANGMENUCOMPACT); pNativeSpeaker->messageBox("LanguageMenuCompactWarning", _hSelf, L"This option will be changed on the next launch.", @@ -4613,7 +4619,7 @@ intptr_t CALLBACK PrintSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM l switch (wParam) { case IDC_CHECK_PRINTLINENUM: - nppGUI._printSettings._printLineNumber = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_PRINTLINENUM, BM_GETCHECK, 0, 0)); + nppGUI._printSettings._printLineNumber = isCheckedOrNot(IDC_CHECK_PRINTLINENUM); break; case IDC_RADIO_WYSIWYG: @@ -5308,7 +5314,7 @@ intptr_t CALLBACK AutoCompletionSubDlg::run_dlgProc(UINT message, WPARAM wParam, case IDD_AUTOCTAG_CHECK : { - nppGUI._matchedPairConf._doHtmlXmlTag = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDD_AUTOCTAG_CHECK, BM_GETCHECK, 0, 0)); + nppGUI._matchedPairConf._doHtmlXmlTag = isCheckedOrNot(IDD_AUTOCTAG_CHECK); return TRUE; } default : @@ -5760,7 +5766,7 @@ intptr_t CALLBACK DelimiterSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR case IDD_SEVERALLINEMODEON_CHECK: { - bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDD_SEVERALLINEMODEON_CHECK, BM_GETCHECK, 0, 0)); + bool isChecked = isCheckedOrNot(IDD_SEVERALLINEMODEON_CHECK); nppGUI._delimiterSelectionOnEntireDocument = isChecked; setCtrlsPos(isChecked); @@ -5904,7 +5910,7 @@ intptr_t CALLBACK CloudAndLinkSubDlg::run_dlgProc(UINT message, WPARAM wParam, L } else { - bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_WITHCLOUD_RADIO, BM_GETCHECK, 0, 0)); + bool isChecked = isCheckedOrNot(IDC_WITHCLOUD_RADIO); if (isChecked) { wstring errMsg = pNativeSpeaker->getLocalizedStrFromID("cloud-invalid-warning", L"Invalid path."); diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index 76a34d515..e26c37943 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -121,7 +121,7 @@ #define IDC_CARETBLINKRATE_S_STATIC (IDD_PREFERENCE_SUB_EDITING + 22) #define IDC_CHECK_CHANGHISTORYMARGIN (IDD_PREFERENCE_SUB_EDITING + 23) #define IDC_DISTRACTIONFREE_SLIDER (IDD_PREFERENCE_SUB_EDITING + 24) - //#define IDC_CHECK_MULTISELECTION (IDD_PREFERENCE_SUB_EDITING + 25) + #define IDC_CHECK_SELECTEDTEXTSINGLECOLOR (IDD_PREFERENCE_SUB_EDITING + 25) #define IDC_RADIO_FOLDMARGENONE (IDD_PREFERENCE_SUB_EDITING + 26) diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 9fc569554..c3aeca5b5 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -720,9 +720,9 @@ #define NPPM_INTERNAL_DOCMODIFIEDBYREPLACEALL (NOTEPADPLUS_USER_INTERNAL + 79) #define NPPM_INTERNAL_DRAWTABBARPINBUTTON (NOTEPADPLUS_USER_INTERNAL + 80) #define NPPM_INTERNAL_DRAWTABBARCLOSEBUTTON (NOTEPADPLUS_USER_INTERNAL + 81) - #define NPPM_INTERNAL_REFRESHTABBAR (NOTEPADPLUS_USER_INTERNAL + 82) + #define NPPM_INTERNAL_REFRESHTABBAR (NOTEPADPLUS_USER_INTERNAL + 82) #define NPPM_INTERNAL_REDUCETABBAR (NOTEPADPLUS_USER_INTERNAL + 83) - //#define NPPM_INTERNAL_LOCKTABBAR (NOTEPADPLUS_USER_INTERNAL + 84) + #define NPPM_INTERNAL_CHANGESELECTTEXTFORGROUND (NOTEPADPLUS_USER_INTERNAL + 84) #define NPPM_INTERNAL_DRAWINACIVETAB (NOTEPADPLUS_USER_INTERNAL + 85) #define NPPM_INTERNAL_DRAWTABTOPBAR (NOTEPADPLUS_USER_INTERNAL + 86) //#define NPPM_INTERNAL_TABDBCLK2CLOSE (NOTEPADPLUS_USER_INTERNAL + 87)