Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-17 15:10:13 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-10-17 15:10:13 (GMT)
commitce67563b09e3213b090c29a1d6a814eeaefb6442 (patch)
tree672ff1b2972847c00d6ea1ed54c264d440e33cd5 /lib
parent3227653cd311be9d4a09c5076fe3ec331d4d6a96 (diff)
parent8a7ed2da6da291675b4174ebd030ec0e3a263887 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'lib')
-rw-r--r--lib/sugar/graphics/alert.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/sugar/graphics/alert.py b/lib/sugar/graphics/alert.py
index ef93a5a..dd1bcec 100644
--- a/lib/sugar/graphics/alert.py
+++ b/lib/sugar/graphics/alert.py
@@ -64,29 +64,27 @@ class Alert(gtk.EventBox, gobject.GObject):
self.set_visible_window(True)
self._hbox = gtk.HBox()
+ self._hbox.set_border_width(style.DEFAULT_SPACING)
+ self._hbox.set_spacing(style.DEFAULT_SPACING)
self.add(self._hbox)
self._title = None
self._msg = None
self._icon = None
- self._timeout = 0
self._buttons = {}
-
+
self._msg_box = gtk.VBox()
self._title_label = gtk.Label()
- size = style.zoom(style.GRID_CELL_SIZE * 0.5)
self._title_label.set_alignment(0, 0.5)
- self._title_label.set_padding(style.DEFAULT_SPACING, 0)
self._msg_box.pack_start(self._title_label, False)
self._title_label.show()
self._msg_label = gtk.Label()
self._msg_label.set_alignment(0, 0.5)
- self._msg_label.set_padding(style.DEFAULT_SPACING, 0)
self._msg_box.pack_start(self._msg_label, False)
+ self._hbox.pack_start(self._msg_box, False)
self._msg_label.show()
- self._hbox.pack_start(self._msg_box)
-
+
self._buttons_box = gtk.HButtonBox()
self._buttons_box.set_layout(gtk.BUTTONBOX_END)
self._buttons_box.set_spacing(style.DEFAULT_SPACING)
@@ -94,7 +92,6 @@ class Alert(gtk.EventBox, gobject.GObject):
self._buttons_box.show()
self._msg_box.show()
-
self._hbox.show()
self.show()
@@ -110,7 +107,7 @@ class Alert(gtk.EventBox, gobject.GObject):
elif pspec.name == 'icon':
if self._icon != value:
self._icon = value
- self._hbox.pack_start(self._icon)
+ self._hbox.pack_start(self._icon, False)
self._hbox.reorder_child(self._icon, 0)
def do_get_property(self, pspec):