From a23955742cd4422b2365d6fde7a82b4ff0311bd2 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Wed, 9 Apr 2025 00:53:16 +0200 Subject: [PATCH] Make some control names more accurate for dark mode ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/16387#issuecomment-2786729453 Close #16401 --- PowerEditor/installer/nativeLang/english.xml | 8 ++++---- .../installer/nativeLang/english_customizable.xml | 8 ++++---- PowerEditor/installer/nativeLang/french.xml | 8 ++++---- .../installer/nativeLang/taiwaneseMandarin.xml | 11 ++++++----- PowerEditor/src/NppDarkMode.h | 4 ++-- PowerEditor/src/WinControls/Preference/preference.rc | 8 ++++---- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 3b65dc434..8cb60cf6b 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -1034,10 +1034,10 @@ Translation note: - - - - + + + + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index cee70c212..a26e87206 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -1034,10 +1034,10 @@ Translation note: - - - - + + + + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 57dce7688..ac4d8d2d1 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -1034,10 +1034,10 @@ Translation note: - - - - + + + + diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml index ca8e93d23..144d0c47d 100644 --- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml +++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml @@ -989,17 +989,18 @@ - - - - + + + + - + + diff --git a/PowerEditor/src/NppDarkMode.h b/PowerEditor/src/NppDarkMode.h index 0672bf647..92ffee80e 100644 --- a/PowerEditor/src/NppDarkMode.h +++ b/PowerEditor/src/NppDarkMode.h @@ -25,9 +25,9 @@ namespace NppDarkMode struct Colors { COLORREF background = 0; - COLORREF softerBackground = 0; + COLORREF softerBackground = 0; // ctrl background color COLORREF hotBackground = 0; - COLORREF pureBackground = 0; + COLORREF pureBackground = 0; // dlg background color COLORREF errorBackground = 0; COLORREF text = 0; COLORREF darkerText = 0; diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index f0eb2bc4d..8f5265ef4 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -151,10 +151,10 @@ BEGIN CONTROL "Cyan",IDC_RADIO_DARKMODE_CYAN,"Button",BS_AUTORADIOBUTTON,11,135,80,10 CONTROL "Olive",IDC_RADIO_DARKMODE_OLIVE,"Button",BS_AUTORADIOBUTTON,11,150,80,10 CONTROL "Customized",IDC_RADIO_DARKMODE_CUSTOMIZED,"Button",BS_AUTORADIOBUTTON,96,60,120,10 - LTEXT "Top",IDD_CUSTOMIZED_COLOR1_STATIC,112,80,95,8 - LTEXT "Menu hot track",IDD_CUSTOMIZED_COLOR2_STATIC,112,100,95,8 - LTEXT "Active",IDD_CUSTOMIZED_COLOR3_STATIC,112,120,95,8 - LTEXT "Main",IDD_CUSTOMIZED_COLOR4_STATIC,112,140,95,8 + LTEXT "Content background",IDD_CUSTOMIZED_COLOR1_STATIC,112,80,95,8 + LTEXT "Hot track item",IDD_CUSTOMIZED_COLOR2_STATIC,112,100,95,8 + LTEXT "Control background",IDD_CUSTOMIZED_COLOR3_STATIC,112,120,95,8 + LTEXT "Dialog background",IDD_CUSTOMIZED_COLOR4_STATIC,112,140,95,8 LTEXT "Error",IDD_CUSTOMIZED_COLOR5_STATIC,112,160,95,8 LTEXT "Text",IDD_CUSTOMIZED_COLOR6_STATIC,227,80,95,8 LTEXT "Darker text",IDD_CUSTOMIZED_COLOR7_STATIC,227,100,95,8