From b6b11d9f6d8117d20ebdafa8c0f6aeb4901fab6b Mon Sep 17 00:00:00 2001 From: Don Ho Date: Fri, 14 Oct 2016 09:26:28 +0200 Subject: [PATCH] Update english.xml Update english.xml, chinese.xml and french.xml --- PowerEditor/installer/nativeLang/chinese.xml | 40 +++++++++---------- PowerEditor/installer/nativeLang/english.xml | 28 +++++++------ PowerEditor/installer/nativeLang/french.xml | 30 +++++++------- .../src/WinControls/Preference/preference.rc | 15 +++---- .../WinControls/Preference/preferenceDlg.cpp | 12 +++--- .../WinControls/Preference/preferenceDlg.h | 6 +-- .../WinControls/Preference/preference_rc.h | 2 +- PowerEditor/src/localization.cpp | 8 ++-- 8 files changed, 72 insertions(+), 69 deletions(-) diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index af74acdc5..2f3fd7c40 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -618,24 +618,20 @@ - - - - + - @@ -696,27 +692,36 @@ - - + + - + - - - - + - + + + + + + + + + + + + + @@ -836,14 +841,7 @@ - - - - - - - - + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 1d5391748..e5628f87f 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -698,19 +698,28 @@ - + - - - - + - + + + + + + + + + + + + + @@ -832,14 +841,7 @@ - - - - - - - diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 25db89762..5f56518e7 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -676,26 +676,35 @@ - - + + - + - - - + - + + + + + + + + + + + + @@ -818,14 +827,7 @@ - - - - - - - diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 77c2e06ef..aa843ad7e 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -225,19 +225,20 @@ BEGIN CONTROL "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,295,149,100,10 END -IDD_PREFERENCE_TABSETTINGS_BOX DIALOGEX 0, 0, 455, 185 +IDD_PREFERENCE_HILITE_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN + GROUPBOX "Smart Highlighting",IDC_SMARTHILITING_STATIC,147,21,155,67,BS_CENTER CONTROL "Enable",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,31,142,10 CONTROL "Match case",IDC_CHECK_SMARTHILITECASESENSITIVE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,45,142,10 - GROUPBOX "Smart Highlighting",IDC_SMARTHILITING_STATIC,147,21,155,66,BS_CENTER - CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,156,120,140,10 - CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,156,132,140,10 - CONTROL "Highlight comment/php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,156,145,140,10 - GROUPBOX "Highlight Matching Tags",IDC_TAGMATCHEDHILITE_STATIC,148,110,155,50,BS_CENTER CONTROL "Match whole word only",IDC_CHECK_SMARTHILITEWHOLEWORDONLY, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,58,142,10 - CONTROL "Use Find dialog settings",IDC_CHECK_SMARTHILITEUSEFINDSETTINGS, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,71,142,10 + CONTROL "Use Find dialog settings",IDC_CHECK_SMARTHILITEUSEFINDSETTINGS, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,72,142,10 + + GROUPBOX "Highlight Matching Tags",IDC_TAGMATCHEDHILITE_STATIC,147,110,155,55,BS_CENTER + CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,120,140,10 + CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,134,140,10 + CONTROL "Highlight comment/php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,155,148,140,10 END IDD_PREFERENCE_PRINT_BOX DIALOGEX 0, 0, 455, 185 diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 1e42bc4cf..06c14cfdb 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -129,8 +129,8 @@ INT_PTR CALLBACK PreferenceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM _langMenuDlg.init(_hInst, _hSelf); _langMenuDlg.create(IDD_PREFERENCE_LANG_BOX, false, false); - _tabSettings.init(_hInst, _hSelf); - _tabSettings.create(IDD_PREFERENCE_TABSETTINGS_BOX, false, false); + _highlighting.init(_hInst, _hSelf); + _highlighting.create(IDD_PREFERENCE_HILITE_BOX, false, false); _backupDlg.init(_hInst, _hSelf); _backupDlg.create(IDD_PREFERENCE_BACKUP_BOX, false, false); @@ -158,7 +158,7 @@ INT_PTR CALLBACK PreferenceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM _wVector.push_back(DlgInfo(&_recentFilesHistoryDlg, TEXT("Recent Files History"), TEXT("RecentFilesHistory"))); _wVector.push_back(DlgInfo(&_fileAssocDlg, TEXT("File Association"), TEXT("FileAssoc"))); _wVector.push_back(DlgInfo(&_langMenuDlg, TEXT("Language"), TEXT("Language"))); - _wVector.push_back(DlgInfo(&_tabSettings, TEXT("Highlighting"), TEXT("Highlighting"))); + _wVector.push_back(DlgInfo(&_highlighting, TEXT("Highlighting"), TEXT("Highlighting"))); _wVector.push_back(DlgInfo(&_printSettingsDlg, TEXT("Print"), TEXT("Print"))); _wVector.push_back(DlgInfo(&_backupDlg, TEXT("Backup"), TEXT("Backup"))); _wVector.push_back(DlgInfo(&_autoCompletionDlg, TEXT("Auto-Completion"), TEXT("AutoCompletion"))); @@ -185,7 +185,7 @@ INT_PTR CALLBACK PreferenceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM _recentFilesHistoryDlg.reSizeTo(rc); _fileAssocDlg.reSizeTo(rc); _langMenuDlg.reSizeTo(rc); - _tabSettings.reSizeTo(rc); + _highlighting.reSizeTo(rc); _printSettingsDlg.reSizeTo(rc); _backupDlg.reSizeTo(rc); _autoCompletionDlg.reSizeTo(rc); @@ -326,7 +326,7 @@ void PreferenceDlg::destroy() _settingsDlg.destroy(); _fileAssocDlg.destroy(); _langMenuDlg.destroy(); - _tabSettings.destroy(); + _highlighting.destroy(); _printSettingsDlg.destroy(); _defaultNewDocDlg.destroy(); _defaultDirectoryDlg.destroy(); @@ -1907,7 +1907,7 @@ INT_PTR CALLBACK LangMenuDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP return FALSE; } -INT_PTR CALLBACK TabSettings::run_dlgProc(UINT message, WPARAM wParam, LPARAM/* lParam*/) +INT_PTR CALLBACK Highlighting::run_dlgProc(UINT message, WPARAM wParam, LPARAM/* lParam*/) { NppParameters *pNppParam = NppParameters::getInstance(); NppGUI & nppGUI = (NppGUI & )pNppParam->getNppGUI(); diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.h b/PowerEditor/src/WinControls/Preference/preferenceDlg.h index adac760b7..472eec1c2 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.h +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.h @@ -128,10 +128,10 @@ private : std::vector _langList; }; -class TabSettings : public StaticDialog +class Highlighting : public StaticDialog { public : - TabSettings() {}; + Highlighting() {}; private : @@ -256,7 +256,7 @@ private : SettingsDlg _settingsDlg; RegExtDlg _fileAssocDlg; LangMenuDlg _langMenuDlg; - TabSettings _tabSettings; + Highlighting _highlighting; PrintSettingsDlg _printSettingsDlg; DefaultNewDocDlg _defaultNewDocDlg; DefaultDirectoryDlg _defaultDirectoryDlg; diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index 3884bce19..0a980c858 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -242,7 +242,7 @@ #define IDC_CHECK_DEFAULTTABVALUE (IDD_PREFERENCE_LANG_BOX + 10) #define IDC_GR_TABVALUE_STATIC (IDD_PREFERENCE_LANG_BOX + 11) #define IDC_TABSIZEVAL_DISABLE_STATIC (IDD_PREFERENCE_LANG_BOX + 12) -#define IDD_PREFERENCE_TABSETTINGS_BOX 6550 //(IDD_PREFERENCE_BOX + 500) +#define IDD_PREFERENCE_HILITE_BOX 6550 //(IDD_PREFERENCE_BOX + 500) #define IDD_PREFERENCE_PRINT_BOX 6600 //(IDD_PREFERENCE_BOX + 600) #define IDC_CHECK_PRINTLINENUM (IDD_PREFERENCE_PRINT_BOX + 1) diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp index 60b99f82a..915e6c971 100644 --- a/PowerEditor/src/localization.cpp +++ b/PowerEditor/src/localization.cpp @@ -770,18 +770,18 @@ void NativeLangSpeaker::changePrefereceDlgLang(PreferenceDlg & preference) preference.renameDialogTitle(TEXT("FileAssoc"), nameW); } - changeDlgLang(preference._langMenuDlg.getHSelf(), "LangMenu", titre); + changeDlgLang(preference._langMenuDlg.getHSelf(), "Language", titre); if (titre[0] != '\0') { const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); - preference.renameDialogTitle(TEXT("LangMenu"), nameW); + preference.renameDialogTitle(TEXT("Language"), nameW); } - changeDlgLang(preference._tabSettings.getHSelf(), "TabSettings", titre); + changeDlgLang(preference._highlighting.getHSelf(), "Highlighting", titre); if (titre[0] != '\0') { const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); - preference.renameDialogTitle(TEXT("TabSettings"), nameW); + preference.renameDialogTitle(TEXT("Highlighting"), nameW); } changeDlgLang(preference._printSettingsDlg.getHSelf(), "Print", titre);