# HG changeset patch
# User Adrian Buehlmann <[email protected]>
# Date 1259591702 -3600
# Node ID 1e8885a625183cad603d68b3fb80f01a88e37523
# Parent 144d6d6fcfb9495b8eb37d0250b1d93a84842fb3
changeset: put "diff to second parent" on top of file tree area
was previously on the bottom
diff --git a/tortoisehg/hgtk/changeset.py b/tortoisehg/hgtk/changeset.py
--- a/tortoisehg/hgtk/changeset.py
+++ b/tortoisehg/hgtk/changeset.py
@@ -101,8 +101,8 @@ class ChangeSet(gdialog.GDialog):
if len(parents) == 2:
# deferred adding of parent check button
if not self.parent_button.parent:
+ self.parent_box.pack_start(self.parent_button, False,
False)
self.parent_box.pack_start(gtk.HSeparator(), False, False)
- self.parent_box.pack_start(self.parent_button, False,
False)
self.parent_box.show_all()
# show parent box
@@ -703,11 +703,10 @@ class ChangeSet(gdialog.GDialog):
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scroller.add(filelist_tree)
flbox = gtk.VBox()
- flbox.pack_start(scroller)
list_frame.add(flbox)
-
self.parent_box = gtk.VBox()
flbox.pack_start(self.parent_box, False, False)
+ flbox.pack_start(scroller)
btn = gtk.CheckButton(_('Diff to second Parent'))
btn.connect('toggled', self.parent_toggled)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
