From: Kimmo Varis Date: Mon, 15 Sep 2003 17:43:34 +0000 (+0000) Subject: BUG [ 806552 ] DirView icons missing? - Adding icons for skipped files and folders X-Git-Tag: 2.16.5~7776 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac4e1e62cd9dd361d5a42b109881c16910fb9493;p=winmerge-jp%2Fwinmerge-jp.git BUG [ 806552 ] DirView icons missing? - Adding icons for skipped files and folders --- diff --git a/Src/DirView.cpp b/Src/DirView.cpp index a8a8e0371..3faca5f95 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -207,6 +207,12 @@ void CDirView::OnInitialUpdate() VERIFY (bm.LoadBitmap (IDB_RFOLDER)); VERIFY (-1 != m_imageList.Add (&bm, RGB (255, 255, 255))); bm.Detach(); + VERIFY (bm.LoadBitmap (IDB_FILESKIP)); + VERIFY (-1 != m_imageList.Add (&bm, RGB (255, 255, 255))); + bm.Detach(); + VERIFY (bm.LoadBitmap (IDB_FOLDERSKIP)); + VERIFY (-1 != m_imageList.Add (&bm, RGB (255, 255, 255))); + bm.Detach(); m_pList->SetImageList (&m_imageList, LVSIL_SMALL); // Restore column orders as they had them last time they ran diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index 1bb489bda..7f59c5ac5 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -105,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for ..." + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -768,6 +768,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Brazilian/res/fileskip.bmp b/Src/Languages/Brazilian/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Brazilian/res/fileskip.bmp differ diff --git a/Src/Languages/Brazilian/res/folderskip.bmp b/Src/Languages/Brazilian/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Brazilian/res/folderskip.bmp differ diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Brazilian/resource.h +++ b/Src/Languages/Brazilian/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index da554aa70..66d88d1bb 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -100,7 +100,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -635,6 +635,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/ChineseSimplified/res/fileskip.bmp b/Src/Languages/ChineseSimplified/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/ChineseSimplified/res/fileskip.bmp differ diff --git a/Src/Languages/ChineseSimplified/res/folderskip.bmp b/Src/Languages/ChineseSimplified/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/ChineseSimplified/res/folderskip.bmp differ diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/ChineseSimplified/resource.h +++ b/Src/Languages/ChineseSimplified/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 266139320..f1d069ab3 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -742,6 +742,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/ChineseTraditional/res/fileskip.bmp b/Src/Languages/ChineseTraditional/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/ChineseTraditional/res/fileskip.bmp differ diff --git a/Src/Languages/ChineseTraditional/res/folderskip.bmp b/Src/Languages/ChineseTraditional/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/ChineseTraditional/res/folderskip.bmp differ diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/ChineseTraditional/resource.h +++ b/Src/Languages/ChineseTraditional/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 184bc50da..fec32988e 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -105,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for ..." + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -762,6 +762,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Czech/res/fileskip.bmp b/Src/Languages/Czech/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Czech/res/fileskip.bmp differ diff --git a/Src/Languages/Czech/res/folderskip.bmp b/Src/Languages/Czech/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Czech/res/folderskip.bmp differ diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Czech/resource.h +++ b/Src/Languages/Czech/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index d728bdc5b..3bf63167e 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -105,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for ..." + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -760,6 +760,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Danish/res/fileskip.bmp b/Src/Languages/Danish/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Danish/res/fileskip.bmp differ diff --git a/Src/Languages/Danish/res/folderskip.bmp b/Src/Languages/Danish/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Danish/res/folderskip.bmp differ diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Danish/resource.h +++ b/Src/Languages/Danish/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index e0ddb7485..9443b8c92 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -105,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for ..." + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -764,6 +764,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Dutch/res/fileskip.bmp b/Src/Languages/Dutch/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Dutch/res/fileskip.bmp differ diff --git a/Src/Languages/Dutch/res/folderskip.bmp b/Src/Languages/Dutch/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Dutch/res/folderskip.bmp differ diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Dutch/resource.h +++ b/Src/Languages/Dutch/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 4c3f8703f..89aa00962 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -105,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Mettre au format " + POPUP "Mettre au format" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -764,6 +764,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/French/res/fileskip.bmp b/Src/Languages/French/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/French/res/fileskip.bmp differ diff --git a/Src/Languages/French/res/folderskip.bmp b/Src/Languages/French/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/French/res/folderskip.bmp differ diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/French/resource.h +++ b/Src/Languages/French/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index de8c937ff..071e84be6 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -106,7 +106,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -766,6 +766,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/German/res/fileskip.bmp b/Src/Languages/German/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/German/res/fileskip.bmp differ diff --git a/Src/Languages/German/res/folderskip.bmp b/Src/Languages/German/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/German/res/folderskip.bmp differ diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/German/resource.h +++ b/Src/Languages/German/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index ea919ecbf..269aa1980 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -104,7 +104,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -761,6 +761,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Italian/res/fileskip.bmp b/Src/Languages/Italian/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Italian/res/fileskip.bmp differ diff --git a/Src/Languages/Italian/res/folderskip.bmp b/Src/Languages/Italian/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Italian/res/folderskip.bmp differ diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Italian/resource.h +++ b/Src/Languages/Italian/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 14a95643f..a9432b965 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -68,7 +68,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -730,6 +730,9 @@ IDB_BINARYSAME BITMAP "res\\binary.bmp" IDB_LFILE BITMAP "res\\lfile.bmp" IDB_RFILE BITMAP "res\\rfile.bmp" IDB_BINARYDIFF BITMAP "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP "res\\folderskip.bmp" +IDB_FILESKIP BITMAP "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Korean/res/fileskip.bmp b/Src/Languages/Korean/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Korean/res/fileskip.bmp differ diff --git a/Src/Languages/Korean/res/folderskip.bmp b/Src/Languages/Korean/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Korean/res/folderskip.bmp differ diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Korean/resource.h +++ b/Src/Languages/Korean/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 7994f3cc8..cee2fa570 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -1,5 +1,7 @@ //Microsoft Developer Studio generated resource script. // +// $Id$ + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -103,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -759,6 +761,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Norwegian/res/fileskip.bmp b/Src/Languages/Norwegian/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Norwegian/res/fileskip.bmp differ diff --git a/Src/Languages/Norwegian/res/folderskip.bmp b/Src/Languages/Norwegian/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Norwegian/res/folderskip.bmp differ diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Norwegian/resource.h +++ b/Src/Languages/Norwegian/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 5fde93109..67b2e8b32 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -105,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -764,6 +764,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Slovak/res/fileskip.bmp b/Src/Languages/Slovak/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Slovak/res/fileskip.bmp differ diff --git a/Src/Languages/Slovak/res/folderskip.bmp b/Src/Languages/Slovak/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Slovak/res/folderskip.bmp differ diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Slovak/resource.h +++ b/Src/Languages/Slovak/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 4bf332659..01dcdc22a 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -105,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -762,6 +762,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/Languages/Spanish/res/fileskip.bmp b/Src/Languages/Spanish/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/Languages/Spanish/res/fileskip.bmp differ diff --git a/Src/Languages/Spanish/res/folderskip.bmp b/Src/Languages/Spanish/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/Languages/Spanish/res/folderskip.bmp differ diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/Languages/Spanish/resource.h +++ b/Src/Languages/Spanish/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 diff --git a/Src/Merge.rc b/Src/Merge.rc index 81690251e..cacb76af2 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1,5 +1,7 @@ //Microsoft Developer Studio generated resource script. // +// $Id$ + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -103,7 +105,7 @@ BEGIN MENUITEM "Left read-only", ID_FILE_LEFT_READONLY MENUITEM "Right read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "Format for " + POPUP "Format for" BEGIN MENUITEM "DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "UNIX (LF)", ID_EOL_TO_UNIX @@ -759,6 +761,9 @@ IDB_BINARYSAME BITMAP DISCARDABLE "res\\binary.bmp" IDB_LFILE BITMAP DISCARDABLE "res\\lfile.bmp" IDB_RFILE BITMAP DISCARDABLE "res\\rfile.bmp" IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.bmp" +IDB_FOLDERSKIP BITMAP DISCARDABLE "res\\folderskip.bmp" +IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/Src/readme.txt b/Src/readme.txt index 452808985..a0c68a6a7 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,10 @@ +2003-09-15 Kimmo + BUG [ 806552 ] DirView icons missing? + Adding icons for skipped files and folders + WinMerge: DirView.cpp Merge.rc resource.h + WinMerge/res: new files fileskip.bmp folderskip.bmp + Languages: resource.h *.rc new files /res fileskip.bmp folderskip.bmp + 2003-09-14 Perry PATCH: [ 805875 ] Switch to diffcode flags WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirDoc.h diff --git a/Src/res/fileskip.bmp b/Src/res/fileskip.bmp new file mode 100644 index 000000000..75a1c7b0f Binary files /dev/null and b/Src/res/fileskip.bmp differ diff --git a/Src/res/folderskip.bmp b/Src/res/folderskip.bmp new file mode 100644 index 000000000..a2b948980 Binary files /dev/null and b/Src/res/folderskip.bmp differ diff --git a/Src/resource.h b/Src/resource.h index 7c7c43ce7..7f5706197 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -131,6 +131,8 @@ #define IDB_LFOLDER 223 #define IDB_BINARYDIFF 224 #define IDS_PRIVATEBUILD_FMT 225 +#define IDB_FOLDERSKIP 226 +#define IDB_FILESKIP 227 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001