tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 07:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add accent tip for toolbar settings & update localization files

Browse Source 
Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/16434#issuecomment-2814666495
This commit is contained in:
Don Ho 2025-04-19 15:08:47 +02:00
parent 29c71c46bb
commit 6bd3d9bfbe
8 changed files with 150 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
PowerEditor/installer/nativeLang/english.xml
View File

@ -5,7 +5,7 @@ Translation note:
2. All the comments are for explanation, they are not for translation. 2. All the comments are for explanation, they are not for translation.
--> -->
<NotepadPlus> <NotepadPlus>
<Native-Langue name="English" filename="english.xml" version="8.7.9"> <Native-Langue name="English" filename="english.xml" version="8.8">
<Menu> <Menu>
<Main> <Main>
<!-- Main Menu Entries --> <!-- Main Menu Entries -->
@ -946,15 +946,38 @@ Translation note:
<Preference title="Preferences"> <Preference title="Preferences">
<Item id="6001" name="Close"/> <Item id="6001" name="Close"/>
<Global title="General"> <Global title="General">
<Item id="6101" name="Toolbar"/> <Item id="6123" name="Localization"/>
<Item id="6131" name="Menu"/>
<Item id="6122" name="Hide (use Alt or F10 key to toggle)"/>
<Item id="6132" name="Hide right shortcuts ＋ ▼ ✕"/>
<Item id="6133" name="Status Bar"/>
<Item id="6134" name="Hide"/>
</Global>
<Toolbar title="Toolbar">
<Item id="6102" name="Hide"/> <Item id="6102" name="Hide"/>
<Item id="6103" name="Fluent UI: small"/> <Item id="6103" name="Fluent UI: small"/>
<Item id="6104" name="Fluent UI: large"/> <Item id="6104" name="Fluent UI: large"/>
<Item id="6129" name="Filled Fluent UI: small"/> <Item id="6129" name="Filled Fluent UI: small"/>
<Item id="6130" name="Filled Fluent UI: large"/> <Item id="6130" name="Filled Fluent UI: large"/>
<Item id="6105" name="Standard icons: small"/> <Item id="6105" name="Standard icons: small"/>
<Item id="6011" name="Colorization"/>
<Item id="6012" name="Complete"/>
<Item id="6013" name="Partial"/>
<Item id="6014" name="Color choice"/>
<Item id="6015" name="Default"/>
<Item id="6016" name="Red"/>
<Item id="6017" name="Blue"/>
<Item id="6018" name="Green"/>
<Item id="6019" name="Purple"/>
<Item id="6020" name="Cyan"/>
<Item id="6021" name="Olive"/>
<Item id="6022" name="Yellow"/>
<Item id="6023" name="System Accent"/>
<Item id="6024" name="Custom"/>
</Toolbar>
<Item id="6106" name="Tab Bar"/> <Tabbar title="Tab Bar">
<Item id="6107" name="Reduce"/> <Item id="6107" name="Reduce"/>
<Item id="6108" name="Lock (no drag and drop)"/> <Item id="6108" name="Lock (no drag and drop)"/>
<Item id="6109" name="Change inactive tab color"/> <Item id="6109" name="Change inactive tab color"/>
@ -969,16 +992,7 @@ Translation note:
<Item id="6120" name="Vertical"/> <Item id="6120" name="Vertical"/>
<Item id="6121" name="Exit on close the last tab"/> <Item id="6121" name="Exit on close the last tab"/>
<Item id="6128" name="Alternate icons"/> <Item id="6128" name="Alternate icons"/>
</Tabbar>
<Item id="6133" name="Status Bar"/>
<Item id="6134" name="Hide"/>
<Item id="6131" name="Menu"/>
<Item id="6122" name="Hide (use Alt or F10 key to toggle)"/>
<Item id="6132" name="Hide right shortcuts ＋ ▼ ✕"/>
<Item id="6123" name="Localization"/>
</Global>
<Scintillas title="Editing 1"> <Scintillas title="Editing 1">
<Item id="6216" name="Caret Settings"/> <Item id="6216" name="Caret Settings"/>
@ -1860,6 +1874,7 @@ If you select advanced mode but do not edit files in the aforementioned language
<statusbar-Pos value="Pos: "/> <statusbar-Pos value="Pos: "/>
<statusbar-Sel value="Sel: "/> <statusbar-Sel value="Sel: "/>
<statusbar-Sel-number value="Sel"/> <statusbar-Sel-number value="Sel"/>
<toolbar-accent-tip value="This option makes your toolbar icons follow Windows system accent color. Accent color is the highlight color used in buttons, borders, and Start menu tiles in Windows. To change it, go to Settings &gt; Personalization &gt; Colors, then select your preferred accent color."/>
</MiscStrings> </MiscStrings>
</Native-Langue> </Native-Langue>
</NotepadPlus> </NotepadPlus>

43
PowerEditor/installer/nativeLang/english_customizable.xml
View File

@ -5,7 +5,7 @@ Translation note:
2. All the comments are for explanation, they are not for translation. 2. All the comments are for explanation, they are not for translation.
--> -->
<NotepadPlus> <NotepadPlus>
<Native-Langue name="English" filename="english_customizable.xml" version="8.7.9"> <Native-Langue name="English" filename="english_customizable.xml" version="8.8">
<Menu> <Menu>
<Main> <Main>
<!-- Main Menu Entries --> <!-- Main Menu Entries -->
@ -946,15 +946,38 @@ Translation note:
<Preference title="Preferences"> <Preference title="Preferences">
<Item id="6001" name="Close"/> <Item id="6001" name="Close"/>
<Global title="General"> <Global title="General">
<Item id="6101" name="Toolbar"/> <Item id="6123" name="Localization"/>
<Item id="6131" name="Menu"/>
<Item id="6122" name="Hide (use Alt or F10 key to toggle)"/>
<Item id="6132" name="Hide right shortcuts ＋ ▼ ✕"/>
<Item id="6133" name="Status Bar"/>
<Item id="6134" name="Hide"/>
</Global>
<Toolbar title="Toolbar">
<Item id="6102" name="Hide"/> <Item id="6102" name="Hide"/>
<Item id="6103" name="Fluent UI: small"/> <Item id="6103" name="Fluent UI: small"/>
<Item id="6104" name="Fluent UI: large"/> <Item id="6104" name="Fluent UI: large"/>
<Item id="6129" name="Filled Fluent UI: small"/> <Item id="6129" name="Filled Fluent UI: small"/>
<Item id="6130" name="Filled Fluent UI: large"/> <Item id="6130" name="Filled Fluent UI: large"/>
<Item id="6105" name="Standard icons: small"/> <Item id="6105" name="Standard icons: small"/>
<Item id="6011" name="Colorization"/>
<Item id="6012" name="Complete"/>
<Item id="6013" name="Partial"/>
<Item id="6014" name="Color choice"/>
<Item id="6015" name="Default"/>
<Item id="6016" name="Red"/>
<Item id="6017" name="Blue"/>
<Item id="6018" name="Green"/>
<Item id="6019" name="Purple"/>
<Item id="6020" name="Cyan"/>
<Item id="6021" name="Olive"/>
<Item id="6022" name="Yellow"/>
<Item id="6023" name="System Accent"/>
<Item id="6024" name="Custom"/>
</Toolbar>
<Item id="6106" name="Tab Bar"/> <Tabbar title="Tab Bar">
<Item id="6107" name="Reduce"/> <Item id="6107" name="Reduce"/>
<Item id="6108" name="Lock (no drag and drop)"/> <Item id="6108" name="Lock (no drag and drop)"/>
<Item id="6109" name="Change inactive tab color"/> <Item id="6109" name="Change inactive tab color"/>
@ -969,16 +992,7 @@ Translation note:
<Item id="6120" name="Vertical"/> <Item id="6120" name="Vertical"/>
<Item id="6121" name="Exit on close the last tab"/> <Item id="6121" name="Exit on close the last tab"/>
<Item id="6128" name="Alternate icons"/> <Item id="6128" name="Alternate icons"/>
</Tabbar>
<Item id="6133" name="Status Bar"/>
<Item id="6134" name="Hide"/>
<Item id="6131" name="Menu"/>
<Item id="6122" name="Hide (use Alt or F10 key to toggle)"/>
<Item id="6132" name="Hide right shortcuts ＋ ▼ ✕"/>
<Item id="6123" name="Localization"/>
</Global>
<Scintillas title="Editing 1"> <Scintillas title="Editing 1">
<Item id="6216" name="Caret Settings"/> <Item id="6216" name="Caret Settings"/>
@ -1526,7 +1540,7 @@ please give another one."/>
<UDLRemoveCurrentLang title="Remove the current language" message="Are you sure?"/> <UDLRemoveCurrentLang title="Remove the current language" message="Are you sure?"/>
<UDL_importSuccessful title="User Defined Language" message="Import successful."/> <UDL_importSuccessful title="User Defined Language" message="Import successful."/>
<UDL_importFails title="User Defined Language" message="Failed to import."/> <UDL_importFails title="User Defined Language" message="Failed to import."/>
<UDL_saveBeforeImport title="User Defined Language" message="Before exporting, save your language definition by clicking &quot;Save As...&quot; button."/> <UDL_saveBeforeImport title="User Defined Language" message="Before exporting, save your language definition by clicking &quot;Save As...&quot; button."/> <!-- HowToReproduce: Choose "User Defined Language" in User Language combobox, then click on "Export... button". -->
<UDL_exportSuccessful title="User Defined Language" message="Export successful."/> <UDL_exportSuccessful title="User Defined Language" message="Export successful."/>
<UDL_exportFails title="User Defined Language" message="Failed to export."/> <UDL_exportFails title="User Defined Language" message="Failed to export."/>
<SCMapperDoDeleteOrNot title="Are you sure?" message="Are you sure you want to delete this shortcut?"/> <SCMapperDoDeleteOrNot title="Are you sure?" message="Are you sure you want to delete this shortcut?"/>
@ -1860,6 +1874,7 @@ If you select advanced mode but do not edit files in the aforementioned language
<statusbar-Pos value="Pos: "/> <statusbar-Pos value="Pos: "/>
<statusbar-Sel value="Sel: "/> <statusbar-Sel value="Sel: "/>
<statusbar-Sel-number value="Sel"/> <statusbar-Sel-number value="Sel"/>
<toolbar-accent-tip value="This option makes your toolbar icons follow Windows system accent color. Accent color is the highlight color used in buttons, borders, and Start menu tiles in Windows. To change it, go to Settings &gt; Personalization &gt; Colors, then select your preferred accent color."/>
</MiscStrings> </MiscStrings>
</Native-Langue> </Native-Langue>
</NotepadPlus> </NotepadPlus>

