sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.sugarlabs.org/sugar-toolkit/mainline

Browse Source
This commit is contained in:
Benjamin Berg 2009-01-12 15:38:49 +01:00
commit a496b1dbf3
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sugar/graphics/menuitem.py
View File

@ -29,7 +29,7 @@ from sugar.graphics.icon import Icon
class MenuItem(gtk.ImageMenuItem): class MenuItem(gtk.ImageMenuItem):
def __init__(self, text_label=None, icon_name=None, text_maxlen=0, def __init__(self, text_label=None, icon_name=None, text_maxlen=0,
xo_color=None): xo_color=None, file_name=None):
gobject.GObject.__init__(self) gobject.GObject.__init__(self)
self._accelerator = None self._accelerator = None
@ -42,8 +42,16 @@ class MenuItem(gtk.ImageMenuItem):
self.add(label) self.add(label)
label.show() label.show()
if icon_name: if icon_name is not None:
icon = Icon(icon_name=icon_name, icon_size=gtk.ICON_SIZE_MENU) icon = Icon(icon_name=icon_name,
icon_size=gtk.ICON_SIZE_SMALL_TOOLBAR)
if xo_color is not None:
icon.props.xo_color = xo_color
self.set_image(icon)
icon.show()
elif file_name is not None:
icon = Icon(file=file_name, icon_size=gtk.ICON_SIZE_SMALL_TOOLBAR)
if xo_color is not None: if xo_color is not None:
icon.props.xo_color = xo_color icon.props.xo_color = xo_color
self.set_image(icon) self.set_image(icon)

12
src/sugar/graphics/objectchooser.py
View File

@ -32,7 +32,8 @@ J_DBUS_INTERFACE = 'org.laptop.Journal'
J_DBUS_PATH = '/org/laptop/Journal' J_DBUS_PATH = '/org/laptop/Journal'
class ObjectChooser(object): class ObjectChooser(object):
def __init__(self, title=None, parent=None, flags=None, buttons=None): def __init__(self, title=None, parent=None, flags=None, buttons=None,
what_filter=None):
# For backwards compatibility: # For backwards compatibility:
# - We ignore title, flags and buttons. # - We ignore title, flags and buttons.
# - 'parent' can be a xid or a gtk.Window # - 'parent' can be a xid or a gtk.Window
@ -54,6 +55,7 @@ class ObjectChooser(object):
self._bus = None self._bus = None
self._chooser_id = None self._chooser_id = None
self._response_code = gtk.RESPONSE_NONE self._response_code = gtk.RESPONSE_NONE
self._what_filter = what_filter
def run(self): def run(self):
self._object_id = None self._object_id = None
@ -73,7 +75,13 @@ class ObjectChooser(object):
self.__chooser_response_cb) self.__chooser_response_cb)
journal.connect_to_signal('ObjectChooserCancelled', journal.connect_to_signal('ObjectChooserCancelled',
self.__chooser_cancelled_cb) self.__chooser_cancelled_cb)
self._chooser_id = journal.ChooseObject(self._parent_xid)
if self._what_filter is None:
what_filter = ''
else:
what_filter = self._what_filter
self._chooser_id = journal.ChooseObject(self._parent_xid, what_filter)
gtk.gdk.threads_leave() gtk.gdk.threads_leave()
try: try: