[Winmerge-svn] SF.net SVN: winmerge:[5793] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2008-08-12 20:03:43
|
Revision: 5793 http://winmerge.svn.sourceforge.net/winmerge/?rev=5793&view=rev Author: gerundt Date: 2008-08-12 20:03:39 +0000 (Tue, 12 Aug 2008) Log Message: ----------- PATCH: [ 2047054 ] Add icon for "Open Conflict File" menu item Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MainFrm.cpp trunk/Src/Merge2.rc trunk/Src/resource.h Added Paths: ----------- trunk/Src/res/open_conflict.bmp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-12 20:03:39 UTC (rev 5793) @@ -5,6 +5,7 @@ WinMerge 2.11.1.4 Add wait cursor for undo and redo (#2039228) + Add icon for "Open Conflict File" menu item (#2047054) BugFix: External editor command line switches did not work (#2037862) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) Bugfix: Lost focus after folder compare operations (#2046002) Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Src/MainFrm.cpp 2008-08-12 20:03:39 UTC (rev 5793) @@ -98,6 +98,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: trunk/Src/Merge2.rc =================================================================== --- trunk/Src/Merge2.rc 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Src/Merge2.rc 2008-08-12 20:03:39 UTC (rev 5793) @@ -141,6 +141,7 @@ IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp" IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp" IDB_TREE_STATE BITMAP "res\\treestate.bmp" +IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp" ///////////////////////////////////////////////////////////////////////////// Property changes on: trunk/Src/res/open_conflict.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/Src/resource.h =================================================================== --- trunk/Src/resource.h 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Src/resource.h 2008-08-12 20:03:39 UTC (rev 5793) @@ -101,6 +101,7 @@ #define IDB_VIEW_ZOOMIN 358 #define IDB_VIEW_ZOOMOUT 359 #define IDB_TREE_STATE 360 +#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. |