|
From: <ki...@us...> - 2006-10-30 17:03:24
|
Revision: 3738
http://svn.sourceforge.net/winmerge/?rev=3738&view=rev
Author: kimmov
Date: 2006-10-30 09:02:39 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
trunk/Src/resource.h
Removed Paths:
-------------
trunk/Src/res/unknown.ico
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Changes.txt 2006-10-30 17:02:39 UTC (rev 3738)
@@ -6,6 +6,10 @@
PATCH: [ 1586869 ] Fix File Select -dialog modality
Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
+ PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
+ Src: DirView.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ Remove file: Src/Res: unknown.ico
2006-10-26 Gal
BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/DirView.cpp 2006-10-30 17:02:39 UTC (rev 3738)
@@ -65,6 +65,32 @@
*/
const int TimeToSignalCompare = 3;
+/**
+ * @brief Folder compare icon indexes.
+ * This enum defines indexes for imagelist used for folder compare icons.
+ * Note that this enum must be in synch with code in OnInitialUpdate() and
+ * GetColImage(). Also remember that icons are in resource file...
+ */
+static enum
+{
+ DIFFIMG_LUNIQUE,
+ DIFFIMG_RUNIQUE,
+ DIFFIMG_DIFF,
+ DIFFIMG_SAME,
+ DIFFIMG_BINSAME,
+ DIFFIMG_BINDIFF,
+ DIFFIMG_LDIRUNIQUE,
+ DIFFIMG_RDIRUNIQUE,
+ DIFFIMG_SKIP,
+ DIFFIMG_DIRSKIP,
+ DIFFIMG_DIR,
+ DIFFIMG_ERROR,
+ DIFFIMG_DIRUP,
+ DIFFIMG_DIRUP_DISABLE,
+ DIFFIMG_ABORT,
+};
+
+
/////////////////////////////////////////////////////////////////////////////
// CDirView
@@ -240,7 +266,6 @@
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALFILE)));
- VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_UNKNOWN)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALBINARY)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_BINARYDIFF)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_LFOLDER)));
@@ -272,24 +297,6 @@
m_pList->SetExtendedStyle(exstyle);
}
-// These are the offsets into the image list created in OnInitDialog
-#define DIFFIMG_LUNIQUE 0
-#define DIFFIMG_RUNIQUE 1
-#define DIFFIMG_DIFF 2
-#define DIFFIMG_SAME 3
-#define DIFFIMG_UNKNOWN 4
-#define DIFFIMG_BINSAME 5
-#define DIFFIMG_BINDIFF 6
-#define DIFFIMG_LDIRUNIQUE 7
-#define DIFFIMG_RDIRUNIQUE 8
-#define DIFFIMG_SKIP 9
-#define DIFFIMG_DIRSKIP 10
-#define DIFFIMG_DIR 11
-#define DIFFIMG_ERROR 12
-#define DIFFIMG_DIRUP 13
-#define DIFFIMG_DIRUP_DISABLE 14
-#define DIFFIMG_ABORT 15
-
/**
* @brief Return image index appropriate for this row
*/
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
@@ -2011,7 +2010,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Contingut en un cop d'ull"
IDS_COMPMETHOD_MODDATE "Data de modificaci\xF3"
IDS_COMPMETHOD_DATESIZE "Data de modificaci\xF3 i mida"
- IDS_COMPMETHOD_SIZE "Mida
+ IDS_COMPMETHOD_SIZE "Mida"
END
// FILTER OPTIONS
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -82,7 +82,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/French/MergeFrench.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -78,7 +78,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Merge.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "res\\folderskip.ico"
IDI_EQUALFILE ICON "res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "res\\notequalfile.ico"
-IDI_UNKNOWN ICON "res\\unknown.ico"
IDI_EQUALBINARY ICON "res\\equalbinary.ico"
IDI_LFILE ICON "res\\lfile.ico"
IDI_RFILE ICON "res\\rfile.ico"
Deleted: trunk/Src/res/unknown.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/resource.h 2006-10-30 17:02:39 UTC (rev 3738)
@@ -89,17 +89,16 @@
#define IDI_FOLDERSKIP 503
#define IDI_EQUALFILE 504
#define IDI_NOTEQUALFILE 505
-#define IDI_UNKNOWN 506
-#define IDI_EQUALBINARY 507
-#define IDI_LFILE 508
-#define IDI_RFILE 509
-#define IDI_BINARYDIFF 510
-#define IDI_FILESKIP 511
-#define IDI_COMPARE_ERROR 512
-#define IDI_FOLDERUP 513
-#define IDI_FOLDERUP_DISABLE 514
-#define IDI_SIGMA 515
-#define IDI_COMPARE_ABORTED 516
+#define IDI_EQUALBINARY 506
+#define IDI_LFILE 507
+#define IDI_RFILE 508
+#define IDI_BINARYDIFF 509
+#define IDI_FILESKIP 510
+#define IDI_COMPARE_ERROR 511
+#define IDI_FOLDERUP 512
+#define IDI_FOLDERUP_DISABLE 513
+#define IDI_SIGMA 514
+#define IDI_COMPARE_ABORTED 515
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