42
PowerEditor/installer/nativeLang/french.xml
View File

@ -5,7 +5,7 @@ Translation note:
2. All the comments are for explanation, they are not for translation. 2. All the comments are for explanation, they are not for translation.
--> -->
<NotepadPlus> <NotepadPlus>
<Native-Langue name="Français" filename="french.xml" version="8.7.9"> <Native-Langue name="Français" filename="french.xml" version="8.8">
<Menu> <Menu>
<Main> <Main>
<!-- Main Menu Entries --> <!-- Main Menu Entries -->
@ -946,7 +946,15 @@ Translation note:
<Preference title="Préférences"> <Preference title="Préférences">
<Item id="6001" name="Fermer"/> <Item id="6001" name="Fermer"/>
<Global title="Général"> <Global title="Général">
<Item id="6101" name="Barre d’outils"/> <Item id="6123" name="Langue"/>
<Item id="6131" name="Menu"/>
<Item id="6122" name="Cacher (Alt ou F10 pour basculer)"/>
<Item id="6132" name="Cacher ＋ ▼ ✕"/>
<Item id="6133" name="Barre d’état"/>
<Item id="6134" name="Masquer"/>
</Global>
<Toolbar title="Barre d’outils">
<Item id="6102" name="Cacher"/> <Item id="6102" name="Cacher"/>
<Item id="6103" name="Icônes ajourées (petite)"/> <Item id="6103" name="Icônes ajourées (petite)"/>
<Item id="6104" name="Icônes ajourées (grande)"/> <Item id="6104" name="Icônes ajourées (grande)"/>
@ -954,7 +962,23 @@ Translation note:
<Item id="6130" name="Icônes pleines (grande)"/> <Item id="6130" name="Icônes pleines (grande)"/>
<Item id="6105" name="Icônes standard (petite)"/> <Item id="6105" name="Icônes standard (petite)"/>
<Item id="6106" name="Barre d’onglets"/> <Item id="6011" name="Colorisation"/>
<Item id="6012" name="Complèt"/>
<Item id="6013" name="Partiel"/>
<Item id="6014" name="Choix de couleur"/>
<Item id="6015" name="Défaut"/>
<Item id="6016" name="Rouge"/>
<Item id="6017" name="Bleu"/>
<Item id="6018" name="Vert"/>
<Item id="6019" name="Violet"/>
<Item id="6020" name="Cyan"/>
<Item id="6021" name="Olive"/>
<Item id="6022" name="Jaune"/>
<Item id="6023" name="Couleur d'accentuation"/>
<Item id="6024" name="Personaliser"/>
</Toolbar>
<Tabbar title="Barre d’onglets">
<Item id="6107" name="Réduire la taille"/> <Item id="6107" name="Réduire la taille"/>
<Item id="6108" name="Verrouiller (pas de glisser-déposer)"/> <Item id="6108" name="Verrouiller (pas de glisser-déposer)"/>
<Item id="6109" name="Colorer les onglets inactifs"/> <Item id="6109" name="Colorer les onglets inactifs"/>
@ -969,16 +993,7 @@ Translation note:
<Item id="6120" name="Verticale"/> <Item id="6120" name="Verticale"/>
<Item id="6121" name="Quitter lors de la fermeture du dernier onglet"/> <Item id="6121" name="Quitter lors de la fermeture du dernier onglet"/>
<Item id="6128" name="Icônes alternatives"/> <Item id="6128" name="Icônes alternatives"/>
</Tabbar>
<Item id="6133" name="Barre d’état"/>
<Item id="6134" name="Masquer"/>
<Item id="6131" name="Menu"/>
<Item id="6122" name="Cacher (Alt ou F10 pour basculer)"/>
<Item id="6132" name="Cacher ＋ ▼ ✕"/>
<Item id="6123" name="Langue"/>
</Global>
<Scintillas title="Zones d’édition 1"> <Scintillas title="Zones d’édition 1">
<Item id="6216" name="Curseur"/> <Item id="6216" name="Curseur"/>
@ -1860,6 +1875,7 @@ Si vous sélectionnez le mode avancé sans modifier les fichiers des langues men
<statusbar-Pos value="Pos : "/> <statusbar-Pos value="Pos : "/>
<statusbar-Sel value="Sel : "/> <statusbar-Sel value="Sel : "/>
<statusbar-Sel-number value="Sel"/> <statusbar-Sel-number value="Sel"/>
<toolbar-accent-tip value="Cette option permet aux icônes de votre barre d'outils d'adopter la couleur d'accentuation du système Windows. La couleur d'accentuation est la couleur de surbrillance utilisée pour les boutons, les bordures et les tuiles du menu Démarrer sous Windows. Pour la modifier, accédez à Paramètres &gt; Personnalisation &gt; Couleurs, puis sélectionnez votre couleur d'accentuation préférée."/>
</MiscStrings> </MiscStrings>
</Native-Langue> </Native-Langue>
</NotepadPlus> </NotepadPlus>

