diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 8cb60cf6b..07260c7c1 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -5,7 +5,7 @@ Translation note: 2. All the comments are for explanation, they are not for translation. --> - +
@@ -946,15 +946,38 @@ Translation note: - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -969,16 +992,7 @@ Translation note: - - - - - - - - - - + @@ -1860,6 +1874,7 @@ If you select advanced mode but do not edit files in the aforementioned language + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index a26e87206..b3a5686fc 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -5,7 +5,7 @@ Translation note: 2. All the comments are for explanation, they are not for translation. --> - +
@@ -946,15 +946,38 @@ Translation note: - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -969,16 +992,7 @@ Translation note: - - - - - - - - - - + @@ -1526,7 +1540,7 @@ please give another one."/> - + @@ -1860,6 +1874,7 @@ If you select advanced mode but do not edit files in the aforementioned language + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index ac4d8d2d1..0113c8503 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -5,7 +5,7 @@ Translation note: 2. All the comments are for explanation, they are not for translation. --> - +
@@ -946,7 +946,15 @@ Translation note: - + + + + + + + + + @@ -954,7 +962,23 @@ Translation note: - + + + + + + + + + + + + + + + + + @@ -969,16 +993,7 @@ Translation note: - - - - - - - - - - + @@ -1860,6 +1875,7 @@ Si vous sélectionnez le mode avancé sans modifier les fichiers des langues men + diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml index 144d0c47d..cbd90cd84 100644 --- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml +++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml @@ -1,6 +1,6 @@ - +
@@ -905,14 +905,39 @@ - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + @@ -927,13 +952,7 @@ - - - - - - - + @@ -1680,6 +1699,7 @@ C、C++、Java、C#、Objective-C、PHP、JavaScript、JSP、CSS、Perl、Rust + diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index f436889b5..ff638d9fe 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -72,9 +72,10 @@ BEGIN 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 "Yellow",IDC_RADIO_YELLOW,"Button",BS_AUTORADIOBUTTON,195,164,77,10 - CONTROL "Default",IDC_RADIO_DEFAULTCOLOR,"Button",BS_AUTORADIOBUTTON,278,80,77,10 - CONTROL "Follow System Accent setting",IDC_RADIO_ACCENTCOLOR,"Button",BS_AUTORADIOBUTTON,278,94,127,10 - CONTROL "Custom",IDC_RADIO_CUSTOMCOLOR,"Button",BS_AUTORADIOBUTTON,278,108,114,10 + CONTROL "Default",IDC_RADIO_DEFAULTCOLOR,"Button",BS_AUTORADIOBUTTON,278,80,112,10 + CONTROL "System Accent",IDC_RADIO_ACCENTCOLOR,"Button",BS_AUTORADIOBUTTON,278,94,112,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 END diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 73541e1cd..a2a118369 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -798,7 +798,6 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM ::SendDlgItemMessage(_hSelf, ID2Check, BM_SETCHECK, BST_CHECKED, 0); - ID2Check = 0; 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); + 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(findInFilesFilterTip.c_str()), pNativeSpeaker->isRTL()); + ::SendDlgItemMessage(_hSelf, nppGUITbInfo._tbUseMono ? IDC_RADIO_COMPLETE : IDC_RADIO_PARTIAL, BM_SETCHECK, BST_CHECKED, 0); _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_DEFAULTCOLOR), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_ACCENTCOLOR), enableColor); + ::EnableWindow(::GetDlgItem(_hSelf, IDD_ACCENT_TIP_STATIC), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_CUSTOMCOLOR), enableColor); bool useDark = static_cast(wParam) ? !NppDarkMode::isEnabled() : NppDarkMode::isEnabled(); @@ -919,6 +923,9 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM { _pIconColorPicker->destroy(); delete _pIconColorPicker; + + if (_accentTip) + ::DestroyWindow(_accentTip); return TRUE; } diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.h b/PowerEditor/src/WinControls/Preference/preferenceDlg.h index ed0f16d60..9684c45ba 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.h +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.h @@ -56,12 +56,13 @@ public: ToolbarSubDlg() = default; private: + HWND _accentTip = nullptr; + ColourPicker* _pIconColorPicker = nullptr; + intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) override; UINT getToolbarIconSetMsg(int* idxIconSet); void move2CtrlLeft(int ctrlID, HWND handle2Move, int handle2MoveWidth, int handle2MoveHeight); void enableIconColorPicker(bool enable, bool useDark); - ColourPicker* _pIconColorPicker = nullptr; - }; class TabbarSubDlg : public StaticDialog diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index 3c3d0dece..2b8d4a6a3 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -21,32 +21,33 @@ #define IDC_BUTTON_CLOSE (IDD_PREFERENCE_BOX + 1) #define IDC_LIST_DLGTITLE (IDD_PREFERENCE_BOX + 2) -#define IDD_PREFERENCE_SUB_TOOLBAR 6010 //(IDD_PREFERENCE_BOX + 10) - #define IDC_TOOLBAR_GB_COLORIZATION (IDD_PREFERENCE_SUB_TOOLBAR + 1) - #define IDC_RADIO_COMPLETE (IDD_PREFERENCE_SUB_TOOLBAR + 2) - #define IDC_RADIO_PARTIAL (IDD_PREFERENCE_SUB_TOOLBAR + 3) - #define IDC_TOOLBAR_GB_COLORCHOICE (IDD_PREFERENCE_SUB_TOOLBAR + 4) - #define IDC_RADIO_RED (IDD_PREFERENCE_SUB_TOOLBAR + 5) - #define IDC_RADIO_GREEN (IDD_PREFERENCE_SUB_TOOLBAR + 6) - #define IDC_RADIO_BLUE (IDD_PREFERENCE_SUB_TOOLBAR + 7) - #define IDC_RADIO_PURPLE (IDD_PREFERENCE_SUB_TOOLBAR + 8) - #define IDC_RADIO_CYAN (IDD_PREFERENCE_SUB_TOOLBAR + 9) - #define IDC_RADIO_OLIVE (IDD_PREFERENCE_SUB_TOOLBAR + 10) - #define IDC_RADIO_YELLOW (IDD_PREFERENCE_SUB_TOOLBAR + 11) - #define IDC_RADIO_DEFAULTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 12) - #define IDC_RADIO_ACCENTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 13) - #define IDC_RADIO_CUSTOMCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 14) +#define IDD_PREFERENCE_SUB_TOOLBAR 6010 //(IDD_PREFERENCE_BOX + 10) + #define IDC_TOOLBAR_GB_COLORIZATION (IDD_PREFERENCE_SUB_TOOLBAR + 1) + #define IDC_RADIO_COMPLETE (IDD_PREFERENCE_SUB_TOOLBAR + 2) + #define IDC_RADIO_PARTIAL (IDD_PREFERENCE_SUB_TOOLBAR + 3) + #define IDC_TOOLBAR_GB_COLORCHOICE (IDD_PREFERENCE_SUB_TOOLBAR + 4) + #define IDC_RADIO_DEFAULTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 5) + #define IDC_RADIO_RED (IDD_PREFERENCE_SUB_TOOLBAR + 6) + #define IDC_RADIO_GREEN (IDD_PREFERENCE_SUB_TOOLBAR + 7) + #define IDC_RADIO_BLUE (IDD_PREFERENCE_SUB_TOOLBAR + 8) + #define IDC_RADIO_PURPLE (IDD_PREFERENCE_SUB_TOOLBAR + 9) + #define IDC_RADIO_CYAN (IDD_PREFERENCE_SUB_TOOLBAR + 10) + #define IDC_RADIO_OLIVE (IDD_PREFERENCE_SUB_TOOLBAR + 11) + #define IDC_RADIO_YELLOW (IDD_PREFERENCE_SUB_TOOLBAR + 12) + #define IDC_RADIO_ACCENTCOLOR (IDD_PREFERENCE_SUB_TOOLBAR + 13) + #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_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_RADIO_SMALLICON (IDD_PREFERENCE_SUB_GENRAL + 3) #define IDC_RADIO_BIGICON (IDD_PREFERENCE_SUB_GENRAL + 4) #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_LOCK (IDD_PREFERENCE_SUB_GENRAL + 8) #define IDC_CHECK_DRAWINACTIVE (IDD_PREFERENCE_SUB_GENRAL + 9)