[Winmerge-svn] SF.net SVN: winmerge:[6122] branches/R2_10

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

Revision: 6122
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6122&view=rev
Author:   kimmov
Date:     2008-11-26 10:56:08 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
PATCH: [ 2327565 ] Patch for Bug 2309190
 Submitted by Chris Paulse

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Docs/Users/Contributors.txt
    branches/R2_10/Src/DirActions.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-26 10:51:59 UTC (rev 6121)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-26 10:56:08 UTC (rev 6122)
@@ -5,6 +5,7 @@
 
 WinMerge 2.10.4
   Add Git to Source Control filter and fix ignore file rules (#2329381)
+  Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_10/Docs/Users/Contributors.txt	2008-11-26 10:51:59 UTC (rev 6121)
+++ branches/R2_10/Docs/Users/Contributors.txt	2008-11-26 10:56:08 UTC (rev 6122)
@@ -153,6 +153,7 @@
 * Ryan Mott
 * Tim Musschoot
 * Marco De Paoli
+* Chris Paulse
 * Dan Pidcock
 * Vincent Osele
 * Scott Rasmussen

Modified: branches/R2_10/Src/DirActions.cpp
===================================================================
--- branches/R2_10/Src/DirActions.cpp	2008-11-26 10:51:59 UTC (rev 6121)
+++ branches/R2_10/Src/DirActions.cpp	2008-11-26 10:56:08 UTC (rev 6122)
@@ -748,6 +748,7 @@
 			act.dirflag = di.diffcode.isDirectory();
 			act.context = sel;
 			act.atype = actType;
+			act.UIOrigin = FileActionItem::UI_LEFT;
 			act.UIResult = FileActionItem::UI_DEL_LEFT;
 			actionScript.AddActionItem(act);
 			++selCount;
@@ -816,6 +817,7 @@
 			act.dirflag = di.diffcode.isDirectory();
 			act.context = sel;
 			act.atype = actType;
+			act.UIOrigin = FileActionItem::UI_RIGHT;
 			act.UIResult = FileActionItem::UI_DEL_RIGHT;
 			actionScript.AddActionItem(act);
 			++selCount;


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