From b1f84d278874a2499179e9eb13b3083db5962844 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 30 Nov 2014 02:17:49 +0000 Subject: [PATCH] [NEW] Add some menu accelerator. [UPDATE] Fix some typos and syntax issues. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1299 f5eea248-9336-0410-98b8-ebc06183d4e3 --- .../src/MISC/PluginsManager/PluginsManager.cpp | 2 +- PowerEditor/src/Notepad_plus.rc | 6 +++--- .../WinControls/ProjectPanel/ProjectPanel.cpp | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp index 3f8d639b..3031fbd9 100644 --- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp +++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp @@ -340,7 +340,7 @@ HMENU PluginsManager::setMenu(HMENU hMenu, const TCHAR *menuName) { if (hasPlugins()) { - const TCHAR *nom_menu = (menuName && menuName[0])?menuName:TEXT("Plugins"); + const TCHAR *nom_menu = (menuName && menuName[0])?menuName:TEXT("&Plugins"); if (!_hPluginsMenu) { diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 993c54bd..0c6d1b9f 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -505,7 +505,7 @@ BEGIN MENUITEM "Text Direction LTR", IDM_EDIT_LTR END - POPUP "Encoding" + POPUP "E&ncoding" BEGIN MENUITEM "Encode in ANSI", IDM_FORMAT_ANSI MENUITEM "Encode in UTF-8 without BOM", IDM_FORMAT_AS_UTF_8 @@ -814,7 +814,7 @@ BEGIN MENUITEM "Edit Popup ContextMenu", IDM_SETTING_EDITCONTEXTMENU END - POPUP "Macro" + POPUP "&Macro" BEGIN MENUITEM "Start Re&cording", IDM_MACRO_STARTRECORDINGMACRO MENUITEM "S&top Recording", IDM_MACRO_STOPRECORDINGMACRO @@ -823,7 +823,7 @@ BEGIN MENUITEM "&Run a Macro Multiple Times...", IDM_MACRO_RUNMULTIMACRODLG END - POPUP "Run" + POPUP "&Run" BEGIN MENUITEM "&Run...", IDM_EXECUTE END diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp index edcac31e..f0372919 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp +++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp @@ -840,7 +840,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) { if (_isDirty) { - int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Do you want to save the current project?"), TEXT(""), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL); + int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Do you want to save the current project?"), TEXT("New Workspace"), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL); if (res == IDYES) { if (!saveWorkSpace()) @@ -908,7 +908,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) { if (_isDirty) { - int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Do you want to save the current project?"), TEXT(""), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL); + int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Do you want to save the current project?"), TEXT("Open Workspace"), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL); if (res == IDYES) { if (!saveWorkSpace()) @@ -931,7 +931,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) { if (!openWorkSpace(fn)) { - ::MessageBox(_hSelf, TEXT("Opening Workspace failed.\rIt seems the file to open is not valid project file."), TEXT("Open Workspace"), MB_OK); + ::MessageBox(_hSelf, TEXT("The workspace could not be opened.\rIt seems the file to open is not a valid project file."), TEXT("Open Workspace"), MB_OK); return; } } @@ -942,7 +942,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) { if (_isDirty) { - int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Reload will discard all modification.\rDo you want to continue?"), TEXT(""), MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL); + int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Reloading will discard all modifications.\rDo you want to continue?"), TEXT("Reload Workspace"), MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL); if (res == IDYES) { // Do nothing @@ -959,7 +959,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) } else { - ::MessageBox(_hSelf, TEXT("Can not find file to reload"), TEXT(""), MB_OK | MB_ICONEXCLAMATION | MB_APPLMODAL); + ::MessageBox(_hSelf, TEXT("Cannot find the file to reload."), TEXT("Reload Workspace"), MB_OK | MB_ICONEXCLAMATION | MB_APPLMODAL); } } break; @@ -981,8 +981,8 @@ void ProjectPanel::popupMenuCmd(int cmdID) if (_treeView.getChildFrom(hTreeItem) != NULL) { - TCHAR str2display[MAX_PATH] = TEXT("All the sub-items will be removed.\rAre you sure to remove this folder from the project?"); - if (::MessageBox(_hSelf, str2display, TEXT("Remove folder from projet"), MB_YESNO) == IDYES) + TCHAR str2display[MAX_PATH] = TEXT("All the sub-items will be removed.\rAre you sure you want to remove this folder from the project?"); + if (::MessageBox(_hSelf, str2display, TEXT("Remove folder from project"), MB_YESNO) == IDYES) { _treeView.removeItem(hTreeItem); setWorkSpaceDirty(true); @@ -1002,8 +1002,8 @@ void ProjectPanel::popupMenuCmd(int cmdID) { HTREEITEM parent = _treeView.getParent(hTreeItem); - TCHAR str2display[MAX_PATH] = TEXT("Are you sure to remove this file from the project?"); - if (::MessageBox(_hSelf, str2display, TEXT("Remove file from projet"), MB_YESNO) == IDYES) + TCHAR str2display[MAX_PATH] = TEXT("Are you sure you want to remove this file from the project?"); + if (::MessageBox(_hSelf, str2display, TEXT("Remove file from project"), MB_YESNO) == IDYES) { _treeView.removeItem(hTreeItem); setWorkSpaceDirty(true);