Improve the layout of the activity toolbar
This commit is contained in:
parent
c84e21aa9e
commit
820e739a0f
@ -1,6 +1,6 @@
|
|||||||
VERSION=0.63
|
VERSION=0.63
|
||||||
DATE=`date +%Y%m%d`
|
DATE=`date +%Y%m%d`
|
||||||
RELEASE=2.79
|
RELEASE=2.80
|
||||||
TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2
|
TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2
|
||||||
|
|
||||||
rm sugar-$VERSION.tar.bz2
|
rm sugar-$VERSION.tar.bz2
|
||||||
|
@ -47,22 +47,35 @@ class ActivityToolbar(gtk.Toolbar):
|
|||||||
activity.connect('shared', self._activity_shared_cb)
|
activity.connect('shared', self._activity_shared_cb)
|
||||||
activity.connect('joined', self._activity_shared_cb)
|
activity.connect('joined', self._activity_shared_cb)
|
||||||
|
|
||||||
self.close = ToolButton('window-close')
|
if activity.jobject:
|
||||||
self.insert(self.close, -1)
|
self.title = gtk.Entry()
|
||||||
self.close.show()
|
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.share = ToolButton('stock-share-mesh')
|
||||||
self.insert(self.share, -1)
|
self.insert(self.share, -1)
|
||||||
if activity.get_shared():
|
if activity.get_shared():
|
||||||
self.share.set_sensitive(False)
|
self.share.set_sensitive(False)
|
||||||
self.share.show()
|
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):
|
def _jobject_updated_cb(self, jobject):
|
||||||
self.title.set_text(jobject['title'])
|
self.title.set_text(jobject['title'])
|
||||||
|
Loading…
Reference in New Issue
Block a user