From 8f30af618dee5446957d5d3ce00328a7392b7a4b Mon Sep 17 00:00:00 2001 From: Don Ho Date: Wed, 19 Aug 2009 20:51:53 +0000 Subject: [PATCH] [NEW] Merge 2 print tab in Preference dialog in 1 tab. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@523 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nppSetup.nsi | 19 +- PowerEditor/src/Notepad_plus.cpp | 8 +- .../src/WinControls/Preference/preference.rc | 382 +++++++++--------- .../WinControls/Preference/preferenceDlg.cpp | 268 ++++++------ .../WinControls/Preference/preferenceDlg.h | 29 +- 5 files changed, 363 insertions(+), 343 deletions(-) diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index febd79ab5..54495d03d 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -17,12 +17,12 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "5.4.5" -!define APPNAMEANDVERSION "Notepad++ v5.4.5" +!define APPVERSION "5.5" +!define APPNAMEANDVERSION "Notepad++ v5.5" !define APPWEBSITE "http://notepad-plus.sourceforge.net/" !define VERSION_MAJOR 5 -!define VERSION_MINOR 45 +!define VERSION_MINOR 5 ; Main Install settings Name "${APPNAMEANDVERSION}" @@ -746,7 +746,13 @@ SubSection "Themes" Themes Section "Bespin" Bespin SetOutPath "$INSTDIR\themes" File "..\bin\themes\Bespin.xml" - SectionEnd + SectionEnd + + Section "Zenburn" Zenburn + SetOutPath "$INSTDIR\themes" + File "..\bin\themes\Zenburn.xml" + SectionEnd + SubSectionEnd Section /o "As default html viewer" htmlViewer @@ -1071,6 +1077,11 @@ SubSection un.Themes Delete "$INSTDIR\themes\Bespin.xml" RMDir "$INSTDIR\themes\" SectionEnd + + Section un.Zenburn + Delete "$INSTDIR\themes\Zenburn.xml" + RMDir "$INSTDIR\themes\" + SectionEnd SubSectionEnd Section un.htmlViewer diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 73618e654..c3f650756 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -6390,16 +6390,17 @@ void Notepad_plus::changePrefereceDlgLang() #endif } - changeDlgLang(_preference._printSettingsDlg.getHSelf(), "Print1", titre); + changeDlgLang(_preference._printSettingsDlg.getHSelf(), "Print", titre); if (*titre) { #ifdef UNICODE const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); - _preference._ctrlTab.renameTab(TEXT("Print1"), nameW); + _preference._ctrlTab.renameTab(TEXT("Print"), nameW); #else - _preference._ctrlTab.renameTab("Print1", titre); + _preference._ctrlTab.renameTab("Print", titre); #endif } +/* changeDlgLang(_preference._printSettings2Dlg.getHSelf(), "Print2", titre); if (*titre) { @@ -6410,6 +6411,7 @@ void Notepad_plus::changePrefereceDlgLang() _preference._ctrlTab.renameTab("Print2", titre); #endif } +*/ changeDlgLang(_preference._settingsDlg.getHSelf(), "MISC", titre); if (*titre) { diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 4e9ee51df..b826da21c 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -23,236 +23,248 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #ifndef IDC_STATIC #define IDC_STATIC -1 #endif -IDD_PREFERENCE_BOX DIALOGEX 0, 0, 400, 235 + +IDD_PREFERENCE_BOX DIALOGEX 0, 0, 470, 235 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE CAPTION "Preferences" -FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - PUSHBUTTON "Close",IDC_BUTTON_CLOSE,174,212,45,14 + PUSHBUTTON "Close",IDC_BUTTON_CLOSE,213,212,45,14 END - -IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 390, 185 +IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tool bar",IDC_TOOLBAR_GB_STATIC,17,45,147,68,BS_CENTER - CONTROL "Hide",IDC_CHECK_HIDE,"Button",BS_AUTOCHECKBOX,24,55,94,10 - CONTROL "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,24,69,114,10 - CONTROL "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,24,83,109,10 - CONTROL "Small standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,24,97,119,10 - GROUPBOX "Tab bar",IDC_TABBAR_GB_STATIC,183,6,176,151,BS_CENTER - CONTROL "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,16,108,10 - CONTROL "Multi-Line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,30,134,10 - CONTROL "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,44,134,10 - CONTROL "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,59,108,10 - CONTROL "Lock (No Drag N Drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,73,134,10 - CONTROL "Draw the inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,88,134,10 - CONTROL "Draw the orange top bar",IDC_CHECK_ORANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,103,133,10 + GROUPBOX "Tool bar",IDC_TOOLBAR_GB_STATIC,57,45,147,68,BS_CENTER + CONTROL "Hide",IDC_CHECK_HIDE,"Button",BS_AUTOCHECKBOX,64,55,94,10 + CONTROL "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,64,69,114,10 + CONTROL "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,64,83,109,10 + CONTROL "Small standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,64,97,119,10 + GROUPBOX "Tab bar",IDC_TABBAR_GB_STATIC,223,6,176,151,BS_CENTER + CONTROL "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,16,108,10 + CONTROL "Multi-Line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,30,134,10 + CONTROL "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,44,134,10 + CONTROL "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,59,108,10 + CONTROL "Lock (No Drag N Drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,73,134,10 + CONTROL "Draw the inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,88,134,10 + CONTROL "Draw the orange top bar",IDC_CHECK_ORANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,103,133,10 CONTROL "Enable close button on each tab",IDC_CHECK_ENABLETABCLOSE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,118,133,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,118,133,10 CONTROL "Double click to close document",IDC_CHECK_DBCLICK2CLOSE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,133,133,10 - CONTROL "Show Status Bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,163,130,10 - GROUPBOX "Menu bar",IDC_MENUBAR_GB_STATIC,17,117,147,40,BS_CENTER + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,133,133,10 + CONTROL "Show Status Bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,163,130,10 + GROUPBOX "Menu bar",IDC_MENUBAR_GB_STATIC,57,117,147,40,BS_CENTER CONTROL "Hide (Use Alt or F10 key to toggle it)",IDC_CHECK_HIDEMENUBAR, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE,24,127,135,25 - GROUPBOX "Localization",IDC_LOCALIZATION_GB_STATIC,17,6,147,35,BS_CENTER - COMBOBOX IDC_COMBO_LOCALIZATION,28,20,119,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + "Button",BS_AUTOCHECKBOX | BS_MULTILINE,64,127,135,25 + GROUPBOX "Localization",IDC_LOCALIZATION_GB_STATIC,57,6,147,35,BS_CENTER + COMBOBOX IDC_COMBO_LOCALIZATION,68,20,119,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 390, 185 +IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Folder margin style",IDC_FMS_GB_STATIC,32,69,149,42,BS_CENTER - CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,41,82,59,10 - CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,41,96,60,10 - CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,114,82,62,10 - CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,114,96,61,10 + GROUPBOX "Folder margin style",IDC_FMS_GB_STATIC,60,69,149,42,BS_CENTER + CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,69,82,59,10 + CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,69,96,60,10 + CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,142,82,62,10 + CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,142,96,61,10 CONTROL "Display line number margin",IDC_CHECK_LINENUMBERMARGE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,117,141,10 - CONTROL "Display bookmark margin",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,129,150,10 - //CONTROL "Display line change state margin",IDC_CHECK_DOCCHANGESTATEMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,141,162,10 - CONTROL "Enable current line highlight",IDC_CHECK_CURRENTLINEHILITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,141,129,10 - CONTROL "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,81,122,10 - RTEXT "Number of columns :",IDC_NBCOLONE_STATIC,207,129,83,8 - LTEXT "0",IDC_COLONENUMBER_STATIC,297,128,18,8 - GROUPBOX "Vertical Edge Setting",IDC_VES_GB_STATIC,201,69,148,77,BS_CENTER - CONTROL "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,215,97,91,10 - CONTROL "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,215,111,91,10 - GROUPBOX "",IDC_STATIC,20,54,350,118,0,WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE - COMBOBOX IDC_COMBO_SCINTILLAVIEWCHOIX,139,51,96,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Caret settings",IDC_CARETSETTING_STATIC,23,5,199,40,BS_CENTER - LTEXT "Width :",IDC_WIDTH_STATIC,27,24,37,8,0,WS_EX_RIGHT - COMBOBOX IDC_WIDTH_COMBO,66,22,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Blink Rate :",IDC_BLINKRATE_STATIC,138,17,50,8 - CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,133,29,67,13 - LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,202,29,12,8 - LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,121,29,12,8,0,WS_EX_RIGHT + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,61,117,141,10 + CONTROL "Display bookmark margin",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,61,129,150,10 + CONTROL "Enable current line highlight",IDC_CHECK_CURRENTLINEHILITE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,61,141,129,10 + CONTROL "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,81,122,10 + RTEXT "Number of columns :",IDC_NBCOLONE_STATIC,235,129,83,8 + LTEXT "0",IDC_COLONENUMBER_STATIC,325,128,18,8 + GROUPBOX "Vertical Edge Setting",IDC_VES_GB_STATIC,229,69,148,77,BS_CENTER + CONTROL "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,243,97,91,10 + CONTROL "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,243,111,91,10 + GROUPBOX "",IDC_STATIC,48,54,350,118,0,WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE + COMBOBOX IDC_COMBO_SCINTILLAVIEWCHOIX,167,51,96,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Caret settings",IDC_CARETSETTING_STATIC,51,5,199,40,BS_CENTER + LTEXT "Width :",IDC_WIDTH_STATIC,55,24,37,8,0,WS_EX_RIGHT + COMBOBOX IDC_WIDTH_COMBO,94,22,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Blink Rate :",IDC_BLINKRATE_STATIC,166,17,50,8 + CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,161,29,67,13 + LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,230,29,12,8 + LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,149,29,12,8,0,WS_EX_RIGHT END - -IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 390, 185 +IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "History File Setting",IDC_HISTORY_GB_STATIC,15,4,155,39,BS_CENTER - RTEXT "Max number history file :",IDC_MAXNBFILE_STATIC,18,14,112,8 - LTEXT "0",IDC_MAXNBFILEVAL_STATIC,137,14,15,8 - CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,27,140,10 - GROUPBOX "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,15,48,155,39,BS_CENTER - CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,59,69,10 - CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,72,140,10 - CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,94,150,10 - CONTROL "Smart highlighting",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,136,150,10 - CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,108,150,10 - CONTROL "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,122,150,10 - CONTROL "Show only filename in titlebar",IDC_CHECK_SHORTTITLE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,150,217,10 - CONTROL "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,164,217,10 - GROUPBOX "Clickable link setting",IDC_CLICKABLELINK_STATIC,193,4,155,39,BS_CENTER - CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,15,140,10 - CONTROL "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,28,140,10 - GROUPBOX "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,193,47,155,50,BS_CENTER - CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,57,140,10 - CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,69,140,10 - CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,81,140,10 - GROUPBOX "Highlight matching tags",IDC_TAGMATCHEDHILITE_STATIC,193,101,155,50,BS_CENTER - CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,201,111,140,10 - CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,202,123,140,10 - CONTROL "Highlight comment/php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,202,136,140,10 - RTEXT "Session file ext:",IDC_SESSIONFILEEXT_STATIC,205,160,108,8 - EDITTEXT IDC_EDIT_SESSIONFILEEXT,315,157,34,14,ES_AUTOHSCROLL + GROUPBOX "History File Setting",IDC_HISTORY_GB_STATIC,54,4,155,39,BS_CENTER + RTEXT "Max number history file :",IDC_MAXNBFILE_STATIC,57,14,112,8 + LTEXT "0",IDC_MAXNBFILEVAL_STATIC,176,14,15,8 + CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,27,140,10 + GROUPBOX "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,54,48,155,39,BS_CENTER + CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,59,69,10 + CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,72,140,10 + CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,55,94,150,10 + CONTROL "Smart highlighting",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,55,136,150,10 + CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,108,150,10 + CONTROL "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,122,150,10 + CONTROL "Show only filename in titlebar",IDC_CHECK_SHORTTITLE, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,55,150,217,10 + CONTROL "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,164,217,10 + GROUPBOX "Clickable link setting",IDC_CLICKABLELINK_STATIC,232,4,155,39,BS_CENTER + CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,15,140,10 + CONTROL "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,28,140,10 + GROUPBOX "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,232,47,155,50,BS_CENTER + CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,57,140,10 + CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,69,140,10 + CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,81,140,10 + GROUPBOX "Highlight matching tags",IDC_TAGMATCHEDHILITE_STATIC,232,101,155,50,BS_CENTER + CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,240,111,140,10 + CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,241,123,140,10 + CONTROL "Highlight comment/php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,241,136,140,10 + RTEXT "Session file ext:",IDC_SESSIONFILEEXT_STATIC,244,160,108,8 + EDITTEXT IDC_EDIT_SESSIONFILEEXT,354,157,34,14,ES_AUTOHSCROLL END -IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 390, 185 +IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Format",IDC_FORMAT_GB_STATIC,225,12,110,55,BS_CENTER - CONTROL "Windows",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,233,25,48,10 - CONTROL "Unix",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,233,38,56,10 - CONTROL "Mac",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,233,52,60,10 - GROUPBOX "Encoding",IDC_ENCODING_STATIC,57,11,144,91,BS_CENTER - CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,64,20,80,10 - CONTROL "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,64,34,128,10 - CONTROL "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,64,59,62,10 - CONTROL "UCS-2 big endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,64,73,103,10 - CONTROL "UCS-2 small endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,64,87,102,10 - RTEXT "Default Language :",IDC_DEFAULTLANG_STATIC,203,83,77,8 - COMBOBOX IDC_COMBO_DEFAULTLANG,285,81,60,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "New Document",IDC_NEWDOCUMENT_GR_STATIC,47,2,304,108,BS_CENTER - GROUPBOX "File Open/Save Directory",IDC_OPENSAVEDIR_GR_STATIC,47,117,304,61,BS_CENTER + GROUPBOX "Format",IDC_FORMAT_GB_STATIC,250,12,110,55,BS_CENTER + CONTROL "Windows",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,258,25,48,10 + CONTROL "Unix",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,258,38,56,10 + CONTROL "Mac",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,258,52,60,10 + GROUPBOX "Encoding",IDC_ENCODING_STATIC,82,11,144,91,BS_CENTER + CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,89,20,80,10 + CONTROL "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,89,34,128,10 + CONTROL "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,89,59,62,10 + CONTROL "UCS-2 big endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,89,73,103,10 + CONTROL "UCS-2 small endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,89,87,102,10 + RTEXT "Default Language :",IDC_DEFAULTLANG_STATIC,228,83,77,8 + COMBOBOX IDC_COMBO_DEFAULTLANG,310,81,60,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "New Document",IDC_NEWDOCUMENT_GR_STATIC,72,2,304,108,BS_CENTER + GROUPBOX "File Open/Save Directory",IDC_OPENSAVEDIR_GR_STATIC,72,117,304,61,BS_CENTER CONTROL "Follow the current document",IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO, - "Button",BS_AUTORADIOBUTTON | WS_GROUP,64,129,200,10 + "Button",BS_AUTORADIOBUTTON | WS_GROUP,89,129,200,10 CONTROL "Remember the last operation directory",IDC_OPENSAVEDIR_REMEMBERLAST_RADIO, - "Button",BS_AUTORADIOBUTTON,64,144,217,10 - CONTROL "",IDC_OPENSAVEDIR_ALWAYSON_RADIO,"Button",BS_AUTORADIOBUTTON,64,156,11,10 - EDITTEXT IDC_OPENSAVEDIR_ALWAYSON_EDIT,80,157,179,14,ES_AUTOHSCROLL - PUSHBUTTON "...",IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON,266,156,16,14 - CONTROL "Apply while open ANSI file",IDC_CHECK_OPENANSIASUTF8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,74,46,124,10 + "Button",BS_AUTORADIOBUTTON,89,144,217,10 + CONTROL "",IDC_OPENSAVEDIR_ALWAYSON_RADIO,"Button",BS_AUTORADIOBUTTON,89,156,11,10 + EDITTEXT IDC_OPENSAVEDIR_ALWAYSON_EDIT,105,157,179,14,ES_AUTOHSCROLL + PUSHBUTTON "...",IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON,291,156,16,14 + CONTROL "Apply while open ANSI file",IDC_CHECK_OPENANSIASUTF8, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,46,124,10 END -IDD_PREFERENCE_LANG_BOX DIALOGEX 0, 0, 390, 185 +IDD_PREFERENCE_LANG_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Language Menu",IDC_CHECK_LANGMENU_GR_STATIC,5,3,220,172,BS_CENTER - CONTROL "Make Language Menu compact",IDC_CHECK_LANGMENUCOMPACT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,14,174,10 - CTEXT "Available items",IDC_ENABLEDITEMS_STATIC,23,31,72,8 - LISTBOX IDC_LIST_ENABLEDLANG,18,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "->",IDC_BUTTON_REMOVE,103,76,25,14 - PUSHBUTTON "<-",IDC_BUTTON_RESTORE,103,107,25,14 - CTEXT "Disabled items",IDC_DISABLEDITEMS_STATIC,138,31,72,8 - LISTBOX IDC_LIST_DISABLEDLANG,135,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - - GROUPBOX "Tab Setting",IDC_TABSETTING_GB_STATIC,238,3,130,172,BS_CENTER - LISTBOX IDC_LIST_TABSETTNG,260,18,84,100,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - GROUPBOX "",IDC_GR_TABVALUE_STATIC,250,125,110,42,BS_CENTER - CONTROL "Use default value",IDC_CHECK_DEFAULTTABVALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,246,125,85,10 - RTEXT "Tab size : ",IDC_TABSIZE_STATIC,251,138,58,8 - LTEXT "0",IDC_TABSIZEVAL_STATIC,311,138,18,8 - LTEXT "0",IDC_TABSIZEVAL_DISABLE_STATIC,311,138,18,8 - CONTROL "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,149,100,10 + GROUPBOX "Language Menu",IDC_CHECK_LANGMENU_GR_STATIC,37,3,220,172,BS_CENTER + CONTROL "Make Language Menu compact",IDC_CHECK_LANGMENUCOMPACT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,51,14,174,10 + CTEXT "Available items",IDC_ENABLEDITEMS_STATIC,55,31,72,8 + LISTBOX IDC_LIST_ENABLEDLANG,50,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "->",IDC_BUTTON_REMOVE,135,76,25,14 + PUSHBUTTON "<-",IDC_BUTTON_RESTORE,135,107,25,14 + CTEXT "Disabled items",IDC_DISABLEDITEMS_STATIC,170,31,72,8 + LISTBOX IDC_LIST_DISABLEDLANG,167,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Tab Setting",IDC_TABSETTING_GB_STATIC,283,3,130,172,BS_CENTER + 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 + CONTROL "Use default value",IDC_CHECK_DEFAULTTABVALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,291,125,85,10 + RTEXT "Tab size : ",IDC_TABSIZE_STATIC,296,138,58,8 + LTEXT "0",IDC_TABSIZEVAL_STATIC,356,138,18,8 + LTEXT "0",IDC_TABSIZEVAL_DISABLE_STATIC,356,138,18,8 + CONTROL "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,303,149,100,10 END -IDD_PREFERENCE_PRINT_BOX DIALOGEX 0, 0, 390, 185 +IDD_PREFERENCE_PRINT_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "WYSIWYG",IDC_RADIO_WYSIWYG,"Button",BS_AUTORADIOBUTTON,50,65,123,10 - CONTROL "Invert",IDC_RADIO_INVERT,"Button",BS_AUTORADIOBUTTON,50,80,90,10 - CONTROL "Black on white",IDC_RADIO_BW,"Button",BS_AUTORADIOBUTTON,50,95,90,10 - CONTROL "No background colour",IDC_RADIO_NOBG,"Button",BS_AUTORADIOBUTTON,50,111,123,10 - GROUPBOX "Colour Option",IDC_COLOUROPT_STATIC,45,45,133,96,BS_CENTER - CONTROL "Print Line Number",IDC_CHECK_PRINTLINENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,30,145,10 - EDITTEXT IDC_EDIT_ML,228,88,17,14,ES_NUMBER - EDITTEXT IDC_EDIT_MT,249,69,17,14,ES_NUMBER - EDITTEXT IDC_EDIT_MR,269,88,17,14,ES_NUMBER - EDITTEXT IDC_EDIT_MB,249,109,17,14,ES_NUMBER - RTEXT "Left",IDC_ML_STATIC,195,91,30,8 - CTEXT "Top",IDC_MT_STATIC,231,59,54,8 - LTEXT "Right",IDC_MR_STATIC,291,91,29,8 - CTEXT "Bottom",IDC_MB_STATIC,231,124,54,8 - GROUPBOX "Margin Setting (Unit:mm)",IDC_MARGESETTINGS_STATIC,187,45,144,96,BS_CENTER + CONTROL "WYSIWYG",IDC_RADIO_WYSIWYG,"Button",BS_AUTORADIOBUTTON,12,30,123,10 + CONTROL "Invert",IDC_RADIO_INVERT,"Button",BS_AUTORADIOBUTTON,12,45,90,10 + CONTROL "Black on white",IDC_RADIO_BW,"Button",BS_AUTORADIOBUTTON,12,60,90,10 + CONTROL "No background colour",IDC_RADIO_NOBG,"Button",BS_AUTORADIOBUTTON,12,76,123,10 + GROUPBOX "Colour Option",IDC_COLOUROPT_STATIC,6,20,133,73,BS_CENTER + CONTROL "Print Line Number",IDC_CHECK_PRINTLINENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,6,145,10 + EDITTEXT IDC_EDIT_ML,42,136,17,14,ES_NUMBER + EDITTEXT IDC_EDIT_MT,59,120,17,14,ES_NUMBER + EDITTEXT IDC_EDIT_MR,77,136,17,14,ES_NUMBER + EDITTEXT IDC_EDIT_MB,59,152,17,14,ES_NUMBER + RTEXT "Left",IDC_ML_STATIC,9,139,30,8 + CTEXT "Top",IDC_MT_STATIC,41,110,54,8 + LTEXT "Right",IDC_MR_STATIC,99,139,29,8 + CTEXT "Bottom",IDC_MB_STATIC,41,167,54,8 + GROUPBOX "Margin Setting (Unit:mm)",IDC_MARGESETTINGS_STATIC,5,98,133,82,BS_CENTER + EDITTEXT IDC_EDIT_HLEFT,166,58,83,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_HMIDDLE,256,58,83,14,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_HRIGHT,346,58,83,14,ES_RIGHT | ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_HFONTNAME,166,76,84,104,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_HFONTSIZE,256,76,31,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Bold",IDC_CHECK_HBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,296,76,46,10 + CONTROL "Italic",IDC_CHECK_HITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,356,76,43,10 + GROUPBOX "Header",IDC_HGB_STATIC,158,39,279,56,BS_CENTER + CTEXT "Left part",IDC_HL_STATIC,168,49,79,8 + CTEXT "Middle part",IDC_HM_STATIC,260,49,75,8 + CTEXT "Right part",IDC_HR_STATIC,348,49,78,8 + EDITTEXT IDC_EDIT_FLEFT,166,116,83,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FMIDDLE,257,116,83,14,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRIGHT,346,116,83,14,ES_RIGHT | ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_FFONTNAME,166,134,84,119,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_FFONTSIZE,258,134,31,71,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Bold",IDC_CHECK_FBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,297,136,46,10 + CONTROL "Italic",IDC_CHECK_FITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,356,136,47,10 + GROUPBOX "Footer",IDC_FGB_STATIC,158,97,279,58,BS_CENTER + CTEXT "Left part",IDC_FL_STATIC,168,107,78,8 + CTEXT "Middle part",IDC_FM_STATIC,257,107,82,8 + CTEXT "Right part",IDC_FR_STATIC,348,107,79,8 + COMBOBOX IDC_COMBO_VARLIST,259,24,70,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Add",IDC_BUTTON_ADDVAR,337,24,44,12 + RTEXT "Variable :",IDC_VAR_STATIC,198,26,59,8 + RTEXT "Which part :",IDC_WHICHPART_STATIC,155,161,80,8 + LTEXT "",IDC_VIEWPANEL_STATIC,242,161,190,8 + GROUPBOX "Header and Footer",IDC_STATIC,150,7,296,172,BS_CENTER END -IDD_PREFERENCE_PRINT2_BOX DIALOGEX 0, 0, 390, 185 +/* +IDD_PREFERENCE_PRINT2_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - EDITTEXT IDC_EDIT_HLEFT,59,48,83,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_HMIDDLE,149,48,83,14,ES_CENTER | ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_HRIGHT,239,48,83,14,ES_RIGHT | ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_HFONTNAME,59,66,84,104,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_HFONTSIZE,149,66,31,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Bold",IDC_CHECK_HBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,66,46,10 - CONTROL "Italic",IDC_CHECK_HITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,249,66,43,10 - GROUPBOX "Header",IDC_HGB_STATIC,51,29,279,56,BS_CENTER - CTEXT "Left part",IDC_HL_STATIC,61,39,79,8 - CTEXT "Middle part",IDC_HM_STATIC,153,39,75,8 - CTEXT "Right part",IDC_HR_STATIC,241,39,78,8 - EDITTEXT IDC_EDIT_FLEFT,59,106,83,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FMIDDLE,150,106,83,14,ES_CENTER | ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRIGHT,239,106,83,14,ES_RIGHT | ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_FFONTNAME,59,124,84,119,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_FFONTSIZE,151,124,31,71,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Bold",IDC_CHECK_FBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,126,46,10 - CONTROL "Italic",IDC_CHECK_FITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,249,126,47,10 - GROUPBOX "Footer",IDC_FGB_STATIC,51,87,279,58,BS_CENTER - CTEXT "Left part",IDC_FL_STATIC,61,97,78,8 - CTEXT "Middle part",IDC_FM_STATIC,150,97,82,8 - CTEXT "Right part",IDC_FR_STATIC,241,97,79,8 - COMBOBOX IDC_COMBO_VARLIST,113,14,70,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add",IDC_BUTTON_ADDVAR,191,14,44,12 - RTEXT "Variable :",IDC_VAR_STATIC,52,16,59,8 - RTEXT "Which part :",IDC_WHICHPART_STATIC,38,149,80,8 - LTEXT "",IDC_VIEWPANEL_STATIC,121,149,213,8 END +*/ -IDD_PREFERENCE_BACKUP_BOX DIALOGEX 0, 0, 390, 185 +IDD_PREFERENCE_BACKUP_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Backup",IDC_BACKUPDIR_GRP_STATIC,46,11,289,86,BS_CENTER - CONTROL "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,71,24,87,10 - CONTROL "Simple Backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,195,24,111,10 - CONTROL "Verbose Backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,195,38,111,10 - GROUPBOX "User custom backup directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,62,50,260,40 - CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,50,8,10 - RTEXT "Directory :",IDD_BACKUPDIR_STATIC,66,67,40,8 - EDITTEXT IDC_BACKUPDIR_EDIT,113,65,179,14,ES_AUTOHSCROLL - PUSHBUTTON "...",IDD_BACKUPDIR_BROWSE_BUTTON,299,65,16,14 - GROUPBOX "Auto-completion",IDD_AUTOC_GRPSTATIC,46,103,289,73,BS_CENTER + GROUPBOX "Backup",IDC_BACKUPDIR_GRP_STATIC,79,11,289,86,BS_CENTER + CONTROL "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,104,24,87,10 + CONTROL "Simple Backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,228,24,111,10 + CONTROL "Verbose Backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,228,38,111,10 + GROUPBOX "User custom backup directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,95,50,260,40 + CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,50,8,10 + RTEXT "Directory :",IDD_BACKUPDIR_STATIC,99,67,40,8 + EDITTEXT IDC_BACKUPDIR_EDIT,146,65,179,14,ES_AUTOHSCROLL + PUSHBUTTON "...",IDD_BACKUPDIR_BROWSE_BUTTON,332,65,16,14 + GROUPBOX "Auto-completion",IDD_AUTOC_GRPSTATIC,79,103,289,73,BS_CENTER CONTROL "Enable Auto-completion on each input",IDD_AUTOC_ENABLECHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,51,114,150,10 - CONTROL "Function completion",IDD_AUTOC_FUNCRADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,78,128,145,10 - CONTROL "Word completion",IDD_AUTOC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,78,144,145,10 - RTEXT "From",IDD_AUTOC_STATIC_FROM,208,114,47,8 - CTEXT "1",IDD_AUTOC_STATIC_N,259,114,8,8 - LTEXT "th characters",IDD_AUTOC_STATIC_CHAR,273,114,57,8 - LTEXT "Valid value : 1 - 9",IDD_AUTOC_STATIC_NOTE,238,124,93,8 - CONTROL "Function parameters hint on input",IDD_FUNC_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,51,156,160,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,114,150,10 + CONTROL "Function completion",IDD_AUTOC_FUNCRADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,128,145,10 + CONTROL "Word completion",IDD_AUTOC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,111,144,145,10 + RTEXT "From",IDD_AUTOC_STATIC_FROM,241,114,47,8 + CTEXT "1",IDD_AUTOC_STATIC_N,292,114,8,8 + LTEXT "th characters",IDD_AUTOC_STATIC_CHAR,306,114,57,8 + LTEXT "Valid value : 1 - 9",IDD_AUTOC_STATIC_NOTE,271,124,93,8 + CONTROL "Function parameters hint on input",IDD_FUNC_CHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,156,160,10 END + diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index aff7b6bce..e40f0dccb 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -51,10 +51,10 @@ BOOL CALLBACK PreferenceDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa _printSettingsDlg.init(_hInst, _hSelf); _printSettingsDlg.create(IDD_PREFERENCE_PRINT_BOX); - +/* _printSettings2Dlg.init(_hInst, _hSelf); _printSettings2Dlg.create(IDD_PREFERENCE_PRINT2_BOX); - +*/ _langMenuDlg.init(_hInst, _hSelf); _langMenuDlg.create(IDD_PREFERENCE_LANG_BOX); @@ -66,8 +66,8 @@ BOOL CALLBACK PreferenceDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa _wVector.push_back(DlgInfo(&_defaultNewDocDlg, TEXT("New Document/Open Save Directory"), TEXT("NewDoc"))); _wVector.push_back(DlgInfo(&_fileAssocDlg, TEXT("File Association"), TEXT("FileAssoc"))); _wVector.push_back(DlgInfo(&_langMenuDlg, TEXT("Language Menu/Tab Settings"), TEXT("LangMenu"))); - _wVector.push_back(DlgInfo(&_printSettingsDlg, TEXT("Print - Colour and Margin"), TEXT("Print1"))); - _wVector.push_back(DlgInfo(&_printSettings2Dlg, TEXT("Print - Header and Footer"), TEXT("Print2"))); + _wVector.push_back(DlgInfo(&_printSettingsDlg, TEXT("Print"), TEXT("Print"))); + //_wVector.push_back(DlgInfo(&_printSettings2Dlg, TEXT("Print - Header and Footer"), TEXT("Print2"))); _wVector.push_back(DlgInfo(&_backupDlg, TEXT("Backup/Auto-completion"), TEXT("Backup"))); _wVector.push_back(DlgInfo(&_settingsDlg, TEXT("MISC"), TEXT("MISC"))); _ctrlTab.createTabs(_wVector); @@ -84,7 +84,7 @@ BOOL CALLBACK PreferenceDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa _fileAssocDlg.reSizeTo(rc); _langMenuDlg.reSizeTo(rc); _printSettingsDlg.reSizeTo(rc); - _printSettings2Dlg.reSizeTo(rc); + //_printSettings2Dlg.reSizeTo(rc); _backupDlg.reSizeTo(rc); NppParameters *pNppParam = NppParameters::getInstance(); @@ -306,7 +306,6 @@ BOOL CALLBACK BarsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_RELOADNATIVELANG, 0, 0); ::InvalidateRect(_hParent, NULL, TRUE); } - //::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_RELOADSTYLERS, 0, 0); } #endif } @@ -351,7 +350,6 @@ void MarginsDlg::changePanelTo(int index) ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINENUMBERMARGE, BM_SETCHECK, svp._lineNumberMarginShow, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_BOOKMARKMARGE, BM_SETCHECK, svp._bookMarkMarginShow, 0); - //::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCCHANGESTATEMARGE, BM_SETCHECK, svp._docChangeStateMarginShow, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_CURRENTLINEHILITE, BM_SETCHECK, svp._currentLineHilitingShow, 0); bool isEnable = !(svp._edgeMode == EDGE_NONE); @@ -409,9 +407,7 @@ BOOL CALLBACK MarginsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) case WM_HSCROLL: { - //case IDC_CARETBLINKRATE_SLIDER: NppGUI & nppGUI = (NppGUI &)NppParameters::getInstance()->getNppGUI(); - //nppGUI._caretBlinkRate = ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_GETPOS, 0, 0); int blinkRate = (int)::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_GETPOS, 0, 0); if (blinkRate == BLINKRATE_SLOWEST) blinkRate = 0; @@ -438,12 +434,7 @@ BOOL CALLBACK MarginsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) svp._bookMarkMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_BOOKMARKMARGE, BM_GETCHECK, 0, 0)); ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_SYMBOLMARGIN, iView); return TRUE; -/* - case IDC_CHECK_DOCCHANGESTATEMARGE: - svp._docChangeStateMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCCHANGESTATEMARGE, BM_GETCHECK, 0, 0)); - ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_DOCCHANGEMARGIN, iView); - return TRUE; -*/ + case IDC_CHECK_CURRENTLINEHILITE: svp._currentLineHilitingShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_CURRENTLINEHILITE, BM_GETCHECK, 0, 0)); ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_CURLINE_HILITING, iView); @@ -1360,6 +1351,19 @@ BOOL CALLBACK LangMenuDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara return FALSE; } +void trim(generic_string & str) +{ + generic_string::size_type pos = str.find_last_not_of(' '); + + if (pos != generic_string::npos) + { + str.erase(pos + 1); + pos = str.find_first_not_of(' '); + if(pos != generic_string::npos) str.erase(0, pos); + } + else str.erase(str.begin(), str.end()); +}; + BOOL CALLBACK PrintSettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) { NppParameters *pNppParam = NppParameters::getInstance(); @@ -1407,88 +1411,6 @@ BOOL CALLBACK PrintSettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) ::SendDlgItemMessage(_hSelf, IDC_EDIT_MT, WM_SETTEXT, 0, (LPARAM)valStrT); ::SendDlgItemMessage(_hSelf, IDC_EDIT_MB, WM_SETTEXT, 0, (LPARAM)valStrB); - ETDTProc enableDlgTheme = (ETDTProc)pNppParam->getEnableThemeDlgTexture(); - if (enableDlgTheme) - enableDlgTheme(_hSelf, ETDT_ENABLETAB); - break; - } - case WM_COMMAND : - { - if (HIWORD(wParam) == EN_CHANGE) - { - switch (LOWORD(wParam)) - { - case IDC_EDIT_ML: - nppGUI._printSettings._marge.left = ::GetDlgItemInt(_hSelf, IDC_EDIT_ML, NULL, FALSE); - return TRUE; - - case IDC_EDIT_MR: - nppGUI._printSettings._marge.right = ::GetDlgItemInt(_hSelf, IDC_EDIT_MR, NULL, FALSE); - return TRUE; - - case IDC_EDIT_MT : - nppGUI._printSettings._marge.top = ::GetDlgItemInt(_hSelf, IDC_EDIT_MT, NULL, FALSE); - return TRUE; - - case IDC_EDIT_MB : - nppGUI._printSettings._marge.bottom = ::GetDlgItemInt(_hSelf, IDC_EDIT_MB, NULL, FALSE); - return TRUE; - - default : - return FALSE; - } - } - - switch (wParam) - { - case IDC_CHECK_PRINTLINENUM: - nppGUI._printSettings._printLineNumber = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_PRINTLINENUM, BM_GETCHECK, 0, 0)); - break; - - case IDC_RADIO_WYSIWYG: - nppGUI._printSettings._printOption = SC_PRINT_NORMAL; - break; - - case IDC_RADIO_INVERT: - nppGUI._printSettings._printOption = SC_PRINT_INVERTLIGHT; - break; - - case IDC_RADIO_BW : - nppGUI._printSettings._printOption = SC_PRINT_BLACKONWHITE; - break; - - case IDC_RADIO_NOBG : - nppGUI._printSettings._printOption = SC_PRINT_COLOURONWHITE; - break; - } - return TRUE; - } - } - return FALSE; -} - -void trim(generic_string & str) -{ - generic_string::size_type pos = str.find_last_not_of(' '); - - if (pos != generic_string::npos) - { - str.erase(pos + 1); - pos = str.find_first_not_of(' '); - if(pos != generic_string::npos) str.erase(0, pos); - } - else str.erase(str.begin(), str.end()); -}; - -BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) -{ - NppParameters *pNppParam = NppParameters::getInstance(); - NppGUI & nppGUI = (NppGUI & )pNppParam->getNppGUI(); - - switch (Message) - { - case WM_INITDIALOG : - { ::SendDlgItemMessage(_hSelf, IDC_EDIT_HLEFT, WM_SETTEXT, 0, (LPARAM)nppGUI._printSettings._headerLeft.c_str()); ::SendDlgItemMessage(_hSelf, IDC_EDIT_HMIDDLE, WM_SETTEXT, 0, (LPARAM)nppGUI._printSettings._headerMiddle.c_str()); ::SendDlgItemMessage(_hSelf, IDC_EDIT_HRIGHT, WM_SETTEXT, 0, (LPARAM)nppGUI._printSettings._headerRight.c_str()); @@ -1547,58 +1469,79 @@ BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM } ::SendDlgItemMessage(_hSelf, IDC_COMBO_VARLIST, CB_SETCURSEL, 0, 0); - //_colourHooker.setColour(RGB(0, 0, 0xFF)); - //_colourHooker.hookOn(::GetDlgItem(_hSelf, IDC_VIEWPANEL_STATIC)); + + ETDTProc enableDlgTheme = (ETDTProc)pNppParam->getEnableThemeDlgTexture(); if (enableDlgTheme) enableDlgTheme(_hSelf, ETDT_ENABLETAB); - - return TRUE; + break; } case WM_COMMAND : { if (HIWORD(wParam) == EN_CHANGE) { - const int stringSize = 256; - TCHAR str[stringSize]; - _focusedEditCtrl = LOWORD(wParam); - ::GetDlgItemText(_hSelf, _focusedEditCtrl, str, stringSize); - ::SendDlgItemMessage(_hSelf, IDC_VIEWPANEL_STATIC, WM_SETTEXT, 0, (LPARAM)str); - switch (LOWORD(wParam)) { - case IDC_EDIT_HLEFT: - nppGUI._printSettings._headerLeft = str; - trim(nppGUI._printSettings._headerLeft); + case IDC_EDIT_ML: + nppGUI._printSettings._marge.left = ::GetDlgItemInt(_hSelf, IDC_EDIT_ML, NULL, FALSE); return TRUE; - case IDC_EDIT_HMIDDLE: - nppGUI._printSettings._headerMiddle = str; - trim(nppGUI._printSettings._headerMiddle); + case IDC_EDIT_MR: + nppGUI._printSettings._marge.right = ::GetDlgItemInt(_hSelf, IDC_EDIT_MR, NULL, FALSE); return TRUE; - case IDC_EDIT_HRIGHT : - nppGUI._printSettings._headerRight = str; - trim(nppGUI._printSettings._headerRight); + case IDC_EDIT_MT : + nppGUI._printSettings._marge.top = ::GetDlgItemInt(_hSelf, IDC_EDIT_MT, NULL, FALSE); return TRUE; - case IDC_EDIT_FLEFT: - nppGUI._printSettings._footerLeft = str; - trim(nppGUI._printSettings._footerLeft); + case IDC_EDIT_MB : + nppGUI._printSettings._marge.bottom = ::GetDlgItemInt(_hSelf, IDC_EDIT_MB, NULL, FALSE); return TRUE; - case IDC_EDIT_FMIDDLE: - nppGUI._printSettings._footerMiddle = str; - trim(nppGUI._printSettings._footerMiddle); - return TRUE; + default : + { + const int stringSize = 256; + TCHAR str[stringSize]; + _focusedEditCtrl = LOWORD(wParam); + ::GetDlgItemText(_hSelf, _focusedEditCtrl, str, stringSize); + ::SendDlgItemMessage(_hSelf, IDC_VIEWPANEL_STATIC, WM_SETTEXT, 0, (LPARAM)str); + switch (LOWORD(wParam)) + { + case IDC_EDIT_HLEFT: + nppGUI._printSettings._headerLeft = str; + trim(nppGUI._printSettings._headerLeft); + return TRUE; - case IDC_EDIT_FRIGHT : - nppGUI._printSettings._footerRight = str; - trim(nppGUI._printSettings._footerRight); - return TRUE; + case IDC_EDIT_HMIDDLE: + nppGUI._printSettings._headerMiddle = str; + trim(nppGUI._printSettings._headerMiddle); + return TRUE; - default : - return FALSE; + case IDC_EDIT_HRIGHT : + nppGUI._printSettings._headerRight = str; + trim(nppGUI._printSettings._headerRight); + return TRUE; + + case IDC_EDIT_FLEFT: + nppGUI._printSettings._footerLeft = str; + trim(nppGUI._printSettings._footerLeft); + return TRUE; + + case IDC_EDIT_FMIDDLE: + nppGUI._printSettings._footerMiddle = str; + trim(nppGUI._printSettings._footerMiddle); + return TRUE; + + case IDC_EDIT_FRIGHT : + nppGUI._printSettings._footerRight = str; + trim(nppGUI._printSettings._footerRight); + return TRUE; + + default : + return FALSE; + } + return TRUE; + } } } else if (HIWORD(wParam) == EN_SETFOCUS) @@ -1606,9 +1549,6 @@ BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM const int stringSize = 256; TCHAR str[stringSize]; _focusedEditCtrl = LOWORD(wParam); - ::GetDlgItemText(_hSelf, _focusedEditCtrl, str, stringSize); - //_colourHooker.setColour(RGB(0, 0, 0xFF)); - ::SendDlgItemMessage(_hSelf, IDC_VIEWPANEL_STATIC, WM_SETTEXT, 0, (LPARAM)str); int focusedEditStatic = 0; int groupStatic = 0; @@ -1620,8 +1560,10 @@ BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM case IDC_EDIT_FLEFT : focusedEditStatic = IDC_FL_STATIC; groupStatic = IDC_FGB_STATIC; break; case IDC_EDIT_FMIDDLE : focusedEditStatic = IDC_FM_STATIC; groupStatic = IDC_FGB_STATIC; break; case IDC_EDIT_FRIGHT : focusedEditStatic = IDC_FR_STATIC; groupStatic = IDC_FGB_STATIC; break; + default : return TRUE; } - + ::GetDlgItemText(_hSelf, _focusedEditCtrl, str, stringSize); + ::SendDlgItemMessage(_hSelf, IDC_VIEWPANEL_STATIC, WM_SETTEXT, 0, (LPARAM)str); ::GetDlgItemText(_hSelf, groupStatic, str, stringSize); generic_string title = str; title += TEXT(" "); @@ -1676,6 +1618,25 @@ BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM switch (wParam) { + case IDC_CHECK_PRINTLINENUM: + nppGUI._printSettings._printLineNumber = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_PRINTLINENUM, BM_GETCHECK, 0, 0)); + break; + + case IDC_RADIO_WYSIWYG: + nppGUI._printSettings._printOption = SC_PRINT_NORMAL; + break; + + case IDC_RADIO_INVERT: + nppGUI._printSettings._printOption = SC_PRINT_INVERTLIGHT; + break; + + case IDC_RADIO_BW : + nppGUI._printSettings._printOption = SC_PRINT_BLACKONWHITE; + break; + + case IDC_RADIO_NOBG : + nppGUI._printSettings._printOption = SC_PRINT_COLOURONWHITE; + break; case IDC_CHECK_HBOLD: nppGUI._printSettings._headerFontStyle ^= FONTSTYLE_BOLD; break; @@ -1701,15 +1662,10 @@ BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM TCHAR *varStr = (TCHAR *)::SendDlgItemMessage(_hSelf, IDC_COMBO_VARLIST, CB_GETITEMDATA, iSel, 0); ::SendDlgItemMessage(_hSelf, _focusedEditCtrl, EM_GETSEL, (WPARAM)&_selStart, (LPARAM)&_selEnd); -/* - TCHAR toto[32]; - wsprintf(toto, TEXT("_selStart = %d\r_selEnd = %d"), _selStart, _selEnd); - ::MessageBox(NULL, toto, TEXT(""), MB_OK); -*/ + const int stringSize = 256; TCHAR str[stringSize]; ::SendDlgItemMessage(_hSelf, _focusedEditCtrl, WM_GETTEXT, stringSize, (LPARAM)str); - //::MessageBox(NULL, str, TEXT(""), MB_OK); generic_string str2Set(str); str2Set.replace(_selStart, _selEnd - _selStart, varStr); @@ -1717,6 +1673,39 @@ BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM ::SetDlgItemText(_hSelf, _focusedEditCtrl, str2Set.c_str()); } break; + } + return TRUE; + } + } + return FALSE; +} + + +/* +BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) +{ + NppParameters *pNppParam = NppParameters::getInstance(); + NppGUI & nppGUI = (NppGUI & )pNppParam->getNppGUI(); + + switch (Message) + { + case WM_INITDIALOG : + { + + } + case WM_COMMAND : + { + if (HIWORD(wParam) == EN_CHANGE) + { + + + + } + + + switch (wParam) + { + } return TRUE; @@ -1724,6 +1713,7 @@ BOOL CALLBACK PrintSettings2Dlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM } return FALSE; } +*/ BOOL CALLBACK BackupDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) { diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.h b/PowerEditor/src/WinControls/Preference/preferenceDlg.h index c9632fc56..cfa9e7a1e 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.h +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.h @@ -102,12 +102,22 @@ private : vector _langList; }; +struct strCouple { + generic_string _varDesc; + generic_string _var; + strCouple(TCHAR *varDesc, TCHAR *var): _varDesc(varDesc), _var(var){}; +}; + class PrintSettingsDlg : public StaticDialog { public : - PrintSettingsDlg() {}; + PrintSettingsDlg():_focusedEditCtrl(0), _selStart(0), _selEnd(0){}; private : BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); + vector varList; + int _focusedEditCtrl; + DWORD _selStart; + DWORD _selEnd; }; class BackupDlg : public StaticDialog @@ -120,23 +130,18 @@ private : BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); }; -struct strCouple { - generic_string _varDesc; - generic_string _var; - strCouple(TCHAR *varDesc, TCHAR *var): _varDesc(varDesc), _var(var){}; -}; + +/* class PrintSettings2Dlg : public StaticDialog { public : PrintSettings2Dlg():_focusedEditCtrl(0), _selStart(0), _selEnd(0){}; private : BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); - vector varList; - int _focusedEditCtrl; - DWORD _selStart; - DWORD _selEnd; + }; +*/ class PreferenceDlg : public StaticDialog { @@ -166,7 +171,7 @@ public : _fileAssocDlg.destroy(); _langMenuDlg.destroy(); _printSettingsDlg.destroy(); - _printSettings2Dlg.destroy(); + //_printSettings2Dlg.destroy(); _defaultNewDocDlg.destroy(); }; private : @@ -179,7 +184,7 @@ private : RegExtDlg _fileAssocDlg; LangMenuDlg _langMenuDlg; PrintSettingsDlg _printSettingsDlg; - PrintSettings2Dlg _printSettings2Dlg; + //PrintSettings2Dlg _printSettings2Dlg; DefaultNewDocDlg _defaultNewDocDlg; BackupDlg _backupDlg; };