tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-21 12:54:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

[UPDATE] Update native language files (in progress).

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1141 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-10-28 19:18:01 +00:00
parent c9ab034e61
commit c824157bcc
10 changed files with 40 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PowerEditor/installer/nativeLang/chinese.xml
View File

@ -818,6 +818,9 @@
<FileAlreadyOpenedInNpp title="" message="The file is already opened in the Notepad++."/> <FileAlreadyOpenedInNpp title="" message="The file is already opened in the Notepad++."/>
<DeleteFileFailed title="Delete File" message="Delete File failed"/> <DeleteFileFailed title="Delete File" message="Delete File failed"/>
</MessageBox> </MessageBox>
<DocumentMap>
<PanelTitle name="¤å¥óÁY¹Ï"/>
</DocumentMap>
<FunctionList> <FunctionList>
<PanelTitle name="函數功能明細單"/> <PanelTitle name="函數功能明細單"/>
<SortTip name="排序" /> <SortTip name="排序" />

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

@ -816,6 +816,9 @@
<!-- $INT_REPLACE$ is a place holder, don't translate it --> <!-- $INT_REPLACE$ is a place holder, don't translate it -->
<NbFileToOpenImportantWarning title="Amount of files to open is too large" message="$INT_REPLACE$ files are about to be opened.\rAre you sure to open them?"/> <NbFileToOpenImportantWarning title="Amount of files to open is too large" message="$INT_REPLACE$ files are about to be opened.\rAre you sure to open them?"/>
</MessageBox> </MessageBox>
<DocumentMap>
<PanelTitle name="Document Map"/>
</DocumentMap>
<FunctionList> <FunctionList>
<PanelTitle name="Function List"/> <PanelTitle name="Function List"/>
<SortTip name="Sort" /> <SortTip name="Sort" />

3
PowerEditor/installer/nativeLang/french.xml
View File

@ -840,6 +840,9 @@
<NppHelpAbsentWarning title="Le fichier n'existe pas" message=" n'existe pas. S'il vous plaît, le télécharger sur le site de Notepad++."/> <NppHelpAbsentWarning title="Le fichier n'existe pas" message=" n'existe pas. S'il vous plaît, le télécharger sur le site de Notepad++."/>
<SaveCurrentModifWarning title="Sauvegarder la modification en cours" message="Vous devez enregistrer la modification en cours. Toutes les modifications enregistrées ne peuvent pas être annulées. Continuer?"/> <SaveCurrentModifWarning title="Sauvegarder la modification en cours" message="Vous devez enregistrer la modification en cours. Toutes les modifications enregistrées ne peuvent pas être annulées. Continuer?"/>
</MessageBox> </MessageBox>
<DocumentMap>
<PanelTitle name="Map de Document"/>
</DocumentMap>
<FunctionList> <FunctionList>
<PanelTitle name="Liste des Fonctions"/> <PanelTitle name="Liste des Fonctions"/>
<SortTip name="Trier" /> <SortTip name="Trier" />

12
PowerEditor/src/Notepad_plus.cpp
View File

@ -5125,7 +5125,7 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
data.dlgID = cmdID; data.dlgID = cmdID;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string title_temp = pNativeSpeaker->getProjectPanelLangStr("PanelTitle", PM_PROJECTPANELTITLE); generic_string title_temp = pNativeSpeaker->getAttrNameStr(PM_PROJECTPANELTITLE, "ProjectManager", "PanelTitle");
static TCHAR title[32]; static TCHAR title[32];
if (title_temp.length() < 32) if (title_temp.length() < 32)
@ -5165,6 +5165,14 @@ void Notepad_plus::launchDocMap()
// In the case of Notepad++ internal function, it'll be the command ID which triggers this dialog // In the case of Notepad++ internal function, it'll be the command ID which triggers this dialog
data.dlgID = IDM_VIEW_DOC_MAP; data.dlgID = IDM_VIEW_DOC_MAP;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string title_temp = pNativeSpeaker->getAttrNameStr(DM_PANELTITLE, "DocumentMap", "PanelTitle");
static TCHAR title[32];
if (title_temp.length() < 32)
{
lstrcpy(title, title_temp.c_str());
data.pszName = title;
}
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, (LPARAM)&data); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, (LPARAM)&data);
} }
@ -5197,7 +5205,7 @@ void Notepad_plus::launchFunctionList()
data.dlgID = IDM_VIEW_FUNC_LIST; data.dlgID = IDM_VIEW_FUNC_LIST;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string title_temp = pNativeSpeaker->getFunctionListPanelLangStr("PanelTitle", FL_PANELTITLE); generic_string title_temp = pNativeSpeaker->getAttrNameStr(FL_PANELTITLE, "FunctionList", "PanelTitle");
static TCHAR title[32]; static TCHAR title[32];
if (title_temp.length() < 32) if (title_temp.length() < 32)

