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

[MODIF] Change Preferences dialog interface: use list instead of tab to switch among the dialogs.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1061 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-06-25 17:50:51 +00:00
parent 197a28d1bd
commit e1423c27d4
6 changed files with 917 additions and 471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -33,17 +33,18 @@
#define IDC_STATIC -1 #define IDC_STATIC -1
#endif #endif
IDD_PREFERENCE_BOX DIALOGEX 0, 0, 470, 235 IDD_PREFERENCE_BOX DIALOGEX 0, 0, 560, 220
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
CAPTION "Preferences" CAPTION "Preferences"
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
PUSHBUTTON "Close",IDC_BUTTON_CLOSE,213,212,45,14 LISTBOX IDC_LIST_DLGTITLE,10,10,80,185,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "Close",IDC_BUTTON_CLOSE,255,200,45,14
END END
IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 455, 185 IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | DS_CONTROL STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
GROUPBOX "Toolbar",IDC_TOOLBAR_GB_STATIC,57,45,147,68,BS_CENTER GROUPBOX "Toolbar",IDC_TOOLBAR_GB_STATIC,57,45,147,68,BS_CENTER
@ -75,65 +76,73 @@ BEGIN
END END
IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 455, 185 IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | DS_CONTROL STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
GROUPBOX "Folder Margin Style",IDC_FMS_GB_STATIC,44,48,83,89,BS_CENTER GROUPBOX "Folder Margin Style",IDC_FMS_GB_STATIC,46,54,83,89,BS_CENTER
CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,53,61,59,10 CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,55,67,59,10
CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,53,75,60,10 CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,55,81,60,10
CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,53,90,62,10 CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,55,96,62,10
CONTROL "None",IDC_RADIO_FOLDMARGENONE,"Button",BS_AUTORADIOBUTTON,53,119,61,10 CONTROL "None",IDC_RADIO_FOLDMARGENONE,"Button",BS_AUTORADIOBUTTON,55,125,61,10
CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,53,104,61,10 CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,55,110,61,10
CONTROL "Display line number",IDC_CHECK_LINENUMBERMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,296,111,141,10 CONTROL "Display line number",IDC_CHECK_LINENUMBERMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,117,141,10
CONTROL "Display bookmark",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,296,124,150,10 CONTROL "Display bookmark",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,130,150,10
CONTROL "Enable current line highlighting",IDC_CHECK_CURRENTLINEHILITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,296,137,129,10 CONTROL "Enable current line highlighting",IDC_CHECK_CURRENTLINEHILITE,
CONTROL "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,60,122,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,143,129,10
RTEXT "Number of columns :",IDC_NBCOLONE_STATIC,146,108,83,8 CONTROL "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,66,122,10
LTEXT "0",IDC_COLONENUMBER_STATIC,236,107,18,8,SS_LEFT | WS_TABSTOP RTEXT "Number of columns :",IDC_NBCOLONE_STATIC,148,114,83,8
GROUPBOX "Vertical Edge Settings",IDC_VES_GB_STATIC,140,48,148,77,BS_CENTER LTEXT "0",IDC_COLONENUMBER_STATIC,238,113,18,8,WS_TABSTOP
CONTROL "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,154,76,91,10 GROUPBOX "Vertical Edge Settings",IDC_VES_GB_STATIC,142,54,148,77,BS_CENTER
CONTROL "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,154,90,91,10 CONTROL "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,156,82,91,10
GROUPBOX "Caret Settings",IDC_CARETSETTING_STATIC,44,5,199,40,BS_CENTER CONTROL "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,156,96,91,10
LTEXT "Width :",IDC_WIDTH_STATIC,48,24,37,8,0,WS_EX_RIGHT GROUPBOX "Caret Settings",IDC_CARETSETTING_STATIC,46,11,199,40,BS_CENTER
COMBOBOX IDC_WIDTH_COMBO,87,22,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Width :",IDC_WIDTH_STATIC,50,30,37,8,0,WS_EX_RIGHT
LTEXT "Blink rate :",IDC_BLINKRATE_STATIC,159,17,50,8 COMBOBOX IDC_WIDTH_COMBO,89,28,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,154,29,67,13 LTEXT "Blink rate :",IDC_BLINKRATE_STATIC,161,23,50,8
LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,223,29,12,8 CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,156,35,67,13
LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,142,29,12,8,0,WS_EX_RIGHT LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,225,35,12,8
GROUPBOX "Multi-Editing Settings",IDC_MULTISELECTION_GB_STATIC,251,5,140,40,BS_CENTER LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,144,35,12,8,0,WS_EX_RIGHT
GROUPBOX "Multi-Editing Settings",IDC_MULTISELECTION_GB_STATIC,253,11,140,40,BS_CENTER
CONTROL "Enable (Ctrl+Mouse click/selection)",IDC_CHECK_MULTISELECTION, CONTROL "Enable (Ctrl+Mouse click/selection)",IDC_CHECK_MULTISELECTION,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,259,22,130,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,28,130,10
GROUPBOX "Line Wrap",IDC_LW_GB_STATIC,299,48,92,56,BS_CENTER GROUPBOX "Line Wrap",IDC_LW_GB_STATIC,301,54,92,56,BS_CENTER
CONTROL "Default",IDC_RADIO_LWDEF,"Button",BS_AUTORADIOBUTTON | WS_GROUP,309,61,59,10 CONTROL "Default",IDC_RADIO_LWDEF,"Button",BS_AUTORADIOBUTTON | WS_GROUP,311,67,59,10
CONTROL "Aligned",IDC_RADIO_LWALIGN,"Button",BS_AUTORADIOBUTTON,309,75,60,10 CONTROL "Aligned",IDC_RADIO_LWALIGN,"Button",BS_AUTORADIOBUTTON,311,81,60,10
CONTROL "Indent",IDC_RADIO_LWINDENT,"Button",BS_AUTORADIOBUTTON,309,89,62,10 CONTROL "Indent",IDC_RADIO_LWINDENT,"Button",BS_AUTORADIOBUTTON,311,95,62,10
GROUPBOX "Border Width",IDC_BORDERWIDTH_STATIC,142,132,148,30,BS_CENTER
GROUPBOX "Border Width",IDC_BORDERWIDTH_STATIC,140,126,148,30,BS_CENTER CONTROL "",IDC_BORDERWIDTH_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,156,145,67,13
CONTROL "",IDC_BORDERWIDTH_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,154,139,67,13 LTEXT "0",IDC_BORDERWIDTHVAL_STATIC,225,145,12,8
LTEXT "0",IDC_BORDERWIDTHVAL_STATIC,223,139,12,8
END END
IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 455, 185 IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | DS_CONTROL STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,15,69,10 CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,15,69,10
CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,28,140,10 CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,28,140,10
CONTROL "Enable",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,45,57,142,10 CONTROL "Enable",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,45,57,142,10
CONTROL "Highlighting is case sensitive",IDC_CHECK_SMARTHILITECASESENSITIVE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,45,71,142,10 CONTROL "Highlighting is case sensitive",IDC_CHECK_SMARTHILITECASESENSITIVE,
CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,105,150,10 "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,45,71,142,10
CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,105,150,10
CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,120,150,10 CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,120,150,10
CONTROL "Minimize to system tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,135,150,10 CONTROL "Minimize to system tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,135,150,10
CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,150,217,10 CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE,
CONTROL "Remember current session for next launch",IDC_CHECK_REMEMBERSESSION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,165,217,10 "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,150,217,10
CONTROL "Remember current session for next launch",IDC_CHECK_REMEMBERSESSION,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,165,217,10
CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,15,140,10 CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,15,140,10
CONTROL "No underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,28,140,10 CONTROL "No underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,28,140,10
CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,57,140,10 CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,57,140,10
CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,69,140,10 CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,69,140,10
CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,81,140,10 CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,81,140,10
CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,267,111,140,10 CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,267,111,140,10
CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,267,123,140,10 CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE,
CONTROL "Highlight comment/php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,267,136,140,10 "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,267,123,140,10
CONTROL "Highlight comment/php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,267,136,140,10
EDITTEXT IDC_EDIT_SESSIONFILEEXT,381,157,34,14,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_SESSIONFILEEXT,381,157,34,14,ES_AUTOHSCROLL
GROUPBOX "Document Switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,37,4,155,39,BS_CENTER GROUPBOX "Document Switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,37,4,155,39,BS_CENTER
GROUPBOX "Smart Highlighting",IDC_SMARTHILITING_STATIC,37,47,155,39,BS_CENTER GROUPBOX "Smart Highlighting",IDC_SMARTHILITING_STATIC,37,47,155,39,BS_CENTER
@ -144,77 +153,91 @@ BEGIN
END END
IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 455, 185 IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | DS_CONTROL STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
GROUPBOX "New Document",IDC_NEWDOCUMENT_GR_STATIC,7,2,195,178,BS_CENTER GROUPBOX "New Document",IDC_NEWDOCUMENT_GR_STATIC,50,8,354,161,BS_CENTER
GROUPBOX "Format",IDC_FORMAT_GB_STATIC,68,29,129,79,BS_CENTER
GROUPBOX "Format",IDC_FORMAT_GB_STATIC,17,12,176,25,BS_CENTER CONTROL "Windows",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,75,48,50,10
CONTROL "Windows",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,27,23,50,10 CONTROL "Old Mac",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,75,64,50,10
CONTROL "Old Mac",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,80,23,50,10 CONTROL "Unix/OSX",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,75,81,50,10
CONTROL "Unix/OSX",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,135,23,50,10 GROUPBOX "Encoding",IDC_ENCODING_STATIC,212,28,175,122,BS_CENTER
CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,222,39,80,10
GROUPBOX "Encoding",IDC_ENCODING_STATIC,17,44,175,110,BS_CENTER CONTROL "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,222,53,128,10
CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,27,53,80,10
CONTROL "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,27,67,128,10
CONTROL "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,27,92,62,10
CONTROL "UCS-2 Big Endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,27,106,103,10
CONTROL "UCS-2 Little Endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,27,120,102,10
CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,27,135,10,10
COMBOBOX IDC_COMBO_OTHERCP,41,134,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,12,161,77,8
COMBOBOX IDC_COMBO_DEFAULTLANG,94,159,60,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Default Directory (Open/Save)",IDC_OPENSAVEDIR_GR_STATIC,213,2,232,63,BS_CENTER
CONTROL "Follow current document",IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO,
"Button",BS_AUTORADIOBUTTON | WS_GROUP,221,14,200,10
CONTROL "Remember last used directory",IDC_OPENSAVEDIR_REMEMBERLAST_RADIO,
"Button",BS_AUTORADIOBUTTON,221,29,217,10
CONTROL "",IDC_OPENSAVEDIR_ALWAYSON_RADIO,"Button",BS_AUTORADIOBUTTON,221,43,11,10
EDITTEXT IDC_OPENSAVEDIR_ALWAYSON_EDIT,237,42,179,14,ES_AUTOHSCROLL
PUSHBUTTON "...",IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON,423,41,16,14
CONTROL "Apply to opened ANSI files",IDC_CHECK_OPENANSIASUTF8, CONTROL "Apply to opened ANSI files",IDC_CHECK_OPENANSIASUTF8,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,79,124,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,65,124,10
GROUPBOX "Recent Files History",IDC_HISTORY_GB_STATIC,213,69,232,110,BS_CENTER CONTROL "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,222,79,62,10
RTEXT "Max. number of entries :",IDC_MAXNBFILE_STATIC,217,91,112,8 CONTROL "UCS-2 Big Endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,222,95,103,10
LTEXT "0",IDC_MAXNBFILEVAL_STATIC,338,91,15,8,SS_LEFT | WS_TABSTOP CONTROL "UCS-2 Little Endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,222,111,102,10
CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY, CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,222,126,10,10
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,221,78,140,10 COMBOBOX IDC_COMBO_OTHERCP,236,126,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Display",IDC_STATIC,226,103,207,69,BS_CENTER RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,57,130,77,8
CONTROL "In Submenu",IDC_CHECK_INSUBMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,114,79,10 COMBOBOX IDC_COMBO_DEFAULTLANG,139,128,60,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Only File Name",IDC_RADIO_ONLYFILENAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,235,130,88,10 END
CONTROL "Full File Name Path",IDC_RADIO_FULLFILENAMEPATH,"Button",BS_AUTORADIOBUTTON,235,144,109,10
CONTROL "Customize Maximum Length:",IDC_RADIO_CUSTOMIZELENTH,
"Button",BS_AUTORADIOBUTTON,235,157,114,10
LTEXT "0",IDC_CUSTOMIZELENGTHVAL_STATIC,353,158,18,8,SS_LEFT | WS_TABSTOP
IDD_PREFERENCE_DEFAULTDIRECTORY_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 "Default Directory (Open/Save)",IDC_OPENSAVEDIR_GR_STATIC,110,29,232,101,BS_CENTER
CONTROL "Follow current document",IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO,
"Button",BS_AUTORADIOBUTTON | WS_GROUP,118,60,200,10
CONTROL "Remember last used directory",IDC_OPENSAVEDIR_REMEMBERLAST_RADIO,
"Button",BS_AUTORADIOBUTTON,118,75,217,10
CONTROL "",IDC_OPENSAVEDIR_ALWAYSON_RADIO,"Button",BS_AUTORADIOBUTTON,118,89,11,10
EDITTEXT IDC_OPENSAVEDIR_ALWAYSON_EDIT,134,88,179,14,ES_AUTOHSCROLL
PUSHBUTTON "...",IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON,320,87,16,14
END
IDD_PREFERENCE_RECENTFILESHISTORY_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 "Recent Files History",IDC_HISTORY_GB_STATIC,104,25,260,126,BS_CENTER
RTEXT "Max. number of entries :",IDC_MAXNBFILE_STATIC,108,52,112,8
LTEXT "0",IDC_MAXNBFILEVAL_STATIC,229,52,15,8,WS_TABSTOP
CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,39,140,10
GROUPBOX "Display",IDC_STATIC,121,65,225,73,BS_CENTER
CONTROL "In Submenu",IDC_CHECK_INSUBMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,132,76,79,10
CONTROL "Only File Name",IDC_RADIO_ONLYFILENAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,133,92,88,10
CONTROL "Full File Name Path",IDC_RADIO_FULLFILENAMEPATH,"Button",BS_AUTORADIOBUTTON,133,106,109,10
CONTROL "Customize Maximum Length:",IDC_RADIO_CUSTOMIZELENTH,
"Button",BS_AUTORADIOBUTTON,133,120,114,10
LTEXT "0",IDC_CUSTOMIZELENGTHVAL_STATIC,251,120,18,8,WS_TABSTOP
END END
IDD_PREFERENCE_LANG_BOX DIALOGEX 0, 0, 455, 185 IDD_PREFERENCE_LANG_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | DS_CONTROL STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
GROUPBOX "Language Menu",IDC_CHECK_LANGMENU_GR_STATIC,37,3,220,172,BS_CENTER GROUPBOX "Language Menu",IDC_CHECK_LANGMENU_GR_STATIC,111,3,220,172,BS_CENTER
CONTROL "Make language menu compact",IDC_CHECK_LANGMENUCOMPACT, CONTROL "Make language menu compact",IDC_CHECK_LANGMENUCOMPACT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,51,14,174,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,14,174,10
CTEXT "Available items",IDC_ENABLEDITEMS_STATIC,55,31,72,8 CTEXT "Available items",IDC_ENABLEDITEMS_STATIC,129,31,72,8
LISTBOX IDC_LIST_ENABLEDLANG,50,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LISTBOX IDC_LIST_ENABLEDLANG,124,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "->",IDC_BUTTON_REMOVE,135,76,25,14 PUSHBUTTON "->",IDC_BUTTON_REMOVE,209,76,25,14
PUSHBUTTON "<-",IDC_BUTTON_RESTORE,135,107,25,14 PUSHBUTTON "<-",IDC_BUTTON_RESTORE,209,107,25,14
CTEXT "Disabled items",IDC_DISABLEDITEMS_STATIC,170,31,72,8 CTEXT "Disabled items",IDC_DISABLEDITEMS_STATIC,244,31,72,8
LISTBOX IDC_LIST_DISABLEDLANG,167,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LISTBOX IDC_LIST_DISABLEDLANG,241,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Tab Settings",IDC_TABSETTING_GB_STATIC,283,3,130,172,BS_CENTER END
LISTBOX IDC_LIST_TABSETTNG,305,18,84,100,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "",IDC_GR_TABVALUE_STATIC,295,125,110,42,BS_CENTER IDD_PREFERENCE_TABSETTINGS_BOX DIALOGEX 0, 0, 455, 185
CONTROL "Use default value",IDC_CHECK_DEFAULTTABVALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,291,125,85,10 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
RTEXT "Tab size : ",IDC_TABSIZE_STATIC,296,138,58,8 FONT 8, "MS Shell Dlg", 0, 0, 0x1
LTEXT "0",IDC_TABSIZEVAL_STATIC,356,138,18,8,SS_LEFT | WS_TABSTOP BEGIN
LTEXT "0",IDC_TABSIZEVAL_DISABLE_STATIC,356,138,18,8 GROUPBOX "Tab Settings",IDC_TABSETTING_GB_STATIC,156,3,130,172,BS_CENTER
CONTROL "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,303,149,100,10 LISTBOX IDC_LIST_TABSETTNG,178,18,84,100,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "",IDC_GR_TABVALUE_STATIC,168,125,110,42,BS_CENTER
CONTROL "Use default value",IDC_CHECK_DEFAULTTABVALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,125,85,10
RTEXT "Tab size : ",IDC_TABSIZE_STATIC,169,138,58,8
LTEXT "0",IDC_TABSIZEVAL_STATIC,229,138,18,8,WS_TABSTOP
LTEXT "0",IDC_TABSIZEVAL_DISABLE_STATIC,229,138,18,8
CONTROL "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,149,100,10
END END
IDD_PREFERENCE_PRINT_BOX DIALOGEX 0, 0, 455, 185 IDD_PREFERENCE_PRINT_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | DS_CONTROL STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
CONTROL "WYSIWYG",IDC_RADIO_WYSIWYG,"Button",BS_AUTORADIOBUTTON,12,30,123,10 CONTROL "WYSIWYG",IDC_RADIO_WYSIWYG,"Button",BS_AUTORADIOBUTTON,12,30,123,10
@ -262,37 +285,35 @@ BEGIN
GROUPBOX "Header and Footer",IDC_HEADERFPPTER_GR_STATIC,150,7,296,172,BS_CENTER GROUPBOX "Header and Footer",IDC_HEADERFPPTER_GR_STATIC,150,7,296,172,BS_CENTER
END END
/*
IDD_PREFERENCE_PRINT2_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
END
*/
IDD_PREFERENCE_BACKUP_BOX DIALOGEX 0, 0, 455, 185 IDD_PREFERENCE_BACKUP_BOX DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | DS_CONTROL STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
GROUPBOX "Backup",IDC_BACKUPDIR_GRP_STATIC,79,11,289,86,BS_CENTER GROUPBOX "Backup",IDC_BACKUPDIR_GRP_STATIC,79,19,289,128,BS_CENTER
CONTROL "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,104,24,87,10 CONTROL "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,104,32,87,10
CONTROL "Simple backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,228,24,111,10 CONTROL "Simple backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,104,46,111,10
CONTROL "Verbose backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,228,38,111,10 CONTROL "Verbose backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,104,60,111,10
GROUPBOX "Custom Backup Directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,95,50,260,40 GROUPBOX "Custom Backup Directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,95,87,260,40
CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,50,8,10 CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,87,8,10
RTEXT "Directory :",IDD_BACKUPDIR_STATIC,99,67,40,8 RTEXT "Directory :",IDD_BACKUPDIR_STATIC,99,98,40,8
EDITTEXT IDC_BACKUPDIR_EDIT,146,65,179,14,ES_AUTOHSCROLL EDITTEXT IDC_BACKUPDIR_EDIT,146,102,179,14,ES_AUTOHSCROLL
PUSHBUTTON "...",IDD_BACKUPDIR_BROWSE_BUTTON,332,65,16,14 PUSHBUTTON "...",IDD_BACKUPDIR_BROWSE_BUTTON,332,102,16,14
GROUPBOX "Auto-Completion",IDD_AUTOC_GRPSTATIC,79,103,289,73,BS_CENTER END
CONTROL "Enable auto-completion on each input",IDD_AUTOC_ENABLECHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,114,150,10 IDD_PREFERENCE_AUTOCOMPLETION_BOX DIALOGEX 0, 0, 455, 185
CONTROL "Function completion",IDD_AUTOC_FUNCRADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,128,145,10 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
CONTROL "Word completion",IDD_AUTOC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,111,144,145,10 FONT 8, "MS Shell Dlg", 0, 0, 0x1
RTEXT "From",IDD_AUTOC_STATIC_FROM,241,114,47,8 BEGIN
CTEXT "1",IDD_AUTOC_STATIC_N,292,114,8,8,SS_CENTER | WS_TABSTOP GROUPBOX "Auto-Completion",IDD_AUTOC_GRPSTATIC,86,40,289,92,BS_CENTER
LTEXT "th character",IDD_AUTOC_STATIC_CHAR,306,114,57,8 CONTROL "Enable auto-completion on each input",IDD_AUTOC_ENABLECHECK,
LTEXT "Valid value : 1 - 9",IDD_AUTOC_STATIC_NOTE,271,124,93,8 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,51,150,10
CONTROL "Function parameters hint on input",IDD_FUNC_CHECK, CONTROL "Function completion",IDD_AUTOC_FUNCRADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,118,65,145,10
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,156,160,10 CONTROL "Word completion",IDD_AUTOC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,118,81,145,10
RTEXT "From",IDD_AUTOC_STATIC_FROM,248,51,47,8
CTEXT "1",IDD_AUTOC_STATIC_N,299,51,8,8,WS_TABSTOP
LTEXT "th character",IDD_AUTOC_STATIC_CHAR,313,51,57,8
LTEXT "Valid value : 1 - 9",IDD_AUTOC_STATIC_NOTE,278,61,93,8
CONTROL "Function parameters hint on input",IDD_FUNC_CHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,103,160,10
END END

