Make find dlg status msgs color customizable via Style Configurator

Fix notepad-plus-plus#5087, close notepad-plus-plus#15597
donho · Sep 2, 2024 · a866900 · a866900
1 parent 43ebe79
commit a866900
Show file tree

Hide file tree

Showing 34 changed files with 228 additions and 77 deletions.
diff --git a/PowerEditor/installer/themes/Bespin.xml b/PowerEditor/installer/themes/Bespin.xml
@@ -1008,6 +1008,9 @@ Credits:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FCAF3E" />
         <WidgetStyle name="Smart HighLighting" styleID="29" bgColor="FF0080" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="EDD400" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Black board.xml b/PowerEditor/installer/themes/Black board.xml
@@ -1006,6 +1006,9 @@ Credits:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FCAF3E" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Choco.xml b/PowerEditor/installer/themes/Choco.xml
@@ -998,6 +998,9 @@ Credits:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FCAF3E" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="EDD400" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/DansLeRuSH-Dark.xml b/PowerEditor/installer/themes/DansLeRuSH-Dark.xml
@@ -1117,6 +1117,9 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable
         <WidgetStyle name="White space symbol" styleID="0" fgColor="4D4D4D" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="2E2E2E" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="2E2E2E" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="88B090" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="F8F893" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="F18C96" />

diff --git a/PowerEditor/installer/themes/DarkModeDefault.xml b/PowerEditor/installer/themes/DarkModeDefault.xml
@@ -1730,6 +1730,9 @@ License:             GPL2
         <WidgetStyle name="White space symbol" styleID="0" fgColor="5F5F5F" />
         <WidgetStyle name="Smart HighLighting" styleID="29" bgColor="358A35" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0080" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="88B090" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="F8F893" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="F18C96" />

diff --git a/PowerEditor/installer/themes/Deep Black.xml b/PowerEditor/installer/themes/Deep Black.xml
@@ -1003,6 +1003,9 @@ https://notepad-plus-plus.org/donate/
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FF8080" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="80FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Hello Kitty.xml b/PowerEditor/installer/themes/Hello Kitty.xml
@@ -975,6 +975,9 @@ so your enhanced file can be included in Notepad++ future release.
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FFB56A" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/HotFudgeSundae.xml b/PowerEditor/installer/themes/HotFudgeSundae.xml
@@ -1132,6 +1132,9 @@ Installation:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="CFBA28" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="008947" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="7578DB" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="C11418" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="0088CE" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="BCBB80" />

diff --git a/PowerEditor/installer/themes/Mono Industrial.xml b/PowerEditor/installer/themes/Mono Industrial.xml
@@ -1002,6 +1002,9 @@ Credits:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FCAF3E" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Monokai.xml b/PowerEditor/installer/themes/Monokai.xml
@@ -1018,6 +1018,9 @@ Credits:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FCAF3E" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/MossyLawn.xml b/PowerEditor/installer/themes/MossyLawn.xml
@@ -1132,6 +1132,9 @@ Installation:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FFC973" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="BF8830" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="6A1A01" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="FDD64A" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="AFCF90" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFDC87" />

diff --git a/PowerEditor/installer/themes/Navajo.xml b/PowerEditor/installer/themes/Navajo.xml
@@ -1129,6 +1129,9 @@ Installation:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="106060" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="BCBCBC" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="3B4092" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="870087" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="C00058" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="181880" />

diff --git a/PowerEditor/installer/themes/Obsidian.xml b/PowerEditor/installer/themes/Obsidian.xml
@@ -1006,6 +1006,9 @@ Notepad++ Custom Style
         <WidgetStyle name="White space symbol" styleID="0" fgColor="343F43" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="56676D" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="6B8189" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00659B" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="00880B" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="A6AA00" />

diff --git a/PowerEditor/installer/themes/Plastic Code Wrap.xml b/PowerEditor/installer/themes/Plastic Code Wrap.xml
@@ -1014,6 +1014,9 @@ Credits:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FCAF3E" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Ruby Blue.xml b/PowerEditor/installer/themes/Ruby Blue.xml
@@ -852,6 +852,9 @@ http://sourceforge.net/donate/index.php?group_id=95717
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FF8080" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml
@@ -1140,6 +1140,9 @@ Installation:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="B58900" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="002B36" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="6C71C4" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="DC322F" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="268BD2" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="2AA198" />

diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml
@@ -1530,6 +1530,9 @@ Installation:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="B58900" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="FDF6E3" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="6C71C4" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="DC322F" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="268BD2" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="2AA198" />

diff --git a/PowerEditor/installer/themes/Twilight.xml b/PowerEditor/installer/themes/Twilight.xml
@@ -1003,6 +1003,9 @@ Credits:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FCAF3E" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="8000FF" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Vibrant Ink.xml b/PowerEditor/installer/themes/Vibrant Ink.xml
@@ -974,6 +974,9 @@ http://sourceforge.net/donate/index.php?group_id=95717
         <WidgetStyle name="White space symbol" styleID="0" fgColor="FF8080" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="00FF00" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0000" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml
@@ -1698,6 +1698,9 @@ License:             GPL2
         <WidgetStyle name="White space symbol" styleID="0" fgColor="5F5F5F" />
         <WidgetStyle name="Smart HighLighting" styleID="29" bgColor="358A35" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="FF0080" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="88B090" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="F8F893" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="F18C96" />

diff --git a/PowerEditor/installer/themes/khaki.xml b/PowerEditor/installer/themes/khaki.xml
@@ -1129,6 +1129,9 @@ Installation:
         <WidgetStyle name="White space symbol" styleID="0" fgColor="005F00" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="D7FF87" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="D7FF87" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="AF5F00" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="005F5F" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="AFAF87" />

diff --git a/PowerEditor/installer/themes/vim Dark Blue.xml b/PowerEditor/installer/themes/vim Dark Blue.xml
@@ -966,6 +966,9 @@
         <WidgetStyle name="White space symbol" styleID="0" fgColor="004040" />
         <WidgetStyle name="Smart Highlighting" styleID="29" bgColor="2050D0" />
         <WidgetStyle name="Find Mark Style" styleID="31" bgColor="000040" />
+        <WidgetStyle name="Find status: Not found" styleID="0" fgColor="FF0000" />
+        <WidgetStyle name="Find status: Message" styleID="0" fgColor="0000FF" />
+        <WidgetStyle name="Find status: Search end reached" styleID="0" fgColor="008000" />
         <WidgetStyle name="Mark Style 1" styleID="25" bgColor="00FFFF" />
         <WidgetStyle name="Mark Style 2" styleID="24" bgColor="FF8000" />
         <WidgetStyle name="Mark Style 3" styleID="23" bgColor="FFFF00" />

diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
@@ -2715,7 +2715,7 @@ void Notepad_plus::setupColorSampleBitmapsOnMainMenuItems()
 	// Adds tab colour icons
 	for (int i = 0; i < 5; ++i)
 	{
-		COLORREF colour = nppParam.getIndividualTabColour(i, NppDarkMode::isDarkMenuEnabled(), true);
+		COLORREF colour = nppParam.getIndividualTabColor(i, NppDarkMode::isDarkMenuEnabled(), true);
 		HBITMAP hBitmap = generateSolidColourMenuItemIcon(colour);
 		SetMenuItemBitmaps(_mainMenuHandle, IDM_VIEW_TAB_COLOUR_1 + i, MF_BYCOMMAND, hBitmap, hBitmap);
 	}

diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
@@ -2308,6 +2308,8 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
 			addHotSpot(& _subEditView);
 
 			_findReplaceDlg.updateFinderScintilla();
+
+			_findReplaceDlg.redraw();
 
 			drawTabbarColoursFromStylerArray();
 

diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp
@@ -581,7 +581,7 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 			// Adds colour icons
 			for (int i = 0; i < 5; ++i)
 			{
-				COLORREF colour = nppParam.getIndividualTabColour(i, NppDarkMode::isDarkMenuEnabled(), true);
+				COLORREF colour = nppParam.getIndividualTabColor(i, NppDarkMode::isDarkMenuEnabled(), true);
 				HBITMAP hBitmap = generateSolidColourMenuItemIcon(colour);
 				SetMenuItemBitmaps(_tabPopupMenu.getMenuHandle(), IDM_VIEW_TAB_COLOUR_1 + i, MF_BYCOMMAND, hBitmap, hBitmap);
 			}