CONTROL "&Options...",IDC_OPTIONS,"Button",BS_SPLITBUTTON | WS_TABSTOP,383,29,72,14\r
END\r
\r
-IDD_PROPPAGE_GENERAL DIALOGEX 0, 0, 235, 222\r
+IDD_PROPPAGE_GENERAL DIALOGEX 0, 0, 255, 222\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "General"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
CONTROL "Automatically &scroll to first difference",IDC_SCROLL_CHECK,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,220,10\r
- CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,220,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,240,10\r
+ CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,240,10\r
CONTROL "&Automatically verify paths in Open-dialog",IDC_VERIFY_OPEN_PATHS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,220,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,240,10\r
CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,220,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,240,10\r
CONTROL "As&k when closing multiple windows",IDC_ASK_MULTIWINDOW_CLOSE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,220,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,240,10\r
CONTROL "&Preserve file time in file compare",IDC_PRESERVE_FILETIME,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,220,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,240,10\r
CONTROL "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,220,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,240,10\r
CONTROL "Close ""Select Files or Folders"" Dialog on clicking OK button",IDC_CLOSE_WITH_OK,\r
- "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,90,220,20\r
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,7,110,220,10\r
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,122,220,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,90,240,20\r
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,7,110,240,10\r
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,122,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
LTEXT "Language:",IDC_STATIC,7,140,80,10\r
- COMBOBOX IDC_LANGUAGE_LIST,7,152,221,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",IDC_STATIC,7,186,173,40\r
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,183,205,45,14,NOT WS_TABSTOP\r
+ COMBOBOX IDC_LANGUAGE_LIST,7,152,241,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",IDC_STATIC,7,186,193,40\r
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,203,205,45,14,NOT WS_TABSTOP\r
END\r
\r
IDD_EDIT_FIND DIALOGEX 30, 73, 293, 96\r
PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14\r
END\r
\r
-IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196\r
+IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 255, 196\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Colors"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,161,208,70,14\r
END\r
\r
-IDD_PROPPAGE_SYSTEM DIALOGEX 0, 0, 235, 220\r
+IDD_PROPPAGE_SYSTEM DIALOGEX 0, 0, 255, 220\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "System"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
CONTROL "&Send deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,222,10\r
LTEXT "&External editor:",IDC_STATIC,7,18,222,10\r
- EDITTEXT IDC_EXT_EDITOR_PATH,7,30,167,14,ES_AUTOHSCROLL\r
- PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,30,50,14\r
+ EDITTEXT IDC_EXT_EDITOR_PATH,7,30,187,14,ES_AUTOHSCROLL\r
+ PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,199,30,50,14\r
LTEXT "&Filter folder:",IDC_STATIC,7,54,166,10\r
- EDITTEXT IDC_FILTER_USER_PATH,7,66,167,14,ES_AUTOHSCROLL\r
- PUSHBUTTON "B&rowse...",IDC_FILTER_USER_BROWSE,179,66,50,14\r
- GROUPBOX "Temporary files folder",IDC_STATIC,7,90,218,56\r
+ EDITTEXT IDC_FILTER_USER_PATH,7,66,187,14,ES_AUTOHSCROLL\r
+ PUSHBUTTON "B&rowse...",IDC_FILTER_USER_BROWSE,199,66,50,14\r
+ GROUPBOX "Temporary files folder",IDC_STATIC,7,90,241,56\r
CONTROL "S&ystem's temp folder",IDC_TMPFOLDER_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,17,102,199,10\r
- CONTROL "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,17,114,199,10\r
- EDITTEXT IDC_TMPFOLDER_NAME,27,126,136,14,ES_AUTOHSCROLL | WS_GROUP\r
- PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,167,126,50,14\r
+ CONTROL "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,17,114,219,10\r
+ EDITTEXT IDC_TMPFOLDER_NAME,27,126,161,14,ES_AUTOHSCROLL | WS_GROUP\r
+ PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,194,126,50,14\r
END\r
\r
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 190\r
PUSHBUTTON "Cancel",IDCANCEL,153,24,50,14\r
END\r
\r
-IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 235, 205\r
+IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 255, 205\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Compare"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Whitespace",IDC_STATIC,7,7,221,50\r
+ GROUPBOX "Whitespace",IDC_STATIC,7,7,241,50\r
CONTROL "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,19,206,10\r
CONTROL "&Ignore change",IDC_WHITE_CHANGE,"Button",BS_AUTORADIOBUTTON,14,30,206,10\r
CONTROL "I&gnore all",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON,14,41,206,10\r
- CONTROL "Ignore blan&k lines",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,60,221,10\r
- CONTROL "Ignore &case",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,221,10\r
+ CONTROL "Ignore blan&k lines",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,60,241,10\r
+ CONTROL "Ignore &case",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,241,10\r
CONTROL "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_EOL_SENSITIVE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,221,10\r
- CONTROL "Ignore codepage &differences",IDC_CP_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,221,10\r
- CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,221,10\r
- CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,221,10\r
- GROUPBOX "Comments",IDC_STATIC,7,164,221,32\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,241,10\r
+ CONTROL "Ignore codepage &differences",IDC_CP_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,241,10\r
+ CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,241,10\r
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,241,10\r
+ GROUPBOX "Comments",IDC_STATIC,7,164,241,32\r
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,177,205,10\r
PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,198,70,14\r
END\r
\r
-IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 215\r
+IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 255, 215\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Editor"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
CONTROL "&Highlight syntax",IDC_HILITE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,215,10\r
CONTROL "&Automatic rescan",IDC_AUTOMRESCAN_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,215,10\r
CONTROL "&Preserve original EOL chars",IDC_MIXED_EOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,215,10\r
- GROUPBOX "Tabs",IDC_STATIC,7,42,221,72,WS_GROUP\r
+ GROUPBOX "Tabs",IDC_STATIC,7,42,241,72,WS_GROUP\r
LTEXT "&Tab size:",IDC_STATIC,14,54,201,10\r
EDITTEXT IDC_TAB_EDIT,24,66,18,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT\r
CONTROL "&Insert Tabs",IDC_PROP_INSERT_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,84,201,10\r
CONTROL "Insert &Spaces",IDC_PROP_INSERT_SPACES,"Button",BS_AUTORADIOBUTTON,14,96,201,10\r
- GROUPBOX "Line Difference Coloring",IDC_LINE_COLORING_GROUP,7,114,221,102,WS_GROUP\r
+ GROUPBOX "Line Difference Coloring",IDC_LINE_COLORING_GROUP,7,114,241,102,WS_GROUP\r
CONTROL "View line differences",IDC_VIEW_LINE_DIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,126,201,10\r
CONTROL "&Character level",IDC_EDITOR_CHARLEVEL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,138,194,10\r
CONTROL "&Word-level:",IDC_EDITOR_WORDLEVEL,"Button",BS_AUTORADIOBUTTON,24,150,194,10\r
- COMBOBOX IDC_BREAK_TYPE,38,162,163,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
+ COMBOBOX IDC_BREAK_TYPE,38,162,183,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
LTEXT "W&ord break characters:",IDC_STATIC,24,180,194,10\r
- EDITTEXT IDC_BREAK_CHARS,24,192,178,14,ES_AUTOHSCROLL\r
+ EDITTEXT IDC_BREAK_CHARS,24,192,198,14,ES_AUTOHSCROLL\r
END\r
\r
IDD_MESSAGE_BOX DIALOGEX 0, 0, 186, 95\r
PUSHBUTTON "Cancel",IDCANCEL,205,195,50,14\r
END\r
\r
-IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 235, 138\r
+IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 255, 138\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Codepage"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Default Codepage",IDC_STATIC,7,7,221,81\r
- LTEXT "Select the default codepage assumed when loading non-Unicode files:",IDC_STATIC,14,18,208,20\r
+ GROUPBOX "Default Codepage",IDC_STATIC,7,7,241,81\r
+ LTEXT "Select the default codepage assumed when loading non-Unicode files:",IDC_STATIC,14,18,228,20\r
CONTROL "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session",IDC_DETECT_CODEPAGE,\r
- "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,90,210,20\r
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,90,230,30\r
CONTROL "Detect codepage for text files using mlang.dll\nneed to restart session",IDC_DETECT_CODEPAGE2,\r
- "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,114,210,34\r
- COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,150,125,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- CONTROL "System codepage",IDC_CP_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,42,210,10\r
- CONTROL "According to WinMerge User Interface",IDC_CP_UI,"Button",BS_AUTORADIOBUTTON,13,55,210,10\r
- CONTROL "Custom codepage:",IDC_CP_CUSTOM,"Button",BS_AUTORADIOBUTTON,13,68,80,10\r
- COMBOBOX IDC_CUSTOM_CP_NUMBER,96,67,122,130,CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,124,230,34\r
+ COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,160,125,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ CONTROL "System codepage",IDC_CP_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,42,230,10\r
+ CONTROL "According to WinMerge User Interface",IDC_CP_UI,"Button",BS_AUTORADIOBUTTON,13,55,230,10\r
+ CONTROL "Custom codepage:",IDC_CP_CUSTOM,"Button",BS_AUTORADIOBUTTON,13,68,120,10\r
+ COMBOBOX IDC_CUSTOM_CP_NUMBER,136,67,102,130,CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
END\r
\r
-IDD_PREFERENCES DIALOGEX 0, 0, 352, 280\r
+IDD_PREFERENCES DIALOGEX 0, 0, 372, 280\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Options"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,187,257,50,14\r
- PUSHBUTTON "Cancel",IDCANCEL,241,257,50,14\r
- PUSHBUTTON "Help",IDC_TREEOPT_HELP,295,257,50,14\r
+ DEFPUSHBUTTON "OK",IDOK,207,257,50,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,261,257,50,14\r
+ PUSHBUTTON "Help",IDC_TREEOPT_HELP,315,257,50,14\r
CONTROL "",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,20,96,222\r
- CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE | WS_DISABLED,110,0,235,242\r
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,250,338,1\r
+ CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE | WS_DISABLED,110,0,255,242\r
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,250,358,1\r
LTEXT " Categories",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE | SS_SUNKEN\r
PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,257,50,14\r
PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,257,50,14\r
END\r
\r
-IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 235, 214\r
+IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 255, 214\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Dialog"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Defaults",IDC_SCOLORS_BDEFAULTS,162,198,70,14\r
END\r
\r
-IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 197, 157\r
+IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 255, 157\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Dialog"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Cancel",IDCANCEL,135,55,50,14\r
END\r
\r
-IDD_PROP_ARCHIVE DIALOGEX 0, 0, 235, 126\r
+IDD_PROP_ARCHIVE DIALOGEX 0, 0, 255, 126\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Archive Support"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- CONTROL "&Enable archive file support",IDC_ARCHIVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,221,10\r
+ CONTROL "&Enable archive file support",IDC_ARCHIVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,241,10\r
CONTROL "&Detect archive type from file signature",IDC_ARCHIVE_DETECTTYPE,\r
- "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,18,221,10\r
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,7,18,241,20\r
END\r
\r
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 174\r
PUSHBUTTON "&Close",IDCANCEL,192,121,50,14\r
END\r
\r
-IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 197, 157\r
+IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 255, 157\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Dialog"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
CONTROL "",IDC_MARGIN_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,114,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
END\r
\r
-IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222\r
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 255, 222\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Backup Files"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
LTEXT "Create backup files into:",IDC_STATIC,7,42,222,10\r
CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,17,54,212,10\r
CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",BS_AUTORADIOBUTTON,17,66,212,10\r
- EDITTEXT IDC_BACKUP_FOLDER,29,78,145,14,ES_AUTOHSCROLL | WS_GROUP\r
- PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,78,50,14\r
+ EDITTEXT IDC_BACKUP_FOLDER,29,78,165,14,ES_AUTOHSCROLL | WS_GROUP\r
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,199,78,50,14\r
LTEXT "Backup filename:",IDC_STATIC,7,96,222,10\r
CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,108,212,10\r
CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,120,212,10\r
PUSHBUTTON "Cancel",IDCANCEL,313,190,50,14\r
END\r
\r
-IDD_PROPPAGE_SHELL DIALOGEX 0, 0, 236, 222\r
+IDD_PROPPAGE_SHELL DIALOGEX 0, 0, 255, 222\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Shell Integration"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Explorer",IDC_STATIC,7,6,218,80\r
- CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,30,190,10\r
- CONTROL "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,200,10\r
- PUSHBUTTON "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,48,200,14\r
- PUSHBUTTON "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,64,200,14\r
+ GROUPBOX "Explorer",IDC_STATIC,7,6,238,80\r
+ CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,30,210,10\r
+ CONTROL "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,220,10\r
+ PUSHBUTTON "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,48,220,14\r
+ PUSHBUTTON "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,64,220,14\r
END\r
\r
-IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 235, 205\r
+IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 255, 205\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Folder"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
LTEXT "&Compare method:",IDC_STATIC,7,6,100,10\r
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,6,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ COMBOBOX IDC_COMPAREMETHODCOMBO,130,6,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,24,202,10\r
CONTROL "Ign&ore time differences less than 3 seconds",IDC_IGNORE_SMALLTIMEDIFF,\r
LTEXT "&Quick compare limit (MB):",IDC_STATIC,7,96,200,10\r
EDITTEXT IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL\r
PUSHBUTTON "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,198,70,14\r
- LTEXT "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,124,200,30\r
+ LTEXT "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,124,230,30\r
EDITTEXT IDC_COMPARE_THREAD_COUNT,7,156,30,14,ES_AUTOHSCROLL\r
END\r
\r
-IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 235, 205\r
+IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 255, 205\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Binary"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
LTEXT "Binary File &Patterns:",IDC_STATIC,7,6,200,10\r
- EDITTEXT IDC_COMPAREBINARY_PATTERNS,7,18,220,14,ES_AUTOHSCROLL\r
- GROUPBOX "Frhed settings",IDC_STATIC,7,40,221,88\r
- PUSHBUTTON "View &Settings...",IDC_COMPAREBINARY_VIEWSETTINGS,37,58,150,14\r
- PUSHBUTTON "&Binary Mode...",IDC_COMPAREBINARY_BINARYMODE,37,82,150,14\r
- PUSHBUTTON "&Character Set...",IDC_COMPAREBINARY_CHARACTERSET,37,106,150,14\r
+ EDITTEXT IDC_COMPAREBINARY_PATTERNS,7,18,240,14,ES_AUTOHSCROLL\r
+ GROUPBOX "Frhed settings",IDC_STATIC,7,40,241,88\r
+ PUSHBUTTON "View &Settings...",IDC_COMPAREBINARY_VIEWSETTINGS,37,58,170,14\r
+ PUSHBUTTON "&Binary Mode...",IDC_COMPAREBINARY_BINARYMODE,37,82,170,14\r
+ PUSHBUTTON "&Character Set...",IDC_COMPAREBINARY_CHARACTERSET,37,106,170,14\r
PUSHBUTTON "Defaults",IDC_COMPAREBINARY_DEFAULTS,7,198,70,14\r
END\r
\r
-IDD_PROPPAGE_COMPARE_IMAGE DIALOGEX 0, 0, 235, 205\r
+IDD_PROPPAGE_COMPARE_IMAGE DIALOGEX 0, 0, 255, 205\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Image"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
LTEXT "Image File &Patterns:",IDC_STATIC,7,6,200,10\r
- EDITTEXT IDC_COMPAREIMAGE_PATTERNS,7,18,220,14,ES_AUTOHSCROLL\r
+ EDITTEXT IDC_COMPAREIMAGE_PATTERNS,7,18,240,14,ES_AUTOHSCROLL\r
PUSHBUTTON "Defaults",IDC_COMPAREIMAGE_DEFAULTS,7,198,70,14\r
END\r
\r
OSDN Git Service
