Subject says it all. Cheers,
Jelmer -- Jelmer Vernooij <[email protected]> - http://samba.org/~jelmer/ Jabber: [email protected]
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: lp:bzr-gtk # testament_sha1: d6fa8f2a3c31b28ee302376be36e9afd6f8c289c # timestamp: 2009-03-06 15:39:04 +0100 # base_revision_id: [email protected] # # Begin patch === modified file 'revisionview.py' --- revisionview.py 2008-11-13 06:55:41 +0000 +++ 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) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUuQx+MAAfxfgARQUe///3d3 TVq////0UAR6qavQ7rjqmu5tsGSEMk1NomxPQiYgAeoaA0AB6g9QElAmEAVPZU/QpowIyNADQaAA AEppNIFPVP1PTVPKfkp6Q0yaZAeo0AGj1NPImmg4yZNNMJkZAwIxNGCMINGmAAQSSQmZJ6mTCpie k/QChp5QPJGTRoDQZCQzVd04B2o2bjLvqYYpsU6M9bYiaxUzqlDGSGrepoqZfqdgJNyAEtBPk6ca pECIRX7IPMQy0RLgCB7yhRmkQb6oFeiuezdbs/OqRPRD4S3w/3NZsoqpfpbr70V5snq33QXwGKET FDTofZnXgyrlUlOicngYzEwAU7K/T5u1dTurB6U/AW7V9/m+ElTlDce8W4F65CwUzlfE69DBc1Rm 0jIp4odQjk7g2B4hmvJcYxxZmlCSZKZpOqrKe56NlQjou8I7YbWrvxIsEQP0LmQOWgMoRFriokDI dxnILj09lrFaoT1v8BRdcWkarThRcoMQMIMTDisFLnMKEevgGXZ9NjqkFBg+JmUX8cLQJ72yF7od YJk6YgKROjisPAtcV6y94rxgxdbThvV46JhpinvnWcQ6ww4xYVomZkcbh7FuFyEIbS4wMh5Uqmsx NDBSLi8zYpTk+2mydrGbxhYml40cYCutldJcqzVCZKcXO2iY42mo4tK1QgQNKqmxcK0lMg8iRTsW VSQQHJDRhQrJtN0Swe1qU3pkEahMYFiUCDaFHUXI9COVBRY+VHBWdeLMhVZ9jm98ocoxdSiKhjbd Nklrv29Px56OU7EFO79hR1XuByRgSOutugw6crWY7V5S84yMxC1w6ljIgjyAhgCA5zd/r+CKF0DG yqJqCC6Bcx1TCLB+XK9IKd/7cj5XMpjA48DgWlhu+LxHWKE5yF1YqRlYeXRWJbwOoVp0q09h0nEx nZWSlB5FMMYMJMOZARrpNJV6ShaUT0zVUDeMVnAdWVm5o3m2NVx3dFm20yJYYHuLs2xoyhs5DMS5 43U1kWDlM6A29/cIwoNaghyVZv0zeIfX/e2K5QT0tKJD1IIauzAMw7BuN4OPGYi026XczLsdUI1C 30Il75xbDGi9kwXUstpNMJTBEU0SCQZw8MxYYlgsmBauUqnW1UE/rDNX8+ipcMxIkVKSNhgZVbZW OQKKKrJwgoTOClSEVAV3JRNSaVEhHUmHIB5Uzt7JGSrRi54RTxEEx9bxDUsxZlQaLKs5dOCEkc6O FBpIZgmEkzxBYNAaxGWY7CiJMQxT7mMbBVyxOiWpZWI6GVyS3ByiLlzuVMlUDMs7OHXXVQJirlVV bNrr5QXZA1YSgHOe1gCBNNmcimWrS6LKXCkQ975FJdLlFQGubUJu2mTYRIQvGe4Yy3v7h2uySdOJ GnPiNhIpHLG5Iyfcr1FHSTc1cB/m83JUVIgM47ihnBtl5NjxvFenGMTwyB9mJmU5ZJYxX6Xa23w4 9wqQiPSKkmWCc4LSDRTnNw3Cy5VPb/xdyRThQkEuQx+M
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