42
PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<NotepadPlus> <NotepadPlus>
<Native-Langue name="台灣繁體" filename="taiwaneseMandarin.xml" version="8.7.8"> <Native-Langue name="台灣繁體" filename="taiwaneseMandarin.xml" version="8.8">
<Menu> <Menu>
<Main> <Main>
<!-- Main Menu Entries --> <!-- Main Menu Entries -->
@ -905,14 +905,39 @@
<Preference title="偏好設定"> <Preference title="偏好設定">
<Item id="6001" name="儲存並關閉"/> <Item id="6001" name="儲存並關閉"/>
<Global title="一般"> <Global title="一般">
<Item id="6101" name="工具列"/> <Item id="6125" name="文件切換器"/>
<Item id="6131" name="選單"/>
<Item id="6122" name="隱藏（用 Alt 或 F10 切換）"/>
<Item id="6132" name="隱藏選單中右邊的 ＋ ▼ ✕ 捷徑"/>
<Item id="6123" name="語言"/>
<Item id="6133" name="狀態列"/>
<Item id="6134" name="隱藏"/>
</Global>
<Toolbar title="工具列">
<Item id="6102" name="隱藏"/> <Item id="6102" name="隱藏"/>
<Item id="6103" name="Fluent UI: 小圖示"/> <Item id="6103" name="Fluent UI: 小圖示"/>
<Item id="6104" name="Fluent UI: 大圖示"/> <Item id="6104" name="Fluent UI: 大圖示"/>
<Item id="6129" name="Filled Fluent UI: 小圖示"/> <Item id="6129" name="Filled Fluent UI: 小圖示"/>
<Item id="6130" name="Filled Fluent UI: 大圖示"/> <Item id="6130" name="Filled Fluent UI: 大圖示"/>
<Item id="6105" name="標準: : 小圖示"/> <Item id="6105" name="標準: 小圖示"/>
<Item id="6106" name="頁籤列"/> <Item id="6011" name="著色"/>
<Item id="6012" name="全部"/>
<Item id="6013" name="部份"/>
<Item id="6014" name="顏色選擇"/>
<Item id="6015" name="內定色"/>
<Item id="6016" name="紅色"/>
<Item id="6017" name="綠色"/>
<Item id="6018" name="藍色"/>
<Item id="6019" name="紫色"/>
<Item id="6020" name="青色"/>
<Item id="6021" name="橄欖色"/>
<Item id="6022" name="黃色"/>
<Item id="6023" name="系統強調色"/>
<Item id="6024" name="自訂色調"/>
</Toolbar>
<Tabbar title="頁籤列">
<Item id="6107" name="縮小"/> <Item id="6107" name="縮小"/>
<Item id="6128" name="替代圖示"/> <Item id="6128" name="替代圖示"/>
<Item id="6108" name="鎖定（禁止拖曳）"/> <Item id="6108" name="鎖定（禁止拖曳）"/>
@ -927,13 +952,7 @@
<Item id="6119" name="多行"/> <Item id="6119" name="多行"/>
<Item id="6120" name="直式"/> <Item id="6120" name="直式"/>
<Item id="6121" name="關閉最後一個文件時關閉程式"/> <Item id="6121" name="關閉最後一個文件時關閉程式"/>
<Item id="6131" name="選單"/> </Tabbar>
<Item id="6122" name="隱藏（用 Alt 或 F10 切換）"/>
<Item id="6132" name="隱藏選單中右邊的 ＋ ▼ ✕ 捷徑"/>
<Item id="6123" name="語言"/>
<Item id="6125" name="文件切換器"/>
<Item id="6127" name="停用副檔名欄"/>
</Global>
<Scintillas title="編輯一"> <Scintillas title="編輯一">
<Item id="6216" name="游標設定"/> <Item id="6216" name="游標設定"/>
@ -1680,6 +1699,7 @@ C、C++、Java、C#、Objective-C、PHP、JavaScript、JSP、CSS、Perl、Rust
<statusbar-Pos value="位置："/> <statusbar-Pos value="位置："/>
<statusbar-Sel value="選取："/> <statusbar-Sel value="選取："/>
<statusbar-Sel-number value="選取"/> <statusbar-Sel-number value="選取"/>
<toolbar-accent-tip value="此選項可讓您的工具列圖示遵循 Windows 系統強調色。強調色是 Windows 中的按鈕、邊框和開始功能表圖塊所使用的反白顯示顏色。要更改它，請轉到「設定」&gt;「個性化」&gt;「顏色」，然後選擇您喜歡的強調色。"/>
</MiscStrings> </MiscStrings>
</Native-Langue> </Native-Langue>
</NotepadPlus> </NotepadPlus>

