Add icon for Substitution filters dialog

diff --git a/Src/Merge2.rc b/Src/Merge2.rc
index f1bb4bf..14a77fb 100644 (file)
--- a/Src/Merge2.rc
+++ b/Src/Merge2.rc
@@ -44,6 +44,7 @@ IDI_FOLDERUP_DISABLE    ICON                    "res\\folderup_disable.ico"
 IDI_COMPARE_ABORTED     ICON                    "res\\aborted.ico"
 IDI_FILEFILTER          ICON                    "res\\FileFilter.ico"
 IDI_LINEFILTER          ICON                    "res\\LineFilter.ico"
+IDI_SUBSTITUTIONFILTER  ICON                    "res\\SubstitutionFilter.ico"
 IDI_EQUALTEXTFILE       ICON                    "res\\equaltextfile.ico"
 IDI_NOTEQUALTEXTFILE    ICON                    "res\\notequaltextfile.ico"
 IDI_EQUALIMAGE          ICON                    "res\\equalimage.ico"

diff --git a/Src/SubstitutionFiltersDlg.cpp b/Src/SubstitutionFiltersDlg.cpp
index 57eeed4..2a887e5 100644 (file)
--- a/Src/SubstitutionFiltersDlg.cpp
+++ b/Src/SubstitutionFiltersDlg.cpp
@@ -35,7 +35,7 @@ SubstitutionFiltersDlg::SubstitutionFiltersDlg()
        m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
        m_psp.pszTitle = m_strCaption;
        m_psp.dwFlags |= PSP_USETITLE;
-       m_psp.hIcon = AfxGetApp()->LoadIcon(IDI_LINEFILTER);
+       m_psp.hIcon = AfxGetApp()->LoadIcon(IDI_SUBSTITUTIONFILTER);
        m_psp.dwFlags |= PSP_USEHICON;
 }
 

diff --git a/Src/res/SubstitutionFilter.ico b/Src/res/SubstitutionFilter.ico
new file mode 100644 (file)
index 0000000..9b096b1
Binary files /dev/null and b/Src/res/SubstitutionFilter.ico differ

diff --git a/Src/resource.h b/Src/resource.h
index 910bfab..5997f15 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -161,22 +161,23 @@
 #define IDI_FOLDERUP_DISABLE            515\r
 #define IDI_FILEFILTER                  517\r
 #define IDI_LINEFILTER                  518\r
-#define IDI_COMPARE_ABORTED             519\r
-#define IDI_MRFILE                      520\r
-#define IDI_LRFILE                      521\r
-#define IDI_LMFILE                      522\r
-#define IDI_MRFOLDER                    523\r
-#define IDI_LRFOLDER                    524\r
-#define IDI_LMFOLDER                    525\r
-#define IDI_EQUALFOLDER                 526\r
-#define IDI_NOTEQUALFOLDER              527\r
-#define IDI_EQUALTEXTFILE               528\r
-#define IDI_NOTEQUALTEXTFILE            529\r
-#define IDI_EQUALIMAGE                  530\r
-#define IDI_NOTEQUALIMAGE               531\r
-#define IDI_TREE_STATE_COLLAPSED        532\r
-#define IDI_TREE_STATE_EXPANDED         533\r
-#define IDI_FILE                        534\r
+#define IDI_SUBSTITUTIONFILTER          519\r
+#define IDI_COMPARE_ABORTED             520\r
+#define IDI_MRFILE                      521\r
+#define IDI_LRFILE                      522\r
+#define IDI_LMFILE                      523\r
+#define IDI_MRFOLDER                    524\r
+#define IDI_LRFOLDER                    525\r
+#define IDI_LMFOLDER                    526\r
+#define IDI_EQUALFOLDER                 527\r
+#define IDI_NOTEQUALFOLDER              528\r
+#define IDI_EQUALTEXTFILE               529\r
+#define IDI_NOTEQUALTEXTFILE            530\r
+#define IDI_EQUALIMAGE                  531\r
+#define IDI_NOTEQUALIMAGE               532\r
+#define IDI_TREE_STATE_COLLAPSED        533\r
+#define IDI_TREE_STATE_EXPANDED         534\r
+#define IDI_FILE                        535\r
 // CONTROLS\r
 #define IDC_PATH0_BUTTON                1001\r
 #define IDC_PATH1_BUTTON                1002\r