Rev 173: Merge Aaron. in file:///home/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 173
revision-id: jelmer at samba.org-20070318164705-2j23rmbkpdkkszxx
parent: jelmer at samba.org-20070317235803-fyaw65t8ika939s1
parent: aaron.bentley at utoronto.ca-20070318002211-avro3dt0jjf0g3ed
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2007-03-18 17:47:05 +0100
message:
  Merge Aaron.
modified:
  annotate/gannotate.py          xannotate.py-20051024072750-fe35acd6bb909bd3
    ------------------------------------------------------------
    revno: 170.1.6
    merged: aaron.bentley at utoronto.ca-20070318002211-avro3dt0jjf0g3ed
    parent: aaron.bentley at utoronto.ca-20070317231321-1ougi4ktyqpbvmoh
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr-gtk-meld
    timestamp: Sat 2007-03-17 20:22:11 -0400
    message:
      Move buttons to top, tweak layout
=== modified file 'annotate/gannotate.py'
--- a/annotate/gannotate.py	2007-03-17 23:13:21 +0000
+++ b/annotate/gannotate.py	2007-03-18 00:22:11 +0000
@@ -190,8 +190,7 @@
         self.logview = self._create_log_view()
         self.annoview = self._create_annotate_view()
 
-        vbox = gtk.VBox(False, 12)
-        vbox.set_border_width(12)
+        vbox = gtk.VBox(False)
         vbox.show()
 
         sw = gtk.ScrolledWindow()
@@ -204,6 +203,14 @@
         swbox = gtk.VBox()
         swbox.pack_start(sw)
         swbox.show()
+
+        hbox = gtk.HBox(False, 6)
+        self.back_button = self._create_back_button()
+        hbox.pack_start(self.back_button, expand=False, fill=True)
+        self.forward_button = self._create_forward_button()
+        hbox.pack_start(self.forward_button, expand=False, fill=True)
+        hbox.show()
+        vbox.pack_start(hbox, expand=False, fill=True)
         
         self.pane = pane = gtk.VPaned()
         pane.add1(swbox)
@@ -222,15 +229,6 @@
                              self._search_by_line)
         self.add_accel_group(accels)
 
-        hbox = gtk.HBox(False, 6)
-        self.back_button = self._create_back_button()
-        hbox.pack_start(self.back_button, expand=False, fill=True)
-        self.forward_button = self._create_forward_button()
-        hbox.pack_start(self.forward_button, expand=False, fill=True)
-        hbox.pack_end(self._create_button_box(), expand=False, fill=True)
-        hbox.show()
-        vbox.pack_start(hbox, expand=False, fill=True)
-
         self.add(vbox)
 
     def _search_by_text(self, accel_group, window, key, modifiers):
@@ -324,19 +322,12 @@
         lv.show()
         return lv
 
-    def _create_button_box(self):
-        button = gtk.Button()
-        button.set_use_stock(True)
-        button.set_label("gtk-close")
-        button.connect("clicked", lambda w: self.destroy())
-        button.show()
-        return button
-
     def _create_back_button(self):
         button = gtk.Button()
         button.set_use_stock(True)
         button.set_label("gtk-go-back")
         button.connect("clicked", lambda w: self.go_back())
+        button.set_relief(gtk.RELIEF_NONE)
         button.show()
         return button
 
@@ -345,6 +336,7 @@
         button.set_use_stock(True)
         button.set_label("gtk-go-forward")
         button.connect("clicked", lambda w: self.go_forward())
+        button.set_relief(gtk.RELIEF_NONE)
         button.show()
         button.set_sensitive(False)
         return button