Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BUG_FIXED] Fix tab context menu in the other localization regression due to adding new command "Reload".

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@923 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-07-01 13:28:34 +00:00
parent 4a8cb6d15e
commit 2a6d8b213f
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/installer/nativeLang/english.xml
View File

@ -260,6 +260,7 @@
<Item order="13" name="Clear Read-Only Flag"/> <Item order="13" name="Clear Read-Only Flag"/>
<Item order="14" name="Move to New Instance"/> <Item order="14" name="Move to New Instance"/>
<Item order="15" name="Open in New Instance"/> <Item order="15" name="Open in New Instance"/>
<Item order="16" name="Reload"/>
</TabBar> </TabBar>
</Menu> </Menu>

42
PowerEditor/src/localization.cpp
View File

@ -282,19 +282,20 @@ void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM)
const int POS_SAVEAS = 3; const int POS_SAVEAS = 3;
const int POS_RENAME = 4; const int POS_RENAME = 4;
const int POS_REMOVE = 5; const int POS_REMOVE = 5;
const int POS_PRINT = 6; const int POS_RELOAOD = 6;
//------7 const int POS_PRINT = 7;
const int POS_READONLY = 8; //------8
const int POS_CLEARREADONLY = 9; const int POS_READONLY = 9;
//------10 const int POS_CLEARREADONLY = 10;
const int POS_CLIPFULLPATH = 11; //------11
const int POS_CLIPFILENAME = 12; const int POS_CLIPFULLPATH = 12;
const int POS_CLIPCURRENTDIR = 13; const int POS_CLIPFILENAME = 13;
//------14 const int POS_CLIPCURRENTDIR = 14;
const int POS_GO2VIEW = 15; //------15
const int POS_CLONE2VIEW = 16; const int POS_GO2VIEW = 16;
const int POS_GO2NEWINST = 17; const int POS_CLONE2VIEW = 17;
const int POS_OPENINNEWINST = 18; const int POS_GO2NEWINST = 18;
const int POS_OPENINNEWINST = 19;
const char *pClose = NULL; const char *pClose = NULL;
const char *pCloseBut = NULL; const char *pCloseBut = NULL;
@ -312,6 +313,8 @@ void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM)
const char *pCilpCurrentDir = NULL; const char *pCilpCurrentDir = NULL;
const char *pRename = NULL; const char *pRename = NULL;
const char *pRemove = NULL; const char *pRemove = NULL;
const char *pReload = NULL;
if (_nativeLangA) if (_nativeLangA)
{ {
TiXmlNodeA *tabBarMenu = _nativeLangA->FirstChild("Menu"); TiXmlNodeA *tabBarMenu = _nativeLangA->FirstChild("Menu");
@ -361,6 +364,8 @@ void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM)
pGoToNewInst = element->Attribute("name"); break; pGoToNewInst = element->Attribute("name"); break;
case 15 : case 15 :
pOpenInNewInst = element->Attribute("name"); break; pOpenInNewInst = element->Attribute("name"); break;
case 16 :
pReload = element->Attribute("name"); break;
} }
} }
} }
@ -466,6 +471,12 @@ void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM)
int cmdID = ::GetMenuItemID(hCM, POS_REMOVE); int cmdID = ::GetMenuItemID(hCM, POS_REMOVE);
::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, removeG); ::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, removeG);
} }
if (pReload && pReload[0])
{
const wchar_t *reloadG = wmc->char2wchar(pReload, _nativeLangEncoding);
int cmdID = ::GetMenuItemID(hCM, POS_RELOAOD);
::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, reloadG);
}
#else #else
if (pGoToView && pGoToView[0]) if (pGoToView && pGoToView[0])
{ {
@ -547,6 +558,11 @@ void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM)
int cmdID = ::GetMenuItemID(hCM, POS_REMOVE); int cmdID = ::GetMenuItemID(hCM, POS_REMOVE);
::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, pRemove); ::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, pRemove);
} }
if (pReload && pReload[0])
{
int cmdID = ::GetMenuItemID(hCM, POS_RELOAD);
::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, pReload);
}
#endif #endif
} }