7
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -72,9 +72,10 @@ BEGIN
CONTROL "Cyan",IDC_RADIO_CYAN,"Button",BS_AUTORADIOBUTTON,195,136,77,10 CONTROL "Cyan",IDC_RADIO_CYAN,"Button",BS_AUTORADIOBUTTON,195,136,77,10
CONTROL "Olive",IDC_RADIO_OLIVE,"Button",BS_AUTORADIOBUTTON,195,150,77,10 CONTROL "Olive",IDC_RADIO_OLIVE,"Button",BS_AUTORADIOBUTTON,195,150,77,10
CONTROL "Yellow",IDC_RADIO_YELLOW,"Button",BS_AUTORADIOBUTTON,195,164,77,10 CONTROL "Yellow",IDC_RADIO_YELLOW,"Button",BS_AUTORADIOBUTTON,195,164,77,10
CONTROL "Default",IDC_RADIO_DEFAULTCOLOR,"Button",BS_AUTORADIOBUTTON,278,80,77,10 CONTROL "Default",IDC_RADIO_DEFAULTCOLOR,"Button",BS_AUTORADIOBUTTON,278,80,112,10
CONTROL "Follow System Accent setting",IDC_RADIO_ACCENTCOLOR,"Button",BS_AUTORADIOBUTTON,278,94,127,10 CONTROL "System Accent",IDC_RADIO_ACCENTCOLOR,"Button",BS_AUTORADIOBUTTON,278,94,112,10
CONTROL "Custom",IDC_RADIO_CUSTOMCOLOR,"Button",BS_AUTORADIOBUTTON,278,108,114,10 LTEXT "(?)",IDD_ACCENT_TIP_STATIC,393,94,10,10, SS_NOTIFY
CONTROL "Custom",IDC_RADIO_CUSTOMCOLOR,"Button",BS_AUTORADIOBUTTON,278,108,112,10
LTEXT "",IDC_STATIC,310,127,1,8 // For placing the color picker on the left LTEXT "",IDC_STATIC,310,127,1,8 // For placing the color picker on the left
END END

