diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-14 17:27:35 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-14 17:27:35 (GMT) |
commit | 820e739a0f1b51aed605a935fb19ca169309db99 (patch) | |
tree | 1cb11afe718a093639cca9958f0069c4b74523f0 | |
parent | c84e21aa9ef2a5223cd4fbf1fb5792d3b031b054 (diff) |
Improve the layout of the activity toolbar
-rwxr-xr-x | build-snapshot.sh | 2 | ||||
-rw-r--r-- | sugar/activity/activity.py | 31 |
2 files changed, 23 insertions, 10 deletions
diff --git a/build-snapshot.sh b/build-snapshot.sh index e41b947..b31280c 100755 --- a/build-snapshot.sh +++ b/build-snapshot.sh @@ -1,6 +1,6 @@ VERSION=0.63 DATE=`date +%Y%m%d` -RELEASE=2.79 +RELEASE=2.80 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2 rm sugar-$VERSION.tar.bz2 diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index 7ff73f2..2156594 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -47,22 +47,35 @@ class ActivityToolbar(gtk.Toolbar): activity.connect('shared', self._activity_shared_cb) activity.connect('joined', self._activity_shared_cb) - self.close = ToolButton('window-close') - self.insert(self.close, -1) - self.close.show() + if activity.jobject: + self.title = gtk.Entry() + self.title.set_size_request(int(gtk.gdk.screen_width() / 6), -1) + self.title.set_text(activity.jobject['title']) + self.title.connect('focus-out-event', self._title_focus_out_event_cb) + self._add_widget(self.title) + + activity.jobject.connect('updated', self._jobject_updated_cb) + + separator = gtk.SeparatorToolItem() + separator.props.draw = False + separator.set_expand(True); + self.insert(separator, -1) + separator.show() self.share = ToolButton('stock-share-mesh') self.insert(self.share, -1) if activity.get_shared(): self.share.set_sensitive(False) self.share.show() - if activity.jobject: - self.title = gtk.Entry() - self.title.set_text(activity.jobject['title']) - self.title.connect('focus-out-event', self._title_focus_out_event_cb) - self._add_widget(self.title, expand=True) - activity.jobject.connect('updated', self._jobject_updated_cb) + separator = gtk.SeparatorToolItem() + separator.props.draw = False + self.insert(separator, -1) + separator.show() + + self.close = ToolButton('window-close') + self.insert(self.close, -1) + self.close.show() def _jobject_updated_cb(self, jobject): self.title.set_text(jobject['title']) |