Trivial fix and some cosmetic changes to get a better layout for
the NotificationsPage.
Vincent
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: http://bazaar.launchpad.net/%7Ebzr-gtk/bzr-gtk/trunk
# testament_sha1: 134abca2d2c38619c9cf786d070d723511db103e
# timestamp: 2008-10-29 09:42:15 +0100
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'notify.py'
--- notify.py 2008-10-28 16:02:01 +0000
+++ notify.py 2008-10-29 08:36:29 +0000
@@ -17,14 +17,17 @@
"""Notification area icon and notification for Bazaar."""
import gtk
-import bzrlib.plugins.dbus
+import bzrlib
+
def has_dbus():
return (getattr(bzrlib.plugins, "dbus", None) is not None)
+
def has_avahi():
return (getattr(bzrlib.plugins, "avahi", None) is not None)
+
class NotifyPopupMenu(gtk.Menu):
def __init__(self):
super(NotifyPopupMenu, self).__init__()
=== modified file 'preferences/notifications.py'
--- preferences/notifications.py 2008-10-28 16:02:01 +0000
+++ preferences/notifications.py 2008-10-29 08:36:29 +0000
@@ -25,14 +25,15 @@
from bzrlib.plugins.gtk.notify import has_avahi, has_dbus
class NotificationsPage(gtk.VBox):
- def __init__(self, config):
+ def __init__(self, config, homogeneous=False, spacing=6):
self.config = config
- gtk.VBox.__init__(self)
+ gtk.VBox.__init__(self, homogeneous=homogeneous, spacing=spacing)
+ self.set_spacing(spacing) # The vertical one
self.gateway_to_lan = gtk.CheckButton("_Gateway to LAN")
- self.pack_start(self.gateway_to_lan)
+ self.pack_start(self.gateway_to_lan, expand=False)
self.gateway_to_lan.set_sensitive(has_dbus())
self.announce_on_lan = gtk.CheckButton("_Announce on LAN")
- self.pack_start(self.announce_on_lan)
+ self.pack_start(self.announce_on_lan, expand=False)
self.announce_on_lan.set_sensitive(has_avahi())
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaA2ab0AAm/fgEQQWf///1MF
TQC////wUAVb1mOQDndt3TR3YVQlI0mkaNQ2RqeFPJMmnpMhoepoDRkaBJJI9BkU8p6TQ0eo0yPU
GmhkDQAAlNEQIhp5I0HqANAAaNGgADmAAmTAAmEwTCGAIwAJJCYgBGpgaAVPU3qjTTT1PUeSeo00
PUhjptMRddsbxY1/ZaS0d+BLbWBFGnXYRW02TQnvlVKaA4D+FzVunGnlRCb/pai1hE0W3eteteRk
MMwzDWZwOI+J0rEpwnIWNFC1Ye5GN3VTp3yWXX57cU/zkbTJoXBpUVT4JuPs8f7wb+EKmuuBYXPU
lYYYhoSsInT58HNW4exlS3xlTc/gA2uZUE6jdHoWlrdxORSjM1je0JmaDdWRdRv6aWbjsIMSRiB2
iBuRepZPHGujX1vovQO/1B1Q4hemTO2r9caGcGUaTCQHNkcmGbBtsBBYMjQPQyScS5GkmciQ4AeB
qROYeXvKZwImoYRVM6fApUsJSksk0pDPIPkgx4JjdTESWgsGRgHaGoLovwEk6cZkfplJozrG1og0
o0ESEWMO3g+mP9vClKm4D4/KAELEazMCZAZUDqB10NY1UzIko6gIrZhSRNpvWmTXDyhai6A8pDxD
wWCxKjabKr2qNBpxIgQ2QsPtSV5yLg1GgmQKSZcawNyLkWgZFSu/B1aKioyLyZECe3a1JE5H+EXm
41g/waprnNO03lj3movMC0gYTLSI8mPD9CBIstMSka2sAgAwFJGDUD4g60tKDIhhGwrAeyRCW7dI
vKCRpKz3Myo8C80EiB3Nx5ZjbZXMXTYGVYPwWlFFwfku7JdWOGeFFA+VRekkcoitHOPfobWlFLlM
PGBgsYfCISF6/j8bYsnpY5zYe8xkpamkScmQxnh1VmotQZh7MqEAl4oI7evXOBPD97EDDwxD0Nhq
u3pAhMk0RejKPJyWEgs0Ud+uq81EqO1GgxXI4HdI0yGvBUSGQ7igc6yY2wfybMKLMg1KhEN5znLC
5SSCskGAisRhRtxnzHhRCpGN1Wl+qzKaTMdLMiA4tfcXDU6CQkWjgiSLeisJdzxa0gjDqY2HUdDe
YoKyS6PmMOmxJeKGwEFQ7Yq3CsVpRba9FpCfIEOJmIyp7VCHoKdRuHIoyNaXMcaywleoFoGj6HQi
UQc5l0QfZB8nzD5nwmOBk/Sh49T7AdlKQ3FH1PrllKhKOOJ3rIQmQQhlpaToLj2iOSxGIED3yCCi
WUFNZ67EPsxkmYnaXemc67KUDI6oOdhjF/nIh390cTy2hTsmBkrmOwGSOVTIIh0QQHi7JZ+75cKE
f8geupl38fQDEsUgHRR/XG3FvPOsKdioPYg6JCYNlrbpuTiGHJkmUMFaaW1pJJKrdnSxUhzJMtKO
XbLa18Xa1McbJXNVB8iJ0XojlpQ5wc0OXBQU8dAe7A9tK9vuAceHJBxRpuPYdu58wmrwocY8uECc
xqheoDFKPQbm2tBiBuejyZEEHG8iSSdZ8bi5k+lEpw5QWcKQ9YFZNOYZaZM9nO3oZ4zxnu2Hmjcv
zDzUt+xleq6eyB5iBYFz9cbSJNQ546ArLKd+8/nLmRWXF5jKDaIZgrpTp32BNspW1MPQQPGSLOxZ
y8HIvCtlWwfMe879rsMBGeRqMMjMWbDZ7XnQDFafBBpKh04FcJCVDJV7LvgLEIZgPEUP2/sUDuli
pRU1gH/i7kinChIUBs03oA==
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
