conduit r1623 - in trunk: . conduit/gtkui
- From: jstowers svn gnome org
- To: svn-commits-list gnome org
- Subject: conduit r1623 - in trunk: . conduit/gtkui
- Date: Sat, 2 Aug 2008 07:32:18 +0000 (UTC)
Author: jstowers
Date: Sat Aug 2 07:32:18 2008
New Revision: 1623
URL: http://svn.gnome.org/viewvc/conduit?rev=1623&view=rev
Log:
* conduit/gtkui/MsgArea.py: Dont expand the button action area. Timeouts
can only clear the msg they were connected to.
Modified:
trunk/ (props changed)
trunk/ChangeLog
trunk/conduit/gtkui/MsgArea.py
Modified: trunk/conduit/gtkui/MsgArea.py
==============================================================================
--- trunk/conduit/gtkui/MsgArea.py (original)
+++ trunk/conduit/gtkui/MsgArea.py Sat Aug 2 07:32:18 2008
@@ -44,7 +44,13 @@
self.__action_area = gtk.HBox(True, 4); # FIXME: use style properties
self.__action_area.show()
- self.__main_hbox.pack_end (self.__action_area, False, True, 0)
+
+ #Pack the buttons into a VBox so they remain the same height and do
+ #not expand to be the same size as the Primary + Secondary text
+ vb = gtk.VBox()
+ vb.pack_end(self.__action_area, False, False)
+
+ self.__main_hbox.pack_end (vb, False, False, 0)
self.pack_start(self.__main_hbox, True, True, 0)
@@ -221,8 +227,9 @@
self.__msgarea = None
- def _timeout(self):
- self.clear()
+ def _timeout(self, msgarea):
+ if msgarea == self.__msgarea:
+ self.clear()
def clear(self):
if self.__msgarea is not None:
@@ -237,6 +244,6 @@
self.pack_start(msgarea, expand=True)
if timeout:
- gobject.timeout_add(timeout*1000, self._timeout)
+ gobject.timeout_add(timeout*1000, self._timeout, msgarea)
return msgarea
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]