9
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -798,7 +798,6 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
::SendDlgItemMessage(_hSelf, ID2Check, BM_SETCHECK, BST_CHECKED, 0); ::SendDlgItemMessage(_hSelf, ID2Check, BM_SETCHECK, BST_CHECKED, 0);
ID2Check = 0; ID2Check = 0;
switch (nppGUITbInfo._tbColor) switch (nppGUITbInfo._tbColor)
{ {
@ -835,6 +834,10 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
} }
::SendDlgItemMessage(_hSelf, ID2Check, BM_SETCHECK, BST_CHECKED, 0); ::SendDlgItemMessage(_hSelf, ID2Check, BM_SETCHECK, BST_CHECKED, 0);
NativeLangSpeaker* pNativeSpeaker = nppParam.getNativeLangSpeaker();
wstring findInFilesFilterTip = pNativeSpeaker->getLocalizedStrFromID("toolbar-accent-tip", L"This option makes your toolbar icons follow Windows system accent color. Accent color is the highlight color used in buttons, borders, and Start menu tiles in Windows. To change it, go to Settings > Personalization > Colors, then select your preferred accent color.");
_accentTip = CreateToolTip(IDD_ACCENT_TIP_STATIC, _hSelf, _hInst, const_cast<PTSTR>(findInFilesFilterTip.c_str()), pNativeSpeaker->isRTL());
::SendDlgItemMessage(_hSelf, nppGUITbInfo._tbUseMono ? IDC_RADIO_COMPLETE : IDC_RADIO_PARTIAL, BM_SETCHECK, BST_CHECKED, 0); ::SendDlgItemMessage(_hSelf, nppGUITbInfo._tbUseMono ? IDC_RADIO_COMPLETE : IDC_RADIO_PARTIAL, BM_SETCHECK, BST_CHECKED, 0);
_dpiManager.setDpi(_hSelf); _dpiManager.setDpi(_hSelf);
@ -879,6 +882,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_YELLOW), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_YELLOW), enableColor);
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_DEFAULTCOLOR), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_DEFAULTCOLOR), enableColor);
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_ACCENTCOLOR), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_ACCENTCOLOR), enableColor);
::EnableWindow(::GetDlgItem(_hSelf, IDD_ACCENT_TIP_STATIC), enableColor);
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_CUSTOMCOLOR), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_CUSTOMCOLOR), enableColor);
bool useDark = static_cast<bool>(wParam) ? !NppDarkMode::isEnabled() : NppDarkMode::isEnabled(); bool useDark = static_cast<bool>(wParam) ? !NppDarkMode::isEnabled() : NppDarkMode::isEnabled();
@ -919,6 +923,9 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
{ {
_pIconColorPicker->destroy(); _pIconColorPicker->destroy();
delete _pIconColorPicker; delete _pIconColorPicker;
if (_accentTip)
::DestroyWindow(_accentTip);
return TRUE; return TRUE;
} }