7
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -674,6 +674,13 @@ protected:
POINTS pts = MAKEPOINTS(lParam); POINTS pts = MAKEPOINTS(lParam);
POINTSTOPOINT(pt, pts); POINTSTOPOINT(pt, pts);
HWND hwndOnMouse = WindowFromPoint(pt); HWND hwndOnMouse = WindowFromPoint(pt);
//Hack for Synaptics TouchPad Driver
char synapticsHack[26];
GetClassNameA(hwndOnMouse, (LPSTR)&synapticsHack, 26);
if (std::string(synapticsHack) == "SynTrackCursorWindowClass")
return (pScint->scintillaNew_Proc(hwnd, Message, wParam, lParam));
ScintillaEditView *pScintillaOnMouse = (ScintillaEditView *)(::GetWindowLongPtr(hwndOnMouse, GWL_USERDATA)); ScintillaEditView *pScintillaOnMouse = (ScintillaEditView *)(::GetWindowLongPtr(hwndOnMouse, GWL_USERDATA));
if (pScintillaOnMouse != pScint) if (pScintillaOnMouse != pScint)
return ::SendMessage(hwndOnMouse, Message, wParam, lParam); return ::SendMessage(hwndOnMouse, Message, wParam, lParam);

2
PowerEditor/src/WinControls/DocumentMap/documentMap.h
View File

@ -35,6 +35,8 @@
#include "documentMap_rc.h" #include "documentMap_rc.h"
#define DM_PANELTITLE TEXT("Document Map")
#define DOCUMENTMAP_SCROLL (WM_USER + 1) #define DOCUMENTMAP_SCROLL (WM_USER + 1)
#define DOCUMENTMAP_MOUSECLICKED (WM_USER + 2) #define DOCUMENTMAP_MOUSECLICKED (WM_USER + 2)
#define DOCUMENTMAP_MOUSEWHEEL (WM_USER + 3) #define DOCUMENTMAP_MOUSEWHEEL (WM_USER + 3)

8
PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
View File

