diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-07 20:08:14 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-07 20:08:14 (GMT) |
| commit | c4b112366ce91ddedbb3a7a1c6caa7543b0256c8 (patch) | |
| tree | 4aab7c369cd5ee6bfcc36c6f6f5c2231402afff9 | |
| parent | 09353c01545178166608e2ffbab8c31739d5f4d5 (diff) | |
Force themes to be olpc, so people can get
| -rw-r--r-- | sugar/__init__.py | 11 | ||||
| -rw-r--r-- | sugar/browser/AddressItem.py | 4 | ||||
| -rw-r--r-- | sugar/browser/NavigationToolbar.py | 9 | ||||
| -rw-r--r-- | sugar/p2p/Stream.py | 2 |
4 files changed, 21 insertions, 5 deletions
diff --git a/sugar/__init__.py b/sugar/__init__.py index e69de29..5ecc9df 100644 --- a/sugar/__init__.py +++ b/sugar/__init__.py @@ -0,0 +1,11 @@ +import pygtk +pygtk.require('2.0') +import gtk + +settings = gtk.settings_get_default() + +if settings.get_property('gtk-theme-name') != 'olpc': + settings.set_string_property('gtk-theme-name', 'olpc', '') + +if settings.get_property('gtk-icon-theme-name') != 'olpc': + settings.set_string_property('gtk-icon-theme-name', 'olpc', '') diff --git a/sugar/browser/AddressItem.py b/sugar/browser/AddressItem.py index 50556bf..eb6df4f 100644 --- a/sugar/browser/AddressItem.py +++ b/sugar/browser/AddressItem.py @@ -31,14 +31,14 @@ class AddressEntry(gtk.HBox): def _update_folded_state(self): if self.folded: image = gtk.Image() - image.set_from_file(sugar.env.get_data_file('unfold.png')) + image.set_from_icon_name('expand', gtk.ICON_SIZE_SMALL_TOOLBAR) self.button.set_image(image) image.show() self.entry.hide() else: image = gtk.Image() - image.set_from_file(sugar.env.get_data_file('fold.png')) + image.set_from_icon_name('unexpand', gtk.ICON_SIZE_SMALL_TOOLBAR) self.button.set_image(image) image.show() diff --git a/sugar/browser/NavigationToolbar.py b/sugar/browser/NavigationToolbar.py index e857849..2063c20 100644 --- a/sugar/browser/NavigationToolbar.py +++ b/sugar/browser/NavigationToolbar.py @@ -12,17 +12,20 @@ class NavigationToolbar(gtk.Toolbar): self.set_style(gtk.TOOLBAR_BOTH_HORIZ) - self.back = gtk.ToolButton(gtk.STOCK_GO_BACK) + self.back = gtk.ToolButton(None, 'Back') + self.back.set_icon_name('back') self.back.connect("clicked", self.__go_back_cb) self.insert(self.back, -1) self.back.show() - self.forward = gtk.ToolButton(gtk.STOCK_GO_FORWARD) + self.forward = gtk.ToolButton(None, 'Forward') + self.forward.set_icon_name('forward') self.forward.connect("clicked", self.__go_forward_cb) self.insert(self.forward, -1) self.forward.show() - self.reload = gtk.ToolButton(gtk.STOCK_REFRESH) + self.reload = gtk.ToolButton(None, 'Reload') + self.reload.set_icon_name('reload') self.reload.connect("clicked", self.__reload_cb) self.insert(self.reload, -1) self.reload.show() diff --git a/sugar/p2p/Stream.py b/sugar/p2p/Stream.py index 3d0914d..375c66e 100644 --- a/sugar/p2p/Stream.py +++ b/sugar/p2p/Stream.py @@ -83,6 +83,8 @@ class UnicastStream(Stream): except(socket.error): port = port + 1 tries = tries - 1 + if self._reader is None: + print 'Could not start xmlrpc server.' self._service.set_port(port) def _message(self, nick_name, message): |