[Winmerge-svn] SF.net SVN: winmerge:[5794] branches/R2_10
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2008-08-12 21:06:30
|
Revision: 5794 http://winmerge.svn.sourceforge.net/winmerge/?rev=5794&view=rev Author: gerundt Date: 2008-08-12 21:06:27 +0000 (Tue, 12 Aug 2008) Log Message: ----------- PATCH: [ 2047054 ] Add icon for "Open Conflict File" menu item Modified Paths: -------------- branches/R2_10/Docs/Users/ChangeLog.txt branches/R2_10/Src/MainFrm.cpp branches/R2_10/Src/Merge2.rc branches/R2_10/Src/resource.h Added Paths: ----------- branches/R2_10/Src/res/open_conflict.bmp Modified: branches/R2_10/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-12 20:03:39 UTC (rev 5793) +++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-12 21:06:27 UTC (rev 5794) @@ -19,6 +19,7 @@ Unlimited undo (#2033754) Add wait cursor for undo and redo (#2039228) Rename color scheme menu item "None" and add separator (#2027300) + Add icon for "Open Conflict File" menu item (#2047054) BugFix: Use system codepage for paths (#1979429, #2008581) BugFix: ANSI build crash in folder compare (#2010053) BugFix: Add insert/overtype mode indicator to statusbar (#2015174) Modified: branches/R2_10/Src/MainFrm.cpp =================================================================== --- branches/R2_10/Src/MainFrm.cpp 2008-08-12 20:03:39 UTC (rev 5793) +++ branches/R2_10/Src/MainFrm.cpp 2008-08-12 21:06:27 UTC (rev 5794) @@ -96,6 +96,7 @@ * @brief A table associating menuitem id, icon and menus to apply. */ const CMainFrame::MENUITEM_ICON CMainFrame::m_MenuIcons[] = { + { ID_FILE_OPENCONFLICT, IDB_FILE_OPENCONFLICT, CMainFrame::MENU_ALL }, { ID_EDIT_COPY, IDB_EDIT_COPY, CMainFrame::MENU_ALL }, { ID_EDIT_CUT, IDB_EDIT_CUT, CMainFrame::MENU_ALL }, { ID_EDIT_PASTE, IDB_EDIT_PASTE, CMainFrame::MENU_ALL }, Modified: branches/R2_10/Src/Merge2.rc =================================================================== --- branches/R2_10/Src/Merge2.rc 2008-08-12 20:03:39 UTC (rev 5793) +++ branches/R2_10/Src/Merge2.rc 2008-08-12 21:06:27 UTC (rev 5794) @@ -138,6 +138,7 @@ IDB_TOOLBAR_ENABLED32 BITMAP "res\\ToolbarEnabled32.bmp" IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp" IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp" +IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp" ///////////////////////////////////////////////////////////////////////////// Property changes on: branches/R2_10/Src/res/open_conflict.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/R2_10/Src/resource.h =================================================================== --- branches/R2_10/Src/resource.h 2008-08-12 20:03:39 UTC (rev 5793) +++ branches/R2_10/Src/resource.h 2008-08-12 21:06:27 UTC (rev 5794) @@ -100,6 +100,7 @@ #define IDB_TOOLBAR_ENABLED32 357 #define IDB_VIEW_ZOOMIN 358 #define IDB_VIEW_ZOOMOUT 359 +#define IDB_FILE_OPENCONFLICT 361 #define IDI_FOLDER 500 #define IDI_LFOLDER 501 #define IDI_RFOLDER 502 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |