[Winmerge-svn] SF.net SVN: winmerge: [4199] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2007-03-26 21:46:25
|
Revision: 4199 http://svn.sourceforge.net/winmerge/?rev=4199&view=rev Author: gerundt Date: 2007-03-26 14:46:22 -0700 (Mon, 26 Mar 2007) Log Message: ----------- PATCH: [ 1688012 ] Remove IDR_MAINFRAME icon from lang files Modified Paths: -------------- trunk/Src/AboutDlg.cpp trunk/Src/Changes.txt trunk/Src/Languages/Brazilian/MergeBrazilian.rc trunk/Src/Languages/Bulgarian/MergeBulgarian.rc trunk/Src/Languages/Catalan/MergeCatalan.rc trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc trunk/Src/Languages/Czech/MergeCzech.rc trunk/Src/Languages/Danish/MergeDanish.rc trunk/Src/Languages/Dutch/MergeDutch.rc trunk/Src/Languages/French/MergeFrench.rc trunk/Src/Languages/German/MergeGerman.rc trunk/Src/Languages/Hungarian/MergeHungarian.rc trunk/Src/Languages/Italian/MergeItalian.rc trunk/Src/Languages/Japanese/MergeJapanese.rc trunk/Src/Languages/Korean/MergeKorean.rc trunk/Src/Languages/Norwegian/MergeNorwegian.rc trunk/Src/Languages/Polish/MergePolish.rc trunk/Src/Languages/Russian/MergeRussian.rc trunk/Src/Languages/Slovak/MergeSlovak.rc trunk/Src/Languages/Spanish/MergeSpanish.rc trunk/Src/Languages/Swedish/MergeSwedish.rc trunk/Src/Languages/Turkish/MergeTurkish.rc trunk/Src/Merge.rc trunk/Src/resource.h Modified: trunk/Src/AboutDlg.cpp =================================================================== --- trunk/Src/AboutDlg.cpp 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/AboutDlg.cpp 2007-03-26 21:46:22 UTC (rev 4199) @@ -64,6 +64,13 @@ { CDialog::OnInitDialog(); + // Load application icon + HICON icon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); + if (icon != NULL) { + CStatic * pIcon = (CStatic *) GetDlgItem(IDC_ABOUTBOX_ICON); + pIcon->SetIcon(icon); + } + CVersionInfo version(AfxGetResourceHandle()); CString sVersion = version.GetFixedProductVersion(); AfxFormatString1(m_strVersion, IDS_VERSION_FMT, sVersion); Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Changes.txt 2007-03-26 21:46:22 UTC (rev 4199) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-03-26 Tim + PATCH: [ 1688012 ] Remove IDR_MAINFRAME icon from lang files + Src: AboutDlg.cpp Merge.rc resource.h + Src/Languages/*: Merge*.rc + 2007-03-26 Kimmo PATCH: [ 1687966 ] Fix crash when changing compare method Src: DiffContext.cpp DiffContext.h FolderCmp.cpp Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Sobre o WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Vers\xE3o 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "\xC7\xE0 WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "\xC2\xE5\xF0\xF1\xE8\xFF 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Quant al WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Versi\xF3 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Muntatge Privat)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -63,19 +63,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -622,7 +609,7 @@ CAPTION "\xB9\xD8\xD3\xDA WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "\xB0汾 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc =================================================================== --- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "\xC3\xF6\xA9\xF3 WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "\xAA\xA9\xA5\xBB 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "O aplikaci WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Verze 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Danish/MergeDanish.rc =================================================================== --- trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Om WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "About WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Versie 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/French/MergeFrench.rc =================================================================== --- trunk/Src/Languages/French/MergeFrench.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/French/MergeFrench.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,17 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Load shared resources from Src\res -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -618,7 +607,7 @@ CAPTION "A propos de WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,20,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,20,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/German/MergeGerman.rc =================================================================== --- trunk/Src/Languages/German/MergeGerman.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/German/MergeGerman.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Info \xFCber WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "A WinMerge n\xE9vjegye" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Verzi\xF3sz\xE1m: 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Informazioni su WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Versione 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Build Privata)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "WinMerge\x82ɂ\xA2\x82\xC4" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Korean/MergeKorean.rc =================================================================== --- trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "WinMerge \xC1\xA4\xBA\xB8" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Om WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Polish/MergePolish.rc =================================================================== --- trunk/Src/Languages/Polish/MergePolish.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Polish/MergePolish.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "O programie WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Wersja 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(kompilacja prywatna)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Russian/MergeRussian.rc =================================================================== --- trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "\xCE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE5 WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "\xC2\xE5\xF0\xF1\xE8\xFF 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "O aplik\xE1cii" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Verzia 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(S\xFAkromn\xE9 zostavenie)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Sobre WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Versi\xF3n 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "Om WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -61,19 +61,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -// Normally translations share these icons from the English versions -// (in Src\res) - -IDR_MAINFRAME ICON "..\\..\\res\\Merge.ico" - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -620,7 +607,7 @@ CAPTION "About WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/Merge.rc 2007-03-26 21:46:22 UTC (rev 4199) @@ -649,7 +649,7 @@ CAPTION "About WinMerge" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 + ICON IDR_MAINFRAME,IDC_ABOUTBOX_ICON,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 Modified: trunk/Src/resource.h =================================================================== --- trunk/Src/resource.h 2007-03-26 16:01:40 UTC (rev 4198) +++ trunk/Src/resource.h 2007-03-26 21:46:22 UTC (rev 4199) @@ -418,6 +418,7 @@ #define IDC_LFILTER_REMOVEBTN 1331 #define IDC_BUTTON2 1332 #define IDC_LFILTER_EDITSAVE 1333 +#define IDC_ABOUTBOX_ICON 1334 #define IDC_EDIT_WHOLE_WORD 8603 #define IDC_EDIT_MATCH_CASE 8604 #define IDC_EDIT_FINDTEXT 8605 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |