From 2576bf884b37a916cf5f597d87e436fb59864cec Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sat, 7 Aug 2021 23:28:15 +0200 Subject: [PATCH] Substitute "Mark" for "Style" in the menu entries In order to avoid users' confusion, all "Mark" occurrences of menu entries are substituted for "Style", so users won't confuse with "Mark" fonction in Find dialog. Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/issues/10195#issuecomment-893481499 Close #10351 --- PowerEditor/installer/nativeLang/english.xml | 85 ++++++++++--------- PowerEditor/src/Notepad_plus.rc | 12 +-- PowerEditor/src/Parameters.cpp | 70 +++++++-------- .../src/WinControls/Preference/preference.rc | 2 +- PowerEditor/src/contextMenu.xml | 12 +-- 5 files changed, 91 insertions(+), 90 deletions(-) diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 2c0be0946..0b0b276f0 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -36,9 +36,9 @@ The comments are here for explanation, it's not necessary to translate them. - - - + + + @@ -220,20 +220,20 @@ The comments are here for explanation, it's not necessary to translate them. - + - + - + @@ -547,41 +547,41 @@ The comments are here for explanation, it's not necessary to translate them. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -616,6 +616,7 @@ The comments are here for explanation, it's not necessary to translate them. + @@ -937,7 +938,7 @@ You can define several column markers by using white space to separate the diffe - + diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 04ffff924..ba23265bd 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -559,7 +559,7 @@ BEGIN MENUITEM "Mar&k...", IDM_SEARCH_MARK MENUITEM SEPARATOR - POPUP "Mark &All" + POPUP "Style &All Occurrences of Token" BEGIN MENUITEM "Using 1st Style", IDM_SEARCH_MARKALLEXT1 MENUITEM "Using 2nd Style", IDM_SEARCH_MARKALLEXT2 @@ -567,7 +567,7 @@ BEGIN MENUITEM "Using 4th Style", IDM_SEARCH_MARKALLEXT4 MENUITEM "Using 5th Style", IDM_SEARCH_MARKALLEXT5 END - POPUP "Mark &One" + POPUP "Style &One Token" BEGIN MENUITEM "Using 1st Style", IDM_SEARCH_MARKONEEXT1 MENUITEM "Using 2nd Style", IDM_SEARCH_MARKONEEXT2 @@ -575,7 +575,7 @@ BEGIN MENUITEM "Using 4th Style", IDM_SEARCH_MARKONEEXT4 MENUITEM "Using 5th Style", IDM_SEARCH_MARKONEEXT5 END - POPUP "&Unmark All" + POPUP "Clear Style" BEGIN MENUITEM "Clear 1st Style", IDM_SEARCH_UNMARKALLEXT1 MENUITEM "Clear 2nd Style", IDM_SEARCH_UNMARKALLEXT2 @@ -591,7 +591,7 @@ BEGIN MENUITEM "3rd Style", IDM_SEARCH_GOPREVMARKER3 MENUITEM "4th Style", IDM_SEARCH_GOPREVMARKER4 MENUITEM "5th Style", IDM_SEARCH_GOPREVMARKER5 - MENUITEM "Find Style", IDM_SEARCH_GOPREVMARKER_DEF + MENUITEM "Find Mark Style", IDM_SEARCH_GOPREVMARKER_DEF END POPUP "Jump &Down" BEGIN @@ -600,7 +600,7 @@ BEGIN MENUITEM "3rd Style", IDM_SEARCH_GONEXTMARKER3 MENUITEM "4th Style", IDM_SEARCH_GONEXTMARKER4 MENUITEM "5th Style", IDM_SEARCH_GONEXTMARKER5 - MENUITEM "Find Style", IDM_SEARCH_GONEXTMARKER_DEF + MENUITEM "Find Mark Style", IDM_SEARCH_GONEXTMARKER_DEF END POPUP "&Copy Styled Text" BEGIN @@ -610,7 +610,7 @@ BEGIN MENUITEM "4th Style", IDM_SEARCH_STYLE4TOCLIP MENUITEM "5th Style", IDM_SEARCH_STYLE5TOCLIP MENUITEM "All Styles", IDM_SEARCH_ALLSTYLESTOCLIP - MENUITEM "Find Style (Marked)", IDM_SEARCH_MARKEDTOCLIP + MENUITEM "Find Mark Style", IDM_SEARCH_MARKEDTOCLIP END MENUITEM SEPARATOR POPUP "&Bookmark" diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index fb3a13ddd..2eb435d99 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -189,41 +189,41 @@ static const WinMenuKeyDefinition winKeyDefs[] = { VK_B, IDM_SEARCH_GOTOMATCHINGBRACE, true, false, false, nullptr }, { VK_B, IDM_SEARCH_SELECTMATCHINGBRACES, true, true, false, nullptr }, { VK_M, IDM_SEARCH_MARK, true, false, false, nullptr }, - { VK_NULL, IDM_SEARCH_MARKALLEXT1, false, false, false, TEXT("Mark all using 1st style") }, - { VK_NULL, IDM_SEARCH_MARKALLEXT2, false, false, false, TEXT("Mark all using 2nd style") }, - { VK_NULL, IDM_SEARCH_MARKALLEXT3, false, false, false, TEXT("Mark all using 3rd style") }, - { VK_NULL, IDM_SEARCH_MARKALLEXT4, false, false, false, TEXT("Mark all using 4th style") }, - { VK_NULL, IDM_SEARCH_MARKALLEXT5, false, false, false, TEXT("Mark all using 5th style") }, - { VK_NULL, IDM_SEARCH_MARKONEEXT1, false, false, false, TEXT("Mark one using 1st style") }, - { VK_NULL, IDM_SEARCH_MARKONEEXT2, false, false, false, TEXT("Mark one using 2nd style") }, - { VK_NULL, IDM_SEARCH_MARKONEEXT3, false, false, false, TEXT("Mark one using 3rd style") }, - { VK_NULL, IDM_SEARCH_MARKONEEXT4, false, false, false, TEXT("Mark one using 4th style") }, - { VK_NULL, IDM_SEARCH_MARKONEEXT5, false, false, false, TEXT("Mark one using 5th style") }, - { VK_NULL, IDM_SEARCH_UNMARKALLEXT1, false, false, false, TEXT("Clear marks using 1st style") }, - { VK_NULL, IDM_SEARCH_UNMARKALLEXT2, false, false, false, TEXT("Clear marks using 2nd style") }, - { VK_NULL, IDM_SEARCH_UNMARKALLEXT3, false, false, false, TEXT("Clear marks using 3rd style") }, - { VK_NULL, IDM_SEARCH_UNMARKALLEXT4, false, false, false, TEXT("Clear marks using 4th style") }, - { VK_NULL, IDM_SEARCH_UNMARKALLEXT5, false, false, false, TEXT("Clear marks using 5th style") }, - { VK_NULL, IDM_SEARCH_CLEARALLMARKS, false, false, false, TEXT("Clear marks using any style") }, - { VK_1, IDM_SEARCH_GOPREVMARKER1, true, false, true, TEXT("Previous mark using 1st style") }, - { VK_2, IDM_SEARCH_GOPREVMARKER2, true, false, true, TEXT("Previous mark using 2nd style") }, - { VK_3, IDM_SEARCH_GOPREVMARKER3, true, false, true, TEXT("Previous mark using 3rd style") }, - { VK_4, IDM_SEARCH_GOPREVMARKER4, true, false, true, TEXT("Previous mark using 4th style") }, - { VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, TEXT("Previous mark using 5th style") }, - { VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, TEXT("Previous mark created with Mark") }, - { VK_1, IDM_SEARCH_GONEXTMARKER1, true, false, false, TEXT("Next mark using 1st style") }, - { VK_2, IDM_SEARCH_GONEXTMARKER2, true, false, false, TEXT("Next mark using 2nd style") }, - { VK_3, IDM_SEARCH_GONEXTMARKER3, true, false, false, TEXT("Next mark using 3rd style") }, - { VK_4, IDM_SEARCH_GONEXTMARKER4, true, false, false, TEXT("Next mark using 4th style") }, - { VK_5, IDM_SEARCH_GONEXTMARKER5, true, false, false, TEXT("Next mark using 5th style") }, - { VK_0, IDM_SEARCH_GONEXTMARKER_DEF, true, false, false, TEXT("Next mark created with Mark") }, - { VK_NULL, IDM_SEARCH_STYLE1TOCLIP, false, false, false, TEXT("Copy Styled Text - 1st Style") }, - { VK_NULL, IDM_SEARCH_STYLE2TOCLIP, false, false, false, TEXT("Copy Styled Text - 2nd Style") }, - { VK_NULL, IDM_SEARCH_STYLE3TOCLIP, false, false, false, TEXT("Copy Styled Text - 3rd Style") }, - { VK_NULL, IDM_SEARCH_STYLE4TOCLIP, false, false, false, TEXT("Copy Styled Text - 4th Style") }, - { VK_NULL, IDM_SEARCH_STYLE5TOCLIP, false, false, false, TEXT("Copy Styled Text - 5th Style") }, - { VK_NULL, IDM_SEARCH_ALLSTYLESTOCLIP, false, false, false, TEXT("Copy Styled Text - All Styles") }, - { VK_NULL, IDM_SEARCH_MARKEDTOCLIP, false, false, false, TEXT("Copy Styled Text - Find Style (Marked)") }, + { VK_NULL, IDM_SEARCH_MARKALLEXT1, false, false, false, TEXT("Style all using 1st style") }, + { VK_NULL, IDM_SEARCH_MARKALLEXT2, false, false, false, TEXT("Style all using 2nd style") }, + { VK_NULL, IDM_SEARCH_MARKALLEXT3, false, false, false, TEXT("Style all using 3rd style") }, + { VK_NULL, IDM_SEARCH_MARKALLEXT4, false, false, false, TEXT("Style all using 4th style") }, + { VK_NULL, IDM_SEARCH_MARKALLEXT5, false, false, false, TEXT("Style all using 5th style") }, + { VK_NULL, IDM_SEARCH_MARKONEEXT1, false, false, false, TEXT("Style one using 1st style") }, + { VK_NULL, IDM_SEARCH_MARKONEEXT2, false, false, false, TEXT("Style one using 2nd style") }, + { VK_NULL, IDM_SEARCH_MARKONEEXT3, false, false, false, TEXT("Style one using 3rd style") }, + { VK_NULL, IDM_SEARCH_MARKONEEXT4, false, false, false, TEXT("Style one using 4th style") }, + { VK_NULL, IDM_SEARCH_MARKONEEXT5, false, false, false, TEXT("Style one using 5th style") }, + { VK_NULL, IDM_SEARCH_UNMARKALLEXT1, false, false, false, TEXT("Clear 1st style") }, + { VK_NULL, IDM_SEARCH_UNMARKALLEXT2, false, false, false, TEXT("Clear 2nd style") }, + { VK_NULL, IDM_SEARCH_UNMARKALLEXT3, false, false, false, TEXT("Clear 3rd style") }, + { VK_NULL, IDM_SEARCH_UNMARKALLEXT4, false, false, false, TEXT("Clear 4th style") }, + { VK_NULL, IDM_SEARCH_UNMARKALLEXT5, false, false, false, TEXT("Clear 5th style") }, + { VK_NULL, IDM_SEARCH_CLEARALLMARKS, false, false, false, TEXT("Clear all styles") }, + { VK_1, IDM_SEARCH_GOPREVMARKER1, true, false, true, TEXT("Previous style of 1st style") }, + { VK_2, IDM_SEARCH_GOPREVMARKER2, true, false, true, TEXT("Previous style of 2nd style") }, + { VK_3, IDM_SEARCH_GOPREVMARKER3, true, false, true, TEXT("Previous style of 3rd style") }, + { VK_4, IDM_SEARCH_GOPREVMARKER4, true, false, true, TEXT("Previous style of 4th style") }, + { VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, TEXT("Previous style of 5th style") }, + { VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, TEXT("Previous style of Find Mark style") }, + { VK_1, IDM_SEARCH_GONEXTMARKER1, true, false, false, TEXT("Next style of 1st style") }, + { VK_2, IDM_SEARCH_GONEXTMARKER2, true, false, false, TEXT("Next style of 2nd style") }, + { VK_3, IDM_SEARCH_GONEXTMARKER3, true, false, false, TEXT("Next style of 3rd style") }, + { VK_4, IDM_SEARCH_GONEXTMARKER4, true, false, false, TEXT("Next style of 4th style") }, + { VK_5, IDM_SEARCH_GONEXTMARKER5, true, false, false, TEXT("Next style of 5th style") }, + { VK_0, IDM_SEARCH_GONEXTMARKER_DEF, true, false, false, TEXT("Next style of Find Mark style") }, + { VK_NULL, IDM_SEARCH_STYLE1TOCLIP, false, false, false, TEXT("Copy Styled Text of 1st Style") }, + { VK_NULL, IDM_SEARCH_STYLE2TOCLIP, false, false, false, TEXT("Copy Styled Text of 2nd Style") }, + { VK_NULL, IDM_SEARCH_STYLE3TOCLIP, false, false, false, TEXT("Copy Styled Text of 3rd Style") }, + { VK_NULL, IDM_SEARCH_STYLE4TOCLIP, false, false, false, TEXT("Copy Styled Text of 4th Style") }, + { VK_NULL, IDM_SEARCH_STYLE5TOCLIP, false, false, false, TEXT("Copy Styled Text of 5th Style") }, + { VK_NULL, IDM_SEARCH_ALLSTYLESTOCLIP, false, false, false, TEXT("Copy Styled Text of All Styles") }, + { VK_NULL, IDM_SEARCH_MARKEDTOCLIP, false, false, false, TEXT("Copy Styled Text of Find Mark style") }, { VK_F2, IDM_SEARCH_TOGGLE_BOOKMARK, true, false, false, nullptr }, { VK_F2, IDM_SEARCH_NEXT_BOOKMARK, false, false, false, nullptr }, { VK_F2, IDM_SEARCH_PREV_BOOKMARK, false, false, true, nullptr }, diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index fd56f8b42..29dca97bb 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -240,7 +240,7 @@ IDD_PREFERENCE_SUB_HIGHLIGHTING DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Mark All",IDC_MARKALL_STATIC,62,29,155,45,BS_CENTER + GROUPBOX "Style All Occurrences of Token",IDC_MARKALL_STATIC,62,29,155,45,BS_CENTER CONTROL "Match case",IDC_CHECK_MARKALLCASESENSITIVE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,70,42,142,10 CONTROL "Match whole word only",IDC_CHECK_MARKALLWHOLEWORDONLY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,70,55,142,10 GROUPBOX "Smart Highlighting",IDC_SMARTHILITING_STATIC,226,29,172,108,BS_CENTER diff --git a/PowerEditor/src/contextMenu.xml b/PowerEditor/src/contextMenu.xml index 9bd3ac482..ec0eb44dd 100644 --- a/PowerEditor/src/contextMenu.xml +++ b/PowerEditor/src/contextMenu.xml @@ -42,12 +42,12 @@ https://npp-user-manual.org/docs/config-files/#the-context-menu-contextmenu-xml - - - - - - + + + + + +