Rev 626: Hide branch nick field rather if there is no branch nick property in file:///home/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 626
revision-id: jelmer at samba.org-20090119212847-meq00ak3vba1o1yt
parent: jelmer at samba.org-20090112011935-2w6c6e1aigl4imd9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2009-01-19 22:28:47 +0100
message:
  Hide branch nick field rather if there is no branch nick property 
  set on a revision rather than showing an empty field.
modified:
  revisionview.py                logview.py-20051024072750-4d5c28cb73611027
=== modified file 'revisionview.py'
--- a/revisionview.py	2008-11-13 06:55:41 +0000
+++ b/revisionview.py	2009-01-19 21:28:47 +0000
@@ -416,9 +416,12 @@
             self.timestamp.set_text(format_date(revision.timestamp,
                                                 revision.timezone))
         try:
-            self.branchnick_label.set_text(revision.properties['branch-nick'])
+            self.branchnick.show()
+            self.branchnick_label.show()
+            self.branchnick.set_text(revision.properties['branch-nick'])
         except KeyError:
-            self.branchnick_label.set_text("")
+            self.branchnick.hide()
+            self.branchnick_label.hide()
 
         self._add_parents_or_children(revision.parent_ids,
                                       self.parents_widgets,
@@ -623,19 +626,19 @@
         self.committer.show()
 
         row += 1
-        label = gtk.Label()
-        label.set_alignment(1.0, 0.5)
-        label.set_markup("<b>Branch nick:</b>")
-        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
-        label.show()
-
         self.branchnick_label = gtk.Label()
-        self.branchnick_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
-        self.branchnick_label.set_alignment(0.0, 0.5)
-        self.branchnick_label.set_selectable(True)
-        self.table.attach(self.branchnick_label, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.branchnick_label.set_alignment(1.0, 0.5)
+        self.branchnick_label.set_markup("<b>Branch nick:</b>")
+        self.table.attach(self.branchnick_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
         self.branchnick_label.show()
 
+        self.branchnick = gtk.Label()
+        self.branchnick.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
+        self.branchnick.set_alignment(0.0, 0.5)
+        self.branchnick.set_selectable(True)
+        self.table.attach(self.branchnick, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.branchnick.show()
+
         row += 1
         label = gtk.Label()
         label.set_alignment(1.0, 0.5)