@ -348,7 +348,7 @@ bool ProjectPanel::openWorkSpace(const TCHAR *projectFileName)
_workSpaceFilePath = projectFileName; _workSpaceFilePath = projectFileName;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string workspace = pNativeSpeaker->getProjectPanelLangStr("WorkspaceRootName", PM_WORKSPACEROOTNAME); generic_string workspace = pNativeSpeaker->getAttrNameStr(PM_WORKSPACEROOTNAME, "ProjectManager", "WorkspaceRootName");
HTREEITEM rootItem = _treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT); HTREEITEM rootItem = _treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT);
for ( ; childNode ; childNode = childNode->NextSibling(TEXT("Project"))) for ( ; childNode ; childNode = childNode->NextSibling(TEXT("Project")))
@ -366,7 +366,7 @@ bool ProjectPanel::openWorkSpace(const TCHAR *projectFileName)
void ProjectPanel::newWorkSpace() void ProjectPanel::newWorkSpace()
{ {
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string workspace = pNativeSpeaker->getProjectPanelLangStr("WorkspaceRootName", PM_WORKSPACEROOTNAME); generic_string workspace = pNativeSpeaker->getAttrNameStr(PM_WORKSPACEROOTNAME, "ProjectManager", "WorkspaceRootName");
_treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT); _treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT);
setWorkSpaceDirty(false); setWorkSpaceDirty(false);
_workSpaceFilePath = TEXT(""); _workSpaceFilePath = TEXT("");
@ -828,7 +828,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
HTREEITEM root = _treeView.getRoot(); HTREEITEM root = _treeView.getRoot();
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string newProjectLabel = pNativeSpeaker->getProjectPanelLangStr("NewProjectName", PM_NEWPROJECTNAME); generic_string newProjectLabel = pNativeSpeaker->getAttrNameStr(PM_NEWPROJECTNAME, "ProjectManager", "NewProjectName");
HTREEITEM addedItem = _treeView.addItem(newProjectLabel.c_str(), root, INDEX_PROJECT); HTREEITEM addedItem = _treeView.addItem(newProjectLabel.c_str(), root, INDEX_PROJECT);
setWorkSpaceDirty(true); setWorkSpaceDirty(true);
_treeView.expand(hTreeItem); _treeView.expand(hTreeItem);
@ -868,7 +868,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
case IDM_PROJECT_NEWFOLDER : case IDM_PROJECT_NEWFOLDER :
{ {
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string newFolderLabel = pNativeSpeaker->getProjectPanelLangStr("NewFolderName", PM_NEWFOLDERNAME); generic_string newFolderLabel = pNativeSpeaker->getAttrNameStr(PM_NEWFOLDERNAME, "ProjectManager", "NewFolderName");
addFolder(hTreeItem, newFolderLabel.c_str()); addFolder(hTreeItem, newFolderLabel.c_str());
setWorkSpaceDirty(true); setWorkSpaceDirty(true);
} }

185
PowerEditor/src/localization.cpp
View File

