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

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-10-23 18:23:14 +02:00
commit 606346b18c
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sugar/graphics/icon.py
View File

@ -130,6 +130,8 @@ class _IconBuffer(object):
icon_info.file_name = info.get_filename() icon_info.file_name = info.get_filename()
icon_info.attach_x = attach_x icon_info.attach_x = attach_x
icon_info.attach_y = attach_y icon_info.attach_y = attach_y
del info
else: else:
logging.warning('No icon with the name %s ' logging.warning('No icon with the name %s '
'was found in the theme.' % self.icon_name) 'was found in the theme.' % self.icon_name)

2
lib/sugar/graphics/iconentry.py
View File

@ -28,8 +28,8 @@ class IconEntry(_sugarext.IconEntry):
icon_info = icon_theme.lookup_icon(name, icon_info = icon_theme.lookup_icon(name,
gtk.ICON_SIZE_SMALL_TOOLBAR, gtk.ICON_SIZE_SMALL_TOOLBAR,
0) 0)
pixbuf = gtk.gdk.pixbuf_new_from_file(icon_info.get_filename()) pixbuf = gtk.gdk.pixbuf_new_from_file(icon_info.get_filename())
del icon_info
image = gtk.Image() image = gtk.Image()
image.set_from_pixbuf(pixbuf) image.set_from_pixbuf(pixbuf)

6
lib/sugar/graphics/toolbox.py
View File

@ -89,3 +89,9 @@ class Toolbox(gtk.VBox):
def set_current_toolbar(self, index): def set_current_toolbar(self, index):
self._notebook.set_current_page(index) self._notebook.set_current_page(index)
def get_current_toolbar(self):
return self._notebook.get_current_page()
current_toolbar = property(get_current_toolbar, set_current_toolbar)

2
services/shell/sugar-shell-service
View File

@ -25,6 +25,7 @@ import logging
import gobject import gobject
import dbus.glib import dbus.glib
from sugar import logger
from sugar import env from sugar import env
sys.path.append(env.get_service_path('shell')) sys.path.append(env.get_service_path('shell'))
@ -32,6 +33,7 @@ sys.path.append(env.get_service_path('shell'))
import clipboardservice import clipboardservice
import activityregistryservice import activityregistryservice
logger.start('shellservice')
logging.info('Starting shell service.') logging.info('Starting shell service.')
gobject.threads_init() gobject.threads_init()