|
From: <ki...@us...> - 2008-06-23 23:01:18
|
Revision: 5512
http://winmerge.svn.sourceforge.net/winmerge/?rev=5512&view=rev
Author: kimmov
Date: 2008-06-23 16:01:12 -0700 (Mon, 23 Jun 2008)
Log Message:
-----------
PATCH: [ 2001237 ] Proper source displaying in "Confirm Copy" dialog
Submitted by Denis Matiukha
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Src/DirActions.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-23 22:54:36 UTC (rev 5511)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-23 23:01:12 UTC (rev 5512)
@@ -12,6 +12,8 @@
BugFix: Crash when starting a second instance (#1993835)
BugFix: Crash when starting WinMerge with only one path (#1994402)
BugFix: Messages missing from installer translations (r5506)
+ BugFix: Always right side as origin side in copy confirmation dialog
+ when Copy To... (#2001237)
New translation: Slovenian (#1997236)
Translation updates:
- Brazilian (#1994578)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2008-06-23 22:54:36 UTC (rev 5511)
+++ trunk/Docs/Users/Contributors.txt 2008-06-23 23:01:12 UTC (rev 5512)
@@ -139,6 +139,7 @@
* Vladimir Lukianov
* David Maisonave
* Dmitry Maslov
+* Denis Matiukha
* Harry Mckame
* Oliver Mellet
* Andreas Morsing
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2008-06-23 22:54:36 UTC (rev 5511)
+++ trunk/Src/DirActions.cpp 2008-06-23 23:01:12 UTC (rev 5512)
@@ -554,6 +554,7 @@
act.context = sel;
act.atype = actType;
act.UIResult = FileActionItem::UI_DONT_CARE;
+ act.UIOrigin = FileActionItem::UI_LEFT;
actionScript.AddActionItem(act);
++selCount;
}
@@ -624,6 +625,7 @@
act.context = sel;
act.atype = actType;
act.UIResult = FileActionItem::UI_DONT_CARE;
+ act.UIOrigin = FileActionItem::UI_RIGHT;
actionScript.AddActionItem(act);
++selCount;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
