Rev 148: Clean up interface a bit: don't show diff button when no diff can be accessed, use label instead of button when there is no callback set. in file:///home/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 148
revision-id: jelmer at samba.org-20070203124133-z02b51snxvn13zhx
parent: jelmer at samba.org-20070203123555-ulewrsm062evq90q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-02-03 13:41:33 +0100
message:
  Clean up interface a bit: don't show diff button when no diff can be accessed, use label instead of button when there is no callback set.
modified:
  annotate/gannotate.py          xannotate.py-20051024072750-fe35acd6bb909bd3
  logview.py                     logview.py-20051024072750-4d5c28cb73611027
=== modified file 'annotate/gannotate.py'
--- a/annotate/gannotate.py	2007-02-03 11:52:13 +0000
+++ b/annotate/gannotate.py	2007-02-03 12:41:33 +0000
@@ -311,7 +311,6 @@
     def _create_log_view(self):
         lv = LogView()
         lv.show()
-
         return lv
 
     def _create_button_box(self):

=== modified file 'logview.py'
--- a/logview.py	2007-02-03 12:35:55 +0000
+++ b/logview.py	2007-02-03 12:41:33 +0000
@@ -35,6 +35,7 @@
         self.set_shadow_type(gtk.SHADOW_NONE)
         self._create()
         self._show_callback = None
+        self._go_callback = None
         self._clicked_callback = None
 
         if revision is not None:
@@ -91,17 +92,20 @@
                 gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
             image.show()
 
-            button = gtk.Button()
-            button.add(image)
-            button.set_sensitive(self._show_callback is not None)
-            button.connect("clicked", self._show_clicked_cb,
-                           self._revision.revision_id, parent_id)
-            hbox.pack_start(button, expand=False, fill=True)
-            button.show()
+            if self._show_callback is not None:
+                button = gtk.Button()
+                button.add(image)
+                button.connect("clicked", self._show_clicked_cb,
+                               self._revision.revision_id, parent_id)
+                hbox.pack_start(button, expand=False, fill=True)
+                button.show()
 
-            button = gtk.Button(parent_id)
+            if self._go_callback is not None:
+                button = gtk.Button(parent_id)
+                button.connect("clicked", self._go_clicked_cb, parent_id)
+            else:
+                button = gtk.Label(parent_id)
             button.set_use_underline(False)
-            button.connect("clicked", self._go_clicked_cb, parent_id)
             hbox.pack_start(button, expand=False, fill=True)
             button.show()