#include "logfile.h"
#include "paths.h"
#include "FileTransform.h"
+#include "mainfrm.h"
extern bool just_compare_files (LPCTSTR filepath1, LPCTSTR filepath2, int depth, bool * diff, bool * bin, int * ndiffs, int *ntrivialdiffs);
extern CLogFile gLog;
static int prepAndCompareTwoFiles(const fentry & lent, const fentry & rent, const CString & sLeftDir,
const CString & sRightDir, int * ndiffs, int * ntrivialdiffs);
+/// Custom function comparing only by date
+static bool just_compare_files_by_date(LPCTSTR filepath1, LPCTSTR filepath2, int depth, bool * diff, bool * bin, int * ndiffs, int * ntrivialdiffs);
/** @brief cmpmth is a typedef for a pointer to a method */
typedef int (CString::*cmpmth)(LPCTSTR sz) const;
bool diff=false, bin=false;
if (compareok)
{
- compareok = just_compare_files (filepathTransformed1,
- filepathTransformed2, 0, &diff, &bin, ndiffs, ntrivialdiffs);
+ if (mf->m_nCompMethod == 0)
+ {
+ compareok = just_compare_files(filepathTransformed1,
+ filepathTransformed2, 0, &diff, &bin, ndiffs, ntrivialdiffs);
+ }
+ else if (mf->m_nCompMethod == 1)
+ {
+ compareok = just_compare_files_by_date(filepathTransformed1,
+ filepathTransformed2, 0, &diff, &bin, ndiffs, ntrivialdiffs);
+ }
}
// delete the temp files after comparison
, lmtime, rmtime, lctime, rctime, lsize, rsize, code, lattrs, rattrs
, ndiffs, ntrivialdiffs);
}
+
+/**
+ * @brief Compare file timestamps
+ */
+bool just_compare_files_by_date(LPCTSTR filepath1, LPCTSTR filepath2, int depth, bool * diff, bool * bin, int * ndiffs, int * ntrivialdiffs)
+{
+ bool bCompareOK = true;
+ *diff = false;
+ *bin = false;
+ *ndiffs = 0;
+ *ntrivialdiffs = 0;
+
+ FILETIME ftCreate1, ftAccess1, ftWrite1, ftLocal1;
+ FILETIME ftCreate2, ftAccess2, ftWrite2, ftLocal2;
+ SYSTEMTIME stCreate1;
+ SYSTEMTIME stCreate2;
+
+ HANDLE hFile1 = CreateFile(filepath1,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,0,NULL);
+ if (hFile1 == INVALID_HANDLE_VALUE)
+ {
+ return false;
+ }
+
+ HANDLE hFile2 = CreateFile(filepath2,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,0,NULL);
+ if (hFile2 == INVALID_HANDLE_VALUE)
+ {
+ return false;
+ }
+
+ // Retrieve the file times for the file.
+ if (!GetFileTime(hFile1, &ftCreate1, &ftAccess1, &ftWrite1))
+ {
+ return false;
+ }
+
+ // Convert the last-write time to local time.
+ if (!FileTimeToLocalFileTime(&ftWrite1, &ftLocal1))
+ {
+ return false;
+ }
+
+ // Retrieve the file times for the file.
+ if (!GetFileTime(hFile2, &ftCreate2, &ftAccess2, &ftWrite2))
+ {
+ return false;
+ }
+
+ // Convert the last-write time to local time.
+ if (!FileTimeToLocalFileTime(&ftWrite2, &ftLocal2))
+ {
+ return false;
+ }
+
+ // Convert the local file time from UTC to system time.
+ FileTimeToSystemTime(&ftLocal1, &stCreate1);
+ FileTimeToSystemTime(&ftLocal2, &stCreate2);
+
+ if (memcmp(&stCreate1,&stCreate2,sizeof(SYSTEMTIME)) != 0)
+ {
+ *diff = true;
+ }
+ /*if (stCreate1.wYear != stCreate2.wYear ||
+ stCreate1.wMonth != stCreate2.wMonth ||
+ stCreate1.wDay != stCreate2.wDay ||
+ stCreate1.wHour != stCreate2.wHour ||
+ stCreate1.wMinute != stCreate2.wMinute ||
+ stCreate1.wSecond != stCreate2.wSecond ||
+ stCreate1.wMilliseconds != stCreate2.wMilliseconds)
+ {
+ *diff = true;
+ }*/
+
+ CloseHandle(hFile1);
+ CloseHandle(hFile2);
+
+ return bCompareOK;
+}
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
END
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
LEFTMARGIN, 7
RIGHTMARGIN, 266
TOPMARGIN, 7
+ BOTTOMMARGIN, 155
END
IDD_GENERATE_PATCH, DIALOG
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "amb l'editor extern", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "amb...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "&Atura",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nDocument WinMerge"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge aquest directori"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge Õâ¸öÎļþ¼Ð"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE FIXED IMPURE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDD_OPEN "WinMerge ³oÓ¸ê®Æ§¨"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
#endif
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM SEPARATOR
MENUITEM "Kopier alle forskelle til den anden side...",
ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
MENUITEM "Kopier alle forskelle fra den anden side...",
ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
-
MENUITEM SEPARATOR
MENUITEM "Fortryd", ID_UNDO
MENUITEM SEPARATOR
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge denne folder"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM SEPARATOR
MENUITEM "Copier toutes les différences vers l'autre côté...",
ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
MENUITEM "Copier toutes les différences depuis l'autre côté...",
ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
-
MENUITEM SEPARATOR
MENUITEM "Annuler", ID_UNDO
MENUITEM SEPARATOR
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nDocument WinMerge"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge ce répertoire"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "Mit externem Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "Mit...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Dokument"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge dieses Verzeichnis"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Linke Kodierung"
IDS_COLHDR_RENCODING "Rechte Kodierung"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Vergleiche %1 mit %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM SEPARATOR
MENUITEM "¹Ý´ëÆíÀ¸·Î ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...",
ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
MENUITEM "¹Ý´ëÆíÀ¸·ÎºÎÅÍ ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...",
ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
MENUITEM SEPARATOR
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM SEPARATOR
MENUITEM "Kopier alle forskjellene til den andre siden...",
ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
MENUITEM "Kopier alle forskjellene fra den andre siden...",
ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
MENUITEM SEPARATOR
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge denne folder"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nDocument WinMerge"
IDS_WINMERGE_THIS_DIRECTORY "Scalaj ten katalog"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "Âíåøíèì ðåäàêòîðîì", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "Ñ ïîìîùüþ...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM SEPARATOR
MENUITEM "Kopírova\9d v\9aetky rozdiely na druhú stranu...",
ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
MENUITEM "Kopírova\9d v\9aetky rozdiely z druhej strany...",
ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
MENUITEM SEPARATOR
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
#endif
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "RO"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
MENUITEM "med...", ID_DIR_OPEN_RIGHT_WITH
END
+ MENUITEM SEPARATOR
+ POPUP "Zip"
+ BEGIN
+ MENUITEM "Zip left side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_LEFT
+ MENUITEM "Zip right side %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_RIGHT
+ MENUITEM "Zip both sides %1 file(s) from %2 selected item(s)",
+ ID_DIR_ZIP_BOTH
+ MENUITEM "Zip both sides diffs only %1 file(s) from %2 of %3 selected item(s)",
+ ID_DIR_ZIP_BOTH_DIFFS_ONLY
+
+ END
END
POPUP "_HDR_POPUP_"
BEGIN
PUSHBUTTON "Stop",IDC_COMPARISON_STOP,320,13,83,14
END
+IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Go To"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "G&oto:",IDC_STATIC,7,9,18,8
+ EDITTEXT IDC_WMGOTO_PARAM,33,7,93,14,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "File",IDC_STATIC,7,27,48,35
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,13,38,28,10
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,
+ 13,48,33,10
+ GROUPBOX "Goto what",IDC_STATIC,61,27,63,35
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP,68,38,29,10
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",
+ BS_AUTORADIOBUTTON,68,48,49,10
+ DEFPUSHBUTTON "&Go To",IDOK,132,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
+END
+
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "Jämför filerna i den här mappen med WinMerge"
+ IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
END
STRINGTABLE PRELOAD DISCARDABLE
IDS_STATUSBAR_READONLY "Skrivskyddad"
IDS_COLHDR_LENCODING "Left Encoding"
IDS_COLHDR_RENCODING "Right Encoding"
+ IDS_COLHDR_NDIFFS "#differences"
+ IDS_COLHDR_NSDIFFS "#sig. differences"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
#define IDD_OPEN 106
#define IDS_WINMERGE_THIS_DIRECTORY 106
#define IDD_EDITFILE 107
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 107
#define IDD_VSS 108
#define IDD_PROPPAGE_LARGE 109
#define IDD_CLEARCASE 110
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_TOLINE 1111
#define IDC_WMGOTO_TODIFF 1112
#define IDC_WMGOTO_PARAM 1113
+#define IDS_COLHDR_NDIFFS 1114
+#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define ID_DIR_COPY_RIGHT_TO_BROWSE 32857
#define ID_WINDOW_CHANGE_PANE 32858
#define ID_EDIT_WMGOTO 32859
+#define ID_DIR_ZIP_LEFT 32860
+#define ID_DIR_ZIP_RIGHT 32861
+#define ID_DIR_ZIP_BOTH 32862
+#define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32863
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 121
-#define _APS_NEXT_COMMAND_VALUE 32860
-#define _APS_NEXT_CONTROL_VALUE 1108
+#define _APS_NEXT_COMMAND_VALUE 32864
+#define _APS_NEXT_CONTROL_VALUE 1115
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
#include "PropFilter.h"
#include "PropColors.h"
#include "PropRegistry.h"
+#include "PropCompare.h"
#include "RegKey.h"
#include "logfile.h"
#include "PropSyntax.h"
m_sExtEditorPath = theApp.GetProfileString(_T("Settings"), _T("ExternalEditor"), _T(""));
m_bUnpackerMode = theApp.GetProfileInt(_T("Settings"), _T("UnpackerMode"), UNPACK_MANUAL);
m_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PREDIFF_MANUAL);
+
+ // Load the compare method and protect it from manual modifs in registry!
+ m_nCompMethod = theApp.GetProfileInt(_T("Settings"),_T("CompMethod"),0);
+ if (m_nCompMethod > 1)
+ m_nCompMethod = 0;
+
m_bReuseDirDoc = TRUE;
// TODO: read preference for logging
CPropColors colors(theApp.GetDiffColor(), theApp.GetSelDiffColor(), theApp.GetDiffDeletedColor(), theApp.GetSelDiffDeletedColor(),
theApp.GetDiffTextColor(), theApp.GetSelDiffTextColor(), theApp.GetTrivialColor(), theApp.GetTrivialDeletedColor());
CPropRegistry regpage;
+ CPropCompare compage;
sht.AddPage(&gen);
+ sht.AddPage(&compage);
sht.AddPage(&syn);
sht.AddPage(&filter);
sht.AddPage(&vss);
filter.m_sPattern = m_sPattern;
regpage.m_strEditorPath = m_sExtEditorPath;
regpage.GetContextRegValues();
+ compage.m_compareMethod = m_nCompMethod;
if (sht.DoModal()==IDOK)
{
diffOptions.bIgnoreBlankLines = gen.m_bIgnoreBlankLines;
diffOptions.bEolSensitive = gen.m_bEolSensitive;
diffOptions.bIgnoreCase = gen.m_bIgnoreCase;
+
+ m_nCompMethod = compage.m_compareMethod;
m_bIgnoreRegExp = filter.m_bIgnoreRegExp;
m_sPattern = filter.m_sPattern;
theApp.WriteProfileString(_T("Settings"), _T("RegExps"), m_sPattern);
theApp.WriteProfileString(_T("Settings"), _T("FileFilterPath"), filter.m_sFileFilterPath);
theApp.WriteProfileInt(_T("Settings"), _T("DisableSplash"), theApp.m_bDisableSplash);
+ theApp.WriteProfileInt(_T("Settings"), _T("CompMethod"), m_nCompMethod);
theApp.m_bHiliteSyntax = syn.m_bHiliteSyntax;
theApp.WriteProfileInt(_T("Settings"), _T("HiliteSyntax"), theApp.m_bHiliteSyntax);
VERIFY(m_strRightDesc.LoadString(IDS_EMPTY_RIGHT_FILE));
ShowMergeDoc(pDirDoc, _T(""), _T(""), FALSE, FALSE, 0, 0);
}
+
class CDiffView;
class CDirView;
class CDirDoc;
+class CMergeDoc;
class CMergeEditView;
class CMergeDiffDetailView;
BOOL m_CheckOutMulti;
BOOL m_bVCProjSync;
+ int m_nCompMethod; /**< CompareMethod : CPropCompare::BY_CONTENTS or CPropCompare::BY_DATE */
+
// Implementation data
protected: // control bar embedded members
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
+
# End Source File
# Begin Source File
+SOURCE=.\PropCompare.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\PropFilter.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\PropCompare.h
+# End Source File
+# Begin Source File
+
SOURCE=.\PropFilter.h
# End Source File
# Begin Source File
# 1:10:IDB_SPLASH:103
# 2:21:SplashScreenInsertKey:4.0
# End Section
+
PUSHBUTTON "Cancel",IDCANCEL,132,24,50,14
END
+IDD_PROPPAGE_COMPARE DIALOG DISCARDABLE 0, 0, 190, 111
+STYLE WS_CHILD | WS_CAPTION
+CAPTION "Compare"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "File Compare method:",IDC_STATIC,7,6,70,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,83,6,84,71,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_COPY_RIGHT_TO "Right to... (%1)"
IDS_COPY_RIGHT_TO2 "Right to... (%1 of %2)"
IDS_SELECT_DESTFOLDER "Select destination folder"
+ IDS_COMPMETHOD_CONTENTS "Contents"
+ IDS_COMPMETHOD_MODDATE "Modified date"
END
STRINGTABLE DISCARDABLE
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
--- /dev/null
+// PropCompare.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "merge.h"
+#include "PropCompare.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropCompare property page
+
+IMPLEMENT_DYNCREATE(CPropCompare, CPropertyPage)
+
+CPropCompare::CPropCompare() : CPropertyPage(CPropCompare::IDD)
+{
+ //{{AFX_DATA_INIT(CPropCompare)
+ m_compareMethod = -1;
+ //}}AFX_DATA_INIT
+}
+
+CPropCompare::~CPropCompare()
+{
+}
+
+void CPropCompare::DoDataExchange(CDataExchange* pDX)
+{
+ CPropertyPage::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(CPropCompare)
+ DDX_CBIndex(pDX, IDC_COMPAREMETHODCOMBO, m_compareMethod);
+ //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropCompare, CPropertyPage)
+ //{{AFX_MSG_MAP(CPropCompare)
+ // NOTE: the ClassWizard will add message map macros here
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropCompare message handlers
+
+BOOL CPropCompare::OnInitDialog()
+{
+ CPropertyPage::OnInitDialog();
+ CComboBox * combo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
+
+ CString item;
+ VERIFY(item.LoadString(IDS_COMPMETHOD_CONTENTS));
+ combo->AddString(item);
+ VERIFY(item.LoadString(IDS_COMPMETHOD_MODDATE));
+ combo->AddString(item);
+ combo->SetCurSel(m_compareMethod);
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
\ No newline at end of file
--- /dev/null
+#ifndef _PROPPAGE_COMPARE_H_
+#define _PROPPAGE_COMPARE_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// PropCompare.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropCompare dialog
+
+/**
+ * class CPropCompare Property page to set the compare method for files.
+ * Currently 2 methods are available: - compare by contents,
+ * - compare by modified date
+ *
+ * @author Tim Musschoot
+ */
+class CPropCompare : public CPropertyPage
+{
+ DECLARE_DYNCREATE(CPropCompare)
+
+// Construction
+public:
+ enum CompareMethod { BY_CONTENTS, BY_DATE};
+
+ CPropCompare();
+ ~CPropCompare();
+
+// Dialog Data
+ //{{AFX_DATA(CPropCompare)
+ enum { IDD = IDD_PROPPAGE_COMPARE };
+ int m_compareMethod;
+ //}}AFX_DATA
+
+
+// Overrides
+ // ClassWizard generate virtual function overrides
+ //{{AFX_VIRTUAL(CPropCompare)
+ protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+ // Generated message map functions
+ //{{AFX_MSG(CPropCompare)
+ virtual BOOL OnInitDialog();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // _PROPPAGE_COMPARE_H_
+2004-01-23 Kimmo
+ PATCH: [ 848159 ] RFE 826652 : Compare by modified date
+ Submitted by Tim Musschoot - some modifications by Kimmo
+ src: DirScan.cpp MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h
+ src new files: PropCompare.h PropCompare.cpp
+ Languages: *.rc resource.h
+
2004-01-22 Perry
Add some comments before initialization of g_cols
src: DirViewColItems.cpp
#define ID_FILE_VSSDATABASE 118
#define IDD_SELECTUNPACKER 119
#define IDD_DIRCOMPSTATE 120
+#define IDD_WMGOTO 121
+#define IDD_PROPPAGE_COMPARE 122
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_COPY_RIGHT_TO 259
#define IDS_COPY_RIGHT_TO2 260
#define IDS_SELECT_DESTFOLDER 261
-#define IDD_WMGOTO 262
+#define IDS_COMPMETHOD_CONTENTS 262
+#define IDS_COMPMETHOD_MODDATE 263
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_WMGOTO_PARAM 1113
#define IDS_COLHDR_NDIFFS 1114
#define IDS_COLHDR_NSDIFFS 1115
+#define IDC_COMPAREMETHODCOMBO 1116
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO_EOL 8503
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
+
OSDN Git Service