@ -84,9 +84,7 @@ generic_string NativeLangSpeaker::getSpecialMenuEntryName(const char *entryName)
if (!entriesRoot) return TEXT(""); if (!entriesRoot) return TEXT("");
const char *idName = NULL; const char *idName = NULL;
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
#endif
for (TiXmlNodeA *childNode = entriesRoot->FirstChildElement("Item"); for (TiXmlNodeA *childNode = entriesRoot->FirstChildElement("Item");
childNode ; childNode ;
@ -100,11 +98,7 @@ generic_string NativeLangSpeaker::getSpecialMenuEntryName(const char *entryName)
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
if (!strcmp(idName, entryName)) if (!strcmp(idName, entryName))
{ {
#ifdef UNICODE
return wmc->char2wchar(name, _nativeLangEncoding); return wmc->char2wchar(name, _nativeLangEncoding);
#else
return name;
#endif
} }
} }
} }
@ -125,9 +119,7 @@ generic_string NativeLangSpeaker::getNativeLangMenuString(int itemID)
node = node->FirstChild("Commands"); node = node->FirstChild("Commands");
if (!node) return TEXT(""); if (!node) return TEXT("");
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
#endif
for (TiXmlNodeA *childNode = node->FirstChildElement("Item"); for (TiXmlNodeA *childNode = node->FirstChildElement("Item");
childNode ; childNode ;
@ -140,11 +132,7 @@ generic_string NativeLangSpeaker::getNativeLangMenuString(int itemID)
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
if (name) if (name)
{ {
#ifdef UNICODE
return wmc->char2wchar(name, _nativeLangEncoding); return wmc->char2wchar(name, _nativeLangEncoding);
#else
return name;
#endif
} }
} }
} }
@ -156,7 +144,6 @@ struct MenuPosition {
int _y; int _y;
int _z; int _z;
char _id[64]; char _id[64];
//MenuPosition(): _x(-1), _y(-1), _z(-1){_id[0] = '\0';};
}; };
MenuPosition menuPos[] = { MenuPosition menuPos[] = {
@ -245,9 +232,7 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
if (!entriesRoot) return; if (!entriesRoot) return;
const char *idName = NULL; const char *idName = NULL;
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
#endif
for (TiXmlNodeA *childNode = entriesRoot->FirstChildElement("Item"); for (TiXmlNodeA *childNode = entriesRoot->FirstChildElement("Item");
childNode ; childNode ;
@ -261,13 +246,8 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
if (menuPos._x != -1) if (menuPos._x != -1)
{ {
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
::ModifyMenu(menuHandle, menuPos._x, MF_BYPOSITION, 0, nameW); ::ModifyMenu(menuHandle, menuPos._x, MF_BYPOSITION, 0, nameW);
#else
::ModifyMenu(menuHandle, menuPos._x, MF_BYPOSITION, 0, name);
#endif
} }
} }
else else
@ -278,21 +258,13 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
if (!strcmp(idName, "Plugins")) if (!strcmp(idName, "Plugins"))
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
pluginsTrans = nameW; pluginsTrans = nameW;
#else
pluginsTrans = name;
#endif
} }
else if (!strcmp(idName, "Window")) else if (!strcmp(idName, "Window"))
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
windowTrans = nameW; windowTrans = nameW;
#else
windowTrans = name;
#endif
} }
} }
} }
@ -308,12 +280,8 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
element->Attribute("id", &id); element->Attribute("id", &id);
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
::ModifyMenu(menuHandle, id, MF_BYCOMMAND, id, nameW); ::ModifyMenu(menuHandle, id, MF_BYCOMMAND, id, nameW);
#else
::ModifyMenu(menuHandle, id, MF_BYCOMMAND, id, name);
#endif
} }
TiXmlNodeA *subEntriesRoot = mainMenu->FirstChild("SubEntries"); TiXmlNodeA *subEntriesRoot = mainMenu->FirstChild("SubEntries");
@ -356,13 +324,9 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
hMenu = hSubMenu2; hMenu = hSubMenu2;
pos = z; pos = z;
} }
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
::ModifyMenu(hMenu, pos, MF_BYPOSITION, 0, nameW); ::ModifyMenu(hMenu, pos, MF_BYPOSITION, 0, nameW);
#else
::ModifyMenu(hMenu, pos, MF_BYPOSITION, 0, name);
#endif
} }
} }
@ -453,8 +417,7 @@ void NativeLangSpeaker::changeLangTabDrapContextMenu(HMENU hCM)
cloneToViewA = element->Attribute("name"); cloneToViewA = element->Attribute("name");
} }
} }
//HMENU hCM = _tabPopupDropMenu.getMenuHandle();
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
if (goToViewA && goToViewA[0]) if (goToViewA && goToViewA[0])
{ {
@ -468,18 +431,6 @@ void NativeLangSpeaker::changeLangTabDrapContextMenu(HMENU hCM)
int cmdID = ::GetMenuItemID(hCM, POS_CLONE2VIEW); int cmdID = ::GetMenuItemID(hCM, POS_CLONE2VIEW);
::ModifyMenu(hCM, POS_CLONE2VIEW, MF_BYPOSITION|MF_STRING, cmdID, cloneToViewG); ::ModifyMenu(hCM, POS_CLONE2VIEW, MF_BYPOSITION|MF_STRING, cmdID, cloneToViewG);
} }
#else
if (goToViewA && goToViewA[0])
{
int cmdID = ::GetMenuItemID(hCM, POS_GO2VIEW);
::ModifyMenu(hCM, POS_GO2VIEW, MF_BYPOSITION, cmdID, goToViewA);
}
if (cloneToViewA && cloneToViewA[0])
{
int cmdID = ::GetMenuItemID(hCM, POS_CLONE2VIEW);
::ModifyMenu(hCM, POS_CLONE2VIEW, MF_BYPOSITION, cmdID, cloneToViewA);
}
#endif
} }
} }
@ -493,23 +444,15 @@ void NativeLangSpeaker::changeConfigLang(HWND hDlg)
styleConfDlgNode = styleConfDlgNode->FirstChild("StyleConfig"); styleConfDlgNode = styleConfDlgNode->FirstChild("StyleConfig");
if (!styleConfDlgNode) return; if (!styleConfDlgNode) return;
//HWND hDlg = _configStyleDlg.getHSelf();
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
#endif
// Set Title // Set Title
const char *titre = (styleConfDlgNode->ToElement())->Attribute("title"); const char *titre = (styleConfDlgNode->ToElement())->Attribute("title");
if ((titre && titre[0]) && hDlg) if ((titre && titre[0]) && hDlg)
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
::SetWindowText(hDlg, nameW); ::SetWindowText(hDlg, nameW);
#else
::SetWindowText(hDlg, titre);
#endif
} }
for (TiXmlNodeA *childNode = styleConfDlgNode->FirstChildElement("Item"); for (TiXmlNodeA *childNode = styleConfDlgNode->FirstChildElement("Item");
childNode ; childNode ;
@ -524,12 +467,8 @@ void NativeLangSpeaker::changeConfigLang(HWND hDlg)
HWND hItem = ::GetDlgItem(hDlg, id); HWND hItem = ::GetDlgItem(hDlg, id);
if (hItem) if (hItem)
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
::SetWindowText(hItem, nameW); ::SetWindowText(hItem, nameW);
#else
::SetWindowText(hItem, name);
#endif
} }
} }
} }
@ -548,12 +487,8 @@ void NativeLangSpeaker::changeConfigLang(HWND hDlg)
HWND hItem = ::GetDlgItem(hDlg, id); HWND hItem = ::GetDlgItem(hDlg, id);
if (hItem) if (hItem)
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
::SetWindowText(hItem, nameW); ::SetWindowText(hItem, nameW);
#else
::SetWindowText(hItem, name);
#endif
} }
} }
} }
@ -573,14 +508,9 @@ void NativeLangSpeaker::changeStyleCtrlsLang(HWND hDlg, int *idArray, const char
hItem = ::GetDlgItem(hDlg, idArray[i]); hItem = ::GetDlgItem(hDlg, idArray[i]);
if (hItem) if (hItem)
{ {
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
const wchar_t *nameW = wmc->char2wchar(translatedText[i], _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(translatedText[i], _nativeLangEncoding);
::SetWindowText(hItem, nameW); ::SetWindowText(hItem, nameW);
#else
::SetWindowText(hItem, translatedText[i]);
#endif
} }
} }
} }
@ -639,20 +569,15 @@ void NativeLangSpeaker::changeUserDefineLang(UserDefineDialog *userDefineDlg)
if (!userDefineDlgNode) return; if (!userDefineDlgNode) return;
HWND hDlg = userDefineDlg->getHSelf(); HWND hDlg = userDefineDlg->getHSelf();
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
#endif
// Set Title // Set Title
const char *titre = (userDefineDlgNode->ToElement())->Attribute("title"); const char *titre = (userDefineDlgNode->ToElement())->Attribute("title");
if (titre && titre[0]) if (titre && titre[0])
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
::SetWindowText(hDlg, nameW); ::SetWindowText(hDlg, nameW);
#else
::SetWindowText(hDlg, titre);
#endif
} }
// for each control // for each control
const int nbControl = 9; const int nbControl = 9;
@ -676,12 +601,8 @@ void NativeLangSpeaker::changeUserDefineLang(UserDefineDialog *userDefineDlg)
HWND hItem = ::GetDlgItem(hDlg, id); HWND hItem = ::GetDlgItem(hDlg, id);
if (hItem) if (hItem)
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
::SetWindowText(hItem, nameW); ::SetWindowText(hItem, nameW);
#else
::SetWindowText(hItem, name);
#endif
} }
} }
else else
@ -706,18 +627,6 @@ void NativeLangSpeaker::changeUserDefineLang(UserDefineDialog *userDefineDlg)
for (int i = 0 ; i < nbDlg ; ++i) for (int i = 0 ; i < nbDlg ; ++i)
{ {
/*
for (int j = 0 ; j < nbGpArray[i] ; j++)
{
switch (i)
{
case 0 : changeStyleCtrlsLang(hDlgArrary[i], folderID[j], translatedText); break;
case 1 : changeStyleCtrlsLang(hDlgArrary[i], keywordsID[j], translatedText); break;
case 2 : changeStyleCtrlsLang(hDlgArrary[i], commentID[j], translatedText); break;
case 3 : changeStyleCtrlsLang(hDlgArrary[i], operatorID[j], translatedText); break;
}
}
*/
TiXmlNodeA *node = userDefineDlgNode->FirstChild(nodeNameArray[i]); TiXmlNodeA *node = userDefineDlgNode->FirstChild(nodeNameArray[i]);
if (node) if (node)
@ -726,12 +635,8 @@ void NativeLangSpeaker::changeUserDefineLang(UserDefineDialog *userDefineDlg)
titre = (node->ToElement())->Attribute("title"); titre = (node->ToElement())->Attribute("title");
if (titre &&titre[0]) if (titre &&titre[0])
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
userDefineDlg->setTabName(i, nameW); userDefineDlg->setTabName(i, nameW);
#else
userDefineDlg->setTabName(i, titre);
#endif
} }
for (TiXmlNodeA *childNode = node->FirstChildElement("Item"); for (TiXmlNodeA *childNode = node->FirstChildElement("Item");
childNode ; childNode ;
@ -746,12 +651,8 @@ void NativeLangSpeaker::changeUserDefineLang(UserDefineDialog *userDefineDlg)
HWND hItem = ::GetDlgItem(hDlgArrary[i], id); HWND hItem = ::GetDlgItem(hDlgArrary[i], id);
if (hItem) if (hItem)
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(name, _nativeLangEncoding);
::SetWindowText(hItem, nameW); ::SetWindowText(hItem, nameW);
#else
::SetWindowText(hItem, name);
#endif
} }
} }
} }
@ -774,7 +675,7 @@ void NativeLangSpeaker::changeFindReplaceDlgLang(FindReplaceDlg & findReplaceDlg
const char *titre2 = (dlgNode->ToElement())->Attribute("titleReplace"); const char *titre2 = (dlgNode->ToElement())->Attribute("titleReplace");
const char *titre3 = (dlgNode->ToElement())->Attribute("titleFindInFiles"); const char *titre3 = (dlgNode->ToElement())->Attribute("titleFindInFiles");
const char *titre4 = (dlgNode->ToElement())->Attribute("titleMark"); const char *titre4 = (dlgNode->ToElement())->Attribute("titleMark");
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
if (titre1 && titre1[0]) if (titre1 && titre1[0])
@ -801,28 +702,6 @@ void NativeLangSpeaker::changeFindReplaceDlgLang(FindReplaceDlg & findReplaceDlg
pNppParam->getFindDlgTabTitiles()._mark = nameW; pNppParam->getFindDlgTabTitiles()._mark = nameW;
findReplaceDlg.changeTabName(MARK_DLG, pNppParam->getFindDlgTabTitiles()._mark.c_str()); findReplaceDlg.changeTabName(MARK_DLG, pNppParam->getFindDlgTabTitiles()._mark.c_str());
} }
#else
if (titre1 && titre1[0])
{
pNppParam->getFindDlgTabTitiles()._find = titre1;
findReplaceDlg.changeTabName(FIND_DLG, pNppParam->getFindDlgTabTitiles()._find.c_str());
}
if (titre2 && titre2[0])
{
pNppParam->getFindDlgTabTitiles()._replace = titre2;
findReplaceDlg.changeTabName(REPLACE_DLG, pNppParam->getFindDlgTabTitiles()._replace.c_str());
}
if (titre3 && titre3[0])
{
pNppParam->getFindDlgTabTitiles()._findInFiles = titre3;
findReplaceDlg.changeTabName(FINDINFILES_DLG, pNppParam->getFindDlgTabTitiles()._findInFiles.c_str());
}
if (titre4 && titre4[0])
{
pNppParam->getFindDlgTabTitiles()._mark = titre4;
findReplaceDlg.changeTabName(MARK_DLG, pNppParam->getFindDlgTabTitiles()._mark.c_str());
}
#endif
} }
} }
} }
@ -966,13 +845,9 @@ void NativeLangSpeaker::changeShortcutLang()
CommandShortcut & csc = mainshortcuts[index]; CommandShortcut & csc = mainshortcuts[index];
if (csc.getID() == (unsigned long)id) if (csc.getID() == (unsigned long)id)
{ {
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
const wchar_t * nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t * nameW = wmc->char2wchar(name, _nativeLangEncoding);
csc.setName(nameW); csc.setName(nameW);
#else
csc.setName(name);
#endif
} }
} }
} }
@ -999,13 +874,10 @@ void NativeLangSpeaker::changeShortcutLang()
if (index > -1 && index < scinSize) { //valid index only if (index > -1 && index < scinSize) { //valid index only
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
ScintillaKeyMap & skm = scinshortcuts[index]; ScintillaKeyMap & skm = scinshortcuts[index];
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
const wchar_t * nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t * nameW = wmc->char2wchar(name, _nativeLangEncoding);
skm.setName(nameW); skm.setName(nameW);
#else
skm.setName(name);
#endif
} }
} }
} }
@ -1034,13 +906,9 @@ void NativeLangSpeaker::changeShortcutmapperLang(ShortcutMapper * sm)
{ {
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
const wchar_t * nameW = wmc->char2wchar(name, _nativeLangEncoding); const wchar_t * nameW = wmc->char2wchar(name, _nativeLangEncoding);
sm->translateTab(index, nameW); sm->translateTab(index, nameW);
#else
sm->translateTab(index, name);
#endif
} }
} }
} }
@ -1173,24 +1041,6 @@ generic_string NativeLangSpeaker::getProjectPanelLangMenuStr(const char * nodeNa
return defaultStr; return defaultStr;
} }
generic_string NativeLangSpeaker::getProjectPanelLangStr(const char *nodeName, const TCHAR *defaultStr) const
{
if (!_nativeLangA) return defaultStr;
TiXmlNodeA *targetNode = _nativeLangA->FirstChild("ProjectManager");
if (!targetNode) return defaultStr;
targetNode = targetNode->FirstChild(nodeName);
if (!targetNode) return defaultStr;
const char *name = (targetNode->ToElement())->Attribute("name");
if (name && name[0])
{
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
return wmc->char2wchar(name, _nativeLangEncoding);
}
return defaultStr;
}
generic_string NativeLangSpeaker::getAttrNameStr(const TCHAR *defaultStr, const char *nodeL1Name, const char *nodeL2Name) const generic_string NativeLangSpeaker::getAttrNameStr(const TCHAR *defaultStr, const char *nodeL1Name, const char *nodeL2Name) const
{ {
if (!_nativeLangA) return defaultStr; if (!_nativeLangA) return defaultStr;
@ -1211,25 +1061,6 @@ generic_string NativeLangSpeaker::getAttrNameStr(const TCHAR *defaultStr, const
return defaultStr; return defaultStr;
} }
generic_string NativeLangSpeaker::getFunctionListPanelLangStr(const char *nodeName, const TCHAR *defaultStr) const
{
if (!_nativeLangA) return defaultStr;
TiXmlNodeA *targetNode = _nativeLangA->FirstChild("FunctionList");
if (!targetNode) return defaultStr;
targetNode = targetNode->FirstChild(nodeName);
if (!targetNode) return defaultStr;
// Set Title
const char *name = (targetNode->ToElement())->Attribute("name");
if (name && name[0])
{
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
return wmc->char2wchar(name, _nativeLangEncoding);
}
return defaultStr;
}
int NativeLangSpeaker::messageBox(const char *msgBoxTagName, HWND hWnd, TCHAR *defaultMessage, TCHAR *defaultTitle, int msgBoxType, int intInfo, TCHAR *strInfo) int NativeLangSpeaker::messageBox(const char *msgBoxTagName, HWND hWnd, TCHAR *defaultMessage, TCHAR *defaultTitle, int msgBoxType, int intInfo, TCHAR *strInfo)
{ {
generic_string msg, title; generic_string msg, title;
@ -1267,12 +1098,4 @@ int NativeLangSpeaker::messageBox(const char *msgBoxTagName, HWND hWnd, TCHAR *d
msg.replace(index, strPlaceHolderLen, strInfo); msg.replace(index, strPlaceHolderLen, strInfo);
} }
return ::MessageBox(hWnd, msg.c_str(), title.c_str(), msgBoxType); return ::MessageBox(hWnd, msg.c_str(), title.c_str(), msgBoxType);
/*
defaultTitle.replace(index, len, int2Write);
defaultTitle.replace(index, len, str2Write);
defaultMessage.replace(index, len, int2Write);
defaultMessage.replace(index, len, str2Write);
return ::MessageBox(hWnd, defaultMessage, defaultTitle, msgBoxType);
*/
} }

3
PowerEditor/src/localization.h
View File

@ -74,8 +74,7 @@ public:
}; };
bool getMsgBoxLang(const char *msgBoxTagName, generic_string & title, generic_string & message); bool getMsgBoxLang(const char *msgBoxTagName, generic_string & title, generic_string & message);
generic_string getProjectPanelLangMenuStr(const char * nodeName, int cmdID, const TCHAR *defaultStr) const; generic_string getProjectPanelLangMenuStr(const char * nodeName, int cmdID, const TCHAR *defaultStr) const;
generic_string getProjectPanelLangStr(const char *nodeName, const TCHAR *defaultStr) const; //generic_string getFunctionListPanelLangStr(const char *nodeName, const TCHAR *defaultStr) const;
generic_string getFunctionListPanelLangStr(const char *nodeName, const TCHAR *defaultStr) const;
generic_string getAttrNameStr(const TCHAR *defaultStr, const char *nodeL1Name, const char *nodeL2Name = NULL) const; generic_string getAttrNameStr(const TCHAR *defaultStr, const char *nodeL1Name, const char *nodeL2Name = NULL) const;
int messageBox(const char *msgBoxTagName, HWND hWnd, TCHAR *message, TCHAR *title, int msgBoxType, int intInfo = 0, TCHAR *strInfo = NULL); int messageBox(const char *msgBoxTagName, HWND hWnd, TCHAR *message, TCHAR *title, int msgBoxType, int intInfo = 0, TCHAR *strInfo = NULL);
private: private:

