[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
This commit is contained in:
Don Ho 2014-11-30 02:17:49 +00:00
parent 019f5eea7d
commit b1f84d2788
3 changed files with 13 additions and 13 deletions

View File

@ -340,7 +340,7 @@ HMENU PluginsManager::setMenu(HMENU hMenu, const TCHAR *menuName)
{ {
if (hasPlugins()) if (hasPlugins())
{ {
const TCHAR *nom_menu = (menuName && menuName[0])?menuName:TEXT("Plugins"); const TCHAR *nom_menu = (menuName && menuName[0])?menuName:TEXT("&Plugins");
if (!_hPluginsMenu) if (!_hPluginsMenu)
{ {

View File

@ -505,7 +505,7 @@ BEGIN
MENUITEM "Text Direction LTR", IDM_EDIT_LTR MENUITEM "Text Direction LTR", IDM_EDIT_LTR
END END
POPUP "Encoding" POPUP "E&ncoding"
BEGIN BEGIN
MENUITEM "Encode in ANSI", IDM_FORMAT_ANSI MENUITEM "Encode in ANSI", IDM_FORMAT_ANSI
MENUITEM "Encode in UTF-8 without BOM", IDM_FORMAT_AS_UTF_8 MENUITEM "Encode in UTF-8 without BOM", IDM_FORMAT_AS_UTF_8
@ -814,7 +814,7 @@ BEGIN
MENUITEM "Edit Popup ContextMenu", IDM_SETTING_EDITCONTEXTMENU MENUITEM "Edit Popup ContextMenu", IDM_SETTING_EDITCONTEXTMENU
END END
POPUP "Macro" POPUP "&Macro"
BEGIN BEGIN
MENUITEM "Start Re&cording", IDM_MACRO_STARTRECORDINGMACRO MENUITEM "Start Re&cording", IDM_MACRO_STARTRECORDINGMACRO
MENUITEM "S&top Recording", IDM_MACRO_STOPRECORDINGMACRO MENUITEM "S&top Recording", IDM_MACRO_STOPRECORDINGMACRO
@ -823,7 +823,7 @@ BEGIN
MENUITEM "&Run a Macro Multiple Times...", IDM_MACRO_RUNMULTIMACRODLG MENUITEM "&Run a Macro Multiple Times...", IDM_MACRO_RUNMULTIMACRODLG
END END
POPUP "Run" POPUP "&Run"
BEGIN BEGIN
MENUITEM "&Run...", IDM_EXECUTE MENUITEM "&Run...", IDM_EXECUTE
END END

View File

@ -840,7 +840,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
{ {
if (_isDirty) 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 (res == IDYES)
{ {
if (!saveWorkSpace()) if (!saveWorkSpace())
@ -908,7 +908,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
{ {
if (_isDirty) 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 (res == IDYES)
{ {
if (!saveWorkSpace()) if (!saveWorkSpace())
@ -931,7 +931,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
{ {
if (!openWorkSpace(fn)) 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; return;
} }
} }
@ -942,7 +942,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
{ {
if (_isDirty) 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) if (res == IDYES)
{ {
// Do nothing // Do nothing
@ -959,7 +959,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
} }
else 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; break;
@ -981,8 +981,8 @@ void ProjectPanel::popupMenuCmd(int cmdID)
if (_treeView.getChildFrom(hTreeItem) != NULL) 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?"); 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 projet"), MB_YESNO) == IDYES) if (::MessageBox(_hSelf, str2display, TEXT("Remove folder from project"), MB_YESNO) == IDYES)
{ {
_treeView.removeItem(hTreeItem); _treeView.removeItem(hTreeItem);
setWorkSpaceDirty(true); setWorkSpaceDirty(true);
@ -1002,8 +1002,8 @@ void ProjectPanel::popupMenuCmd(int cmdID)
{ {
HTREEITEM parent = _treeView.getParent(hTreeItem); HTREEITEM parent = _treeView.getParent(hTreeItem);
TCHAR str2display[MAX_PATH] = TEXT("Are you sure to remove this file from the project?"); 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 projet"), MB_YESNO) == IDYES) if (::MessageBox(_hSelf, str2display, TEXT("Remove file from project"), MB_YESNO) == IDYES)
{ {
_treeView.removeItem(hTreeItem); _treeView.removeItem(hTreeItem);
setWorkSpaceDirty(true); setWorkSpaceDirty(true);