diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index b9722f44..21fca6f6 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -819,36 +819,34 @@ The comments are here for explanation, it's not necessary to translate them. - - + + + + + + + + + + + + + - - - - - - - - - - - - - + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index 80d21548..3d57614a 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -1,6 +1,6 @@ - +
@@ -37,6 +37,7 @@ + @@ -108,6 +109,7 @@ + @@ -115,6 +117,8 @@ + + @@ -218,6 +222,13 @@ + + + + + + + @@ -338,13 +349,13 @@ - + - + @@ -397,8 +408,9 @@ - + + @@ -543,6 +555,13 @@ + + + + + + + @@ -788,6 +807,8 @@ + + @@ -795,36 +816,34 @@ - - + + + + + + + + + + + + + - - - - - - - - - - - - - + @@ -983,10 +1002,15 @@ You can define several column markers by using white space to separate the diffe (don't choose it unless you know what you're doing)"/> - + + + + + + @@ -1009,17 +1033,14 @@ You can define several column markers by using white space to separate the diffe - - - + - @@ -1083,34 +1104,33 @@ You can define several column markers by using white space to separate the diffe - +Continue?"/> - +Continue?"/> + - - + + + +Are you sure you want to open them?"/> - - + + - + - + This file has been modified by another program. Do you want to reload it and lose the changes made in Notepad++?"/> - + +Do you want to go to Notepad++ page to download the latest version?"/> - + - + +Do you want to save the current file anyways?"/> - +Do you want to recover your langs.xml?"/> + +Please remove its root from the panel before you add folder "$STR_REPLACE$"."/> - + Do you want to launch Notepad++ in Administrator mode?"/> - + - + @@ -1208,6 +1228,9 @@ Continue?"/> + + + @@ -1269,21 +1292,22 @@ Continue?"/> - + + - + - + +*.* !*.exe !*.obj !*.log"/> @@ -1317,7 +1341,8 @@ Find in all files except exe, obj && log: - + + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 890ea0ad..193921e8 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -780,21 +780,9 @@ + - - - - - - - - - - - - + @@ -802,18 +790,32 @@ Vous pouvez définir plusieurs marqueurs de colonne en utilisant un espace pour - - - + - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml index cc4e8a66..7d2c7576 100644 --- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml +++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml @@ -787,42 +787,42 @@ + - - + + + + + + + + + + + + + - - - - - - - - - + - - - - - + + diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 5bf57092..23795e15 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -43,7 +43,9 @@ BEGIN PUSHBUTTON "Close",IDC_BUTTON_CLOSE,255,215,45,14 END -IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 455, 185 + + +IDD_PREFERENCE_SUB_GENRAL DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -73,85 +75,56 @@ BEGIN CONTROL "Hide menu bar (use Alt or F10 key to toggle)",IDC_CHECK_HIDEMENUBAR, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,223,169,218,10 END -IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_EDITING DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Folder Margin Style",IDC_FMS_GB_STATIC,46,44,83,89,BS_CENTER - CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,55,57,59,10 - CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,55,71,60,10 - CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,55,86,62,10 - CONTROL "None",IDC_RADIO_FOLDMARGENONE,"Button",BS_AUTORADIOBUTTON,55,115,61,10 - CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,55,100,61,10 - GROUPBOX "Vertical Edge Settings",IDC_VES_GB_STATIC,142,44,148,135,BS_CENTER - CONTROL "Background mode",IDC_CHECK_EDGEBGMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,161,122,10 - LTEXT "Add your column marker by indicating its position with a decimal number.\nYou can define several column markers by using white space to separate the different numbers.",IDC_STATIC_MULTILNMODE_TIP,150,59,134,55 - EDITTEXT IDC_COLUMNPOS_EDIT,152,116,125,36,ES_MULTILINE - GROUPBOX "Caret Settings",IDC_CARETSETTING_STATIC,46,1,199,40,BS_CENTER - LTEXT "Width :",IDC_WIDTH_STATIC,50,20,37,8,0,WS_EX_RIGHT - COMBOBOX IDC_WIDTH_COMBO,89,18,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Blink rate :",IDC_BLINKRATE_STATIC,161,13,60,8 - CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,156,25,67,13 - LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,225,25,12,8 - LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,144,25,12,8,0,WS_EX_RIGHT - GROUPBOX "Multi-Editing Settings",IDC_MULTISELECTION_GB_STATIC,253,1,140,40,BS_CENTER - CONTROL "Enable (Ctrl+Mouse click/selection)",IDC_CHECK_MULTISELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,18,130,10 - GROUPBOX "Line Wrap",IDC_LW_GB_STATIC,301,44,92,56,BS_CENTER - CONTROL "Default",IDC_RADIO_LWDEF,"Button",BS_AUTORADIOBUTTON | WS_GROUP,311,57,59,10 - CONTROL "Aligned",IDC_RADIO_LWALIGN,"Button",BS_AUTORADIOBUTTON,311,71,60,10 - CONTROL "Indent",IDC_RADIO_LWINDENT,"Button",BS_AUTORADIOBUTTON,311,85,62,10 - GROUPBOX "Border Width",IDC_BORDERWIDTH_STATIC,45,135,85,45,BS_CENTER - CONTROL "",IDC_BORDERWIDTH_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,48,148,67,13 - LTEXT "0",IDC_BORDERWIDTHVAL_STATIC,116,148,12,8 - CONTROL "No edge",IDC_CHECK_NOEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,53,165,60,10 - CONTROL "Display line number",IDC_CHECK_LINENUMBERMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,106,141,10 - CONTROL "Display bookmark",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,118,150,10 - CONTROL "Enable current line highlighting",IDC_CHECK_CURRENTLINEHILITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,130,129,10 - CONTROL "Enable smooth font",IDC_CHECK_SMOOTHFONT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,142,129,10 - CONTROL "Enable scrolling beyond last line",IDC_CHECK_SCROLLBEYONDLASTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,154,139,10 - CONTROL "Keep selection when right-click outside of selection",IDC_CHECK_RIGHTCLICKKEEPSSELECTION,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,298,165,139,18 - CONTROL "Disable advanced scrolling feature\r(if you have touchpad problem)",IDC_CHECK_DISABLEADVANCEDSCROLL,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,298,184,139,18 + GROUPBOX "Caret Settings",IDC_CARETSETTING_STATIC,53,6,186,67,BS_CENTER + LTEXT "Width :",IDC_WIDTH_STATIC,81,27,37,8,0,WS_EX_RIGHT + COMBOBOX IDC_WIDTH_COMBO,125,25,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Blink rate :",IDC_BLINKRATE_STATIC,57,52,60,8 + CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,134,52,67,13 + LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,203,52,12,8 + LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,122,52,12,8,0,WS_EX_RIGHT + GROUPBOX "Line Wrap",IDC_LW_GB_STATIC,265,6,92,66,BS_CENTER + CONTROL "Default",IDC_RADIO_LWDEF,"Button",BS_AUTORADIOBUTTON | WS_GROUP,275,21,59,10 + CONTROL "Aligned",IDC_RADIO_LWALIGN,"Button",BS_AUTORADIOBUTTON,275,36,60,10 + CONTROL "Indent",IDC_RADIO_LWINDENT,"Button",BS_AUTORADIOBUTTON,275,51,62,10 + CONTROL "Enable Multi-Editing (Ctrl+Mouse click/selection)",IDC_CHECK_MULTISELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,90,230,10 + CONTROL "Enable current line highlighting",IDC_CHECK_CURRENTLINEHILITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,103,160,10 + CONTROL "Enable smooth font",IDC_CHECK_SMOOTHFONT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,116,130,10 + CONTROL "Enable scrolling beyond last line",IDC_CHECK_SCROLLBEYONDLASTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,129,160,10 + CONTROL "Keep selection when right-click outside of selection",IDC_CHECK_RIGHTCLICKKEEPSSELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,142,230,10 + CONTROL "Disable advanced scrolling feature due to touchpad issue",IDC_CHECK_DISABLEADVANCEDSCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,155,270,10 END -IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_MARGING_BORDER_EDGE DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,15,140,10 - CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,28,140,10 - CONTROL "Peek on tab",IDC_CHECK_ENABLEDOCPEEKER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,58,140,10 - CONTROL "Peek on document map",IDC_CHECK_ENABLEDOCPEEKONMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,71,140,10 - - // "Enable Notepad++ auto-updater" should be always the 1st item, because it'll be hidden if GUP.exe is absent - CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,94,217,10 - CONTROL "Set Save dialog file extension filter to .* instead of .txt for Normal Text",IDC_CHECK_SAVEDLGEXTFILTALLTYPESFORNORMTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,109,267,10 - CONTROL "Autodetect character encoding",IDC_CHECK_DETECTENCODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,124,217,10 - CONTROL "Minimize to system tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,139,217,10 - CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,154,217,10 - CONTROL "Use DirectWrite (May improve rendering special characters, need to restart Notepad++)",IDC_CHECK_DIRECTWRITE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,169,377,10 - COMBOBOX IDC_COMBO_FILEUPDATECHOICE,44,16,140,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,44,32,140,10 - CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,44,44,140,10 - EDITTEXT IDC_EDIT_SESSIONFILEEXT,380,127,34,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_WORKSPACEFILEEXT,380,144,34,14,ES_AUTOHSCROLL - GROUPBOX "Document Switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,261,4,155,39,BS_CENTER - GROUPBOX "Document Peeker",IDC_DOCUMENTPEEK_STATIC,261,47,155,39,BS_CENTER - GROUPBOX "File Status Auto-Detection",IDC_FILEAUTODETECTION_STATIC,36,4,155,60,BS_CENTER - RTEXT "Session file ext.:",IDC_SESSIONFILEEXT_STATIC,270,130,108,8 - RTEXT "Workspace file ext.:",IDC_WORKSPACEFILEEXT_STATIC,270,147,108,8 + GROUPBOX "Folder Margin Style",IDC_FMS_GB_STATIC,22,21,83,89,BS_CENTER + CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,31,34,59,10 + CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,31,48,60,10 + CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,31,63,62,10 + CONTROL "None",IDC_RADIO_FOLDMARGENONE,"Button",BS_AUTORADIOBUTTON,31,92,61,10 + CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,31,77,61,10 + GROUPBOX "Vertical Edge Settings",IDC_VES_GB_STATIC,118,21,148,135,BS_CENTER + CONTROL "Background mode",IDC_CHECK_EDGEBGMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,138,122,10 + LTEXT "Add your column marker by indicating its position with a decimal number.\nYou can define several column markers by using white space to separate the different numbers.",IDC_STATIC_MULTILNMODE_TIP,126,36,134,55 + EDITTEXT IDC_COLUMNPOS_EDIT,128,93,125,36,ES_MULTILINE + GROUPBOX "Border Width",IDC_BORDERWIDTH_STATIC,21,112,85,45,BS_CENTER + CONTROL "",IDC_BORDERWIDTH_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,24,125,67,13 + LTEXT "0",IDC_BORDERWIDTHVAL_STATIC,92,125,12,8 + CONTROL "No edge",IDC_CHECK_NOEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,142,60,10 + CONTROL "Display line number",IDC_CHECK_LINENUMBERMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,283,27,141,10 + CONTROL "Display bookmark",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,283,39,150,10 END -IDD_PREFERENCE_SEARCHINGSETTINGS_BOX DIALOGEX 0, 0, 455, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "Don't fill find field in Find dialog with selected word", IDC_CHECK_STOPFILLINGFINDFIELD, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,10,350,10 - CONTROL "Use Monospaced font in Find dialog (Need to restart Notepad++)",IDC_CHECK_MONOSPACEDFONT_FINDDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,25,350,10 - CONTROL "Find dialog remains open after search that outputs to results window",IDC_CHECK_FINDDLG_ALWAYS_VISIBLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,40,350,10 - CONTROL "Confirm Replace All in All Opened Documents",IDC_CHECK_CONFIRMREPLOPENDOCS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,55,350,10 -END -IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_NEWDOCUMENT DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -173,7 +146,8 @@ BEGIN COMBOBOX IDC_COMBO_DEFAULTLANG,139,128,60,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_PREFERENCE_DEFAULTDIRECTORY_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_DEFAULTDIRECTORY DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -187,7 +161,8 @@ BEGIN CONTROL "Open all files of folder instead of launching Folder as Workspace on folder dropping",IDC_OPENSAVEDIR_CHECK_DRROPFOLDEROPENFILES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,158,342,10 END -IDD_PREFERENCE_RECENTFILESHISTORY_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_RECENTFILESHISTORY DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -203,7 +178,8 @@ BEGIN LTEXT "0",IDC_CUSTOMIZELENGTHVAL_STATIC,255,120,18,8,WS_TABSTOP END -IDD_PREFERENCE_LANG_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_LANGUAGE DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -226,7 +202,8 @@ BEGIN CONTROL "Treat backslash as escape character for SQL",IDC_CHECK_BACKSLASHISESCAPECHARACTERFORSQL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,175,217,10 END -IDD_PREFERENCE_HILITE_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_HIGHLIGHTING DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -243,7 +220,8 @@ BEGIN 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 + +IDD_PREFERENCE_SUB_PRINT DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -291,8 +269,20 @@ BEGIN LTEXT "",IDC_VIEWPANEL_STATIC,277,161,180,8 GROUPBOX "Header and Footer",IDC_HEADERFPPTER_GR_STATIC,150,7,296,172,BS_CENTER END - -IDD_PREFERENCE_BACKUP_BOX DIALOGEX 0, 0, 455, 185 + + +IDD_PREFERENCE_SUB_SEARCHING DIALOGEX 0, 0, 455, 185 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "Don't fill find field in Find dialog with selected word", IDC_CHECK_STOPFILLINGFINDFIELD, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,10,350,10 + CONTROL "Use Monospaced font in Find dialog (Need to restart Notepad++)",IDC_CHECK_MONOSPACEDFONT_FINDDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,25,350,10 + CONTROL "Find dialog remains open after search that outputs to results window",IDC_CHECK_FINDDLG_ALWAYS_VISIBLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,40,350,10 + CONTROL "Confirm Replace All in All Opened Documents",IDC_CHECK_CONFIRMREPLOPENDOCS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,55,350,10 +END + + +IDD_PREFERENCE_SUB_BACKUP DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -315,7 +305,8 @@ BEGIN EDITTEXT IDD_BACKUPDIR_RESTORESESSION_PATH_EDIT,153,58,208,14,ES_AUTOHSCROLL | ES_READONLY END -IDD_PREFERENCE_AUTOCOMPLETION_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_AUTOCOMPLETION DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -352,7 +343,8 @@ BEGIN EDITTEXT IDC_MACHEDPAIRCLOSE_EDIT3,393,155,14,14 END -IDD_PREFERENCE_MULTIINSTANCE_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_MULTIINSTANCE DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -363,7 +355,8 @@ BEGIN LTEXT "* The modification of this setting needs to restart Notepad++",IDD_STATIC_RESTARTNOTE,110,124,239,20 END -IDD_PREFERENCE_DELIMITERSETTINGS_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_DELIMITER DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -384,7 +377,8 @@ BEGIN CONTROL "Allow on several lines",IDD_SEVERALLINEMODEON_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,166,160,10 END -IDD_PREFERENCE_SETTINGSONCLOUD_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_CLOUD_LINK DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -403,7 +397,8 @@ BEGIN EDITTEXT IDC_URISCHEMES_EDIT,106,148,238,30,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL END -IDD_PREFERENCE_SEARCHENGINE_BOX DIALOGEX 0, 0, 455, 185 + +IDD_PREFERENCE_SUB_SEARCHENGINE DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -417,3 +412,33 @@ BEGIN EDITTEXT IDC_SEARCHENGINE_EDIT,114,128,179,14,ES_AUTOHSCROLL LTEXT "Example: https://www.google.com/search?q=$(CURRENT_WORD)",IDD_SEARCHENGINE_NOTE_STATIC,114,143,245,20 END + + +IDD_PREFERENCE_SUB_MISC DIALOGEX 0, 0, 455, 185 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,15,140,10 + CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,28,140,10 + CONTROL "Peek on tab",IDC_CHECK_ENABLEDOCPEEKER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,58,140,10 + CONTROL "Peek on document map",IDC_CHECK_ENABLEDOCPEEKONMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,269,71,140,10 + + // "Enable Notepad++ auto-updater" should be always the 1st item, because it'll be hidden if GUP.exe is absent + CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,94,217,10 + CONTROL "Set Save dialog file extension filter to .* instead of .txt for Normal Text",IDC_CHECK_SAVEDLGEXTFILTALLTYPESFORNORMTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,109,267,10 + CONTROL "Autodetect character encoding",IDC_CHECK_DETECTENCODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,124,217,10 + CONTROL "Minimize to system tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,139,217,10 + CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,154,217,10 + CONTROL "Use DirectWrite (May improve rendering special characters, need to restart Notepad++)",IDC_CHECK_DIRECTWRITE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,169,377,10 + COMBOBOX IDC_COMBO_FILEUPDATECHOICE,44,16,140,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,44,32,140,10 + CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,44,44,140,10 + EDITTEXT IDC_EDIT_SESSIONFILEEXT,380,127,34,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_WORKSPACEFILEEXT,380,144,34,14,ES_AUTOHSCROLL + GROUPBOX "Document Switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,261,4,155,39,BS_CENTER + GROUPBOX "Document Peeker",IDC_DOCUMENTPEEK_STATIC,261,47,155,39,BS_CENTER + GROUPBOX "File Status Auto-Detection",IDC_FILEAUTODETECTION_STATIC,36,4,155,60,BS_CENTER + RTEXT "Session file ext.:",IDC_SESSIONFILEEXT_STATIC,270,130,108,8 + RTEXT "Workspace file ext.:",IDC_WORKSPACEFILEEXT_STATIC,270,147,108,8 +END + diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 4a67c461..abf36eb0 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -46,7 +46,7 @@ const int BORDERWIDTH_LARGEST = 30; const int BORDERWIDTH_INTERVAL = 1; // This int encoding array is built from "EncodingUnit encodings[]" (see EncodingMapper.cpp) -// And DefaultNewDocDlg will use "int encoding array" to get more info from "EncodingUnit encodings[]" +// And NewDocumentSubDlg will use "int encoding array" to get more info from "EncodingUnit encodings[]" static int encodings[] = { 1250, 1251, @@ -102,76 +102,80 @@ INT_PTR CALLBACK PreferenceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM { case WM_INITDIALOG : { - _barsDlg.init(_hInst, _hSelf); - _barsDlg.create(IDD_PREFERENCE_BAR_BOX, false, false); - _barsDlg.display(); + _generalSubDlg.init(_hInst, _hSelf); + _generalSubDlg.create(IDD_PREFERENCE_SUB_GENRAL, false, false); + _generalSubDlg.display(); - _marginsDlg.init(_hInst, _hSelf); - _marginsDlg.create(IDD_PREFERENCE_MARGEIN_BOX, false, false); - - _settingsDlg.init(_hInst, _hSelf); - _settingsDlg.create(IDD_PREFERENCE_SETTING_BOX, false, false); - - _defaultNewDocDlg.init(_hInst, _hSelf); - _defaultNewDocDlg.create(IDD_PREFERENCE_NEWDOCSETTING_BOX, false, false); + _editingSubDlg.init(_hInst, _hSelf); + _editingSubDlg.create(IDD_PREFERENCE_SUB_EDITING, false, false); - _defaultDirectoryDlg.init(_hInst, _hSelf); - _defaultDirectoryDlg.create(IDD_PREFERENCE_DEFAULTDIRECTORY_BOX, false, false); + _marginsBorderEdgeSubDlg.init(_hInst, _hSelf); + _marginsBorderEdgeSubDlg.create(IDD_PREFERENCE_SUB_MARGING_BORDER_EDGE, false, false); + + _miscSubDlg.init(_hInst, _hSelf); + _miscSubDlg.create(IDD_PREFERENCE_SUB_MISC, false, false); + + _newDocumentSubDlg.init(_hInst, _hSelf); + _newDocumentSubDlg.create(IDD_PREFERENCE_SUB_NEWDOCUMENT, false, false); - _recentFilesHistoryDlg.init(_hInst, _hSelf); - _recentFilesHistoryDlg.create(IDD_PREFERENCE_RECENTFILESHISTORY_BOX, false, false); + _defaultDirectorySubDlg.init(_hInst, _hSelf); + _defaultDirectorySubDlg.create(IDD_PREFERENCE_SUB_DEFAULTDIRECTORY, false, false); + + _recentFilesHistorySubDlg.init(_hInst, _hSelf); + _recentFilesHistorySubDlg.create(IDD_PREFERENCE_SUB_RECENTFILESHISTORY, false, false); _fileAssocDlg.init(_hInst, _hSelf); _fileAssocDlg.create(IDD_REGEXT_BOX, false, false); - _printSettingsDlg.init(_hInst, _hSelf); - _printSettingsDlg.create(IDD_PREFERENCE_PRINT_BOX, false, false); + _printSubDlg.init(_hInst, _hSelf); + _printSubDlg.create(IDD_PREFERENCE_SUB_PRINT, false, false); - _searchingSettingsDlg.init(_hInst, _hSelf); - _searchingSettingsDlg.create(IDD_PREFERENCE_SEARCHINGSETTINGS_BOX, false, false); + _searchingSubDlg.init(_hInst, _hSelf); + _searchingSubDlg.create(IDD_PREFERENCE_SUB_SEARCHING, false, false); - _langMenuDlg.init(_hInst, _hSelf); - _langMenuDlg.create(IDD_PREFERENCE_LANG_BOX, false, false); + _languageSubDlg.init(_hInst, _hSelf); + _languageSubDlg.create(IDD_PREFERENCE_SUB_LANGUAGE, false, false); - _highlighting.init(_hInst, _hSelf); - _highlighting.create(IDD_PREFERENCE_HILITE_BOX, false, false); + _highlightingSubDlg.init(_hInst, _hSelf); + _highlightingSubDlg.create(IDD_PREFERENCE_SUB_HIGHLIGHTING, false, false); - _backupDlg.init(_hInst, _hSelf); - _backupDlg.create(IDD_PREFERENCE_BACKUP_BOX, false, false); + _backupSubDlg.init(_hInst, _hSelf); + _backupSubDlg.create(IDD_PREFERENCE_SUB_BACKUP, false, false); - _autoCompletionDlg.init(_hInst, _hSelf); - _autoCompletionDlg.create(IDD_PREFERENCE_AUTOCOMPLETION_BOX, false, false); + _autoCompletionSubDlg.init(_hInst, _hSelf); + _autoCompletionSubDlg.create(IDD_PREFERENCE_SUB_AUTOCOMPLETION, false, false); - _multiInstDlg.init(_hInst, _hSelf); - _multiInstDlg.create(IDD_PREFERENCE_MULTIINSTANCE_BOX, false, false); + _multiInstanceSubDlg.init(_hInst, _hSelf); + _multiInstanceSubDlg.create(IDD_PREFERENCE_SUB_MULTIINSTANCE, false, false); - _delimiterSettingsDlg.init(_hInst, _hSelf); - _delimiterSettingsDlg.create(IDD_PREFERENCE_DELIMITERSETTINGS_BOX, false, false); + _delimiterSubDlg.init(_hInst, _hSelf); + _delimiterSubDlg.create(IDD_PREFERENCE_SUB_DELIMITER, false, false); - _settingsOnCloudDlg.init(_hInst, _hSelf); - _settingsOnCloudDlg.create(IDD_PREFERENCE_SETTINGSONCLOUD_BOX, false, false); + _cloudAndLinkSubDlg.init(_hInst, _hSelf); + _cloudAndLinkSubDlg.create(IDD_PREFERENCE_SUB_CLOUD_LINK, false, false); - _searchEngineDlg.init(_hInst, _hSelf); - _searchEngineDlg.create(IDD_PREFERENCE_SEARCHENGINE_BOX, false, false); + _searchEngineSubDlg.init(_hInst, _hSelf); + _searchEngineSubDlg.create(IDD_PREFERENCE_SUB_SEARCHENGINE, false, false); - _wVector.push_back(DlgInfo(&_barsDlg, TEXT("General"), TEXT("Global"))); - _wVector.push_back(DlgInfo(&_marginsDlg, TEXT("Editing"), TEXT("Scintillas"))); - _wVector.push_back(DlgInfo(&_defaultNewDocDlg, TEXT("New Document"), TEXT("NewDoc"))); - _wVector.push_back(DlgInfo(&_defaultDirectoryDlg, TEXT("Default Directory"), TEXT("DefaultDir"))); - _wVector.push_back(DlgInfo(&_recentFilesHistoryDlg, TEXT("Recent Files History"), TEXT("RecentFilesHistory"))); + _wVector.push_back(DlgInfo(&_generalSubDlg, TEXT("General"), TEXT("Global"))); + _wVector.push_back(DlgInfo(&_editingSubDlg, TEXT("Editing"), TEXT("Scintillas"))); + _wVector.push_back(DlgInfo(&_marginsBorderEdgeSubDlg, TEXT("Margins/Border/Edge"), TEXT("MarginsBorderEdge"))); + _wVector.push_back(DlgInfo(&_newDocumentSubDlg, TEXT("New Document"), TEXT("NewDoc"))); + _wVector.push_back(DlgInfo(&_defaultDirectorySubDlg, TEXT("Default Directory"), TEXT("DefaultDir"))); + _wVector.push_back(DlgInfo(&_recentFilesHistorySubDlg, 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(&_highlighting, TEXT("Highlighting"), TEXT("Highlighting"))); - _wVector.push_back(DlgInfo(&_printSettingsDlg, TEXT("Print"), TEXT("Print"))); - _wVector.push_back(DlgInfo(&_searchingSettingsDlg, TEXT("Searching"), TEXT("Searching"))); - _wVector.push_back(DlgInfo(&_backupDlg, TEXT("Backup"), TEXT("Backup"))); - _wVector.push_back(DlgInfo(&_autoCompletionDlg, TEXT("Auto-Completion"), TEXT("AutoCompletion"))); - _wVector.push_back(DlgInfo(&_multiInstDlg, TEXT("Multi-Instance"), TEXT("MultiInstance"))); - _wVector.push_back(DlgInfo(&_delimiterSettingsDlg, TEXT("Delimiter"), TEXT("Delimiter"))); - _wVector.push_back(DlgInfo(&_settingsOnCloudDlg, TEXT("Cloud & Link"), TEXT("Cloud"))); - _wVector.push_back(DlgInfo(&_searchEngineDlg, TEXT("Search Engine"), TEXT("SearchEngine"))); - _wVector.push_back(DlgInfo(&_settingsDlg, TEXT("MISC."), TEXT("MISC"))); + _wVector.push_back(DlgInfo(&_languageSubDlg, TEXT("Language"), TEXT("Language"))); + _wVector.push_back(DlgInfo(&_highlightingSubDlg, TEXT("Highlighting"), TEXT("Highlighting"))); + _wVector.push_back(DlgInfo(&_printSubDlg, TEXT("Print"), TEXT("Print"))); + _wVector.push_back(DlgInfo(&_searchingSubDlg, TEXT("Searching"), TEXT("Searching"))); + _wVector.push_back(DlgInfo(&_backupSubDlg, TEXT("Backup"), TEXT("Backup"))); + _wVector.push_back(DlgInfo(&_autoCompletionSubDlg, TEXT("Auto-Completion"), TEXT("AutoCompletion"))); + _wVector.push_back(DlgInfo(&_multiInstanceSubDlg, TEXT("Multi-Instance"), TEXT("MultiInstance"))); + _wVector.push_back(DlgInfo(&_delimiterSubDlg, TEXT("Delimiter"), TEXT("Delimiter"))); + _wVector.push_back(DlgInfo(&_cloudAndLinkSubDlg, TEXT("Cloud & Link"), TEXT("Cloud"))); + _wVector.push_back(DlgInfo(&_searchEngineSubDlg, TEXT("Search Engine"), TEXT("SearchEngine"))); + _wVector.push_back(DlgInfo(&_miscSubDlg, TEXT("MISC."), TEXT("MISC"))); makeCategoryList(); @@ -182,23 +186,24 @@ INT_PTR CALLBACK PreferenceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM rc.bottom -= NppParameters::getInstance()._dpiManager.scaleY(50); rc.left += NppParameters::getInstance()._dpiManager.scaleX(150); - _barsDlg.reSizeTo(rc); - _marginsDlg.reSizeTo(rc); - _settingsDlg.reSizeTo(rc); - _defaultNewDocDlg.reSizeTo(rc); - _defaultDirectoryDlg.reSizeTo(rc); - _recentFilesHistoryDlg.reSizeTo(rc); + _generalSubDlg.reSizeTo(rc); + _editingSubDlg.reSizeTo(rc); + _marginsBorderEdgeSubDlg.reSizeTo(rc); + _miscSubDlg.reSizeTo(rc); + _newDocumentSubDlg.reSizeTo(rc); + _defaultDirectorySubDlg.reSizeTo(rc); + _recentFilesHistorySubDlg.reSizeTo(rc); _fileAssocDlg.reSizeTo(rc); - _langMenuDlg.reSizeTo(rc); - _highlighting.reSizeTo(rc); - _printSettingsDlg.reSizeTo(rc); - _searchingSettingsDlg.reSizeTo(rc); - _backupDlg.reSizeTo(rc); - _autoCompletionDlg.reSizeTo(rc); - _multiInstDlg.reSizeTo(rc); - _delimiterSettingsDlg.reSizeTo(rc); - _settingsOnCloudDlg.reSizeTo(rc); - _searchEngineDlg.reSizeTo(rc); + _languageSubDlg.reSizeTo(rc); + _highlightingSubDlg.reSizeTo(rc); + _printSubDlg.reSizeTo(rc); + _searchingSubDlg.reSizeTo(rc); + _backupSubDlg.reSizeTo(rc); + _autoCompletionSubDlg.reSizeTo(rc); + _multiInstanceSubDlg.reSizeTo(rc); + _delimiterSubDlg.reSizeTo(rc); + _cloudAndLinkSubDlg.reSizeTo(rc); + _searchEngineSubDlg.reSizeTo(rc); NppParameters& nppParam = NppParameters::getInstance(); ETDTProc enableDlgTheme = (ETDTProc)nppParam.getEnableThemeDlgTexture(); @@ -334,24 +339,25 @@ void PreferenceDlg::showDialogByIndex(size_t index) const void PreferenceDlg::destroy() { - _barsDlg.destroy(); - _marginsDlg.destroy(); - _settingsDlg.destroy(); + _generalSubDlg.destroy(); + _editingSubDlg.destroy(); + _marginsBorderEdgeSubDlg.destroy(); + _miscSubDlg.destroy(); _fileAssocDlg.destroy(); - _langMenuDlg.destroy(); - _highlighting.destroy(); - _printSettingsDlg.destroy(); - _searchingSettingsDlg.destroy(); - _defaultNewDocDlg.destroy(); - _defaultDirectoryDlg.destroy(); - _recentFilesHistoryDlg.destroy(); - _backupDlg.destroy(); - _autoCompletionDlg.destroy(); - _multiInstDlg.destroy(); - _delimiterSettingsDlg.destroy(); + _languageSubDlg.destroy(); + _highlightingSubDlg.destroy(); + _printSubDlg.destroy(); + _searchingSubDlg.destroy(); + _newDocumentSubDlg.destroy(); + _defaultDirectorySubDlg.destroy(); + _recentFilesHistorySubDlg.destroy(); + _backupSubDlg.destroy(); + _autoCompletionSubDlg.destroy(); + _multiInstanceSubDlg.destroy(); + _delimiterSubDlg.destroy(); } -INT_PTR CALLBACK BarsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); @@ -588,6 +594,32 @@ INT_PTR CALLBACK BarsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) return FALSE; } +void EditingSubDlg::initScintParam() +{ + NppParameters& nppParam = NppParameters::getInstance(); + ScintillaViewParams & svp = const_cast(nppParam.getSVP()); + + int id = 0; + switch (svp._lineWrapMethod) + { + case LINEWRAP_ALIGNED: + id = IDC_RADIO_LWALIGN; + break; + case LINEWRAP_INDENT: + id = IDC_RADIO_LWINDENT; + break; + default : // LINEWRAP_DEFAULT + id = IDC_RADIO_LWDEF; + } + ::SendDlgItemMessage(_hSelf, id, BM_SETCHECK, TRUE, 0); + + ::SendDlgItemMessage(_hSelf, IDC_CHECK_SMOOTHFONT, BM_SETCHECK, svp._doSmoothFont, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_CURRENTLINEHILITE, BM_SETCHECK, svp._currentLineHilitingShow, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_SETCHECK, svp._scrollBeyondLastLine, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_SETCHECK, svp._rightClickKeepsSelection, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_SETCHECK, svp._disableAdvancedScrolling, 0); +} + static WNDPROC oldFunclstToolbarProc = NULL; static LRESULT CALLBACK editNumSpaceProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -605,7 +637,124 @@ static LRESULT CALLBACK editNumSpaceProc(HWND hwnd, UINT message, WPARAM wParam, return oldFunclstToolbarProc(hwnd, message, wParam, lParam); } -void MarginsDlg::initScintParam() + +INT_PTR CALLBACK EditingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) +{ + NppParameters& nppParam = NppParameters::getInstance(); + NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + switch (message) + { + case WM_INITDIALOG : + { + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("0"))); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("1"))); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("2"))); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("3"))); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("Block"))); + + + ::SendMessage(::GetDlgItem(_hSelf, IDC_WIDTH_COMBO), CB_SETCURSEL, nppGUI._caretWidth, 0); + ::SendDlgItemMessage(_hSelf, IDC_CHECK_MULTISELECTION, BM_SETCHECK, nppGUI._enableMultiSelection, 0); + + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETRANGEMIN, TRUE, BLINKRATE_FASTEST); + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETRANGEMAX, TRUE, BLINKRATE_SLOWEST); + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETPAGESIZE, 0, BLINKRATE_INTERVAL); + int blinkRate = (nppGUI._caretBlinkRate==0)?BLINKRATE_SLOWEST:nppGUI._caretBlinkRate; + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETPOS, TRUE, blinkRate); + + + initScintParam(); + + ETDTProc enableDlgTheme = (ETDTProc)nppParam.getEnableThemeDlgTexture(); + if (enableDlgTheme) + enableDlgTheme(_hSelf, ETDT_ENABLETAB); + return TRUE; + } + + case WM_HSCROLL: + { + HWND hCaretBlikRateSlider = ::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER); + if (reinterpret_cast(lParam) == hCaretBlikRateSlider) + { + auto blinkRate = ::SendMessage(hCaretBlikRateSlider, TBM_GETPOS, 0, 0); + if (blinkRate == BLINKRATE_SLOWEST) + blinkRate = 0; + nppGUI._caretBlinkRate = static_cast(blinkRate); + + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETCARETBLINKRATE, 0, 0); + } + return 0; //return zero when handled + } + + case WM_COMMAND : + { + ScintillaViewParams & svp = const_cast(nppParam.getSVP()); + switch (wParam) + { + case IDC_CHECK_SMOOTHFONT: + svp._doSmoothFont = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SMOOTHFONT, BM_GETCHECK, 0, 0)); + ::SendMessage(::GetParent(_hParent), NPPM_SETSMOOTHFONT, 0, svp._doSmoothFont); + 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, 0); + return TRUE; + + case IDC_CHECK_SCROLLBEYONDLASTLINE: + svp._scrollBeyondLastLine = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_GETCHECK, 0, 0)); + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SCROLLBEYONDLASTLINE, 0, 0); + return TRUE; + + case IDC_CHECK_RIGHTCLICKKEEPSSELECTION: + svp._rightClickKeepsSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_GETCHECK, 0, 0)); + return TRUE; + + case IDC_CHECK_DISABLEADVANCEDSCROLL: + svp._disableAdvancedScrolling = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_GETCHECK, 0, 0)); + return TRUE; + + case IDC_CHECK_MULTISELECTION : + nppGUI._enableMultiSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_MULTISELECTION, BM_GETCHECK, 0, 0)); + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETMULTISELCTION, 0, 0); + return TRUE; + + case IDC_RADIO_LWDEF: + svp._lineWrapMethod = LINEWRAP_DEFAULT; + ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LWDEF, 0); + return TRUE; + + case IDC_RADIO_LWALIGN: + svp._lineWrapMethod = LINEWRAP_ALIGNED; + ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LWALIGN, 0); + return TRUE; + + case IDC_RADIO_LWINDENT: + svp._lineWrapMethod = LINEWRAP_INDENT; + ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LWINDENT, 0); + return TRUE; + + default : + switch (HIWORD(wParam)) + { + case CBN_SELCHANGE : // == case LBN_SELCHANGE : + { + if (LOWORD(wParam) == IDC_WIDTH_COMBO) + { + nppGUI._caretWidth = static_cast(::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_GETCURSEL, 0, 0)); + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETCARETWIDTH, 0, 0); + return TRUE; + } + } + break; + } + } + } + } + return FALSE; +} + +void MarginsBorderEdgeSubDlg::initScintParam() { NppParameters& nppParam = NppParameters::getInstance(); ScintillaViewParams & svp = const_cast(nppParam.getSVP()); @@ -636,29 +785,11 @@ void MarginsDlg::initScintParam() } ::SendDlgItemMessage(_hSelf, id, BM_SETCHECK, TRUE, 0); - switch (svp._lineWrapMethod) - { - case LINEWRAP_ALIGNED: - id = IDC_RADIO_LWALIGN; - break; - case LINEWRAP_INDENT: - id = IDC_RADIO_LWINDENT; - break; - default : // LINEWRAP_DEFAULT - id = IDC_RADIO_LWDEF; - } - ::SendDlgItemMessage(_hSelf, id, BM_SETCHECK, TRUE, 0); - - ::SendDlgItemMessage(_hSelf, IDC_CHECK_SMOOTHFONT, BM_SETCHECK, svp._doSmoothFont, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINENUMBERMARGE, BM_SETCHECK, svp._lineNumberMarginShow, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_BOOKMARKMARGE, BM_SETCHECK, svp._bookMarkMarginShow, 0); - ::SendDlgItemMessage(_hSelf, IDC_CHECK_CURRENTLINEHILITE, BM_SETCHECK, svp._currentLineHilitingShow, 0); - ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_SETCHECK, svp._scrollBeyondLastLine, 0); - ::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_SETCHECK, svp._rightClickKeepsSelection, 0); - ::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_SETCHECK, svp._disableAdvancedScrolling, 0); - + ::SendDlgItemMessage(_hSelf, IDC_CHECK_NOEDGE, BM_SETCHECK, !svp._showBorderEdge, 0); - + bool canBeBg = svp._edgeMultiColumnPos.size() == 1; if (!canBeBg) { @@ -670,7 +801,6 @@ void MarginsDlg::initScintParam() { ::SendDlgItemMessage(_hSelf, IDC_CHECK_EDGEBGMODE, BM_SETCHECK, svp._isEdgeBgMode, 0); } - generic_string edgeColumnPosStr; for (auto i : svp._edgeMultiColumnPos) @@ -684,33 +814,16 @@ void MarginsDlg::initScintParam() oldFunclstToolbarProc = reinterpret_cast(::SetWindowLongPtr(::GetDlgItem(_hSelf, IDC_COLUMNPOS_EDIT), GWLP_WNDPROC, reinterpret_cast(editNumSpaceProc))); } -INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK MarginsBorderEdgeSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) { NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); switch (message) { case WM_INITDIALOG : - { - ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("0"))); - ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("1"))); - ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("2"))); - ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("3"))); - ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("Block"))); - - - ::SendMessage(::GetDlgItem(_hSelf, IDC_WIDTH_COMBO), CB_SETCURSEL, nppGUI._caretWidth, 0); - ::SendDlgItemMessage(_hSelf, IDC_CHECK_MULTISELECTION, BM_SETCHECK, nppGUI._enableMultiSelection, 0); - - ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETRANGEMIN, TRUE, BLINKRATE_FASTEST); - ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETRANGEMAX, TRUE, BLINKRATE_SLOWEST); - ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETPAGESIZE, 0, BLINKRATE_INTERVAL); - int blinkRate = (nppGUI._caretBlinkRate==0)?BLINKRATE_SLOWEST:nppGUI._caretBlinkRate; - ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETPOS, TRUE, blinkRate); - + { ::SendMessage(::GetDlgItem(_hSelf, IDC_BORDERWIDTH_SLIDER),TBM_SETRANGEMIN, TRUE, BORDERWIDTH_SMALLEST); ::SendMessage(::GetDlgItem(_hSelf, IDC_BORDERWIDTH_SLIDER),TBM_SETRANGEMAX, TRUE, BORDERWIDTH_LARGEST); - ::SendMessage(::GetDlgItem(_hSelf, IDC_BORDERWIDTH_SLIDER),TBM_SETPAGESIZE, 0, BLINKRATE_INTERVAL); + ::SendMessage(::GetDlgItem(_hSelf, IDC_BORDERWIDTH_SLIDER),TBM_SETPAGESIZE, 0, BORDERWIDTH_INTERVAL); const ScintillaViewParams & svp = nppParam.getSVP(); ::SendMessage(::GetDlgItem(_hSelf, IDC_BORDERWIDTH_SLIDER),TBM_SETPOS, TRUE, svp._borderWidth); ::SetDlgItemInt(_hSelf, IDC_BORDERWIDTHVAL_STATIC, svp._borderWidth, FALSE); @@ -725,18 +838,8 @@ INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa case WM_HSCROLL: { - HWND hCaretBlikRateSlider = ::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER); HWND hBorderWidthSlider = ::GetDlgItem(_hSelf, IDC_BORDERWIDTH_SLIDER); - if (reinterpret_cast(lParam) == hCaretBlikRateSlider) - { - auto blinkRate = ::SendMessage(hCaretBlikRateSlider, TBM_GETPOS, 0, 0); - if (blinkRate == BLINKRATE_SLOWEST) - blinkRate = 0; - nppGUI._caretBlinkRate = static_cast(blinkRate); - - ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETCARETBLINKRATE, 0, 0); - } - else if (reinterpret_cast(lParam) == hBorderWidthSlider) + if (reinterpret_cast(lParam) == hBorderWidthSlider) { auto borderWidth = ::SendMessage(hBorderWidthSlider, TBM_GETPOS, 0, 0); ScintillaViewParams & svp = (ScintillaViewParams &)nppParam.getSVP(); @@ -752,10 +855,6 @@ INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa ScintillaViewParams & svp = const_cast(nppParam.getSVP()); switch (wParam) { - case IDC_CHECK_SMOOTHFONT: - svp._doSmoothFont = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SMOOTHFONT, BM_GETCHECK, 0, 0)); - ::SendMessage(::GetParent(_hParent), NPPM_SETSMOOTHFONT, 0, svp._doSmoothFont); - return TRUE; case IDC_CHECK_LINENUMBERMARGE: svp._lineNumberMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINENUMBERMARGE, BM_GETCHECK, 0, 0)); ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LINENUMBER, 0); @@ -766,29 +865,6 @@ INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_SYMBOLMARGIN, 0); 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, 0); - return TRUE; - - case IDC_CHECK_SCROLLBEYONDLASTLINE: - svp._scrollBeyondLastLine = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_GETCHECK, 0, 0)); - ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SCROLLBEYONDLASTLINE, 0, 0); - return TRUE; - - case IDC_CHECK_RIGHTCLICKKEEPSSELECTION: - svp._rightClickKeepsSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_RIGHTCLICKKEEPSSELECTION, BM_GETCHECK, 0, 0)); - return TRUE; - - case IDC_CHECK_DISABLEADVANCEDSCROLL: - svp._disableAdvancedScrolling = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DISABLEADVANCEDSCROLL, BM_GETCHECK, 0, 0)); - return TRUE; - - case IDC_CHECK_MULTISELECTION : - nppGUI._enableMultiSelection = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_MULTISELECTION, BM_GETCHECK, 0, 0)); - ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETMULTISELCTION, 0, 0); - return TRUE; - case IDC_CHECK_NOEDGE: svp._showBorderEdge = !(BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_NOEDGE, BM_GETCHECK, 0, 0)); ::SendMessage(::GetParent(_hParent), NPPM_SETEDITORBORDEREDGE, 0, svp._showBorderEdge ? TRUE : FALSE); @@ -821,35 +897,9 @@ INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_EDGEMULTISETSIZE, 0, 0); return TRUE; - case IDC_RADIO_LWDEF: - svp._lineWrapMethod = LINEWRAP_DEFAULT; - ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LWDEF, 0); - return TRUE; - - case IDC_RADIO_LWALIGN: - svp._lineWrapMethod = LINEWRAP_ALIGNED; - ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LWALIGN, 0); - return TRUE; - - case IDC_RADIO_LWINDENT: - svp._lineWrapMethod = LINEWRAP_INDENT; - ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LWINDENT, 0); - return TRUE; - default : switch (HIWORD(wParam)) { - case CBN_SELCHANGE : // == case LBN_SELCHANGE : - { - if (LOWORD(wParam) == IDC_WIDTH_COMBO) - { - nppGUI._caretWidth = static_cast(::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_GETCURSEL, 0, 0)); - ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETCARETWIDTH, 0, 0); - return TRUE; - } - } - break; - case EN_CHANGE : { if (LOWORD(wParam) == IDC_COLUMNPOS_EDIT) @@ -882,7 +932,7 @@ INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa const size_t fileUpdateChoiceEnable = 0; const size_t fileUpdateChoiceEnable4All = 1; const size_t fileUpdateChoiceDisable = 2; -INT_PTR CALLBACK SettingsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK MiscSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); @@ -1108,14 +1158,14 @@ INT_PTR CALLBACK SettingsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) } -void RecentFilesHistoryDlg::setCustomLen(int val) +void RecentFilesHistorySubDlg::setCustomLen(int val) { ::EnableWindow(::GetDlgItem(_hSelf, IDC_CUSTOMIZELENGTHVAL_STATIC), val > 0); ::SetDlgItemInt(_hSelf, IDC_CUSTOMIZELENGTHVAL_STATIC, val, FALSE); ::ShowWindow(::GetDlgItem(_hSelf, IDC_CUSTOMIZELENGTHVAL_STATIC), val > 0?SW_SHOW:SW_HIDE); } -INT_PTR CALLBACK DefaultNewDocDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK NewDocumentSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = (NppGUI & )nppParam.getNppGUI(); @@ -1315,7 +1365,7 @@ INT_PTR CALLBACK DefaultNewDocDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR return FALSE; } -INT_PTR CALLBACK DefaultDirectoryDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK DefaultDirectorySubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = (NppGUI & )nppParam.getNppGUI(); @@ -1413,7 +1463,7 @@ INT_PTR CALLBACK DefaultDirectoryDlg::run_dlgProc(UINT message, WPARAM wParam, L return FALSE; } -INT_PTR CALLBACK RecentFilesHistoryDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK RecentFilesHistorySubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = (NppGUI & )nppParam.getNppGUI(); @@ -1550,7 +1600,7 @@ INT_PTR CALLBACK RecentFilesHistoryDlg::run_dlgProc(UINT message, WPARAM wParam, return FALSE; } -INT_PTR CALLBACK LangMenuDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK LanguageSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); @@ -1965,7 +2015,7 @@ INT_PTR CALLBACK LangMenuDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP return FALSE; } -INT_PTR CALLBACK Highlighting::run_dlgProc(UINT message, WPARAM wParam, LPARAM/* lParam*/) +INT_PTR CALLBACK HighlightingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM/* lParam*/) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = (NppGUI & )nppParam.getNppGUI(); @@ -2102,7 +2152,7 @@ INT_PTR CALLBACK Highlighting::run_dlgProc(UINT message, WPARAM wParam, LPARAM/* return FALSE; } -INT_PTR CALLBACK PrintSettingsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK PrintSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = (NppGUI & )nppParam.getNppGUI(); @@ -2422,7 +2472,7 @@ INT_PTR CALLBACK PrintSettingsDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR } -INT_PTR CALLBACK BackupDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK BackupSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); @@ -2587,7 +2637,7 @@ INT_PTR CALLBACK BackupDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) return FALSE; } -void BackupDlg::updateBackupGUI() +void BackupSubDlg::updateBackupGUI() { bool rememberSession = isCheckedOrNot(IDC_CHECK_REMEMBERSESSION); bool isSnapshot = isCheckedOrNot(IDC_BACKUPDIR_RESTORESESSION_CHECK); @@ -2616,7 +2666,7 @@ void BackupDlg::updateBackupGUI() } -INT_PTR CALLBACK AutoCompletionDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK AutoCompletionSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); @@ -2917,7 +2967,7 @@ INT_PTR CALLBACK AutoCompletionDlg::run_dlgProc(UINT message, WPARAM wParam, LPA } -INT_PTR CALLBACK MultiInstDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK MultiInstanceSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); switch (message) @@ -2963,7 +3013,7 @@ INT_PTR CALLBACK MultiInstDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) return FALSE; } -void DelimiterSettingsDlg::detectSpace(const char *text2Check, int & nbSp, int & nbTab) const +void DelimiterSubDlg::detectSpace(const char *text2Check, int & nbSp, int & nbTab) const { nbSp = nbTab = 0; for (size_t i = 0; i < strlen(text2Check); ++i) @@ -2976,7 +3026,7 @@ void DelimiterSettingsDlg::detectSpace(const char *text2Check, int & nbSp, int & } -generic_string DelimiterSettingsDlg::getWarningText(size_t nbSp, size_t nbTab) const +generic_string DelimiterSubDlg::getWarningText(size_t nbSp, size_t nbTab) const { NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); @@ -3062,7 +3112,7 @@ generic_string DelimiterSettingsDlg::getWarningText(size_t nbSp, size_t nbTab) c return msg; } -void DelimiterSettingsDlg::setWarningIfNeed() const +void DelimiterSubDlg::setWarningIfNeed() const { generic_string msg; NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); @@ -3076,7 +3126,7 @@ void DelimiterSettingsDlg::setWarningIfNeed() const ::SetDlgItemText(_hSelf, IDD_STATIC_WORDCHAR_WARNING, msg.c_str()); } -INT_PTR CALLBACK DelimiterSettingsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DelimiterSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) { NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); switch (message) @@ -3249,7 +3299,7 @@ INT_PTR CALLBACK DelimiterSettingsDlg::run_dlgProc(UINT message, WPARAM wParam, return FALSE; } -INT_PTR CALLBACK SettingsOnCloudDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK CloudAndLinkSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParams = NppParameters::getInstance(); NppGUI & nppGUI = const_cast(nppParams.getNppGUI()); @@ -3425,7 +3475,7 @@ INT_PTR CALLBACK SettingsOnCloudDlg::run_dlgProc(UINT message, WPARAM wParam, LP return FALSE; } -INT_PTR CALLBACK SearchEngineChoiceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK SearchEngineSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParams = NppParameters::getInstance(); NppGUI & nppGUI = const_cast(nppParams.getNppGUI()); @@ -3522,7 +3572,7 @@ INT_PTR CALLBACK SearchEngineChoiceDlg::run_dlgProc(UINT message, WPARAM wParam, return FALSE; } -INT_PTR CALLBACK SearchingSettingsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) +INT_PTR CALLBACK SearchingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParams = NppParameters::getInstance(); NppGUI& nppGUI = const_cast(nppParams.getNppGUI()); diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.h b/PowerEditor/src/WinControls/Preference/preferenceDlg.h index 1955423e..f514a1de 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.h +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.h @@ -35,34 +35,39 @@ #include "regExtDlg.h" #include "WordStyleDlg.h" -class SettingsDlg : public StaticDialog +class MiscSubDlg : public StaticDialog { public : - SettingsDlg() = default; + MiscSubDlg() = default; private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class BarsDlg : public StaticDialog +class GeneralSubDlg : public StaticDialog { public : - BarsDlg() = default; + GeneralSubDlg() = default; private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class MarginsDlg : public StaticDialog +class EditingSubDlg : public StaticDialog { public : - MarginsDlg() = default; - virtual void destroy() { - if (_multiEdgeTip) - ::DestroyWindow(_multiEdgeTip); - }; + EditingSubDlg() = default; + +private : + INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); + void initScintParam(); +}; + +class MarginsBorderEdgeSubDlg : public StaticDialog +{ +public : + MarginsBorderEdgeSubDlg() = default; private : - HWND _multiEdgeTip = nullptr; INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); void initScintParam(); }; @@ -74,10 +79,10 @@ struct LangID_Name LangID_Name(LangType id, const generic_string& name) : _id(id), _name(name){}; }; -class DefaultNewDocDlg : public StaticDialog +class NewDocumentSubDlg : public StaticDialog { public : - DefaultNewDocDlg() = default; + NewDocumentSubDlg() = default; private : std::vector _langList; @@ -89,19 +94,19 @@ private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class DefaultDirectoryDlg : public StaticDialog +class DefaultDirectorySubDlg : public StaticDialog { public : - DefaultDirectoryDlg() = default; + DefaultDirectorySubDlg() = default; private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class RecentFilesHistoryDlg : public StaticDialog +class RecentFilesHistorySubDlg : public StaticDialog { public : - RecentFilesHistoryDlg() = default; + RecentFilesHistorySubDlg() = default; virtual void destroy() { _nbHistoryVal.destroy(); _customLenVal.destroy(); @@ -114,10 +119,10 @@ private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class LangMenuDlg : public StaticDialog +class LanguageSubDlg : public StaticDialog { public : - LangMenuDlg() = default; + LanguageSubDlg() = default; virtual void destroy() { _tabSizeVal.destroy(); }; @@ -129,10 +134,10 @@ private : std::vector _langList; }; -class Highlighting : public StaticDialog +class HighlightingSubDlg : public StaticDialog { public : - Highlighting() = default; + HighlightingSubDlg() = default; private : @@ -140,10 +145,10 @@ private : }; -class SearchingSettingsDlg : public StaticDialog +class SearchingSubDlg : public StaticDialog { public: - SearchingSettingsDlg() = default; + SearchingSubDlg() = default; private: INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); @@ -155,10 +160,10 @@ struct strCouple { strCouple(const TCHAR *varDesc, const TCHAR *var): _varDesc(varDesc), _var(var){}; }; -class PrintSettingsDlg : public StaticDialog +class PrintSubDlg : public StaticDialog { public : - PrintSettingsDlg() = default; + PrintSubDlg() = default; private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); @@ -166,10 +171,10 @@ private : int _focusedEditCtrl = 0; }; -class BackupDlg : public StaticDialog +class BackupSubDlg : public StaticDialog { public : - BackupDlg() = default; + BackupSubDlg() = default; private : void updateBackupGUI(); @@ -177,29 +182,29 @@ private : }; -class AutoCompletionDlg : public StaticDialog +class AutoCompletionSubDlg : public StaticDialog { public : - AutoCompletionDlg() = default; + AutoCompletionSubDlg() = default; private : URLCtrl _nbCharVal; INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class MultiInstDlg : public StaticDialog +class MultiInstanceSubDlg : public StaticDialog { public : - MultiInstDlg() = default; + MultiInstanceSubDlg() = default; private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class DelimiterSettingsDlg : public StaticDialog +class DelimiterSubDlg : public StaticDialog { public : - DelimiterSettingsDlg() = default; - ~DelimiterSettingsDlg() { + DelimiterSubDlg() = default; + ~DelimiterSubDlg() { if (_tip) ::DestroyWindow(_tip); }; @@ -215,19 +220,19 @@ private : void setWarningIfNeed() const; }; -class SettingsOnCloudDlg : public StaticDialog +class CloudAndLinkSubDlg : public StaticDialog { public : - SettingsOnCloudDlg() = default; + CloudAndLinkSubDlg() = default; private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); }; -class SearchEngineChoiceDlg : public StaticDialog +class SearchEngineSubDlg : public StaticDialog { public : - SearchEngineChoiceDlg() = default; + SearchEngineSubDlg() = default; private : INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); @@ -269,22 +274,23 @@ private : int32_t getIndexFromName(const TCHAR *name) const; void showDialogByIndex(size_t index) const; WindowVector _wVector; - BarsDlg _barsDlg; - MarginsDlg _marginsDlg; - SettingsDlg _settingsDlg; + GeneralSubDlg _generalSubDlg; + EditingSubDlg _editingSubDlg; + MarginsBorderEdgeSubDlg _marginsBorderEdgeSubDlg; + MiscSubDlg _miscSubDlg; RegExtDlg _fileAssocDlg; - LangMenuDlg _langMenuDlg; - Highlighting _highlighting; - PrintSettingsDlg _printSettingsDlg; - DefaultNewDocDlg _defaultNewDocDlg; - DefaultDirectoryDlg _defaultDirectoryDlg; - RecentFilesHistoryDlg _recentFilesHistoryDlg; - BackupDlg _backupDlg; - AutoCompletionDlg _autoCompletionDlg; - MultiInstDlg _multiInstDlg; - DelimiterSettingsDlg _delimiterSettingsDlg; - SettingsOnCloudDlg _settingsOnCloudDlg; - SearchEngineChoiceDlg _searchEngineDlg; - SearchingSettingsDlg _searchingSettingsDlg; + LanguageSubDlg _languageSubDlg; + HighlightingSubDlg _highlightingSubDlg; + PrintSubDlg _printSubDlg; + NewDocumentSubDlg _newDocumentSubDlg; + DefaultDirectorySubDlg _defaultDirectorySubDlg; + RecentFilesHistorySubDlg _recentFilesHistorySubDlg; + BackupSubDlg _backupSubDlg; + AutoCompletionSubDlg _autoCompletionSubDlg; + MultiInstanceSubDlg _multiInstanceSubDlg; + DelimiterSubDlg _delimiterSubDlg; + CloudAndLinkSubDlg _cloudAndLinkSubDlg; + SearchEngineSubDlg _searchEngineSubDlg; + SearchingSubDlg _searchingSubDlg; }; diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index 466cba0c..c4222d49 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -33,43 +33,43 @@ #define IDC_LIST_DLGTITLE (IDD_PREFERENCE_BOX + 2) -#define IDD_PREFERENCE_BAR_BOX 6100 //(IDD_PREFERENCE_BOX + 100) - #define IDC_TOOLBAR_GB_STATIC (IDD_PREFERENCE_BAR_BOX + 1) - #define IDC_CHECK_HIDE (IDD_PREFERENCE_BAR_BOX + 2) - #define IDC_RADIO_SMALLICON (IDD_PREFERENCE_BAR_BOX + 3) - #define IDC_RADIO_BIGICON (IDD_PREFERENCE_BAR_BOX + 4) - #define IDC_RADIO_STANDARD (IDD_PREFERENCE_BAR_BOX + 5) +#define IDD_PREFERENCE_SUB_GENRAL 6100 //(IDD_PREFERENCE_BOX + 100) + #define IDC_TOOLBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 1) + #define IDC_CHECK_HIDE (IDD_PREFERENCE_SUB_GENRAL + 2) + #define IDC_RADIO_SMALLICON (IDD_PREFERENCE_SUB_GENRAL + 3) + #define IDC_RADIO_BIGICON (IDD_PREFERENCE_SUB_GENRAL + 4) + #define IDC_RADIO_STANDARD (IDD_PREFERENCE_SUB_GENRAL + 5) - #define IDC_TABBAR_GB_STATIC (IDD_PREFERENCE_BAR_BOX + 6) - #define IDC_CHECK_REDUCE (IDD_PREFERENCE_BAR_BOX + 7) - #define IDC_CHECK_LOCK (IDD_PREFERENCE_BAR_BOX + 8) - #define IDC_CHECK_DRAWINACTIVE (IDD_PREFERENCE_BAR_BOX + 9) - #define IDC_CHECK_ORANGE (IDD_PREFERENCE_BAR_BOX + 10) - #define IDC_CHECK_SHOWSTATUSBAR (IDD_PREFERENCE_BAR_BOX + 11) - #define IDC_CHECK_ENABLETABCLOSE (IDD_PREFERENCE_BAR_BOX + 12) - #define IDC_CHECK_DBCLICK2CLOSE (IDD_PREFERENCE_BAR_BOX + 13) - #define IDC_CHECK_ENABLEDOCSWITCHER (IDD_PREFERENCE_BAR_BOX + 14) - #define IDC_CHECK_MAINTAININDENT (IDD_PREFERENCE_BAR_BOX + 15) - #define IDC_CHECK_KEEPINSAMEDIR (IDD_PREFERENCE_BAR_BOX + 16) - #define IDC_CHECK_STYLEMRU (IDD_PREFERENCE_BAR_BOX + 17) - #define IDC_CHECK_TAB_HIDE (IDD_PREFERENCE_BAR_BOX + 18) - #define IDC_CHECK_TAB_MULTILINE (IDD_PREFERENCE_BAR_BOX + 19) - #define IDC_CHECK_TAB_VERTICAL (IDD_PREFERENCE_BAR_BOX + 20) - #define IDC_CHECK_TAB_LAST_EXIT (IDD_PREFERENCE_BAR_BOX + 21) - #define IDC_CHECK_HIDEMENUBAR (IDD_PREFERENCE_BAR_BOX + 22) - #define IDC_LOCALIZATION_GB_STATIC (IDD_PREFERENCE_BAR_BOX + 23) - #define IDC_COMBO_LOCALIZATION (IDD_PREFERENCE_BAR_BOX + 24) - #define IDC_DOCSWITCH_GB_STATIC (IDD_PREFERENCE_BAR_BOX + 25) - #define IDC_CHECK_DOCSWITCH (IDD_PREFERENCE_BAR_BOX + 26) - #define IDC_CHECK_DOCSWITCH_NOEXTCOLUMN (IDD_PREFERENCE_BAR_BOX + 27) - #define IDC_CHECK_TAB_ALTICONS (IDD_PREFERENCE_BAR_BOX + 28) + #define IDC_TABBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 6) + #define IDC_CHECK_REDUCE (IDD_PREFERENCE_SUB_GENRAL + 7) + #define IDC_CHECK_LOCK (IDD_PREFERENCE_SUB_GENRAL + 8) + #define IDC_CHECK_DRAWINACTIVE (IDD_PREFERENCE_SUB_GENRAL + 9) + #define IDC_CHECK_ORANGE (IDD_PREFERENCE_SUB_GENRAL + 10) + #define IDC_CHECK_SHOWSTATUSBAR (IDD_PREFERENCE_SUB_GENRAL + 11) + #define IDC_CHECK_ENABLETABCLOSE (IDD_PREFERENCE_SUB_GENRAL + 12) + #define IDC_CHECK_DBCLICK2CLOSE (IDD_PREFERENCE_SUB_GENRAL + 13) + #define IDC_CHECK_ENABLEDOCSWITCHER (IDD_PREFERENCE_SUB_GENRAL + 14) + #define IDC_CHECK_MAINTAININDENT (IDD_PREFERENCE_SUB_GENRAL + 15) + #define IDC_CHECK_KEEPINSAMEDIR (IDD_PREFERENCE_SUB_GENRAL + 16) + #define IDC_CHECK_STYLEMRU (IDD_PREFERENCE_SUB_GENRAL + 17) + #define IDC_CHECK_TAB_HIDE (IDD_PREFERENCE_SUB_GENRAL + 18) + #define IDC_CHECK_TAB_MULTILINE (IDD_PREFERENCE_SUB_GENRAL + 19) + #define IDC_CHECK_TAB_VERTICAL (IDD_PREFERENCE_SUB_GENRAL + 20) + #define IDC_CHECK_TAB_LAST_EXIT (IDD_PREFERENCE_SUB_GENRAL + 21) + #define IDC_CHECK_HIDEMENUBAR (IDD_PREFERENCE_SUB_GENRAL + 22) + #define IDC_LOCALIZATION_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 23) + #define IDC_COMBO_LOCALIZATION (IDD_PREFERENCE_SUB_GENRAL + 24) + #define IDC_DOCSWITCH_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 25) + #define IDC_CHECK_DOCSWITCH (IDD_PREFERENCE_SUB_GENRAL + 26) + #define IDC_CHECK_DOCSWITCH_NOEXTCOLUMN (IDD_PREFERENCE_SUB_GENRAL + 27) + #define IDC_CHECK_TAB_ALTICONS (IDD_PREFERENCE_SUB_GENRAL + 28) -#define IDD_PREFERENCE_MULTIINSTANCE_BOX 6150 //(IDD_PREFERENCE_BOX + 150) - #define IDC_MULTIINST_GB_STATIC (IDD_PREFERENCE_MULTIINSTANCE_BOX + 1) - #define IDC_SESSIONININST_RADIO (IDD_PREFERENCE_MULTIINSTANCE_BOX + 2) - #define IDC_MULTIINST_RADIO (IDD_PREFERENCE_MULTIINSTANCE_BOX + 3) - #define IDC_MONOINST_RADIO (IDD_PREFERENCE_MULTIINSTANCE_BOX + 4) - #define IDD_STATIC_RESTARTNOTE (IDD_PREFERENCE_MULTIINSTANCE_BOX + 5) +#define IDD_PREFERENCE_SUB_MULTIINSTANCE 6150 //(IDD_PREFERENCE_BOX + 150) + #define IDC_MULTIINST_GB_STATIC (IDD_PREFERENCE_SUB_MULTIINSTANCE + 1) + #define IDC_SESSIONININST_RADIO (IDD_PREFERENCE_SUB_MULTIINSTANCE + 2) + #define IDC_MULTIINST_RADIO (IDD_PREFERENCE_SUB_MULTIINSTANCE + 3) + #define IDC_MONOINST_RADIO (IDD_PREFERENCE_SUB_MULTIINSTANCE + 4) + #define IDD_STATIC_RESTARTNOTE (IDD_PREFERENCE_SUB_MULTIINSTANCE + 5) #define IDD_PREFERENCE_WORDCHARLIST_BOX 6160 //(IDD_PREFERENCE_BOX + 150) #define IDC_WORDCHARLIST_GB_STATIC (IDD_PREFERENCE_WORDCHARLIST_BOX + 1) @@ -79,207 +79,209 @@ #define IDD_WORDCHAR_QUESTION_BUTTON (IDD_PREFERENCE_WORDCHARLIST_BOX + 5) #define IDD_STATIC_WORDCHAR_WARNING (IDD_PREFERENCE_WORDCHARLIST_BOX + 6) -#define IDD_PREFERENCE_MARGEIN_BOX 6200 //(IDD_PREFERENCE_BOX + 200) - #define IDC_FMS_GB_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 1) - #define IDC_RADIO_SIMPLE (IDD_PREFERENCE_MARGEIN_BOX + 2) - #define IDC_RADIO_ARROW (IDD_PREFERENCE_MARGEIN_BOX + 3) - #define IDC_RADIO_CIRCLE (IDD_PREFERENCE_MARGEIN_BOX + 4) - #define IDC_RADIO_BOX (IDD_PREFERENCE_MARGEIN_BOX + 5) +#define IDD_PREFERENCE_SUB_EDITING 6200 //(IDD_PREFERENCE_BOX + 200) + #define IDC_FMS_GB_STATIC (IDD_PREFERENCE_SUB_EDITING + 1) + #define IDC_RADIO_SIMPLE (IDD_PREFERENCE_SUB_EDITING + 2) + #define IDC_RADIO_ARROW (IDD_PREFERENCE_SUB_EDITING + 3) + #define IDC_RADIO_CIRCLE (IDD_PREFERENCE_SUB_EDITING + 4) + #define IDC_RADIO_BOX (IDD_PREFERENCE_SUB_EDITING + 5) - #define IDC_CHECK_LINENUMBERMARGE (IDD_PREFERENCE_MARGEIN_BOX + 6) - #define IDC_CHECK_BOOKMARKMARGE (IDD_PREFERENCE_MARGEIN_BOX + 7) + #define IDC_CHECK_LINENUMBERMARGE (IDD_PREFERENCE_SUB_EDITING + 6) + #define IDC_CHECK_BOOKMARKMARGE (IDD_PREFERENCE_SUB_EDITING + 7) - //#define IDC_CHECK_SHOWVERTICALEDGE (IDD_PREFERENCE_MARGEIN_BOX + 8) - //#define IDC_NBCOLONE_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 9) - //#define IDC_COLONENUMBER_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 10) + //#define IDC_CHECK_SHOWVERTICALEDGE (IDD_PREFERENCE_SUB_EDITING + 8) + //#define IDC_NBCOLONE_STATIC (IDD_PREFERENCE_SUB_EDITING + 9) + //#define IDC_COLONENUMBER_STATIC (IDD_PREFERENCE_SUB_EDITING + 10) - #define IDC_VES_GB_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 11) - //#define IDC_RADIO_LNMODE (IDD_PREFERENCE_MARGEIN_BOX + 12) - #define IDC_CHECK_EDGEBGMODE (IDD_PREFERENCE_MARGEIN_BOX + 13) - #define IDC_CHECK_CURRENTLINEHILITE (IDD_PREFERENCE_MARGEIN_BOX + 14) - #define IDC_CHECK_SMOOTHFONT (IDD_PREFERENCE_MARGEIN_BOX + 15) + #define IDC_VES_GB_STATIC (IDD_PREFERENCE_SUB_EDITING + 11) + //#define IDC_RADIO_LNMODE (IDD_PREFERENCE_SUB_EDITING + 12) + #define IDC_CHECK_EDGEBGMODE (IDD_PREFERENCE_SUB_EDITING + 13) + #define IDC_CHECK_CURRENTLINEHILITE (IDD_PREFERENCE_SUB_EDITING + 14) + #define IDC_CHECK_SMOOTHFONT (IDD_PREFERENCE_SUB_EDITING + 15) - #define IDC_CARETSETTING_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 16) - #define IDC_WIDTH_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 17) - #define IDC_WIDTH_COMBO (IDD_PREFERENCE_MARGEIN_BOX + 18) - #define IDC_BLINKRATE_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 19) - #define IDC_CARETBLINKRATE_SLIDER (IDD_PREFERENCE_MARGEIN_BOX + 20) - #define IDC_CARETBLINKRATE_F_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 21) - #define IDC_CARETBLINKRATE_S_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 22) - #define IDC_CHECK_DOCCHANGESTATEMARGE (IDD_PREFERENCE_MARGEIN_BOX + 23) - #define IDC_MULTISELECTION_GB_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 24) - #define IDC_CHECK_MULTISELECTION (IDD_PREFERENCE_MARGEIN_BOX + 25) + #define IDC_CARETSETTING_STATIC (IDD_PREFERENCE_SUB_EDITING + 16) + #define IDC_WIDTH_STATIC (IDD_PREFERENCE_SUB_EDITING + 17) + #define IDC_WIDTH_COMBO (IDD_PREFERENCE_SUB_EDITING + 18) + #define IDC_BLINKRATE_STATIC (IDD_PREFERENCE_SUB_EDITING + 19) + #define IDC_CARETBLINKRATE_SLIDER (IDD_PREFERENCE_SUB_EDITING + 20) + #define IDC_CARETBLINKRATE_F_STATIC (IDD_PREFERENCE_SUB_EDITING + 21) + #define IDC_CARETBLINKRATE_S_STATIC (IDD_PREFERENCE_SUB_EDITING + 22) + #define IDC_CHECK_DOCCHANGESTATEMARGE (IDD_PREFERENCE_SUB_EDITING + 23) + //#define IDC_MULTISELECTION_GB_STATIC (IDD_PREFERENCE_SUB_EDITING + 24) + #define IDC_CHECK_MULTISELECTION (IDD_PREFERENCE_SUB_EDITING + 25) - #define IDC_RADIO_FOLDMARGENONE (IDD_PREFERENCE_MARGEIN_BOX + 26) + #define IDC_RADIO_FOLDMARGENONE (IDD_PREFERENCE_SUB_EDITING + 26) - #define IDC_LW_GB_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 27) - #define IDC_RADIO_LWDEF (IDD_PREFERENCE_MARGEIN_BOX + 28) - #define IDC_RADIO_LWALIGN (IDD_PREFERENCE_MARGEIN_BOX + 29) - #define IDC_RADIO_LWINDENT (IDD_PREFERENCE_MARGEIN_BOX + 30) + #define IDC_LW_GB_STATIC (IDD_PREFERENCE_SUB_EDITING + 27) + #define IDC_RADIO_LWDEF (IDD_PREFERENCE_SUB_EDITING + 28) + #define IDC_RADIO_LWALIGN (IDD_PREFERENCE_SUB_EDITING + 29) + #define IDC_RADIO_LWINDENT (IDD_PREFERENCE_SUB_EDITING + 30) - #define IDC_BORDERWIDTH_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 31) - #define IDC_BORDERWIDTHVAL_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 32) - #define IDC_BORDERWIDTH_SLIDER (IDD_PREFERENCE_MARGEIN_BOX + 33) - #define IDC_CHECK_DISABLEADVANCEDSCROLL (IDD_PREFERENCE_MARGEIN_BOX + 34) - #define IDC_CHECK_NOEDGE (IDD_PREFERENCE_MARGEIN_BOX + 35) - #define IDC_CHECK_SCROLLBEYONDLASTLINE (IDD_PREFERENCE_MARGEIN_BOX + 36) + #define IDC_BORDERWIDTH_STATIC (IDD_PREFERENCE_SUB_EDITING + 31) + #define IDC_BORDERWIDTHVAL_STATIC (IDD_PREFERENCE_SUB_EDITING + 32) + #define IDC_BORDERWIDTH_SLIDER (IDD_PREFERENCE_SUB_EDITING + 33) + #define IDC_CHECK_DISABLEADVANCEDSCROLL (IDD_PREFERENCE_SUB_EDITING + 34) + #define IDC_CHECK_NOEDGE (IDD_PREFERENCE_SUB_EDITING + 35) + #define IDC_CHECK_SCROLLBEYONDLASTLINE (IDD_PREFERENCE_SUB_EDITING + 36) - #define IDC_STATIC_MULTILNMODE_TIP (IDD_PREFERENCE_MARGEIN_BOX + 37) - #define IDC_COLUMNPOS_EDIT (IDD_PREFERENCE_MARGEIN_BOX + 38) - #define IDC_CHECK_RIGHTCLICKKEEPSSELECTION (IDD_PREFERENCE_MARGEIN_BOX + 39) + #define IDC_STATIC_MULTILNMODE_TIP (IDD_PREFERENCE_SUB_EDITING + 37) + #define IDC_COLUMNPOS_EDIT (IDD_PREFERENCE_SUB_EDITING + 38) + #define IDC_CHECK_RIGHTCLICKKEEPSSELECTION (IDD_PREFERENCE_SUB_EDITING + 39) -#define IDD_PREFERENCE_DELIMITERSETTINGS_BOX 6250 //(IDD_PREFERENCE_BOX + 250) - #define IDC_DELIMITERSETTINGS_GB_STATIC (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 1) - #define IDD_STATIC_OPENDELIMITER (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 2) - #define IDC_EDIT_OPENDELIMITER (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 3) - #define IDC_EDIT_CLOSEDELIMITER (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 4) - #define IDD_STATIC_CLOSEDELIMITER (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 5) - #define IDD_SEVERALLINEMODEON_CHECK (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 6) - #define IDD_STATIC_BLABLA (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 7) - #define IDD_STATIC_BLABLA2NDLINE (IDD_PREFERENCE_DELIMITERSETTINGS_BOX + 8) +#define IDD_PREFERENCE_SUB_DELIMITER 6250 //(IDD_PREFERENCE_BOX + 250) + #define IDC_DELIMITERSETTINGS_GB_STATIC (IDD_PREFERENCE_SUB_DELIMITER + 1) + #define IDD_STATIC_OPENDELIMITER (IDD_PREFERENCE_SUB_DELIMITER + 2) + #define IDC_EDIT_OPENDELIMITER (IDD_PREFERENCE_SUB_DELIMITER + 3) + #define IDC_EDIT_CLOSEDELIMITER (IDD_PREFERENCE_SUB_DELIMITER + 4) + #define IDD_STATIC_CLOSEDELIMITER (IDD_PREFERENCE_SUB_DELIMITER + 5) + #define IDD_SEVERALLINEMODEON_CHECK (IDD_PREFERENCE_SUB_DELIMITER + 6) + #define IDD_STATIC_BLABLA (IDD_PREFERENCE_SUB_DELIMITER + 7) + #define IDD_STATIC_BLABLA2NDLINE (IDD_PREFERENCE_SUB_DELIMITER + 8) -#define IDD_PREFERENCE_SETTINGSONCLOUD_BOX 6260 //(IDD_PREFERENCE_BOX + 250) - #define IDC_SETTINGSONCLOUD_WARNING_STATIC (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 1) - #define IDC_SETTINGSONCLOUD_GB_STATIC (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 2) - #define IDC_NOCLOUD_RADIO (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 3) - #define IDC_URISCHEMES_STATIC (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 4) - #define IDC_URISCHEMES_EDIT (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 5) - //#define IDC_GOOGLEDRIVE_RADIO (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 6) - #define IDC_WITHCLOUD_RADIO (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 7) - #define IDC_CLOUDPATH_EDIT (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 8) - #define IDD_CLOUDPATH_BROWSE_BUTTON (IDD_PREFERENCE_SETTINGSONCLOUD_BOX + 9) +#define IDD_PREFERENCE_SUB_CLOUD_LINK 6260 //(IDD_PREFERENCE_BOX + 250) + #define IDC_SETTINGSONCLOUD_WARNING_STATIC (IDD_PREFERENCE_SUB_CLOUD_LINK + 1) + #define IDC_SETTINGSONCLOUD_GB_STATIC (IDD_PREFERENCE_SUB_CLOUD_LINK + 2) + #define IDC_NOCLOUD_RADIO (IDD_PREFERENCE_SUB_CLOUD_LINK + 3) + #define IDC_URISCHEMES_STATIC (IDD_PREFERENCE_SUB_CLOUD_LINK + 4) + #define IDC_URISCHEMES_EDIT (IDD_PREFERENCE_SUB_CLOUD_LINK + 5) + //#define IDC_GOOGLEDRIVE_RADIO (IDD_PREFERENCE_SUB_CLOUD_LINK + 6) + #define IDC_WITHCLOUD_RADIO (IDD_PREFERENCE_SUB_CLOUD_LINK + 7) + #define IDC_CLOUDPATH_EDIT (IDD_PREFERENCE_SUB_CLOUD_LINK + 8) + #define IDD_CLOUDPATH_BROWSE_BUTTON (IDD_PREFERENCE_SUB_CLOUD_LINK + 9) -#define IDD_PREFERENCE_SEARCHENGINE_BOX 6270 //(IDD_PREFERENCE_BOX + 250) - #define IDC_SEARCHENGINES_GB_STATIC (IDD_PREFERENCE_SEARCHENGINE_BOX + 1) - #define IDC_SEARCHENGINE_DUCKDUCKGO_RADIO (IDD_PREFERENCE_SEARCHENGINE_BOX + 2) - #define IDC_SEARCHENGINE_GOOGLE_RADIO (IDD_PREFERENCE_SEARCHENGINE_BOX + 3) - #define IDC_SEARCHENGINE_BING_RADIO (IDD_PREFERENCE_SEARCHENGINE_BOX + 4) - #define IDC_SEARCHENGINE_YAHOO_RADIO (IDD_PREFERENCE_SEARCHENGINE_BOX + 5) - #define IDC_SEARCHENGINE_CUSTOM_RADIO (IDD_PREFERENCE_SEARCHENGINE_BOX + 6) - #define IDC_SEARCHENGINE_EDIT (IDD_PREFERENCE_SEARCHENGINE_BOX + 7) - #define IDD_SEARCHENGINE_NOTE_STATIC (IDD_PREFERENCE_SEARCHENGINE_BOX + 8) - #define IDC_SEARCHENGINE_STACKOVERFLOW_RADIO (IDD_PREFERENCE_SEARCHENGINE_BOX + 9) +#define IDD_PREFERENCE_SUB_SEARCHENGINE 6270 //(IDD_PREFERENCE_BOX + 250) + #define IDC_SEARCHENGINES_GB_STATIC (IDD_PREFERENCE_SUB_SEARCHENGINE + 1) + #define IDC_SEARCHENGINE_DUCKDUCKGO_RADIO (IDD_PREFERENCE_SUB_SEARCHENGINE + 2) + #define IDC_SEARCHENGINE_GOOGLE_RADIO (IDD_PREFERENCE_SUB_SEARCHENGINE + 3) + #define IDC_SEARCHENGINE_BING_RADIO (IDD_PREFERENCE_SUB_SEARCHENGINE + 4) + #define IDC_SEARCHENGINE_YAHOO_RADIO (IDD_PREFERENCE_SUB_SEARCHENGINE + 5) + #define IDC_SEARCHENGINE_CUSTOM_RADIO (IDD_PREFERENCE_SUB_SEARCHENGINE + 6) + #define IDC_SEARCHENGINE_EDIT (IDD_PREFERENCE_SUB_SEARCHENGINE + 7) + #define IDD_SEARCHENGINE_NOTE_STATIC (IDD_PREFERENCE_SUB_SEARCHENGINE + 8) + #define IDC_SEARCHENGINE_STACKOVERFLOW_RADIO (IDD_PREFERENCE_SUB_SEARCHENGINE + 9) -#define IDD_PREFERENCE_SETTING_BOX 6300 //(IDD_PREFERENCE_BOX + 300) - #define IDC_TABSETTING_GB_STATIC (IDD_PREFERENCE_SETTING_BOX + 1) - #define IDC_CHECK_REPLACEBYSPACE (IDD_PREFERENCE_SETTING_BOX + 2) - #define IDC_TABSIZE_STATIC (IDD_PREFERENCE_SETTING_BOX + 3) - #define IDC_HISTORY_GB_STATIC (IDD_PREFERENCE_SETTING_BOX + 4) - #define IDC_CHECK_DONTCHECKHISTORY (IDD_PREFERENCE_SETTING_BOX + 5) - #define IDC_MAXNBFILE_STATIC (IDD_PREFERENCE_SETTING_BOX + 6) - #define IDC_CHECK_MIN2SYSTRAY (IDD_PREFERENCE_SETTING_BOX + 8) - #define IDC_CHECK_REMEMBERSESSION (IDD_PREFERENCE_SETTING_BOX + 9) - #define IDC_TABSIZEVAL_STATIC (IDD_PREFERENCE_SETTING_BOX + 10) - #define IDC_MAXNBFILEVAL_STATIC (IDD_PREFERENCE_SETTING_BOX + 11) - #define IDC_FILEAUTODETECTION_STATIC (IDD_PREFERENCE_SETTING_BOX + 12) - #define IDC_CHECK_UPDATESILENTLY (IDD_PREFERENCE_SETTING_BOX + 13) - #define IDC_RADIO_BKNONE (IDD_PREFERENCE_SETTING_BOX + 15) - #define IDC_RADIO_BKSIMPLE (IDD_PREFERENCE_SETTING_BOX + 16) - #define IDC_RADIO_BKVERBOSE (IDD_PREFERENCE_SETTING_BOX + 17) - #define IDC_CLICKABLELINK_STATIC (IDD_PREFERENCE_SETTING_BOX + 18) - #define IDC_CHECK_CLICKABLELINK_ENABLE (IDD_PREFERENCE_SETTING_BOX + 19) - #define IDC_CHECK_CLICKABLELINK_NOUNDERLINE (IDD_PREFERENCE_SETTING_BOX + 20) - #define IDC_EDIT_SESSIONFILEEXT (IDD_PREFERENCE_SETTING_BOX + 21) - #define IDC_SESSIONFILEEXT_STATIC (IDD_PREFERENCE_SETTING_BOX + 22) - #define IDC_CHECK_AUTOUPDATE (IDD_PREFERENCE_SETTING_BOX + 23) - #define IDC_DOCUMENTSWITCHER_STATIC (IDD_PREFERENCE_SETTING_BOX + 24) - #define IDC_CHECK_UPDATEGOTOEOF (IDD_PREFERENCE_SETTING_BOX + 25) - #define IDC_CHECK_ENABLSMARTHILITE (IDD_PREFERENCE_SETTING_BOX + 26) - #define IDC_CHECK_ENABLTAGSMATCHHILITE (IDD_PREFERENCE_SETTING_BOX + 27) - #define IDC_CHECK_ENABLTAGATTRHILITE (IDD_PREFERENCE_SETTING_BOX + 28) - #define IDC_TAGMATCHEDHILITE_STATIC (IDD_PREFERENCE_SETTING_BOX + 29) - #define IDC_CHECK_HIGHLITENONEHTMLZONE (IDD_PREFERENCE_SETTING_BOX + 30) - #define IDC_CHECK_SHORTTITLE (IDD_PREFERENCE_SETTING_BOX + 31) - #define IDC_CHECK_SMARTHILITECASESENSITIVE (IDD_PREFERENCE_SETTING_BOX + 32) - #define IDC_SMARTHILITING_STATIC (IDD_PREFERENCE_SETTING_BOX + 33) - #define IDC_CHECK_DETECTENCODING (IDD_PREFERENCE_SETTING_BOX + 34) - #define IDC_CHECK_BACKSLASHISESCAPECHARACTERFORSQL (IDD_PREFERENCE_SETTING_BOX + 35) - #define IDC_EDIT_WORKSPACEFILEEXT (IDD_PREFERENCE_SETTING_BOX + 36) - #define IDC_WORKSPACEFILEEXT_STATIC (IDD_PREFERENCE_SETTING_BOX + 37) - #define IDC_CHECK_SMARTHILITEWHOLEWORDONLY (IDD_PREFERENCE_SETTING_BOX + 38) - #define IDC_CHECK_SMARTHILITEUSEFINDSETTINGS (IDD_PREFERENCE_SETTING_BOX + 39) - #define IDC_CHECK_SMARTHILITEANOTHERRVIEW (IDD_PREFERENCE_SETTING_BOX + 40) - #define IDC_CHECK_SAVEDLGEXTFILTALLTYPESFORNORMTEXT (IDD_PREFERENCE_SETTING_BOX + 51) +#define IDD_PREFERENCE_SUB_MARGING_BORDER_EDGE 6290 //(IDD_PREFERENCE_BOX + 290) + +#define IDD_PREFERENCE_SUB_MISC 6300 //(IDD_PREFERENCE_BOX + 300) + #define IDC_TABSETTING_GB_STATIC (IDD_PREFERENCE_SUB_MISC + 1) + #define IDC_CHECK_REPLACEBYSPACE (IDD_PREFERENCE_SUB_MISC + 2) + #define IDC_TABSIZE_STATIC (IDD_PREFERENCE_SUB_MISC + 3) + #define IDC_HISTORY_GB_STATIC (IDD_PREFERENCE_SUB_MISC + 4) + #define IDC_CHECK_DONTCHECKHISTORY (IDD_PREFERENCE_SUB_MISC + 5) + #define IDC_MAXNBFILE_STATIC (IDD_PREFERENCE_SUB_MISC + 6) + #define IDC_CHECK_MIN2SYSTRAY (IDD_PREFERENCE_SUB_MISC + 8) + #define IDC_CHECK_REMEMBERSESSION (IDD_PREFERENCE_SUB_MISC + 9) + #define IDC_TABSIZEVAL_STATIC (IDD_PREFERENCE_SUB_MISC + 10) + #define IDC_MAXNBFILEVAL_STATIC (IDD_PREFERENCE_SUB_MISC + 11) + #define IDC_FILEAUTODETECTION_STATIC (IDD_PREFERENCE_SUB_MISC + 12) + #define IDC_CHECK_UPDATESILENTLY (IDD_PREFERENCE_SUB_MISC + 13) + #define IDC_RADIO_BKNONE (IDD_PREFERENCE_SUB_MISC + 15) + #define IDC_RADIO_BKSIMPLE (IDD_PREFERENCE_SUB_MISC + 16) + #define IDC_RADIO_BKVERBOSE (IDD_PREFERENCE_SUB_MISC + 17) + #define IDC_CLICKABLELINK_STATIC (IDD_PREFERENCE_SUB_MISC + 18) + #define IDC_CHECK_CLICKABLELINK_ENABLE (IDD_PREFERENCE_SUB_MISC + 19) + #define IDC_CHECK_CLICKABLELINK_NOUNDERLINE (IDD_PREFERENCE_SUB_MISC + 20) + #define IDC_EDIT_SESSIONFILEEXT (IDD_PREFERENCE_SUB_MISC + 21) + #define IDC_SESSIONFILEEXT_STATIC (IDD_PREFERENCE_SUB_MISC + 22) + #define IDC_CHECK_AUTOUPDATE (IDD_PREFERENCE_SUB_MISC + 23) + #define IDC_DOCUMENTSWITCHER_STATIC (IDD_PREFERENCE_SUB_MISC + 24) + #define IDC_CHECK_UPDATEGOTOEOF (IDD_PREFERENCE_SUB_MISC + 25) + #define IDC_CHECK_ENABLSMARTHILITE (IDD_PREFERENCE_SUB_MISC + 26) + #define IDC_CHECK_ENABLTAGSMATCHHILITE (IDD_PREFERENCE_SUB_MISC + 27) + #define IDC_CHECK_ENABLTAGATTRHILITE (IDD_PREFERENCE_SUB_MISC + 28) + #define IDC_TAGMATCHEDHILITE_STATIC (IDD_PREFERENCE_SUB_MISC + 29) + #define IDC_CHECK_HIGHLITENONEHTMLZONE (IDD_PREFERENCE_SUB_MISC + 30) + #define IDC_CHECK_SHORTTITLE (IDD_PREFERENCE_SUB_MISC + 31) + #define IDC_CHECK_SMARTHILITECASESENSITIVE (IDD_PREFERENCE_SUB_MISC + 32) + #define IDC_SMARTHILITING_STATIC (IDD_PREFERENCE_SUB_MISC + 33) + #define IDC_CHECK_DETECTENCODING (IDD_PREFERENCE_SUB_MISC + 34) + #define IDC_CHECK_BACKSLASHISESCAPECHARACTERFORSQL (IDD_PREFERENCE_SUB_MISC + 35) + #define IDC_EDIT_WORKSPACEFILEEXT (IDD_PREFERENCE_SUB_MISC + 36) + #define IDC_WORKSPACEFILEEXT_STATIC (IDD_PREFERENCE_SUB_MISC + 37) + #define IDC_CHECK_SMARTHILITEWHOLEWORDONLY (IDD_PREFERENCE_SUB_MISC + 38) + #define IDC_CHECK_SMARTHILITEUSEFINDSETTINGS (IDD_PREFERENCE_SUB_MISC + 39) + #define IDC_CHECK_SMARTHILITEANOTHERRVIEW (IDD_PREFERENCE_SUB_MISC + 40) + #define IDC_CHECK_SAVEDLGEXTFILTALLTYPESFORNORMTEXT (IDD_PREFERENCE_SUB_MISC + 51) //-- xFileEditViewHistoryParameterGUI: Additional Checkbox for enabling the history for restoring the edit view per file. - #define IDC_CHECK_REMEMBEREDITVIEWPERFILE (IDD_PREFERENCE_SETTING_BOX + 41) - #define IDC_REMEMBEREDITVIEWPERFILE_STATIC (IDD_PREFERENCE_SETTING_BOX + 42) - #define IDC_EDIT_REMEMBEREDITVIEWPERFILE (IDD_PREFERENCE_SETTING_BOX + 43) + #define IDC_CHECK_REMEMBEREDITVIEWPERFILE (IDD_PREFERENCE_SUB_MISC + 41) + #define IDC_REMEMBEREDITVIEWPERFILE_STATIC (IDD_PREFERENCE_SUB_MISC + 42) + #define IDC_EDIT_REMEMBEREDITVIEWPERFILE (IDD_PREFERENCE_SUB_MISC + 43) - #define IDC_DOCUMENTPEEK_STATIC (IDD_PREFERENCE_SETTING_BOX + 44) - #define IDC_CHECK_ENABLEDOCPEEKER (IDD_PREFERENCE_SETTING_BOX + 45) - #define IDC_CHECK_ENABLEDOCPEEKONMAP (IDD_PREFERENCE_SETTING_BOX + 46) - #define IDC_COMBO_FILEUPDATECHOICE (IDD_PREFERENCE_SETTING_BOX + 47) - #define IDC_CHECK_DIRECTWRITE_ENABLE (IDD_PREFERENCE_SETTING_BOX + 49) - #define IDC_CHECK_CLICKABLELINK_FULLBOXMODE (IDD_PREFERENCE_SETTING_BOX + 50) + #define IDC_DOCUMENTPEEK_STATIC (IDD_PREFERENCE_SUB_MISC + 44) + #define IDC_CHECK_ENABLEDOCPEEKER (IDD_PREFERENCE_SUB_MISC + 45) + #define IDC_CHECK_ENABLEDOCPEEKONMAP (IDD_PREFERENCE_SUB_MISC + 46) + #define IDC_COMBO_FILEUPDATECHOICE (IDD_PREFERENCE_SUB_MISC + 47) + #define IDC_CHECK_DIRECTWRITE_ENABLE (IDD_PREFERENCE_SUB_MISC + 49) + #define IDC_CHECK_CLICKABLELINK_FULLBOXMODE (IDD_PREFERENCE_SUB_MISC + 50) -#define IDD_PREFERENCE_NEWDOCSETTING_BOX 6400 //(IDD_PREFERENCE_BOX + 400) - #define IDC_FORMAT_GB_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 1) - #define IDC_RADIO_F_WIN (IDD_PREFERENCE_NEWDOCSETTING_BOX + 2) - #define IDC_RADIO_F_UNIX (IDD_PREFERENCE_NEWDOCSETTING_BOX + 3) - #define IDC_RADIO_F_MAC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 4) - #define IDC_ENCODING_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 5) - #define IDC_RADIO_ANSI (IDD_PREFERENCE_NEWDOCSETTING_BOX + 6) - #define IDC_RADIO_UTF8SANSBOM (IDD_PREFERENCE_NEWDOCSETTING_BOX + 7) - #define IDC_RADIO_UTF8 (IDD_PREFERENCE_NEWDOCSETTING_BOX + 8) - #define IDC_RADIO_UCS2BIG (IDD_PREFERENCE_NEWDOCSETTING_BOX + 9) - #define IDC_RADIO_UCS2SMALL (IDD_PREFERENCE_NEWDOCSETTING_BOX + 10) - #define IDC_DEFAULTLANG_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 11) - #define IDC_COMBO_DEFAULTLANG (IDD_PREFERENCE_NEWDOCSETTING_BOX + 12) - #define IDC_OPENSAVEDIR_GR_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 13) - #define IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO (IDD_PREFERENCE_NEWDOCSETTING_BOX + 14) - #define IDC_OPENSAVEDIR_REMEMBERLAST_RADIO (IDD_PREFERENCE_NEWDOCSETTING_BOX + 15) - #define IDC_OPENSAVEDIR_ALWAYSON_RADIO (IDD_PREFERENCE_NEWDOCSETTING_BOX + 16) - #define IDC_OPENSAVEDIR_ALWAYSON_EDIT (IDD_PREFERENCE_NEWDOCSETTING_BOX + 17) - #define IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON (IDD_PREFERENCE_NEWDOCSETTING_BOX + 18) - #define IDC_NEWDOCUMENT_GR_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 19) - #define IDC_CHECK_OPENANSIASUTF8 (IDD_PREFERENCE_NEWDOCSETTING_BOX + 20) - #define IDC_RADIO_OTHERCP (IDD_PREFERENCE_NEWDOCSETTING_BOX + 21) - #define IDC_COMBO_OTHERCP (IDD_PREFERENCE_NEWDOCSETTING_BOX + 22) - #define IDC_GP_STATIC_RECENTFILES (IDD_PREFERENCE_NEWDOCSETTING_BOX + 23) - #define IDC_CHECK_INSUBMENU (IDD_PREFERENCE_NEWDOCSETTING_BOX + 24) - #define IDC_RADIO_ONLYFILENAME (IDD_PREFERENCE_NEWDOCSETTING_BOX + 25) - #define IDC_RADIO_FULLFILENAMEPATH (IDD_PREFERENCE_NEWDOCSETTING_BOX + 26) - #define IDC_RADIO_CUSTOMIZELENTH (IDD_PREFERENCE_NEWDOCSETTING_BOX + 27) - #define IDC_CUSTOMIZELENGTHVAL_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 28) - #define IDC_DISPLAY_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 29) - #define IDC_OPENSAVEDIR_CHECK_USENEWSTYLESAVEDIALOG (IDD_PREFERENCE_NEWDOCSETTING_BOX + 30) - #define IDC_OPENSAVEDIR_CHECK_DRROPFOLDEROPENFILES (IDD_PREFERENCE_NEWDOCSETTING_BOX + 31) +#define IDD_PREFERENCE_SUB_NEWDOCUMENT 6400 //(IDD_PREFERENCE_BOX + 400) + #define IDC_FORMAT_GB_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 1) + #define IDC_RADIO_F_WIN (IDD_PREFERENCE_SUB_NEWDOCUMENT + 2) + #define IDC_RADIO_F_UNIX (IDD_PREFERENCE_SUB_NEWDOCUMENT + 3) + #define IDC_RADIO_F_MAC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 4) + #define IDC_ENCODING_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 5) + #define IDC_RADIO_ANSI (IDD_PREFERENCE_SUB_NEWDOCUMENT + 6) + #define IDC_RADIO_UTF8SANSBOM (IDD_PREFERENCE_SUB_NEWDOCUMENT + 7) + #define IDC_RADIO_UTF8 (IDD_PREFERENCE_SUB_NEWDOCUMENT + 8) + #define IDC_RADIO_UCS2BIG (IDD_PREFERENCE_SUB_NEWDOCUMENT + 9) + #define IDC_RADIO_UCS2SMALL (IDD_PREFERENCE_SUB_NEWDOCUMENT + 10) + #define IDC_DEFAULTLANG_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 11) + #define IDC_COMBO_DEFAULTLANG (IDD_PREFERENCE_SUB_NEWDOCUMENT + 12) + #define IDC_OPENSAVEDIR_GR_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 13) + #define IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO (IDD_PREFERENCE_SUB_NEWDOCUMENT + 14) + #define IDC_OPENSAVEDIR_REMEMBERLAST_RADIO (IDD_PREFERENCE_SUB_NEWDOCUMENT + 15) + #define IDC_OPENSAVEDIR_ALWAYSON_RADIO (IDD_PREFERENCE_SUB_NEWDOCUMENT + 16) + #define IDC_OPENSAVEDIR_ALWAYSON_EDIT (IDD_PREFERENCE_SUB_NEWDOCUMENT + 17) + #define IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON (IDD_PREFERENCE_SUB_NEWDOCUMENT + 18) + #define IDC_NEWDOCUMENT_GR_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 19) + #define IDC_CHECK_OPENANSIASUTF8 (IDD_PREFERENCE_SUB_NEWDOCUMENT + 20) + #define IDC_RADIO_OTHERCP (IDD_PREFERENCE_SUB_NEWDOCUMENT + 21) + #define IDC_COMBO_OTHERCP (IDD_PREFERENCE_SUB_NEWDOCUMENT + 22) + #define IDC_GP_STATIC_RECENTFILES (IDD_PREFERENCE_SUB_NEWDOCUMENT + 23) + #define IDC_CHECK_INSUBMENU (IDD_PREFERENCE_SUB_NEWDOCUMENT + 24) + #define IDC_RADIO_ONLYFILENAME (IDD_PREFERENCE_SUB_NEWDOCUMENT + 25) + #define IDC_RADIO_FULLFILENAMEPATH (IDD_PREFERENCE_SUB_NEWDOCUMENT + 26) + #define IDC_RADIO_CUSTOMIZELENTH (IDD_PREFERENCE_SUB_NEWDOCUMENT + 27) + #define IDC_CUSTOMIZELENGTHVAL_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 28) + #define IDC_DISPLAY_STATIC (IDD_PREFERENCE_SUB_NEWDOCUMENT + 29) + #define IDC_OPENSAVEDIR_CHECK_USENEWSTYLESAVEDIALOG (IDD_PREFERENCE_SUB_NEWDOCUMENT + 30) + #define IDC_OPENSAVEDIR_CHECK_DRROPFOLDEROPENFILES (IDD_PREFERENCE_SUB_NEWDOCUMENT + 31) -#define IDD_PREFERENCE_DEFAULTDIRECTORY_BOX 6450 //(IDD_PREFERENCE_BOX + 400) -#define IDD_PREFERENCE_RECENTFILESHISTORY_BOX 6460 //(IDD_PREFERENCE_BOX + 400) +#define IDD_PREFERENCE_SUB_DEFAULTDIRECTORY 6450 //(IDD_PREFERENCE_BOX + 400) +#define IDD_PREFERENCE_SUB_RECENTFILESHISTORY 6460 //(IDD_PREFERENCE_BOX + 400) -#define IDD_PREFERENCE_LANG_BOX 6500 //(IDD_PREFERENCE_BOX + 500) - #define IDC_LIST_ENABLEDLANG (IDD_PREFERENCE_LANG_BOX + 1) - #define IDC_LIST_DISABLEDLANG (IDD_PREFERENCE_LANG_BOX + 2) - #define IDC_BUTTON_REMOVE (IDD_PREFERENCE_LANG_BOX + 3) - #define IDC_BUTTON_RESTORE (IDD_PREFERENCE_LANG_BOX + 4) - #define IDC_ENABLEDITEMS_STATIC (IDD_PREFERENCE_LANG_BOX + 5) - #define IDC_DISABLEDITEMS_STATIC (IDD_PREFERENCE_LANG_BOX + 6) - #define IDC_CHECK_LANGMENUCOMPACT (IDD_PREFERENCE_LANG_BOX + 7) - #define IDC_CHECK_LANGMENU_GR_STATIC (IDD_PREFERENCE_LANG_BOX + 8) - #define IDC_LIST_TABSETTNG (IDD_PREFERENCE_LANG_BOX + 9) - #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_HILITE_BOX 6550 //(IDD_PREFERENCE_BOX + 500) +#define IDD_PREFERENCE_SUB_LANGUAGE 6500 //(IDD_PREFERENCE_BOX + 500) + #define IDC_LIST_ENABLEDLANG (IDD_PREFERENCE_SUB_LANGUAGE + 1) + #define IDC_LIST_DISABLEDLANG (IDD_PREFERENCE_SUB_LANGUAGE + 2) + #define IDC_BUTTON_REMOVE (IDD_PREFERENCE_SUB_LANGUAGE + 3) + #define IDC_BUTTON_RESTORE (IDD_PREFERENCE_SUB_LANGUAGE + 4) + #define IDC_ENABLEDITEMS_STATIC (IDD_PREFERENCE_SUB_LANGUAGE + 5) + #define IDC_DISABLEDITEMS_STATIC (IDD_PREFERENCE_SUB_LANGUAGE + 6) + #define IDC_CHECK_LANGMENUCOMPACT (IDD_PREFERENCE_SUB_LANGUAGE + 7) + #define IDC_CHECK_LANGMENU_GR_STATIC (IDD_PREFERENCE_SUB_LANGUAGE + 8) + #define IDC_LIST_TABSETTNG (IDD_PREFERENCE_SUB_LANGUAGE + 9) + #define IDC_CHECK_DEFAULTTABVALUE (IDD_PREFERENCE_SUB_LANGUAGE + 10) + #define IDC_GR_TABVALUE_STATIC (IDD_PREFERENCE_SUB_LANGUAGE + 11) + #define IDC_TABSIZEVAL_DISABLE_STATIC (IDD_PREFERENCE_SUB_LANGUAGE + 12) +#define IDD_PREFERENCE_SUB_HIGHLIGHTING 6550 //(IDD_PREFERENCE_BOX + 500) -#define IDD_PREFERENCE_PRINT_BOX 6600 //(IDD_PREFERENCE_BOX + 600) - #define IDC_CHECK_PRINTLINENUM (IDD_PREFERENCE_PRINT_BOX + 1) - #define IDC_COLOUROPT_STATIC (IDD_PREFERENCE_PRINT_BOX + 2) - #define IDC_RADIO_WYSIWYG (IDD_PREFERENCE_PRINT_BOX + 3) - #define IDC_RADIO_INVERT (IDD_PREFERENCE_PRINT_BOX + 4) - #define IDC_RADIO_BW (IDD_PREFERENCE_PRINT_BOX + 5) - #define IDC_RADIO_NOBG (IDD_PREFERENCE_PRINT_BOX + 6) - #define IDC_MARGESETTINGS_STATIC (IDD_PREFERENCE_PRINT_BOX + 7) - #define IDC_EDIT_ML (IDD_PREFERENCE_PRINT_BOX + 8) - #define IDC_EDIT_MT (IDD_PREFERENCE_PRINT_BOX + 9) - #define IDC_EDIT_MR (IDD_PREFERENCE_PRINT_BOX + 10) - #define IDC_EDIT_MB (IDD_PREFERENCE_PRINT_BOX + 11) - #define IDC_ML_STATIC (IDD_PREFERENCE_PRINT_BOX + 12) - #define IDC_MT_STATIC (IDD_PREFERENCE_PRINT_BOX + 13) - #define IDC_MR_STATIC (IDD_PREFERENCE_PRINT_BOX + 14) - #define IDC_MB_STATIC (IDD_PREFERENCE_PRINT_BOX + 15) +#define IDD_PREFERENCE_SUB_PRINT 6600 //(IDD_PREFERENCE_BOX + 600) + #define IDC_CHECK_PRINTLINENUM (IDD_PREFERENCE_SUB_PRINT + 1) + #define IDC_COLOUROPT_STATIC (IDD_PREFERENCE_SUB_PRINT + 2) + #define IDC_RADIO_WYSIWYG (IDD_PREFERENCE_SUB_PRINT + 3) + #define IDC_RADIO_INVERT (IDD_PREFERENCE_SUB_PRINT + 4) + #define IDC_RADIO_BW (IDD_PREFERENCE_SUB_PRINT + 5) + #define IDC_RADIO_NOBG (IDD_PREFERENCE_SUB_PRINT + 6) + #define IDC_MARGESETTINGS_STATIC (IDD_PREFERENCE_SUB_PRINT + 7) + #define IDC_EDIT_ML (IDD_PREFERENCE_SUB_PRINT + 8) + #define IDC_EDIT_MT (IDD_PREFERENCE_SUB_PRINT + 9) + #define IDC_EDIT_MR (IDD_PREFERENCE_SUB_PRINT + 10) + #define IDC_EDIT_MB (IDD_PREFERENCE_SUB_PRINT + 11) + #define IDC_ML_STATIC (IDD_PREFERENCE_SUB_PRINT + 12) + #define IDC_MT_STATIC (IDD_PREFERENCE_SUB_PRINT + 13) + #define IDC_MR_STATIC (IDD_PREFERENCE_SUB_PRINT + 14) + #define IDC_MB_STATIC (IDD_PREFERENCE_SUB_PRINT + 15) #define IDD_PREFERENCE_PRINT2_BOX 6700 //(IDD_PREFERENCE_BOX + 700) #define IDC_EDIT_HLEFT (IDD_PREFERENCE_PRINT2_BOX + 1) @@ -312,56 +314,56 @@ #define IDC_HEADERFPPTER_GR_STATIC (IDD_PREFERENCE_PRINT2_BOX + 28) -#define IDD_PREFERENCE_BACKUP_BOX 6800 //(IDD_PREFERENCE_BOX + 800) - #define IDC_BACKUPDIR_GRP_STATIC (IDD_PREFERENCE_BACKUP_BOX + 1) - #define IDC_BACKUPDIR_CHECK (IDD_PREFERENCE_BACKUP_BOX + 2) - #define IDD_BACKUPDIR_STATIC (IDD_PREFERENCE_BACKUP_BOX + 3) - #define IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC (IDD_PREFERENCE_BACKUP_BOX + 4) - #define IDC_BACKUPDIR_EDIT (IDD_PREFERENCE_BACKUP_BOX + 5) - #define IDD_BACKUPDIR_BROWSE_BUTTON (IDD_PREFERENCE_BACKUP_BOX + 6) - #define IDD_AUTOC_GRPSTATIC (IDD_PREFERENCE_BACKUP_BOX + 7) - #define IDD_AUTOC_ENABLECHECK (IDD_PREFERENCE_BACKUP_BOX + 8) - #define IDD_AUTOC_FUNCRADIO (IDD_PREFERENCE_BACKUP_BOX + 9) - #define IDD_AUTOC_WORDRADIO (IDD_PREFERENCE_BACKUP_BOX + 10) - #define IDD_AUTOC_STATIC_FROM (IDD_PREFERENCE_BACKUP_BOX + 11) - #define IDD_AUTOC_STATIC_N (IDD_PREFERENCE_BACKUP_BOX + 12) - #define IDD_AUTOC_STATIC_CHAR (IDD_PREFERENCE_BACKUP_BOX + 13) - #define IDD_AUTOC_STATIC_NOTE (IDD_PREFERENCE_BACKUP_BOX + 14) - #define IDD_FUNC_CHECK (IDD_PREFERENCE_BACKUP_BOX + 15) - #define IDD_AUTOC_BOTHRADIO (IDD_PREFERENCE_BACKUP_BOX + 16) - #define IDC_BACKUPDIR_RESTORESESSION_GRP_STATIC (IDD_PREFERENCE_BACKUP_BOX + 17) - #define IDC_BACKUPDIR_RESTORESESSION_CHECK (IDD_PREFERENCE_BACKUP_BOX + 18) - #define IDD_BACKUPDIR_RESTORESESSION_STATIC1 (IDD_PREFERENCE_BACKUP_BOX + 19) - #define IDC_BACKUPDIR_RESTORESESSION_EDIT (IDD_PREFERENCE_BACKUP_BOX + 20) - #define IDD_BACKUPDIR_RESTORESESSION_STATIC2 (IDD_PREFERENCE_BACKUP_BOX + 21) - #define IDD_BACKUPDIR_RESTORESESSION_PATHLABEL_STATIC (IDD_PREFERENCE_BACKUP_BOX + 22) - #define IDD_BACKUPDIR_RESTORESESSION_PATH_EDIT (IDD_PREFERENCE_BACKUP_BOX + 23) - #define IDD_AUTOC_IGNORENUMBERS (IDD_PREFERENCE_BACKUP_BOX + 24) +#define IDD_PREFERENCE_SUB_BACKUP 6800 //(IDD_PREFERENCE_BOX + 800) + #define IDC_BACKUPDIR_GRP_STATIC (IDD_PREFERENCE_SUB_BACKUP + 1) + #define IDC_BACKUPDIR_CHECK (IDD_PREFERENCE_SUB_BACKUP + 2) + #define IDD_BACKUPDIR_STATIC (IDD_PREFERENCE_SUB_BACKUP + 3) + #define IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC (IDD_PREFERENCE_SUB_BACKUP + 4) + #define IDC_BACKUPDIR_EDIT (IDD_PREFERENCE_SUB_BACKUP + 5) + #define IDD_BACKUPDIR_BROWSE_BUTTON (IDD_PREFERENCE_SUB_BACKUP + 6) + #define IDD_AUTOC_GRPSTATIC (IDD_PREFERENCE_SUB_BACKUP + 7) + #define IDD_AUTOC_ENABLECHECK (IDD_PREFERENCE_SUB_BACKUP + 8) + #define IDD_AUTOC_FUNCRADIO (IDD_PREFERENCE_SUB_BACKUP + 9) + #define IDD_AUTOC_WORDRADIO (IDD_PREFERENCE_SUB_BACKUP + 10) + #define IDD_AUTOC_STATIC_FROM (IDD_PREFERENCE_SUB_BACKUP + 11) + #define IDD_AUTOC_STATIC_N (IDD_PREFERENCE_SUB_BACKUP + 12) + #define IDD_AUTOC_STATIC_CHAR (IDD_PREFERENCE_SUB_BACKUP + 13) + #define IDD_AUTOC_STATIC_NOTE (IDD_PREFERENCE_SUB_BACKUP + 14) + #define IDD_FUNC_CHECK (IDD_PREFERENCE_SUB_BACKUP + 15) + #define IDD_AUTOC_BOTHRADIO (IDD_PREFERENCE_SUB_BACKUP + 16) + #define IDC_BACKUPDIR_RESTORESESSION_GRP_STATIC (IDD_PREFERENCE_SUB_BACKUP + 17) + #define IDC_BACKUPDIR_RESTORESESSION_CHECK (IDD_PREFERENCE_SUB_BACKUP + 18) + #define IDD_BACKUPDIR_RESTORESESSION_STATIC1 (IDD_PREFERENCE_SUB_BACKUP + 19) + #define IDC_BACKUPDIR_RESTORESESSION_EDIT (IDD_PREFERENCE_SUB_BACKUP + 20) + #define IDD_BACKUPDIR_RESTORESESSION_STATIC2 (IDD_PREFERENCE_SUB_BACKUP + 21) + #define IDD_BACKUPDIR_RESTORESESSION_PATHLABEL_STATIC (IDD_PREFERENCE_SUB_BACKUP + 22) + #define IDD_BACKUPDIR_RESTORESESSION_PATH_EDIT (IDD_PREFERENCE_SUB_BACKUP + 23) + #define IDD_AUTOC_IGNORENUMBERS (IDD_PREFERENCE_SUB_BACKUP + 24) -#define IDD_PREFERENCE_AUTOCOMPLETION_BOX 6850 //(IDD_PREFERENCE_BOX + 850) - #define IDD_AUTOCINSERT_GRPSTATIC (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 1) - #define IDD_AUTOCPARENTHESES_CHECK (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 2) - #define IDD_AUTOCBRACKET_CHECK (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 3) - #define IDD_AUTOCCURLYBRACKET_CHECK (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 4) - #define IDD_AUTOC_DOUBLEQUOTESCHECK (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 5) - #define IDD_AUTOC_QUOTESCHECK (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 6) - #define IDD_AUTOCTAG_CHECK (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 7) - #define IDC_MACHEDPAIROPEN_STATIC (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 8) - #define IDC_MACHEDPAIRCLOSE_STATIC (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 9) - #define IDC_MACHEDPAIR_STATIC1 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 10) - #define IDC_MACHEDPAIROPEN_EDIT1 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 11) - #define IDC_MACHEDPAIRCLOSE_EDIT1 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 12) - #define IDC_MACHEDPAIR_STATIC2 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 13) - #define IDC_MACHEDPAIROPEN_EDIT2 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 14) - #define IDC_MACHEDPAIRCLOSE_EDIT2 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 15) - #define IDC_MACHEDPAIR_STATIC3 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 16) - #define IDC_MACHEDPAIROPEN_EDIT3 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 17) - #define IDC_MACHEDPAIRCLOSE_EDIT3 (IDD_PREFERENCE_AUTOCOMPLETION_BOX + 18) +#define IDD_PREFERENCE_SUB_AUTOCOMPLETION 6850 //(IDD_PREFERENCE_BOX + 850) + #define IDD_AUTOCINSERT_GRPSTATIC (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 1) + #define IDD_AUTOCPARENTHESES_CHECK (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 2) + #define IDD_AUTOCBRACKET_CHECK (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 3) + #define IDD_AUTOCCURLYBRACKET_CHECK (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 4) + #define IDD_AUTOC_DOUBLEQUOTESCHECK (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 5) + #define IDD_AUTOC_QUOTESCHECK (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 6) + #define IDD_AUTOCTAG_CHECK (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 7) + #define IDC_MACHEDPAIROPEN_STATIC (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 8) + #define IDC_MACHEDPAIRCLOSE_STATIC (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 9) + #define IDC_MACHEDPAIR_STATIC1 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 10) + #define IDC_MACHEDPAIROPEN_EDIT1 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 11) + #define IDC_MACHEDPAIRCLOSE_EDIT1 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 12) + #define IDC_MACHEDPAIR_STATIC2 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 13) + #define IDC_MACHEDPAIROPEN_EDIT2 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 14) + #define IDC_MACHEDPAIRCLOSE_EDIT2 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 15) + #define IDC_MACHEDPAIR_STATIC3 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 16) + #define IDC_MACHEDPAIROPEN_EDIT3 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 17) + #define IDC_MACHEDPAIRCLOSE_EDIT3 (IDD_PREFERENCE_SUB_AUTOCOMPLETION + 18) -#define IDD_PREFERENCE_SEARCHINGSETTINGS_BOX 6900 //(IDD_PREFERENCE_BOX + 900) - #define IDC_CHECK_STOPFILLINGFINDFIELD (IDD_PREFERENCE_SEARCHINGSETTINGS_BOX + 1) - #define IDC_CHECK_MONOSPACEDFONT_FINDDLG (IDD_PREFERENCE_SEARCHINGSETTINGS_BOX + 2) - #define IDC_CHECK_FINDDLG_ALWAYS_VISIBLE (IDD_PREFERENCE_SEARCHINGSETTINGS_BOX + 3) - #define IDC_CHECK_CONFIRMREPLOPENDOCS (IDD_PREFERENCE_SEARCHINGSETTINGS_BOX + 4) +#define IDD_PREFERENCE_SUB_SEARCHING 6900 //(IDD_PREFERENCE_BOX + 900) + #define IDC_CHECK_STOPFILLINGFINDFIELD (IDD_PREFERENCE_SUB_SEARCHING + 1) + #define IDC_CHECK_MONOSPACEDFONT_FINDDLG (IDD_PREFERENCE_SUB_SEARCHING + 2) + #define IDC_CHECK_FINDDLG_ALWAYS_VISIBLE (IDD_PREFERENCE_SUB_SEARCHING + 3) + #define IDC_CHECK_CONFIRMREPLOPENDOCS (IDD_PREFERENCE_SUB_SEARCHING + 4) #endif //PREFERENCE_RC_H diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp index 55facb2d..daa1300c 100644 --- a/PowerEditor/src/localization.cpp +++ b/PowerEditor/src/localization.cpp @@ -864,34 +864,42 @@ void NativeLangSpeaker::changePrefereceDlgLang(PreferenceDlg & preference) WcharMbcsConvertor& wmc = WcharMbcsConvertor::getInstance(); const size_t titreMaxSize = 128; char titre[titreMaxSize]; - changeDlgLang(preference._barsDlg.getHSelf(), "Global", titre, titreMaxSize); + changeDlgLang(preference._generalSubDlg.getHSelf(), "Global", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Global"), nameW); } - changeDlgLang(preference._marginsDlg.getHSelf(), "Scintillas", titre, titreMaxSize); + + changeDlgLang(preference._editingSubDlg.getHSelf(), "Scintillas", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Scintillas"), nameW); } - changeDlgLang(preference._defaultNewDocDlg.getHSelf(), "NewDoc", titre, titreMaxSize); + changeDlgLang(preference._marginsBorderEdgeSubDlg.getHSelf(), "MarginsBorderEdge", titre, titreMaxSize); + if (titre[0] != '\0') + { + const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); + preference.renameDialogTitle(TEXT("MarginsBorderEdge"), nameW); + } + + changeDlgLang(preference._newDocumentSubDlg.getHSelf(), "NewDoc", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("NewDoc"), nameW); } - changeDlgLang(preference._defaultDirectoryDlg.getHSelf(), "DefaultDir", titre, titreMaxSize); + changeDlgLang(preference._defaultDirectorySubDlg.getHSelf(), "DefaultDir", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("DefaultDir"), nameW); } - changeDlgLang(preference._recentFilesHistoryDlg.getHSelf(), "RecentFilesHistory", titre, titreMaxSize); + changeDlgLang(preference._recentFilesHistorySubDlg.getHSelf(), "RecentFilesHistory", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); @@ -905,76 +913,76 @@ void NativeLangSpeaker::changePrefereceDlgLang(PreferenceDlg & preference) preference.renameDialogTitle(TEXT("FileAssoc"), nameW); } - changeDlgLang(preference._langMenuDlg.getHSelf(), "Language", titre, titreMaxSize); + changeDlgLang(preference._languageSubDlg.getHSelf(), "Language", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Language"), nameW); } - changeDlgLang(preference._highlighting.getHSelf(), "Highlighting", titre, titreMaxSize); + changeDlgLang(preference._highlightingSubDlg.getHSelf(), "Highlighting", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Highlighting"), nameW); } - changeDlgLang(preference._printSettingsDlg.getHSelf(), "Print", titre, titreMaxSize); + changeDlgLang(preference._printSubDlg.getHSelf(), "Print", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Print"), nameW); } - changeDlgLang(preference._searchingSettingsDlg.getHSelf(), "Searching", titre, titreMaxSize); + changeDlgLang(preference._searchingSubDlg.getHSelf(), "Searching", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t* nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Searching"), nameW); } - changeDlgLang(preference._settingsDlg.getHSelf(), "MISC", titre, titreMaxSize); + changeDlgLang(preference._miscSubDlg.getHSelf(), "MISC", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("MISC"), nameW); } - changeDlgLang(preference._backupDlg.getHSelf(), "Backup", titre, titreMaxSize); + changeDlgLang(preference._backupSubDlg.getHSelf(), "Backup", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Backup"), nameW); } - changeDlgLang(preference._autoCompletionDlg.getHSelf(), "AutoCompletion", titre, titreMaxSize); + changeDlgLang(preference._autoCompletionSubDlg.getHSelf(), "AutoCompletion", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("AutoCompletion"), nameW); } - changeDlgLang(preference._multiInstDlg.getHSelf(), "MultiInstance", titre, titreMaxSize); + changeDlgLang(preference._multiInstanceSubDlg.getHSelf(), "MultiInstance", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("MultiInstance"), nameW); } - changeDlgLang(preference._delimiterSettingsDlg.getHSelf(), "Delimiter", titre, titreMaxSize); + changeDlgLang(preference._delimiterSubDlg.getHSelf(), "Delimiter", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Delimiter"), nameW); } - changeDlgLang(preference._settingsOnCloudDlg.getHSelf(), "Cloud", titre, titreMaxSize); + changeDlgLang(preference._cloudAndLinkSubDlg.getHSelf(), "Cloud", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding); preference.renameDialogTitle(TEXT("Cloud"), nameW); } - changeDlgLang(preference._searchEngineDlg.getHSelf(), "SearchEngine", titre, titreMaxSize); + changeDlgLang(preference._searchEngineSubDlg.getHSelf(), "SearchEngine", titre, titreMaxSize); if (titre[0] != '\0') { const wchar_t *nameW = wmc.char2wchar(titre, _nativeLangEncoding);