928
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

File diff suppressed because it is too large Load Diff

95
PowerEditor/src/WinControls/Preference/preferenceDlg.h
View File

@ -95,6 +95,54 @@ class DefaultNewDocDlg : public StaticDialog
{ {
public : public :
DefaultNewDocDlg() {}; DefaultNewDocDlg() {};
/*
virtual void destroy() {
_nbHistoryVal.destroy();
_customLenVal.destroy();
};
*/
private :
//URLCtrl _nbHistoryVal;
//URLCtrl _customLenVal;
std::vector<LangID_Name> _langList;
void makeOpenAnsiAsUtf8(bool doIt){
if (!doIt)
::SendDlgItemMessage(_hSelf, IDC_CHECK_OPENANSIASUTF8, BM_SETCHECK, BST_UNCHECKED, 0);
::EnableWindow(::GetDlgItem(_hSelf, IDC_CHECK_OPENANSIASUTF8), doIt);
};
//void setCustomLen(int val);
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
};
class DefaultDirectoryDlg : public StaticDialog
{
public :
DefaultDirectoryDlg() {};
/*
virtual void destroy() {
_nbHistoryVal.destroy();
_customLenVal.destroy();
};
*/
private :
//URLCtrl _nbHistoryVal;
//URLCtrl _customLenVal;
//std::vector<LangID_Name> _langList;
/*
void makeOpenAnsiAsUtf8(bool doIt){
if (!doIt)
::SendDlgItemMessage(_hSelf, IDC_CHECK_OPENANSIASUTF8, BM_SETCHECK, BST_UNCHECKED, 0);
::EnableWindow(::GetDlgItem(_hSelf, IDC_CHECK_OPENANSIASUTF8), doIt);
};
*/
//void setCustomLen(int val);
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
};
class RecentFilesHistoryDlg : public StaticDialog
{
public :
RecentFilesHistoryDlg() {};
virtual void destroy() { virtual void destroy() {
_nbHistoryVal.destroy(); _nbHistoryVal.destroy();
_customLenVal.destroy(); _customLenVal.destroy();
@ -103,11 +151,6 @@ private :
URLCtrl _nbHistoryVal; URLCtrl _nbHistoryVal;
URLCtrl _customLenVal; URLCtrl _customLenVal;
std::vector<LangID_Name> _langList; std::vector<LangID_Name> _langList;
void makeOpenAnsiAsUtf8(bool doIt){
if (!doIt)
::SendDlgItemMessage(_hSelf, IDC_CHECK_OPENANSIASUTF8, BM_SETCHECK, BST_UNCHECKED, 0);
::EnableWindow(::GetDlgItem(_hSelf, IDC_CHECK_OPENANSIASUTF8), doIt);
};
void setCustomLen(int val); void setCustomLen(int val);
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
}; };
@ -116,17 +159,33 @@ class LangMenuDlg : public StaticDialog
{ {
public : public :
LangMenuDlg() {}; LangMenuDlg() {};
/*
virtual void destroy() {
_tabSizeVal.destroy();
};
*/
private :
//URLCtrl _tabSizeVal;
LexerStylerArray _lsArray;
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
vector<LangMenuItem> _langList;
};
class TabSettings : public StaticDialog
{
public :
TabSettings() {};
virtual void destroy() { virtual void destroy() {
_tabSizeVal.destroy(); _tabSizeVal.destroy();
}; };
private : private :
URLCtrl _tabSizeVal; URLCtrl _tabSizeVal;
LexerStylerArray _lsArray;
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
vector<LangMenuItem> _langList;
}; };
struct strCouple { struct strCouple {
generic_string _varDesc; generic_string _varDesc;
generic_string _var; generic_string _var;
@ -150,12 +209,21 @@ class BackupDlg : public StaticDialog
public : public :
BackupDlg() {}; BackupDlg() {};
private : private :
URLCtrl _nbCharVal; //URLCtrl _nbCharVal;
void updateBackupGUI(); void updateBackupGUI();
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
}; };
class AutoCompletionDlg : public StaticDialog
{
public :
AutoCompletionDlg() {};
private :
URLCtrl _nbCharVal;
//void updateAutoCompletionGUI();
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
};
class PreferenceDlg : public StaticDialog class PreferenceDlg : public StaticDialog
@ -177,9 +245,10 @@ public :
} }
display(); display();
}; };
bool renameDialogTitle(const TCHAR *internalName, const TCHAR *newName);
virtual void destroy() { virtual void destroy() {
_ctrlTab.destroy(); //_ctrlTab.destroy();
_barsDlg.destroy(); _barsDlg.destroy();
_marginsDlg.destroy(); _marginsDlg.destroy();
_settingsDlg.destroy(); _settingsDlg.destroy();
@ -190,16 +259,22 @@ public :
}; };
private : private :
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
ControlsTab _ctrlTab; void makeCategoryList();
void showDialogByIndex(int index);
//ControlsTab _ctrlTab;
WindowVector _wVector; WindowVector _wVector;
BarsDlg _barsDlg; BarsDlg _barsDlg;
MarginsDlg _marginsDlg; MarginsDlg _marginsDlg;
SettingsDlg _settingsDlg; SettingsDlg _settingsDlg;
RegExtDlg _fileAssocDlg; RegExtDlg _fileAssocDlg;
LangMenuDlg _langMenuDlg; LangMenuDlg _langMenuDlg;
TabSettings _tabSettings;
PrintSettingsDlg _printSettingsDlg; PrintSettingsDlg _printSettingsDlg;
DefaultNewDocDlg _defaultNewDocDlg; DefaultNewDocDlg _defaultNewDocDlg;
DefaultDirectoryDlg _defaultDirectoryDlg;
RecentFilesHistoryDlg _recentFilesHistoryDlg;
BackupDlg _backupDlg; BackupDlg _backupDlg;
AutoCompletionDlg _autoCompletionDlg;
}; };

