// TEXTINCLUDE
//
-1 TEXTINCLUDE MOVEABLE PURE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE MOVEABLE PURE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE MOVEABLE PURE
+3 TEXTINCLUDE
BEGIN
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDR_MAINFRAME ICON DISCARDABLE "res\\Merge.ico"
-IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico"
+IDR_MAINFRAME ICON "res\\Merge.ico"
+IDR_MERGETYPE ICON "res\\MergeDoc.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
-IDR_MAINFRAME ACCELERATORS MOVEABLE PURE
+IDR_MAINFRAME ACCELERATORS
BEGIN
"A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
+ "C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL,
+ NOINVERT
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
"X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
"Y", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
"Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
- "Z", ID_EDIT_REDO, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "Z", ID_EDIT_REDO, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
VK_DOWN, ID_NEXTDIFF, VIRTKEY, ALT, NOINVERT
//
IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "About WinMerge"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
END
IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU |
+ WS_THICKFRAME
CAPTION "Select Files or Directories..."
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "&Left:",IDC_STATIC,13,24,40,8
- COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN |
+ COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
PUSHBUTTON "&Browse...",IDC_LEFT_BUTTON,242,22,50,12
RTEXT "&Right:",IDC_STATIC,13,40,40,8
- COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN |
+ COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
PUSHBUTTON "Bro&wse...",IDC_RIGHT_BUTTON,242,38,50,12
RTEXT "&Filter:",IDC_STATIC,13,56,40,8
- COMBOBOX IDC_EXT_COMBO,56,54,182,95,CBS_DROPDOWN |
+ COMBOBOX IDC_EXT_COMBO,56,54,182,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Select...",IDC_SELECT_FILTER,242,54,50,12
RTEXT "&Unpacker:",IDC_STATIC,13,72,40,8
- EDITTEXT IDC_UNPACKER_EDIT,56,70,181,12,ES_AUTOHSCROLL |
+ EDITTEXT IDC_UNPACKER_EDIT,56,70,181,12,ES_AUTOHSCROLL |
ES_READONLY
PUSHBUTTON "&Select...",IDC_SELECT_UNPACKER,242,70,50,12
CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button",
PUSHBUTTON "Cancel",IDCANCEL,306,28,50,14
GROUPBOX "Files or Directories to Compare",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Visual SourceSafe"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "",IDC_STATIC,7,7,243,47,SS_SUNKEN
LTEXT "IDS_SAVEVSS_FMT",IDC_MESSAGE,14,13,231,34
LTEXT "Database:",IDC_STATIC,7,64,36,8
- COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN |
+ COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "Project:",IDC_STATIC,7,81,36,8
- COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN |
+ COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "User:",IDC_STATIC,7,99,36,8
EDITTEXT IDC_USER,48,96,70,14,ES_AUTOHSCROLL
END
IDD_PROP_VSS DIALOGEX 0, 0, 235, 157
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Versioning System"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "&Versioning System:",IDC_STATIC,7,7,221,10
- COMBOBOX IDC_VER_SYS,7,18,166,98,CBS_DROPDOWNLIST | WS_VSCROLL |
+ COMBOBOX IDC_VER_SYS,7,18,166,98,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
LTEXT "&Path to cleartool.exe:",IDC_VSS_L1,7,37,221,10
EDITTEXT IDC_PATH_EDIT,7,48,166,14,ES_AUTOHSCROLL
END
IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 235, 156
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Close compare Statepane automatically",
- IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
+ IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,37,206,10
CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
- CONTROL "Automatically verify paths in Open-dialog",
- IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
+ CONTROL "&Automatically verify paths in Open-dialog",
+ IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,57,206,10
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,87,50,13,NOT
+ CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,87,50,13,NOT
WS_TABSTOP
LTEXT "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
IDC_STATIC,7,79,168,31
END
IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 111
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Language"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
PUSHBUTTON "OK",IDOK,154,16,52,14
PUSHBUTTON "Cancel",IDCANCEL,154,33,52,14
- LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_SORT |
- LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT |
+ WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Available languages:",IDC_STATIC,7,7,140,8
END
IDD_EDIT_FIND DIALOGEX 30, 73, 283, 66
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Find"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Fi&nd what:",IDC_STATIC,7,9,50,8
- COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN |
+ COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",
BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10
CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
GROUPBOX "Direction",IDC_STATIC,148,23,70,36,WS_GROUP
- CONTROL "&Up",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "&Up",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,154,34,57,10
CONTROL "&Down",IDC_EDIT_DIRECTION_DOWN,"Button",
BS_AUTORADIOBUTTON,154,44,57,10
END
IDD_EDIT_REPLACE DIALOGEX 36, 44, 304, 90
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Replace"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Fi&nd what:",IDC_STATIC,7,9,65,8
- COMBOBOX IDC_EDIT_FINDTEXT,75,7,165,66,CBS_DROPDOWN |
+ COMBOBOX IDC_EDIT_FINDTEXT,75,7,165,66,CBS_DROPDOWN |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "Re&place with:",IDC_STATIC,7,24,65,8
- COMBOBOX IDC_EDIT_REPLACE_WITH,75,22,165,66,CBS_DROPDOWN |
+ COMBOBOX IDC_EDIT_REPLACE_WITH,75,22,165,66,CBS_DROPDOWN |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",
BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
- CONTROL "&Don't wrap end of file",IDC_EDIT_SCOPE_DONT_WRAP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10
+ CONTROL "&Don't wrap end of file",IDC_EDIT_SCOPE_DONT_WRAP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10
GROUPBOX "Replace in",IDC_STATIC,149,40,90,36,WS_GROUP
CONTROL "&Selection",IDC_EDIT_SCOPE_SELECTION,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,154,51,80,10
END
IDD_CLEARCASE DIALOGEX 0, 0, 279, 111
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Rational Clearcase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,35,90,50,14
PUSHBUTTON "Cancel",IDCANCEL,194,90,50,14
PUSHBUTTON "Save As...",IDC_SAVE_AS,114,90,50,14,NOT WS_VISIBLE
- EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
+ EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
LTEXT "Comments",IDC_STATIC,18,7,34,10
END
IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Linefilters"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
7,221,15
LTEXT "Regular Expressions (one per line):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
+ EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
ES_AUTOHSCROLL | ES_WANTRETURN
END
-IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Colors"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "Difference:",IDC_STATIC,7,29,90,8
- CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,113,29,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,113,29,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
RTEXT "Selected Difference:",IDC_STATIC,7,49,90,8
- CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
CTEXT "Background",IDC_STATIC,96,15,50,8
CTEXT "Deleted",IDC_STATIC,145,15,38,8
- CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,156,29,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,156,29,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button",
- BS_OWNERDRAW | WS_TABSTOP,156,49,17,14,WS_EX_TRANSPARENT |
+ BS_OWNERDRAW | WS_TABSTOP,156,49,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,199,29,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,199,29,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button",
- BS_OWNERDRAW | WS_TABSTOP,199,49,17,14,WS_EX_TRANSPARENT |
+ BS_OWNERDRAW | WS_TABSTOP,199,49,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
CTEXT "Text",IDC_STATIC,193,15,29,8
- CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,113,69,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,113,69,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
RTEXT "Ignored Difference:",IDC_STATIC,7,69,90,8
CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button",
- BS_OWNERDRAW | WS_TABSTOP,156,69,17,14,WS_EX_TRANSPARENT |
+ BS_OWNERDRAW | WS_TABSTOP,156,69,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Dif",IDC_TRIVIAL_DIFF_TEXT_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,199,69,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_TRIVIAL_DIFF_TEXT_COLOR,"Button",
+ BS_OWNERDRAW | WS_TABSTOP,199,69,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Dif",IDC_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,113,89,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,113,89,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
RTEXT "Moved:",IDC_STATIC,7,89,90,8
- CONTROL "Dif",IDC_MOVEDBLOCK_DELETED_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,156,89,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_MOVEDBLOCK_DELETED_COLOR,"Button",
+ BS_OWNERDRAW | WS_TABSTOP,156,89,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Dif",IDC_MOVEDBLOCK_TEXT_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,199,89,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_MOVEDBLOCK_TEXT_COLOR,"Button",
+ BS_OWNERDRAW | WS_TABSTOP,199,89,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Dif",IDC_SEL_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,113,109,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_SEL_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,113,109,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
RTEXT "Selected Moved:",IDC_STATIC,7,109,90,8
CONTROL "Dif",IDC_SEL_MOVEDBLOCK_DELETED_COLOR,"Button",
- BS_OWNERDRAW | WS_TABSTOP,156,109,17,14,
- WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE
+ BS_OWNERDRAW | WS_TABSTOP,156,109,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button",
- BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,
- WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE
- PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14
+ BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ RTEXT "Word Difference:",IDC_STATIC,7,129,90,8
+ CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button",
+ BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8
+ CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button",
+ BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14
END
IDD_OUTPUT DIALOGEX 0, 0, 278, 157
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,106,136,50,14
- EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY |
+ EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY |
WS_VSCROLL
END
IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "System"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10
CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,18,28,211,10
- LTEXT "&External editor:",IDC_STATIC,7,44,222,8
- EDITTEXT IDC_EXT_EDITOR_PATH,7,54,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,54,50,14
+ CONTROL "Ignore time differences less than 3 seconds",
+ IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,8,39,222,10
+ LTEXT "&External editor:",IDC_STATIC,7,49,222,8
+ EDITTEXT IDC_EXT_EDITOR_PATH,7,59,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,59,50,14
END
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Patch Generator"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "File&1:",IDC_STATIC,7,10,36,8
- COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN |
+ COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Browse...",IDC_DIFF_BROWSE_FILE1,283,7,50,14
LTEXT "File&2:",IDC_STATIC,7,27,36,8
- COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN |
+ COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,50,14
PUSHBUTTON "&Swap",IDC_DIFF_SWAPFILES,283,41,50,14
CONTROL "&Append to existing file",IDC_DIFF_APPENDFILE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10
LTEXT "&Result:",IDC_STATIC,7,66,37,8
- COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN |
+ COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Bro&wse...",IDC_DIFF_BROWSE_RESULT,283,63,50,14
GROUPBOX "&Format",IDC_STATIC,7,81,142,46
LTEXT "St&yle:",IDC_STATIC,13,95,46,8
- COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL |
+ COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
LTEXT "&Context:",IDC_STATIC,13,109,46,8
- COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
GROUPBOX "W&hitespaces",IDC_STATIC,155,81,123,46
CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",
END
IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
-STYLE DS_FIXEDSYS | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
- ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,
- WS_EX_STATICEDGE
- EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
- ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,
- WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
IDD_DIRCOLS DIALOGEX 0, 0, 283, 170
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Display Columns"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109
- LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT |
+ LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "&Up",IDC_UP,14,45,27,14
PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14
GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109
- LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT |
+ LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "<==",IDC_ADD,143,45,29,14
PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14
END
IDD_SELECTUNPACKER DIALOGEX 0, 0, 293, 126
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Select Unpacker"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,87,99,50,14
PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14
LTEXT "File unpacker:",IDC_STATIC,7,18,50,10
- COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Display all unpackers, don't check the extension",
- IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX |
+ IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX |
BS_LEFTTEXT | WS_TABSTOP,7,74,202,13
LTEXT "Extensions list:",IDC_STATIC,7,36,49,10
LTEXT "Description:",IDC_STATIC,7,52,47,10
EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12,
ES_AUTOHSCROLL | ES_READONLY
- EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL |
+ EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL |
ES_READONLY
END
IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 45
-STYLE DS_FIXEDSYS | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL 315,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
WS_EX_STATICEDGE
- CONTROL 300,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
+ CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
WS_EX_STATICEDGE
- CONTROL 311,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
WS_EX_STATICEDGE
- CONTROL 303,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
WS_EX_STATICEDGE
- CONTROL 301,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
WS_EX_STATICEDGE
- CONTROL 302,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
WS_EX_STATICEDGE
- CONTROL 305,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
WS_EX_STATICEDGE
- CONTROL 312,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
WS_EX_STATICEDGE
- CONTROL 306,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
WS_EX_STATICEDGE
- CONTROL 307,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
WS_EX_STATICEDGE
- CONTROL 313,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
+ CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
WS_EX_STATICEDGE
- CONTROL 314,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
+ CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
WS_EX_STATICEDGE
RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
+ RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
+ RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
0x2000
RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
+ RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
+ RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
+ RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
0x2000
RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
+ RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
+ RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
0x2000
DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Go To"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "G&oto:",IDC_STATIC,7,9,36,8
EDITTEXT IDC_WMGOTO_PARAM,45,7,102,14,ES_AUTOHSCROLL | ES_NUMBER
GROUPBOX "File",IDC_STATIC,7,27,57,35
- CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,13,38,48,10
CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",
BS_AUTORADIOBUTTON,13,48,47,10
GROUPBOX "Goto what",IDC_STATIC,69,27,78,35
- CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,76,38,68,10
CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
BS_AUTORADIOBUTTON,76,48,68,10
END
IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 235, 156
-STYLE DS_FIXEDSYS | WS_CHILD | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Compare"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Whitespace",IDC_STATIC,7,7,221,50
- CONTROL "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,14,19,206,10
CONTROL "&Ignore change",IDC_WHITE_CHANGE,"Button",
BS_AUTORADIOBUTTON,14,30,206,10
CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
LTEXT "&File Compare method:",IDC_STATIC,7,105,70,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,79,103,84,52,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_COMPAREMETHODCOMBO,79,103,84,52,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,121,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 156
-STYLE DS_FIXEDSYS | WS_CHILD | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Editor"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "&Highlight syntax",IDC_HILITE_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,7,215,10
- CONTROL "Apply to &unrecognized side",IDC_UNREC_APPLYSYNTAX,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,18,204,10
+ CONTROL "Apply to &unrecognized side",
+ IDC_UNREC_APPLYSYNTAX,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,18,18,204,10
CONTROL "&Automatic rescan",IDC_AUTOMRESCAN_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,28,215,10
CONTROL "&Preserve original EOL chars",IDC_MIXED_EOL,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,85,63,137,10
CONTROL "Insert &Spaces",IDC_PROP_INSERT_SPACES,"Button",
BS_AUTORADIOBUTTON,85,72,137,10
+ GROUPBOX "Line Difference Coloring",IDC_LINE_COLORING_GROUP,10,97,
+ 218,37
+ CONTROL "View line differences",IDC_VIEW_LINE_DIFFERENCES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,16,108,100,8
+ CONTROL "Break on words",IDC_BREAK_ON_WORDS,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,148,108,73,8
+ COMBOBOX IDC_BREAK_TYPE,17,120,143,34,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
END
IDD_MESSAGE_BOX DIALOGEX 0, 0, 186, 95
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
END
IDD_FILEFILTERS DIALOGEX 0, 0, 356, 135
-STYLE DS_FIXEDSYS | WS_CHILD | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
CAPTION "Filefilters"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
+ CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
- PUSHBUTTON "Edit...",IDC_FILTERFILE_EDITBTN,299,114,50,14
+ PUSHBUTTON "New...",IDC_FILTERFILE_NEWBTN,188,114,50,14
+ PUSHBUTTON "Edit...",IDC_FILTERFILE_EDITBTN,244,114,50,14
+ PUSHBUTTON "Delete...",IDC_FILTERFILE_DELETEBTN,299,114,50,14
END
IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Save modified files?"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Left side file",IDC_SAVECLOSING_LEFTFRAME,7,7,248,55
- EDITTEXT IDC_SAVECLOSING_LEFTFILE,16,19,230,14,ES_AUTOHSCROLL |
+ EDITTEXT IDC_SAVECLOSING_LEFTFILE,16,19,230,14,ES_AUTOHSCROLL |
ES_READONLY
CONTROL "&Save changes",IDC_SAVECLOSING_SAVELEFT,"Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,36,230,10
CONTROL "&Discard changes",IDC_SAVECLOSING_DISCARDLEFT,"Button",
BS_AUTORADIOBUTTON,16,46,230,10
GROUPBOX "Right side file",IDC_SAVECLOSING_RIGHTFRAME,7,70,248,55
- EDITTEXT IDC_SAVECLOSING_RIGHTFILE,16,82,230,14,ES_AUTOHSCROLL |
+ EDITTEXT IDC_SAVECLOSING_RIGHTFILE,16,82,230,14,ES_AUTOHSCROLL |
ES_READONLY
CONTROL "S&ave changes",IDC_SAVECLOSING_SAVERIGHT,"Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
END
IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 235, 117
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Codepage"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session",
- IDC_DETECT_CODEPAGE,"Button",BS_AUTOCHECKBOX | BS_TOP |
+ IDC_DETECT_CODEPAGE,"Button",BS_AUTOCHECKBOX | BS_TOP |
BS_MULTILINE | WS_TABSTOP,13,74,210,29
CONTROL "System codepage",IDC_CP_SYSTEM,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,13,20,210,10
GROUPBOX "Default codepage for ANSI files",IDC_STATIC,7,7,221,58
END
-IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 276, 186
+IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "WinMerge"
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "WinMerge - Archive support disabled"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Archive support is disabled. In order to enable archive support, please install a version of 7-Zip that WinMerge can interface, and place a copy of the appropriate interface plugin (Merge7z*.dll) in your WinMerge directory.",
- IDC_STATIC,2,2,272,32
- LTEXT "WinMerge can interface 7-Zip 3.11 and above, provided the appropriate interface plugin is available. Please use the version of 7-Zip recommended below until interface plugins for later versions become available.",
- IDC_STATIC,2,34,272,32
- LTEXT "Recommended version of 7-Zip:",IDC_STATIC,2,70,131,8
- EDITTEXT 101,214,70,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
- WS_BORDER | WS_GROUP | NOT WS_TABSTOP
- LTEXT "Interface plugin required:",IDC_STATIC,2,82,86,8
- EDITTEXT 102,214,82,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
- WS_BORDER | WS_GROUP | NOT WS_TABSTOP
- LTEXT "Version of 7-Zip currently installed on your computer:",
- IDC_STATIC,2,98,208,8
- EDITTEXT 103,214,98,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
- WS_BORDER | WS_GROUP | NOT WS_TABSTOP
- LTEXT "Version of local 7-Zip components found in WinMerge directory:",
- IDC_STATIC,2,110,208,8
- EDITTEXT 104,214,110,60,12,ES_AUTOHSCROLL | ES_READONLY | NOT
- WS_BORDER | WS_GROUP | NOT WS_TABSTOP
- LTEXT "Interface plugins found in WinMerge directory:",
- IDC_STATIC,2,130,168,28
- LISTBOX 105,174,130,100,28,LBS_SORT | LBS_NOINTEGRALHEIGHT |
- WS_VSCROLL | WS_GROUP
- CONTROL "Don't display this &message again.\n(You can allways recall this message from help menu.)",
+ LTEXT "Unable to detect 7-Zip version (not installed?)",107,2,
+ 2,296,18
+ CONTROL "",IDC_STATIC,"Static",SS_GRAYRECT,2,22,296,1
+ LTEXT "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.",
+ IDC_STATIC,2,26,296,26
+ LTEXT "There must also be an appropriate interface plugin (Merge7z*.dll) on the path.",
+ IDC_STATIC,2,52,296,18
+ LTEXT "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.",
+ IDC_STATIC,2,70,296,26
+ CTEXT "Version",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE |
+ SS_SUNKEN
+ CTEXT "Plugin required\n(dllbuild %04u)",102,204,98,94,20,
+ SS_SUNKEN
+ LTEXT "Recommended version of 7-Zip:",IDC_STATIC,2,120,142,10,
+ SS_CENTERIMAGE
+ CTEXT "0.00",110,146,120,20,10,SS_CENTERIMAGE | SS_SUNKEN
+ CTEXT "present",109,168,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
+ CTEXT "Merge7z000U.dll",111,204,120,58,10,SS_CENTERIMAGE |
+ SS_SUNKEN
+ CTEXT "present",112,264,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
+ LTEXT "7-Zip software installed on your computer:",IDC_STATIC,
+ 2,132,142,10,SS_CENTERIMAGE
+ CTEXT "none",120,146,132,56,10,SS_CENTERIMAGE | SS_SUNKEN
+ CTEXT "",121,204,132,58,10,SS_CENTERIMAGE | SS_SUNKEN
+ CTEXT "missing",122,264,132,34,10,SS_CENTERIMAGE | SS_SUNKEN
+ LTEXT "7-Zip components for standalone operation:",IDC_STATIC,
+ 2,144,142,10,SS_CENTERIMAGE
+ CTEXT "none",130,146,144,56,10,SS_CENTERIMAGE | SS_SUNKEN
+ CTEXT "",131,204,144,58,10,SS_CENTERIMAGE | SS_SUNKEN
+ CTEXT "outdated",132,264,144,34,10,SS_CENTERIMAGE | SS_SUNKEN
+ LTEXT "Plugins on path:",9001,2,160,100,8
+ CONTROL "Don't display this &message again.\n(You can always recall this message from help menu.)",
106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
- WS_TABSTOP,2,164,202,20
- DEFPUSHBUTTON "OK",IDOK,208,170,50,14,WS_GROUP
+ WS_TABSTOP,2,225,218,18
+ DEFPUSHBUTTON "OK",IDOK,236,226,50,14,WS_GROUP
+ CONTROL "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
+ 236,160,62,10
+ LISTBOX 105,2,170,296,52,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+ WS_HSCROLL | WS_GROUP | WS_TABSTOP
+END
+
+IDD_PREFERENCES DIALOGEX 0, 0, 352, 260
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Options"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,187,237,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,241,237,50,14
+ PUSHBUTTON "Help",IDC_TREEOPT_HELP,295,237,50,14
+ CONTROL "Tree1",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP |
+ TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,20,96,202
+ CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE |
+ WS_DISABLED,110,0,235,222
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,230,338,1
+ LTEXT " Categories",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE |
+ SS_SUNKEN
+END
+
+IDD_PROP_COLORSYNTAX DIALOGEX 0, 0, 235, 214
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Dialog"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ RTEXT "Keywords:",IDC_STATIC,0,20,70,8
+ RTEXT "Function names:",IDC_STATIC,0,40,70,8
+ RTEXT "Comments:",IDC_STATIC,0,60,70,8
+ RTEXT "Numbers:",IDC_STATIC,0,80,70,8
+ RTEXT "Operators:",IDC_STATIC,0,100,70,8
+ RTEXT "Strings:",IDC_STATIC,0,120,70,8
+ RTEXT "Preprocessor:",IDC_STATIC,0,140,70,8
+ RTEXT "User 1:",IDC_STATIC,0,160,70,8
+ RTEXT "User 2:",IDC_STATIC,0,180,70,8
+ CTEXT "Text",IDC_STATIC,73,7,34,8
+ CONTROL "Button1",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,19,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,110,21,55,10
+ CONTROL "Button1",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,39,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,110,40,55,10
+ CONTROL "Button1",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,59,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,110,60,55,10
+ CONTROL "Button1",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,79,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,110,80,55,10
+ CONTROL "Button1",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,99,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_OPERATORS_BOLD,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,110,100,55,10
+ CONTROL "Button1",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,119,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,110,120,55,10
+ CONTROL "Button1",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,139,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,110,140,55,10
+ CONTROL "Button1",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,159,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,110,160,55,10
+ CONTROL "Button1",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,179,17,14,WS_EX_TRANSPARENT |
+ WS_EX_CLIENTEDGE
+ CONTROL "Bold",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,110,180,55,10
+ PUSHBUTTON "Defaults",IDC_SCOLORS_BDEFAULTS,182,179,50,14
END
// Toolbar
//
-IDR_MAINFRAME TOOLBAR MOVEABLE 16, 15
+IDR_MAINFRAME TOOLBAR 16, 15
BEGIN
BUTTON ID_FILE_NEW
BUTTON ID_FILE_OPEN
ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup"
ID_FILE_PRINT "Print the active document\nPrint"
ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
ID_APP_EXIT "Quit the application; prompts to save documents\nExit"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_FILE_MRU_FILE1 "Open this document"
ID_FILE_MRU_FILE2 "Open this document"
ID_FILE_MRU_FILE16 "Open this document"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_NEXT_PANE "Switch to the next window pane\nNext Pane"
ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_WINDOW_NEW "Open another window for the active document\nNew Window"
ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons"
ID_WINDOW_SPLIT "Split the active window into panes\nSplit"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_EDIT_CLEAR "Erase the selection\nErase"
ID_EDIT_CLEAR_ALL "Erase everything\nErase All"
ID_EDIT_REDO "Redo the previously undone action\nRedo (Ctrl+Y)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"
ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
AFX_IDS_SCSIZE "Change the window size"
AFX_IDS_SCMOVE "Change the window position"
IDS_MESSAGEBOX_DONT_ASK_AGAIN "Don't ask this &question again."
END
+// Options-dialog page captions
+STRINGTABLE
+BEGIN
+ IDS_OPTIONSPG_GENERAL "General"
+ IDS_OPTIONSPG_COMPARE "Compare"
+ IDS_OPTIONSPG_EDITOR "Editor"
+ IDS_OPTIONSPG_COLORS "Colors"
+ IDS_OPTIONSPG_SYSTEM "System"
+ IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
+ IDS_OPTIONSPG_CODEPAGE "Codepage"
+ IDS_OPTIONSPG_SYNTAXCOLORS "Syntax colors"
+END
+
// WINMERGE CUSTOM STRINGS
// WINMERGE INFORMATION
STRINGTABLE
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
- IDS_OPTIONS_TITLE "Options"
+ IDS_OPTIONS_TITLE "Options (%1)"
IDS_MESSAGE_BOX_ARE_RESET "All message boxes are now displayed again."
- IDS_DIFF_OPEN_NO_SET_PROPS
- "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
+ IDS_DIFF_OPEN_NO_SET_PROPS "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
IDS_FONT_CHANGE "The selected font change will not be applied to any currently visible difference windows."
END
IDS_OPEN_TITLE "Open"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "All Files (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
IDS_ERROR_FILEOPEN "Cannot open file\n%1\n\n%2"
END
-STRINGTABLE DISCARDABLE
+// SAVING FILE
+STRINGTABLE
BEGIN
IDS_SAVE_AS_TITLE "Save As"
IDS_SAVE_FMT "Save changes to %1?"
IDS_SAVEREADONLY_FMT "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
IDS_ERROR_FILE_WRITEABLE "Error checking destination writeability"
IDS_ERROR_BACKUP "Error backing up file"
- IDS_BACKUP_FAILED_PROMPT
- "Unable to backup original file.\nContinue anyway?"
- IDS_FILESAVE_FAILED "Saving file failed.\n%1\n%2\nWould you like to save the file under a different name?"
- IDS_FILEPACK_FAILED_LEFT
- "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
- IDS_FILEPACK_FAILED_RIGHT
- "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
+ IDS_BACKUP_FAILED_PROMPT "Unable to backup original file.\nContinue anyway?"
+ IDS_FILESAVE_FAILED "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
+ IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
+ IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
IDS_FILECHANGED_ONDISK "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
IDS_SAVEREADONLY_MULTI "%1\nis marked read-only. Would you like to override the read-only item?"
IDS_FILECHANGED_RESCAN "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
IDS_SAVE_RIGHT_AS "Save Right File As"
END
-STRINGTABLE DISCARDABLE
+// VSS
+STRINGTABLE
BEGIN
IDS_NOPROJECT "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
IDS_VSS_CHECKOUT_STATUS "Checkout files from VSS..."
IDS_VSSERROR "Versioning System returned an error while attempting to check out the file. Unable to continue..."
IDS_VSS_RUN_ERROR "Error executing versioning system command."
- IDS_VSSFOLDER_AND_FILE_NOMATCH
- "The VSS Working Folder and the location of the current file do not match. Continue?"
+ IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?"
IDS_VSS_NODATABASES "No VSS database(s) found!"
IDS_VSS_ERRORFROM "Error from VSS:"
END
-STRINGTABLE DISCARDABLE
+// VSS system
+STRINGTABLE
+BEGIN
+ IDS_VCS_NONE "None"
+ IDS_VCS_VSS4 "Visual SourceSafe (less than 5.0)"
+ IDS_VCS_VSS5 "Visual SourceSafe (5.0 and above)"
+ IDS_VCS_CLEARCASE "Rational ClearCase"
+ IDS_BREAK_ON_WHITESPACE "Break at whitespace"
+ IDS_BREAK_ON_PUNCTUATION "Break at whitespace or punctuation"
+END
+
+// DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
+STRINGTABLE
BEGIN
ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected file to named directory"
ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
ID_DIR_DEL_LEFT "Delete selected item on left"
ID_DIR_DEL_RIGHT "Delete selected item on right"
ID_DIR_DEL_BOTH "Delete selected item(s) on both sides"
+ ID_DIR_HIDE_FILENAMES "Hide selected item(s) (on the fly filter)"
IDS_COPY_TO_LEFT "Right to Left (%1)"
IDS_COPY_TO_RIGHT "Left to Right (%1)"
IDS_COPY_TO_LEFT2 "Right to Left (%1 of %2)"
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_LEFT_TO2 "Left to... (%1 of %2)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
- IDS_DEL_LEFT_FMT "Left (%1)"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK) (2)
+STRINGTABLE
BEGIN
+ IDS_DEL_LEFT_FMT "Left (%1)"
IDS_DEL_RIGHT_FMT "Right (%1)"
IDS_DEL_BOTH_FMT "Both (%1)"
IDS_DEL_LEFT_FMT2 "Left (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
+STRINGTABLE
BEGIN
IDS_CONFIRM_ALL_LEFT "Are you sure you want to copy all differences to the left file?"
IDS_CONFIRM_ALL_RIGHT "Are you sure you want to copy all differences to the right file?"
IDS_CONFIRM_COPY_SINGLE "Are you sure you want to copy\n\n%1\nto\n%2 ?"
IDS_CONFIRM_COPY2DIR "Are you sure you want to copy %1 of %2 selected item(s)?"
- IDS_CONFIRM_DELETE_ITEMS
- "Are you sure you want to delete %1 of %2 selected item(s)?"
+ IDS_CONFIRM_DELETE_ITEMS "Are you sure you want to delete %1 of %2 selected item(s)?"
IDS_CONFIRM_DELETE_DIR "Delete directory\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Are you sure you want to delete\n\n%1 ?"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : OPEN FILE
+STRINGTABLE
BEGIN
ID_DIR_OPEN_LEFT "Open left file"
ID_DIR_OPEN_LEFT_WITHEDITOR "Open the left file to external editor"
ID_DIR_COPY_PATHNAMES_BOTH "Copy both sides pathnames to clipboard"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : 7ZIP
+STRINGTABLE
BEGIN
IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
ID_DIR_ZIP_LEFT "Add items from left side to archive"
ID_DIR_ZIP_RIGHT "Add items from right side to archive"
ID_DIR_ZIP_BOTH "Add items from both sides to archive"
ID_DIR_ZIP_BOTH_DIFFS_ONLY "Add different items to archive (both sides)"
- ID_DIR_MOVE_LEFT_TO_BROWSE
+ ID_DIR_MOVE_LEFT_TO_BROWSE
"Move selected file on left to custom directory"
- ID_DIR_MOVE_RIGHT_TO_BROWSE
+ ID_DIR_MOVE_RIGHT_TO_BROWSE
"Move selected file on right to custom directory"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : GENERATE REPORT
+STRINGTABLE
BEGIN
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : COLUMN TITLES
+STRINGTABLE
BEGIN
IDS_COLHDR_FILENAME "Filename"
IDS_COLHDR_DIR "Directory"
IDS_COLHDR_RATTRIBUTES "Right Attributes"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : COLUMN TITLES (2)
+STRINGTABLE
BEGIN
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
IDS_COLHDR_BINARY "Binary"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : FILE COMPARISON RESULT, FULL & SHORTENED FORMS
+STRINGTABLE
BEGIN
IDS_CANT_COMPARE_FILES "Unable to compare files"
IDS_FILE_SKIPPED "File skipped"
IDS_DIFFERENT "Different"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : SUMMARY BAR
+STRINGTABLE
BEGIN
IDS_ELAPSED_TIME "Elapsed time: %ld ms"
IDS_STATUS_SELITEM1 "1 item selected"
IDS_STATUS_SELITEMS "%1 items selected"
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS
+STRINGTABLE
BEGIN
IDS_COLDESC_FILENAME "Filename or directory name."
IDS_COLDESC_DIR "Subdirectory name when subdirectories are included."
IDS_COLDESC_RATTRIBUTES "Right side attributes."
END
-STRINGTABLE DISCARDABLE
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2)
+STRINGTABLE
BEGIN
IDS_COLDESC_LENCODING "Left side encoding."
IDS_COLDESC_RENCODING "Right side encoding."
IDS_COLDESC_BINARY "Shows asterisk (*) if file is binary."
END
-STRINGTABLE DISCARDABLE
+// FILE COMPARISON RESULT : MESSAGES
+STRINGTABLE
BEGIN
IDS_FILE_TO_ITSELF "The same file is opened in both panels."
IDS_FILESSAME "The selected files are identical."
IDS_FILEBINARY "Binary files cannot be visually compared."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Directory files cannot be visually compared."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
- IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
- IDS_SUGGEST_IGNORECODEPAGE
- "Left and right files don't have the same codepage. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
+ IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+ IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
END
-STRINGTABLE DISCARDABLE
+// EDITOR : SHOW LINE DIFF
+STRINGTABLE
BEGIN
IDS_LINEDIFF_NODIFF "No difference"
IDS_LINEDIFF_NODIFF_CAPTION "Line difference"
END
-STRINGTABLE DISCARDABLE
+// EDITOR : SEARCH/REPLACE DIALOGS
+STRINGTABLE
BEGIN
IDS_NUM_REPLACED "Replaced %1 string(s)."
IDS_EDIT_TEXT_NOT_FOUND "Cannot find string""%s"""
END
-STRINGTABLE DISCARDABLE
+// EDITOR : FILENAME BAR POPUP
+STRINGTABLE
BEGIN
ID_EDITOR_COPY_PATH "Copy Full Path"
ID_EDITOR_COPY_FILENAME "Copy Filename"
END
-STRINGTABLE DISCARDABLE
+// CREATE PATCH
+STRINGTABLE
BEGIN
IDS_DIFF_SUCCEEDED "Patch file succesfully written."
IDS_DIFF_ITEM1NOTFOUND "1. item is not found or is directory!"
IDS_DIFF_UNIFIED "Unified"
IDS_FILEWRITE_ERROR "Could not write to file %1."
IDS_PATH_NOT_ABSOLUTE "%1\n is not absolute path!"
- IDS_CANNOT_CREATE_BINARYPATCH
- "Cannot create a pactch file from binary files."
+ IDS_CANNOT_CREATE_BINARYPATCH "Cannot create a pactch file from binary files."
IDS_CANNOT_CREATE_DIRPATCH "Cannot create a patch file from directories."
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_DIR_RESULTS_EMPTIED "Current directory comparison results will be cleared."
- IDS_NO_ZIP_SUPPORT "Archive support is not enabled.\n \nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found. \nSee manual for more info about archive support and how to enable it."
+ IDS_NO_ZIP_SUPPORT "Archive support is not enabled.\n
+ All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.
+ See manual for more info about archive support and how to enable it."
END
-STRINGTABLE DISCARDABLE
+// Regular expression errors
+STRINGTABLE
BEGIN
IDS_REGEXP_ERROR "Regular expression error"
IDS_REGEXP_NOMATCH "No match"
IDS_REGEXP_TOO_BIG "Regular expression too big"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_REGEXP_UNMATCHED_RPAREN "Unmatched ) or \\)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #1
+STRINGTABLE
BEGIN
IDS_AFRIKAANS "Afrikaans"
IDS_ALBANIAN "Albanian"
IDS_ARABIC_JORDAN "Arabic (Jordan)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #2
+STRINGTABLE
BEGIN
IDS_ARABIC_LEBANON "Arabic (Lebanon)"
IDS_ARABIC_KUWAIT "Arabic (Kuwait)"
IDS_CHINESE_SINGAPORE "Chinese (Singapore)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #3
+STRINGTABLE
BEGIN
IDS_CHINESE_MACAU "Chinese (Macau SAR)"
IDS_CROATIAN "Croatian"
IDS_ENGLISH_BELIZE "English (Belize)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #4
+STRINGTABLE
BEGIN
IDS_ENGLISH_TRINIDAD "English (Trinidad)"
IDS_ENGLISH_ZIMBABWE "English (Zimbabwe)"
IDS_GERMAN_SWISS "German (Switzerland)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #5
+STRINGTABLE
BEGIN
IDS_GERMAN_AUSTRIAN "German (Austria)"
IDS_GERMAN_LUXEMBOURG "German (Luxembourg)"
IDS_KOREAN_JOHAB "Korean (Johab)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #6
+STRINGTABLE
BEGIN
IDS_LATVIAN "Latvian"
IDS_LITHUANIAN "Lithuanian"
IDS_SINDHI "Sindhi"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #7
+STRINGTABLE
BEGIN
IDS_SLOVAK "Slovak"
IDS_SLOVENIAN "Slovenian"
IDS_SPANISH_URUGUAY "Spanish (Uruguay)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #8
+STRINGTABLE
BEGIN
IDS_SPANISH_PARAGUAY "Spanish (Paraguay)"
IDS_SPANISH_BOLIVIA "Spanish (Bolivia)"
IDS_URDU_INDIA "Urdu (India)"
END
-STRINGTABLE DISCARDABLE
+// LANGUAGE NAMES #9
+STRINGTABLE
BEGIN
IDS_UZBEK_LATIN "Uzbek (Latin)"
IDS_UZBEK_CYRILLIC "Uzbek (Cyrillic)"
IDS_VIETNAMESE "Vietnamese"
END
-STRINGTABLE DISCARDABLE
+// CODEPAGE GEOGRAPHIC GROUPS
+STRINGTABLE
+BEGIN
+ IDS_CPG_WESTERN_EUROPEAN "Western European"
+ IDS_CPG_EASTERN_EUROPEAN "Eastern European"
+ IDS_CPG_EAST_ASIAN "East Asian"
+ IDS_CPG_SOUTH_ASIAN "SE & SW Asian"
+ IDS_CPG_MIDDLE_EASTERN "Middle Eastern"
+ IDS_CPG_NA "Not applicable"
+END
+
+// CODEPAGE PLATFORM GROUPS
+STRINGTABLE
+BEGIN
+ IDS_CPP_WINDOWS "MS-Windows"
+ IDS_CPP_DOS "MS-DOS"
+ IDS_CPP_MACINTOSH "Macintosh"
+ IDS_CPP_IBM "IBM"
+ IDS_CPP_NA "Not applicable"
+END
+
+// CODEPAGES #1 (IBM)
+STRINGTABLE
+BEGIN
+ IDS_CP_EBCDIC "EBCDIC"
+ IDS_CP_IBM_EBCDIC_CYRILLIC "IBM EBCDIC Cyrillic"
+END
+
+// CODEPAGES #1 (DOS)
+STRINGTABLE
+BEGIN
+ IDS_CP_DOS_US "MS-DOS Latin US"
+ IDS_CP_DOS_ARABIC "MS-DOS Arabic"
+ IDS_CP_DOS_GREEK "MS-DOS Greek"
+ IDS_CP_DOS_BALTIC "MS-DOS Baltic Rim"
+ IDS_CP_DOS_LATIN1 "MS-DOS Latin 1"
+ IDS_CP_DOS_GREEK1 "MS-DOS Greek 1"
+ IDS_CP_DOS_LATIN2 "MS-DOS Latin 2"
+ IDS_CP_DOS_CYRILLIC "MS-DOS Cyrillic"
+ IDS_CP_DOS_TURKISH "MS-DOS Turkish"
+ IDS_CP_DOS_PORTUGUESE "MS-DOS Portuguese"
+END
+
+// CODEPAGES #2 (more DOS)
+STRINGTABLE
+BEGIN
+ IDS_CP_DOS_ICELANDIC "MS-DOS Icelandic"
+ IDS_CP_DOS_HEBREW "MS-DOS Hebrew"
+ IDS_CP_DOS_FRENCH_CANADA "MS-DOS French Canada"
+ IDS_CP_DOS_NORDIC "MS-DOS Nordic"
+ IDS_CP_DOS_CYRILLIC_CIS1 "MS-DOS Cyrillic CIS 1"
+ IDS_CP_DOS_GREEK2 "MS-DOS Greek 2"
+END
+
+// CODEPAGES #3 (Windows)
+STRINGTABLE
+BEGIN
+ IDS_CP_WINDOWS_THAI "Windows Thai"
+ IDS_CP_WINDOWS_JAPANESE "Windows Japanese"
+ IDS_CP_WINDOWS_CHINESE_SIMP "Windows Simplified Chinese"
+ IDS_CP_WINDOWS_KOREAN "Windows Korean"
+ IDS_CP_WINDOWS_CHINESE_TRAD "Windows Traditional Chinese"
+ IDS_CP_WINDOWS_LATIN2 "Windows Latin 2"
+ IDS_CP_WINDOWS_CYRILLIC "Windows Cyrillic (Slavic)"
+ IDS_CP_WINDOWS_LATIN1 "Windows Latin 1"
+ IDS_CP_WINDOWS_GREEK "Windows Greek"
+ IDS_CP_WINDOWS_TURKISH "Windows Latin 5 (Turkish)"
+ IDS_CP_WINDOWS_HEBREW "Windows Hebrew"
+ IDS_CP_WINDOWS_ARABIC "Windows Arabic"
+ IDS_CP_WINDOWS_BALTIC "Windows Baltic Rim"
+ IDS_CP_WINDOWS_VIETNAM "Windows Vietnamese"
+END
+
+// CODEPAGES #4 (Macintosh)
+STRINGTABLE
+BEGIN
+ IDS_CP_MACINTOSH_ROMAN "Macintosh Roman"
+ IDS_CP_MACINTOSH_GREEK "Macintosh Greek"
+ IDS_CP_MACINTOSH_CYRILLIC "Macintosh Cyrillic"
+ IDS_CP_MACINTOSH_CENTRAL_EUROPE "Macintosh "
+ IDS_CP_MACINTOSH_ICELANDIC "Macintosh Central Europe"
+ IDS_CP_MACINTOSH_TURKISH "Macintosh Turkish"
+END
+
+// CODEPAGES #5 (Extra (alias) information)
+STRINGTABLE
+BEGIN
+ IDS_CP_WINDOWS_JAPANESE_EXTRA ""
+ IDS_CP_WINDOWS_CHINESE_SIMP_EXTRA ""
+ IDS_CP_WINDOWS_KOREAN_EXTRA ""
+ IDS_CP_WINDOWS_LATIN2_EXTRA "Approximates ISO-8859-2"
+ IDS_CP_WINDOWS_CHINESE_TRAD_EXTRA ""
+ IDS_CP_WINDOWS_CYRILLIC_EXTRA ""
+ IDS_CP_WINDOWS_LATIN1_EXTRA "Approximates ISO-8859-1"
+ IDS_CP_WINDOWS_GREEK_EXTRA "Approximates ISO-8859-7"
+ IDS_CP_WINDOWS_TURKISH_EXTRA "Approximates ISO-8859-9"
+ IDS_CP_WINDOWS_HEBREW_EXTRA "Approximates ISO-8859-8"
+END
+
+// MENU STRINGS
+// FILE MENU
+STRINGTABLE
BEGIN
ID_FILE_SAVE_LEFT "Save the left file"
ID_FILE_SAVE_RIGHT "Save the right file"
ID_OPTIONS_SHOWIDENTICAL "Displays files that are exactly the same"
ID_OPTIONS_SHOWDIFFERENT "Displays files that have differences"
ID_OPTIONS_SHOWUNIQUELEFT "Displays files that exist in only on left side"
- ID_OPTIONS_SHOWUNIQUERIGHT
- "Displays files that exist in only on right side"
+ ID_OPTIONS_SHOWUNIQUERIGHT "Displays files that exist in only on right side"
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_OPTIONS_SHOWSKIPPED "Displays skipped files"
END
// VIEW MENU
STRINGTABLE
BEGIN
- ID_VIEW_SELECTFONT "Select the font for the diff views\nSelect Diff Font"
- ID_VIEW_USEDEFAULTFONT "Revert to using the default system font for diff views\nDefault Font"
+ ID_VIEW_SELECTFONT "Select the font for the view\nSelect View Font"
+ ID_VIEW_USEDEFAULTFONT "Revert to using the default system font for view\nDefault Font"
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage"
+ ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
// MERGE MENU
ID_RELOAD_PLUGINS "Unload all plugins and reload them (for developpers)"
END
-STRINGTABLE DISCARDABLE
+// WINDOW MENU
+STRINGTABLE
BEGIN
ID_WINDOW_CHANGE_PANE "Activates next file visible\nActive next File"
END
-STRINGTABLE DISCARDABLE
+// HELP MENU
+STRINGTABLE
BEGIN
ID_HELP_CONTENTS "Displays the WinMerge User's Guide\nHelp"
ID_HELP_GETCONFIG "Outputs current WinMerge version info and configuration to text file"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
END
-STRINGTABLE DISCARDABLE
+// PLUGINS DIALOGS AND DYNAMIC MENUS
+STRINGTABLE
BEGIN
ID_TITLE_PLUGINS_SETTINGS "Plugin Settings"
ID_PREDIFF_MANUAL "No prediffer"
IDS_USERCHOICE_AUTOMATIC "<Automatic>"
END
-STRINGTABLE DISCARDABLE
+// LOCATIONBAR CONTEXT MENU
+STRINGTABLE
BEGIN
ID_DISPLAY_MOVED_NONE "Do not display moved blocks"
ID_DISPLAY_MOVED_ALL "Display all moved blacks"
ID_LOCBAR_GOTOLINE_FMT "G&oto Line %1"
END
-#endif // Turkish resources
+// END STRINGS SYNCHRO
+#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#endif
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
OSDN Git Service