4
PowerEditor/src/menuCmdID.h
View File

@ -40,7 +40,7 @@
#define IDM_FILE_SAVE (IDM_FILE + 6) #define IDM_FILE_SAVE (IDM_FILE + 6)
#define IDM_FILE_SAVEALL (IDM_FILE + 7) #define IDM_FILE_SAVEALL (IDM_FILE + 7)
#define IDM_FILE_SAVEAS (IDM_FILE + 8) #define IDM_FILE_SAVEAS (IDM_FILE + 8)
#define IDM_FILE_CLOSEALL_TOLEFT (IDM_FILE + 9) #define IDM_FILE_CLOSEALL_TOLEFT (IDM_FILE + 9)
#define IDM_FILE_PRINT (IDM_FILE + 10) #define IDM_FILE_PRINT (IDM_FILE + 10)
#define IDM_FILE_PRINTNOW 1001 #define IDM_FILE_PRINTNOW 1001
#define IDM_FILE_EXIT (IDM_FILE + 11) #define IDM_FILE_EXIT (IDM_FILE + 11)
@ -50,7 +50,7 @@
#define IDM_FILE_SAVECOPYAS (IDM_FILE + 15) #define IDM_FILE_SAVECOPYAS (IDM_FILE + 15)
#define IDM_FILE_DELETE (IDM_FILE + 16) #define IDM_FILE_DELETE (IDM_FILE + 16)
#define IDM_FILE_RENAME (IDM_FILE + 17) #define IDM_FILE_RENAME (IDM_FILE + 17)
#define IDM_FILE_CLOSEALL_TORIGHT (IDM_FILE + 18) #define IDM_FILE_CLOSEALL_TORIGHT (IDM_FILE + 18)
// To be updated if new menu item(s) is (are) added in menu "File" // To be updated if new menu item(s) is (are) added in menu "File"
#define IDM_FILEMENU_LASTONE IDM_FILE_CLOSEALL_TORIGHT #define IDM_FILEMENU_LASTONE IDM_FILE_CLOSEALL_TORIGHT