8
PowerEditor/src/WinControls/Preference/preference_rc.h
View File

@ -30,6 +30,7 @@
#define IDD_PREFERENCE_BOX 6000 #define IDD_PREFERENCE_BOX 6000
#define IDC_BUTTON_CLOSE (IDD_PREFERENCE_BOX + 1) #define IDC_BUTTON_CLOSE (IDD_PREFERENCE_BOX + 1)
#define IDC_LIST_DLGTITLE (IDD_PREFERENCE_BOX + 2)
#define IDD_PREFERENCE_BAR_BOX 6100 //(IDD_PREFERENCE_BOX + 100) #define IDD_PREFERENCE_BAR_BOX 6100 //(IDD_PREFERENCE_BOX + 100)
@ -143,6 +144,7 @@
#define IDC_REMEMBEREDITVIEWPERFILE_STATIC (IDD_PREFERENCE_SETTING_BOX + IDC_PREFERENCE_OFFSET_FLS + 2) #define IDC_REMEMBEREDITVIEWPERFILE_STATIC (IDD_PREFERENCE_SETTING_BOX + IDC_PREFERENCE_OFFSET_FLS + 2)
#define IDC_EDIT_REMEMBEREDITVIEWPERFILE (IDD_PREFERENCE_SETTING_BOX + IDC_PREFERENCE_OFFSET_FLS + 3) #define IDC_EDIT_REMEMBEREDITVIEWPERFILE (IDD_PREFERENCE_SETTING_BOX + IDC_PREFERENCE_OFFSET_FLS + 3)
#define IDD_PREFERENCE_NEWDOCSETTING_BOX 6400 //(IDD_PREFERENCE_BOX + 400) #define IDD_PREFERENCE_NEWDOCSETTING_BOX 6400 //(IDD_PREFERENCE_BOX + 400)
#define IDC_FORMAT_GB_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 1) #define IDC_FORMAT_GB_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 1)
#define IDC_RADIO_F_WIN (IDD_PREFERENCE_NEWDOCSETTING_BOX + 2) #define IDC_RADIO_F_WIN (IDD_PREFERENCE_NEWDOCSETTING_BOX + 2)
@ -173,6 +175,9 @@
#define IDC_RADIO_CUSTOMIZELENTH (IDD_PREFERENCE_NEWDOCSETTING_BOX + 27) #define IDC_RADIO_CUSTOMIZELENTH (IDD_PREFERENCE_NEWDOCSETTING_BOX + 27)
#define IDC_CUSTOMIZELENGTHVAL_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 28) #define IDC_CUSTOMIZELENGTHVAL_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 28)
#define IDD_PREFERENCE_DEFAULTDIRECTORY_BOX 6450 //(IDD_PREFERENCE_BOX + 400)
#define IDD_PREFERENCE_RECENTFILESHISTORY_BOX 6460 //(IDD_PREFERENCE_BOX + 400)
#define IDD_PREFERENCE_LANG_BOX 6500 //(IDD_PREFERENCE_BOX + 500) #define IDD_PREFERENCE_LANG_BOX 6500 //(IDD_PREFERENCE_BOX + 500)
#define IDC_LIST_ENABLEDLANG (IDD_PREFERENCE_LANG_BOX + 1) #define IDC_LIST_ENABLEDLANG (IDD_PREFERENCE_LANG_BOX + 1)
#define IDC_LIST_DISABLEDLANG (IDD_PREFERENCE_LANG_BOX + 2) #define IDC_LIST_DISABLEDLANG (IDD_PREFERENCE_LANG_BOX + 2)
@ -186,6 +191,7 @@
#define IDC_CHECK_DEFAULTTABVALUE (IDD_PREFERENCE_LANG_BOX + 10) #define IDC_CHECK_DEFAULTTABVALUE (IDD_PREFERENCE_LANG_BOX + 10)
#define IDC_GR_TABVALUE_STATIC (IDD_PREFERENCE_LANG_BOX + 11) #define IDC_GR_TABVALUE_STATIC (IDD_PREFERENCE_LANG_BOX + 11)
#define IDC_TABSIZEVAL_DISABLE_STATIC (IDD_PREFERENCE_LANG_BOX + 12) #define IDC_TABSIZEVAL_DISABLE_STATIC (IDD_PREFERENCE_LANG_BOX + 12)
#define IDD_PREFERENCE_TABSETTINGS_BOX 6550 //(IDD_PREFERENCE_BOX + 500)
#define IDD_PREFERENCE_PRINT_BOX 6600 //(IDD_PREFERENCE_BOX + 600) #define IDD_PREFERENCE_PRINT_BOX 6600 //(IDD_PREFERENCE_BOX + 600)
#define IDC_CHECK_PRINTLINENUM (IDD_PREFERENCE_PRINT_BOX + 1) #define IDC_CHECK_PRINTLINENUM (IDD_PREFERENCE_PRINT_BOX + 1)
@ -252,4 +258,6 @@
#define IDD_AUTOC_STATIC_NOTE (IDD_PREFERENCE_BACKUP_BOX + 14) #define IDD_AUTOC_STATIC_NOTE (IDD_PREFERENCE_BACKUP_BOX + 14)
#define IDD_FUNC_CHECK (IDD_PREFERENCE_BACKUP_BOX + 15) #define IDD_FUNC_CHECK (IDD_PREFERENCE_BACKUP_BOX + 15)
#define IDD_PREFERENCE_AUTOCOMPLETION_BOX 6850 //(IDD_PREFERENCE_BOX + 850)
#endif //PREFERENCE_RC_H #endif //PREFERENCE_RC_H

