[Winmerge-svn] SF.net SVN: winmerge:[7316] branches/R2_14

[<ki...@us...>]

Revision: 7316
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7316&view=rev
Author:   kimmov
Date:     2010-10-19 17:25:09 +0000 (Tue, 19 Oct 2010)

Log Message:
-----------
PATCH: [ 2600787 ] Remove copy to left at context menu
 Submitted by Dmitry Maslov

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/MergeEditView.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-10-18 13:52:00 UTC (rev 7315)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-10-19 17:25:09 UTC (rev 7316)
@@ -7,6 +7,8 @@
   Add missing keywords to Pascal highlighter (#2834192)
   Recognize .ascx files as ASP files (#3042393)
   Fix help locations (#2988974)
+  Show only "Copy to other side" item in file compare
+    context menu (#2600787)
   New translation: Persian (#2877121, #3065119)
   New translation: Serbian (#3017674, #3065119)
   Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime

Modified: branches/R2_14/Src/MergeEditView.cpp
===================================================================
--- branches/R2_14/Src/MergeEditView.cpp	2010-10-18 13:52:00 UTC (rev 7315)
+++ branches/R2_14/Src/MergeEditView.cpp	2010-10-19 17:25:09 UTC (rev 7316)
@@ -2041,6 +2041,13 @@
 	// Create the menu and populate it with the available functions
 	BCMenu menu;
 	VERIFY(menu.LoadMenu(IDR_POPUP_MERGEVIEW));
+
+	// Remove copying item copying from active side
+	if (m_nThisPane == 0) // left?
+		menu.RemoveMenu(ID_R2L, MF_BYCOMMAND);
+	else
+		menu.RemoveMenu(ID_L2R, MF_BYCOMMAND);
+
 	VERIFY(menu.LoadToolbar(IDR_MAINFRAME));
 	theApp.TranslateMenu(menu.m_hMenu);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.