diff options
Diffstat (limited to 'toolbars.py')
| -rw-r--r-- | toolbars.py | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/toolbars.py b/toolbars.py index 046ae41..3e2343b 100644 --- a/toolbars.py +++ b/toolbars.py @@ -169,10 +169,15 @@ class ImageToolbar(gtk.Toolbar): self._invert_colors.set_tooltip(_('Invert Colors')) separator = gtk.SeparatorToolItem() - separator.set_draw(True) + separator.set_draw(False) separator.set_expand(True) self.insert(separator, -1) + separator = gtk.SeparatorToolItem() + separator.set_draw(True) + separator.set_expand(False) + self.insert(separator, -1) + self._object_insert = ToolButton('insert-picture') self.insert(self._object_insert, -1) self._object_insert.set_tooltip(_('Insert Image')) @@ -308,7 +313,10 @@ class ImageToolbar(gtk.Toolbar): class PresentToolbarBox(ToolbarBox): - __gsignals__ = {'new-slide': (gobject.SIGNAL_RUN_LAST, + __gsignals__ = {'insert-picture': (gobject.SIGNAL_RUN_LAST, + gobject.TYPE_NONE, + tuple()), + 'new-slide': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, tuple())} @@ -327,11 +335,16 @@ class PresentToolbarBox(ToolbarBox): separator.set_draw(False) separator.show() self.toolbar.insert(separator, -1) + self.insert_image_button = ToolButton('insert-picture') + self.insert_image_button.props.tooltip = "Insert image" + self.insert_image_button.connect('clicked', + lambda w: self.emit('insert-picture')) + self.insert_image_button.show() + self.toolbar.insert(self.insert_image_button, -1) self.image_toolbar = ImageToolbar() - image_button = ToolbarButton(icon_name='image-mode', + self.image_button = ToolbarButton(icon_name='image-mode', page=self.image_toolbar) - image_button.show() - self.toolbar.insert(image_button, -1) + self.toolbar.insert(self.image_button, -1) #self.image_options = ImageOptions() #self.toolbar.insert(self.image_options, -1) @@ -344,6 +357,7 @@ class PresentToolbarBox(ToolbarBox): stopbutton.show() def load_image_toolbar(self, widget): - self.image_options.show() - self.image_options.set_expanded(True) - return self.image_options + self.insert_image_button.hide() + self.image_button.show() + self.image_button.set_expanded(True) + return self.image_toolbar |