From d48149f6f2692d8080d01057b90f5326a9945515 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Sun, 25 Mar 2007 15:56:58 +0000 Subject: [PATCH] PATCH: [ 1687661 ] Remove ICONS and BITMAPS from lang files --- Src/Changes.txt | 4 ++ Src/Languages/Brazilian/MergeBrazilian.rc | 63 ---------------------- Src/Languages/Bulgarian/MergeBulgarian.rc | 63 ---------------------- Src/Languages/Catalan/MergeCatalan.rc | 63 ---------------------- .../ChineseSimplified/MergeChineseSimplified.rc | 63 ---------------------- .../ChineseTraditional/MergeChineseTraditional.rc | 63 ---------------------- Src/Languages/Czech/MergeCzech.rc | 63 ---------------------- Src/Languages/Danish/MergeDanish.rc | 63 ---------------------- Src/Languages/Dutch/MergeDutch.rc | 63 ---------------------- Src/Languages/French/MergeFrench.rc | 63 ---------------------- Src/Languages/German/MergeGerman.rc | 63 ---------------------- Src/Languages/Hungarian/MergeHungarian.rc | 63 ---------------------- Src/Languages/Italian/MergeItalian.rc | 63 ---------------------- Src/Languages/Japanese/MergeJapanese.rc | 63 ---------------------- Src/Languages/Korean/MergeKorean.rc | 63 ---------------------- Src/Languages/Norwegian/MergeNorwegian.rc | 63 ---------------------- Src/Languages/Polish/MergePolish.rc | 63 ---------------------- Src/Languages/Russian/MergeRussian.rc | 63 ---------------------- Src/Languages/Slovak/MergeSlovak.rc | 63 ---------------------- Src/Languages/Spanish/MergeSpanish.rc | 63 ---------------------- Src/Languages/Swedish/MergeSwedish.rc | 63 ---------------------- Src/Languages/Turkish/MergeTurkish.rc | 63 ---------------------- 22 files changed, 4 insertions(+), 1323 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index b61c134ae..fb905bee1 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -2,6 +2,10 @@ Src\Changes.txt Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-03-25 Tim + PATCH: [ 1687661 ] Remove ICONS and BITMAPS from lang files + Src/Languages/*: Merge*.rc + 2007-03-25 Gal BUG: [ 1687754 ] Editor regression in trunk Src: stringdiffs.cpp stringdiffsi.h diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index d626f4106..9da3977d5 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index 3bc2fc535..68fe367a1 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1731,51 +1713,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index 830f0a83e..7ba571bd1 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1731,51 +1713,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index bbd7e2da0..468f1e269 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -73,24 +73,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1714,51 +1696,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 0d81d6bff..7e953e0df 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 21d802343..9c416a632 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 1ca00e8d5..6840234ae 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 20ccafbdc..06d7570c0 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 3afd6fb13..3dd4d44d2 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -69,24 +69,6 @@ END // Load shared resources from Src\res IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1711,51 +1693,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index a29c093b6..d201e9bdf 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index 13cb3ee1b..7cda7f63c 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1711,51 +1693,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index d7fb96c42..b1e0e1940 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index 63bf6dc8f..4664d5d5a 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 5219db431..850122c57 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index f1b3ceb72..56132166e 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index 6cf6673a0..60ce381c3 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index cc66fbdae..e650c841c 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 9a5830304..de66da6db 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index ef1d72068..11ea9601f 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index cd67760fb..a323fa1b1 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc index d273a6c20..4c8a8b6c6 100644 --- a/Src/Languages/Turkish/MergeTurkish.rc +++ b/Src/Languages/Turkish/MergeTurkish.rc @@ -71,24 +71,6 @@ END // (in Src\res) IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" -IDR_MERGEDOCTYPE ICON "..\\..\\res\\MergeDoc.ico" -IDR_DIRDOCTYPE ICON "..\\..\\res\\MergeDir.ico" -IDI_FOLDER ICON "..\\..\\res\\folder.ico" -IDI_LFOLDER ICON "..\\..\\res\\lfolder.ico" -IDI_RFOLDER ICON "..\\..\\res\\rfolder.ico" -IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico" -IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico" -IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico" -IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico" -IDI_LFILE ICON "..\\..\\res\\lfile.ico" -IDI_RFILE ICON "..\\..\\res\\rfile.ico" -IDI_BINARYDIFF ICON "..\\..\\res\\binarydiff.ico" -IDI_FILESKIP ICON "..\\..\\res\\fileskip.ico" -IDI_COMPARE_ERROR ICON "..\\..\\res\\error.ico" -IDI_FOLDERUP ICON "..\\..\\res\\folderup.ico" -IDI_FOLDERUP_DISABLE ICON "..\\..\\res\\folderup_disable.ico" -IDI_SIGMA ICON "..\\..\\res\\sigma.ico" -IDI_COMPARE_ABORTED ICON "..\\..\\res\\aborted.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -1713,51 +1695,6 @@ IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" ///////////////////////////////////////////////////////////////////////////// // -// Bitmap -// - -IDB_TOOLBAR_ENABLED BITMAP "..\\..\\res\\ToolbarEnabled.bmp" -IDB_TOOLBAR_DISABLED BITMAP "..\\..\\res\\ToolbarDisabled.bmp" -IDB_EDIT_COPY BITMAP "..\\..\\res\\copy.bmp" -IDB_EDIT_CUT BITMAP "..\\..\\res\\cut.bmp" -IDB_EDIT_PASTE BITMAP "..\\..\\res\\paste.bmp" -IDB_EDIT_SEARCH BITMAP "..\\..\\res\\search.bmp" -IDB_WINDOW_CASCADE BITMAP "..\\..\\res\\cascade.bmp" -IDB_WINDOW_HORIZONTAL BITMAP "..\\..\\res\\horizontally.bmp" -IDB_WINDOW_VERTICAL BITMAP "..\\..\\res\\vertically.bmp" -IDB_WINDOW_CLOSE BITMAP "..\\..\\res\\close.bmp" -IDB_WINDOW_CHANGEPANE BITMAP "..\\..\\res\\change_pane.bmp" -IDB_EDIT_GOTO BITMAP "..\\..\\res\\go_to.bmp" -IDB_EDIT_REPLACE BITMAP "..\\..\\res\\replace.bmp" -IDB_VIEW_LANGUAGE BITMAP "..\\..\\res\\language.bmp" -IDB_VIEW_SELECTFONT BITMAP "..\\..\\res\\select_font.bmp" -IDB_FILE_EXIT BITMAP "..\\..\\res\\exit.bmp" -IDB_HELP_CONTENTS BITMAP "..\\..\\res\\help_contents.bmp" -IDB_EDIT_SELECTALL BITMAP "..\\..\\res\\select_all.bmp" -IDB_TOOLS_FILTERS BITMAP "..\\..\\res\\filters.bmp" -IDB_TOOLS_COLUMNS BITMAP "..\\..\\res\\customize_columns.bmp" -IDB_MERGE_DELETE BITMAP "..\\..\\res\\delete.bmp" -IDB_FILE_PRINT BITMAP "..\\..\\res\\print.bmp" -IDB_TOOLS_GENERATEPATCH BITMAP "..\\..\\res\\patch.bmp" -IDB_TOOLS_GENERATEREPORT BITMAP "..\\..\\res\\report.bmp" -IDR_MARGIN_ICONS BITMAP "..\\..\\res\\mg_icons.bmp" -IDB_EDIT_TOGGLE_BOOKMARK BITMAP "..\\..\\res\\toggle_bookmark.bmp" -IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp" -IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp" -IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp" -IDB_LEFT BITMAP "..\\..\\res\\left.bmp" -IDB_RIGHT BITMAP "..\\..\\res\\right.bmp" -IDB_BOTH BITMAP "..\\..\\res\\both.bmp" -IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp" -IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp" -IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp" -IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp" -IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp" -IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// // Cursor // -- 2.11.0