diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 0e97fa63b..5c6dc3cec 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -1876,8 +1876,8 @@ void Notepad_plus::checkClipboard() enableCommand(IDM_EDIT_DELETE, hasSelection, MENU | TOOLBAR); enableCommand(IDM_EDIT_UPPERCASE, hasSelection, MENU); enableCommand(IDM_EDIT_LOWERCASE, hasSelection, MENU); - enableCommand(IDM_EDIT_TITLECASE_FORCE, hasSelection, MENU); - enableCommand(IDM_EDIT_TITLECASE_BLEND, hasSelection, MENU); + enableCommand(IDM_EDIT_PROPERCASE_FORCE, hasSelection, MENU); + enableCommand(IDM_EDIT_PROPERCASE_BLEND, hasSelection, MENU); enableCommand(IDM_EDIT_SENTENCECASE_FORCE, hasSelection, MENU); enableCommand(IDM_EDIT_SENTENCECASE_BLEND, hasSelection, MENU); enableCommand(IDM_EDIT_INVERTCASE, hasSelection, MENU); diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index a4552d325..f14f5390b 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -275,8 +275,8 @@ BEGIN BEGIN MENUITEM "&UPPERCASE", IDM_EDIT_UPPERCASE MENUITEM "&lowercase", IDM_EDIT_LOWERCASE - MENUITEM "&Title Case", IDM_EDIT_TITLECASE_FORCE - MENUITEM "Title Case (blend)", IDM_EDIT_TITLECASE_BLEND + MENUITEM "&Proper Case", IDM_EDIT_PROPERCASE_FORCE + MENUITEM "Proper Case (blend)", IDM_EDIT_PROPERCASE_BLEND MENUITEM "&Sentence case", IDM_EDIT_SENTENCECASE_FORCE MENUITEM "Sentence case (blend)", IDM_EDIT_SENTENCECASE_BLEND MENUITEM "&iNVERT cASE", IDM_EDIT_INVERTCASE diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 6ddafbf69..5ef104001 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -1364,11 +1364,11 @@ void Notepad_plus::command(int id) _pEditView->convertSelectedTextToLowerCase(); break; - case IDM_EDIT_TITLECASE_FORCE: + case IDM_EDIT_PROPERCASE_FORCE: _pEditView->convertSelectedTextToNewerCase(TITLECASE_FORCE); break; - case IDM_EDIT_TITLECASE_BLEND: + case IDM_EDIT_PROPERCASE_BLEND: _pEditView->convertSelectedTextToNewerCase(TITLECASE_BLEND); break; @@ -3051,8 +3051,8 @@ void Notepad_plus::command(int id) case IDM_EDIT_REMOVEEMPTYLINESWITHBLANK: case IDM_EDIT_UPPERCASE: case IDM_EDIT_LOWERCASE: - case IDM_EDIT_TITLECASE_FORCE: - case IDM_EDIT_TITLECASE_BLEND: + case IDM_EDIT_PROPERCASE_FORCE: + case IDM_EDIT_PROPERCASE_BLEND: case IDM_EDIT_SENTENCECASE_FORCE: case IDM_EDIT_SENTENCECASE_BLEND: case IDM_EDIT_INVERTCASE: diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 81eb93e4e..842a40f57 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -115,8 +115,8 @@ static const WinMenuKeyDefinition winKeyDefs[] = // { VK_NULL, IDM_EDIT_RMV_TAB, false, false, false, nullptr }, { VK_U, IDM_EDIT_UPPERCASE, true, false, true, nullptr }, { VK_U, IDM_EDIT_LOWERCASE, true, false, false, nullptr }, - { VK_U, IDM_EDIT_TITLECASE_FORCE, false, true, false, nullptr }, - { VK_U, IDM_EDIT_TITLECASE_BLEND, false, true, true, nullptr }, + { VK_U, IDM_EDIT_PROPERCASE_FORCE, false, true, false, nullptr }, + { VK_U, IDM_EDIT_PROPERCASE_BLEND, false, true, true, nullptr }, { VK_U, IDM_EDIT_SENTENCECASE_FORCE, true, true, false, nullptr }, { VK_U, IDM_EDIT_SENTENCECASE_BLEND, true, true, true, nullptr }, { VK_NULL, IDM_EDIT_INVERTCASE, false, false, false, nullptr }, diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index ec3b333b0..1f72eda1c 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -109,8 +109,8 @@ #define IDM_EDIT_LINE_DOWN (IDM_EDIT + 15) #define IDM_EDIT_UPPERCASE (IDM_EDIT + 16) #define IDM_EDIT_LOWERCASE (IDM_EDIT + 17) - #define IDM_EDIT_TITLECASE_FORCE (IDM_EDIT + 67) - #define IDM_EDIT_TITLECASE_BLEND (IDM_EDIT + 68) + #define IDM_EDIT_PROPERCASE_FORCE (IDM_EDIT + 67) + #define IDM_EDIT_PROPERCASE_BLEND (IDM_EDIT + 68) #define IDM_EDIT_SENTENCECASE_FORCE (IDM_EDIT + 69) #define IDM_EDIT_SENTENCECASE_BLEND (IDM_EDIT + 70) #define IDM_EDIT_INVERTCASE (IDM_EDIT + 71)