5
PowerEditor/src/WinControls/Preference/preferenceDlg.h
View File

@ -56,12 +56,13 @@ public:
ToolbarSubDlg() = default; ToolbarSubDlg() = default;
private: private:
HWND _accentTip = nullptr;
ColourPicker* _pIconColorPicker = nullptr;
intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) override; intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) override;
UINT getToolbarIconSetMsg(int* idxIconSet); UINT getToolbarIconSetMsg(int* idxIconSet);
void move2CtrlLeft(int ctrlID, HWND handle2Move, int handle2MoveWidth, int handle2MoveHeight); void move2CtrlLeft(int ctrlID, HWND handle2Move, int handle2MoveWidth, int handle2MoveHeight);
void enableIconColorPicker(bool enable, bool useDark); void enableIconColorPicker(bool enable, bool useDark);
ColourPicker* _pIconColorPicker = nullptr;
}; };
class TabbarSubDlg : public StaticDialog class TabbarSubDlg : public StaticDialog

21
PowerEditor/src/WinControls/Preference/preference_rc.h
View File

@ -26,27 +26,28 @@
#define IDC_RADIO_COMPLETE (IDD_PREFERENCE_SUB_TOOLBAR + 2) #define IDC_RADIO_COMPLETE (IDD_PREFERENCE_SUB_TOOLBAR + 2)
#define IDC_RADIO_PARTIAL (IDD_PREFERENCE_SUB_TOOLBAR + 3) #define IDC_RADIO_PARTIAL (IDD_PREFERENCE_SUB_TOOLBAR + 3)
#define IDC_TOOLBAR_GB_COLORCHOICE (IDD_PREFERENCE_SUB_TOOLBAR + 4) #define IDC_TOOLBAR_GB_COLORCHOICE (IDD_PREFERENCE_SUB_TOOLBAR + 4)
#define IDC_RADIO_RED (IDD_PREFERENCE_SUB_TOOLBAR + 5) #define IDC_RADIO_DEFAULTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 5)
#define IDC_RADIO_GREEN (IDD_PREFERENCE_SUB_TOOLBAR + 6) #define IDC_RADIO_RED (IDD_PREFERENCE_SUB_TOOLBAR + 6)
#define IDC_RADIO_BLUE (IDD_PREFERENCE_SUB_TOOLBAR + 7) #define IDC_RADIO_GREEN (IDD_PREFERENCE_SUB_TOOLBAR + 7)
#define IDC_RADIO_PURPLE (IDD_PREFERENCE_SUB_TOOLBAR + 8) #define IDC_RADIO_BLUE (IDD_PREFERENCE_SUB_TOOLBAR + 8)
#define IDC_RADIO_CYAN (IDD_PREFERENCE_SUB_TOOLBAR + 9) #define IDC_RADIO_PURPLE (IDD_PREFERENCE_SUB_TOOLBAR + 9)
#define IDC_RADIO_OLIVE (IDD_PREFERENCE_SUB_TOOLBAR + 10) #define IDC_RADIO_CYAN (IDD_PREFERENCE_SUB_TOOLBAR + 10)
#define IDC_RADIO_YELLOW (IDD_PREFERENCE_SUB_TOOLBAR + 11) #define IDC_RADIO_OLIVE (IDD_PREFERENCE_SUB_TOOLBAR + 11)
#define IDC_RADIO_DEFAULTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 12) #define IDC_RADIO_YELLOW (IDD_PREFERENCE_SUB_TOOLBAR + 12)
#define IDC_RADIO_ACCENTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 13) #define IDC_RADIO_ACCENTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 13)
#define IDC_RADIO_CUSTOMCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 14) #define IDC_RADIO_CUSTOMCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 14)
#define IDD_ACCENT_TIP_STATIC (IDD_PREFERENCE_SUB_TOOLBAR + 15)
#define IDD_PREFERENCE_SUB_TABBAR 6040 //(IDD_PREFERENCE_BOX + 40) #define IDD_PREFERENCE_SUB_TABBAR 6040 //(IDD_PREFERENCE_BOX + 40)
#define IDD_PREFERENCE_SUB_GENRAL 6100 //(IDD_PREFERENCE_BOX + 100) #define IDD_PREFERENCE_SUB_GENRAL 6100 //(IDD_PREFERENCE_BOX + 100)
#define IDC_TOOLBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 1) //#define IDC_TOOLBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 1)
#define IDC_CHECK_HIDE (IDD_PREFERENCE_SUB_GENRAL + 2) #define IDC_CHECK_HIDE (IDD_PREFERENCE_SUB_GENRAL + 2)
#define IDC_RADIO_SMALLICON (IDD_PREFERENCE_SUB_GENRAL + 3) #define IDC_RADIO_SMALLICON (IDD_PREFERENCE_SUB_GENRAL + 3)
#define IDC_RADIO_BIGICON (IDD_PREFERENCE_SUB_GENRAL + 4) #define IDC_RADIO_BIGICON (IDD_PREFERENCE_SUB_GENRAL + 4)
#define IDC_RADIO_STANDARD (IDD_PREFERENCE_SUB_GENRAL + 5) #define IDC_RADIO_STANDARD (IDD_PREFERENCE_SUB_GENRAL + 5)
#define IDC_TABBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 6) //#define IDC_TABBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 6)
#define IDC_CHECK_REDUCE (IDD_PREFERENCE_SUB_GENRAL + 7) #define IDC_CHECK_REDUCE (IDD_PREFERENCE_SUB_GENRAL + 7)
#define IDC_CHECK_LOCK (IDD_PREFERENCE_SUB_GENRAL + 8) #define IDC_CHECK_LOCK (IDD_PREFERENCE_SUB_GENRAL + 8)
#define IDC_CHECK_DRAWINACTIVE (IDD_PREFERENCE_SUB_GENRAL + 9) #define IDC_CHECK_DRAWINACTIVE (IDD_PREFERENCE_SUB_GENRAL + 9)