68
PowerEditor/src/localization.cpp
View File

@ -252,9 +252,7 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
childNode = childNode->NextSibling("Item") ) childNode = childNode->NextSibling("Item") )
{ {
TiXmlElementA *element = childNode->ToElement(); TiXmlElementA *element = childNode->ToElement();
//int id;
const char *menuIdStr = element->Attribute("menuId"); const char *menuIdStr = element->Attribute("menuId");
//if (element->Attribute("id", &id))
if (menuIdStr) if (menuIdStr)
{ {
MenuPosition & menuPos = getMenuPosition(menuIdStr); MenuPosition & menuPos = getMenuPosition(menuIdStr);
@ -866,93 +864,59 @@ void NativeLangSpeaker::changePrefereceDlgLang(PreferenceDlg & preference)
char titre[128]; char titre[128];
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
#endif
changeDlgLang(preference._barsDlg.getHSelf(), "Global", titre); changeDlgLang(preference._barsDlg.getHSelf(), "Global", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("Global"), nameW); preference.renameDialogTitle(TEXT("Global"), nameW);
#else
preference._ctrlTab.renameTab("Global", titre);
#endif
} }
changeDlgLang(preference._marginsDlg.getHSelf(), "Scintillas", titre); changeDlgLang(preference._marginsDlg.getHSelf(), "Scintillas", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("Scintillas"), nameW); preference.renameDialogTitle(TEXT("Scintillas"), nameW);
#else
preference._ctrlTab.renameTab("Scintillas", titre);
#endif
} }
changeDlgLang(preference._defaultNewDocDlg.getHSelf(), "NewDoc", titre); changeDlgLang(preference._defaultNewDocDlg.getHSelf(), "NewDoc", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("NewDoc"), nameW); preference.renameDialogTitle(TEXT("NewDoc"), nameW);
#else
preference._ctrlTab.renameTab("NewDoc", titre);
#endif
} }
changeDlgLang(preference._fileAssocDlg.getHSelf(), "FileAssoc", titre); changeDlgLang(preference._fileAssocDlg.getHSelf(), "FileAssoc", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("FileAssoc"), nameW); preference.renameDialogTitle(TEXT("FileAssoc"), nameW);
#else
preference._ctrlTab.renameTab("FileAssoc", titre);
#endif
} }
changeDlgLang(preference._langMenuDlg.getHSelf(), "LangMenu", titre); changeDlgLang(preference._langMenuDlg.getHSelf(), "LangMenu", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("LangMenu"), nameW); preference.renameDialogTitle(TEXT("LangMenu"), nameW);
#else
preference._ctrlTab.renameTab("LangMenu", titre);
#endif
} }
changeDlgLang(preference._printSettingsDlg.getHSelf(), "Print", titre); changeDlgLang(preference._printSettingsDlg.getHSelf(), "Print", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("Print"), nameW); preference.renameDialogTitle(TEXT("Print"), nameW);
#else
preference._ctrlTab.renameTab("Print", titre);
#endif
} }
changeDlgLang(preference._settingsDlg.getHSelf(), "MISC", titre); changeDlgLang(preference._settingsDlg.getHSelf(), "MISC", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("MISC"), nameW); preference.renameDialogTitle(TEXT("MISC"), nameW);
#else
preference._ctrlTab.renameTab("MISC", titre);
#endif
} }
changeDlgLang(preference._backupDlg.getHSelf(), "Backup", titre); changeDlgLang(preference._backupDlg.getHSelf(), "Backup", titre);
if (*titre) if (titre[0] != '\0')
{ {
#ifdef UNICODE
const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding);
preference._ctrlTab.renameTab(TEXT("Backup"), nameW); preference.renameDialogTitle(TEXT("Backup"), nameW);
#else
preference._ctrlTab.renameTab("Backup", titre);
#endif
} }
} }

4
PowerEditor/visual.net/notepadPlus.vcproj
View File

@ -1226,10 +1226,6 @@
RelativePath="..\src\WinControls\DocumentMap\documentMap.h" RelativePath="..\src\WinControls\DocumentMap\documentMap.h"
> >
</File> </File>
<File
RelativePath="..\src\WinControls\DocumentMap\documentMapl_rc.h"
>
</File>
<File <File
RelativePath="..\src\EncodingMapper.h" RelativePath="..\src\EncodingMapper.h"
> >