# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1252354335 -7200
# Node ID 407307f66e2054c64506367fb8beabf2d8c1ec7a
# Parent 2f94a4b0f9757dee019db0d6e66e3414774f7cb8
commit: Move parent frame to bottom of dialog
Since we now have an "advanced" frame, this IMHO looks a bit nicer.
Having the diff above the parents frame also fits with the mental model
of "the change is based on the parent revision(s)". Having status info
in (or at least near) the status bar is a good fit as well.
Maybe the M,R,?,I,A,!,C checkboxes should be moved to above the parent
frame next.
[1] AttributeError: 'GCommit' object has no attribute 'parents_frame'
diff --git a/hggtk/commit.py b/hggtk/commit.py
--- a/hggtk/commit.py
+++ b/hggtk/commit.py
@@ -298,20 +298,6 @@ class GCommit(GStatus):
scroller.add(self.text)
gtklib.addspellcheck(self.text, self.repo.ui)
- self.parents_frame = gtk.Frame(_('Parent'))
- parents_vbox = gtk.VBox(spacing=2)
- self.parents_frame.add(parents_vbox)
- def plabel():
- w = gtk.Label()
- w.set_selectable(True)
- hb = gtk.HBox()
- hb.pack_start(w, False, False, 4)
- parents_vbox.pack_start(hb, False, False)
- return w
- self.parent1_label = plabel()
- self.parent2_label = plabel()
- vbox.pack_start(self.parents_frame, False, False)
-
self.advanced_frame = gtk.Frame(_('Advanced'))
adv_hbox = gtk.HBox(spacing=2)
adv_hbox.pack_start(gtk.Label(_('Comitter:')), False, False, 2)
@@ -325,11 +311,28 @@ class GCommit(GStatus):
self.advanced_frame.add(adv_hbox)
vbox.pack_start(self.advanced_frame, False, False, 2)
+ vbox2 = gtk.VBox()
+ vbox2.pack_start(status_body)
+
+ self.parents_frame = gtk.Frame(_('Parent'))
+ parents_vbox = gtk.VBox(spacing=2)
+ self.parents_frame.add(parents_vbox)
+ def plabel():
+ w = gtk.Label()
+ w.set_selectable(True)
+ hb = gtk.HBox()
+ hb.pack_start(w, False, False, 4)
+ parents_vbox.pack_start(hb, False, False)
+ return w
+ self.parent1_label = plabel()
+ self.parent2_label = plabel()
+ vbox2.pack_start(self.parents_frame, False, False)
+
self.vmenu.set_menu(self.view_menu())
self.vpaned = gtk.VPaned()
self.vpaned.pack1(vbox, shrink=False)
- self.vpaned.pack2(status_body, shrink=False)
+ self.vpaned.pack2(vbox2, shrink=False)
gobject.idle_add(self.realize_settings)
return self.vpaned
------------------------------------------------------------------------------
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
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
