PATCH: [ 940089 ] Add Binary column and shorten short result

diff --git a/Src/DirViewColHandler.cpp b/Src/DirViewColHandler.cpp
index a7db4a5..1eab703 100644 (file)
--- a/Src/DirViewColHandler.cpp
+++ b/Src/DirViewColHandler.cpp
@@ -47,6 +47,7 @@ enum
        DirCol_Lversion,
        DirCol_Rversion,
        DirCol_StatusAbbr,
+       DirCol_Binary,
        DirCol_Lattr,
        DirCol_Rattr,
 };

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 3c58494..1f2b5e8 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -244,23 +244,26 @@ static CString ColStatusAbbrGet(const CDiffContext *, const void *p)
        }
        else if (di.isResultSame())
        {
-               if (di.isBin())
-                       id = IDS_BIN_FILES_SAME;
-               else
-                       id = IDS_IDENTICAL;
+               id = IDS_IDENTICAL;
        }
        else // diff
        {
-               if (di.isBin())
-                       id = IDS_BIN_FILES_DIFF;
-               else
-                       id = IDS_FILES_ARE_DIFFERENT;
+               id = IDS_DIFFERENT;
        }
 
        CString s;
        VERIFY(s.LoadString(id));
        return s;
 }
+static CString ColBinGet(const CDiffContext *, const void *p)
+{
+       const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
+
+       if (di.isBin())
+               return _T("*");
+       else
+               return _T("");
+}
 static CString ColAttrGet(const CDiffContext *, const void *p)
 {
        const FileFlags &r = *static_cast<const FileFlags *>(p);
@@ -333,6 +336,15 @@ static int ColNewerSort(const CDiffContext *pCtxt, const void *p, const void *q)
 {
        return ColNewerGet(pCtxt, p).Compare(ColNewerGet(pCtxt, q));
 }
+static int ColBinSort(const CDiffContext *, const void *p, const void *q)
+{
+       const DIFFITEM &ldi = *static_cast<const DIFFITEM *>(p);
+       const DIFFITEM &rdi = *static_cast<const DIFFITEM *>(q);
+       int i = ldi.isBin();
+       int j = rdi.isBin();
+
+       return i - j;
+}
 static int ColAttrSort(const CDiffContext *, const void *p, const void *q)
 {
        const FileFlags &r = *static_cast<const FileFlags *>(p);
@@ -374,6 +386,7 @@ DirColInfo g_cols[] =
        { _T("Lversion"), IDS_COLHDR_LVERSION, -1, &ColNameGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, left.version), -1, true },
        { _T("Rversion"), IDS_COLHDR_RVERSION, -1, &ColNameGet, &ColNameSort, FIELD_OFFSET(DIFFITEM, right.version), -1, true },
        { _T("StatusAbbr"), IDS_COLHDR_RESULT_ABBR, -1, &ColStatusAbbrGet, &ColStatusSort, 0, -1, true },
+       { _T("Binary"), IDS_COLHDR_BINARY, -1, &ColBinGet, &ColBinSort, 0, -1, true },
        { _T("Lattr"), IDS_COLHDR_LATTRIBUTES, -1, &ColAttrGet, &ColAttrSort, FIELD_OFFSET(DIFFITEM, left.flags), -1, true },
        { _T("Rattr"), IDS_COLHDR_RATTRIBUTES, -1, &ColAttrGet, &ColAttrSort, FIELD_OFFSET(DIFFITEM, right.flags), -1, true },
        { _T("Lencoding"), IDS_COLHDR_LENCODING, -1, &ColEncodingGet, &ColEncodingSort, FIELD_OFFSET(DIFFITEM, left), -1, true },

diff --git a/Src/Merge.rc b/Src/Merge.rc
index eac0de4..25f777b 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1321,6 +1321,8 @@ BEGIN
     IDS_FILECHANGED_ONDISK  "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
     IDS_TEMP_FILEERROR      "Temporary files could not be created. Check your temporary path settings."
     IDS_MERGEMODE_MERGING   "Merge"
+    IDS_COLHDR_BINARY       "Binary"
+    IDS_DIFFERENT           "Different"
 END
 
 STRINGTABLE 

diff --git a/Src/readme.txt b/Src/readme.txt
index 398323c..4919829 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -3,6 +3,9 @@
   Src: DirViewColHandler.cpp
  Remove deprecated keywords from RC file I added in when applying #936682.
   Src: Merge.rc
+ PATCH: [ 940089 ] Add Binary column and shorten short result
+  Src: DirViewColHandler.cpp DirViewColItems.cpp Merge.rc resource.h
+  Languages: *.rc resource.h
 
 2004-04-22 Kimmo
  PATCH: [ 936682 ] Highlight syntax in unrecognized side

diff --git a/Src/resource.h b/Src/resource.h
index 3fd1cb0..58ccbbb 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -201,6 +201,8 @@
 #define IDD_MESSAGE_BOX                 281
 #define IDS_TEMP_FILEERROR              282
 #define IDS_MERGEMODE_MERGING           283
+#define IDS_COLHDR_BINARY               284
+#define IDS_DIFFERENT                   285
 #define ID_SCRIPT_FIRST                 900
 #define ID_SCRIPT_LAST                  949
 #define ID_PREDIFFERS_FIRST             950