From 2adc473dac81dd794f337d250cf3d49798808056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= Date: Thu, 6 Oct 2011 22:06:26 -0300 Subject: [PATCH] Pippy: fix for export buttons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is for bug #3157 . The buttons were placed in a palette, drop-down menu, in the Keep button. But as the Keep button is hidden since Sugar 0.94, Pippy wasn't able to export anymore. This patch adds the buttons in the activity toolbar, and the design is according to the latest design decisions, using Turtle Block's export buttons as reference. Signed-off-by: Manuel Quiñones --- icons/pippy-create_bundle.svg | 34 +++++++++++++++++ icons/pippy-export_doc.svg | 81 ++++++++++++++++++++++++++++++++++++++++ icons/pippy-export_example.svg | 49 ++++++++++++++++++++++++ pippy_app.py | 57 ++++++++++++++-------------- 4 files changed, 192 insertions(+), 29 deletions(-) create mode 100644 icons/pippy-create_bundle.svg create mode 100644 icons/pippy-export_doc.svg create mode 100644 icons/pippy-export_example.svg diff --git a/icons/pippy-create_bundle.svg b/icons/pippy-create_bundle.svg new file mode 100644 index 0000000..b5d0a26 --- /dev/null +++ b/icons/pippy-create_bundle.svg @@ -0,0 +1,34 @@ + + + +]> + \ No newline at end of file diff --git a/icons/pippy-export_doc.svg b/icons/pippy-export_doc.svg new file mode 100644 index 0000000..b8e8c86 --- /dev/null +++ b/icons/pippy-export_doc.svg @@ -0,0 +1,81 @@ + + + +]> + + + + + + + + + \ No newline at end of file diff --git a/icons/pippy-export_example.svg b/icons/pippy-export_example.svg new file mode 100644 index 0000000..014460b --- /dev/null +++ b/icons/pippy-export_example.svg @@ -0,0 +1,49 @@ + + + +]> + \ No newline at end of file diff --git a/pippy_app.py b/pippy_app.py index 5ee8ff8..6729813 100644 --- a/pippy_app.py +++ b/pippy_app.py @@ -72,38 +72,37 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity): def initialize_display(self): self._logger = logging.getLogger('pippy-activity') - # Top toolbar with share and close buttons: + # Activity toolbar with title input, share button and export buttons: if OLD_TOOLBAR: activity_toolbar = self.toolbox.get_activity_toolbar() else: activity_toolbar = self.activity_button.page - # add 'make bundle' entry to 'keep' palette. - palette = activity_toolbar.keep.get_palette() - # XXX: should clear out old palette entries? - from sugar.graphics.menuitem import MenuItem - from sugar.graphics.icon import Icon - menu_item = MenuItem(_('As Pippy Document')) - menu_item.set_image(Icon(file=('%s/activity/activity-icon.svg' % - get_bundle_path()), - icon_size=gtk.ICON_SIZE_MENU)) - menu_item.connect('activate', self.keepbutton_cb) - palette.menu.append(menu_item) - menu_item.show() - menu_item = MenuItem(_('As Activity Bundle')) - menu_item.set_image(Icon(file=('%s/activity/activity-default.svg' % - get_bundle_path()), - icon_size=gtk.ICON_SIZE_MENU)) - menu_item.connect('activate', self.makebutton_cb) - palette.menu.append(menu_item) - menu_item.show() - - menu_item = MenuItem(_('As Pippy Example')) # pippy example option - menu_item.set_image(Icon(file=('%s/activity/activity-icon.svg' % get_bundle_path()), icon_size=gtk.ICON_SIZE_MENU)) - menu_item.connect('activate', self.saveexamplebutton_cb) - palette.menu.append(menu_item) - menu_item.show() + # Hide keep button for Sugar versions prior to 0.94: + activity_toolbar.keep.hide() + + separator = gtk.SeparatorToolItem() + separator.show() + activity_toolbar.insert(separator, -1) + + export_doc_button = ToolButton('pippy-export_doc') + export_doc_button.set_tooltip(_("Export as Pippy Document")) + export_doc_button.connect('clicked', self._export_document_cb) + export_doc_button.show() + activity_toolbar.insert(export_doc_button, -1) + + export_example_button = ToolButton('pippy-export_example') + export_example_button.set_tooltip(_("Export as Pippy Example")) + export_example_button.connect('clicked', self._export_example_cb) + export_example_button.show() + activity_toolbar.insert(export_example_button, -1) + + create_bundle_button = ToolButton('pippy-create_bundle') + create_bundle_button.set_tooltip(_("Create Activity Bundle")) + create_bundle_button.connect('clicked', self._create_bundle_cb) + create_bundle_button.show() + activity_toolbar.insert(create_bundle_button, -1) self._edit_toolbar = activity.EditToolbar() @@ -417,10 +416,10 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity): except: pass # process must already be dead. - def keepbutton_cb(self, __): + def _export_document_cb(self, __): self.copy() - def makebutton_cb(self, __): + def _create_bundle_cb(self, __): from shutil import copytree, copy2, rmtree from tempfile import mkdtemp # get the name of this pippy program. @@ -467,7 +466,7 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity): rmtree(app_temp, ignore_errors=True) # clean up! raise - def saveexamplebutton_cb(self, __): + def _export_example_cb(self, __): # get the name of this pippy program. title = self.metadata['title'] if title == _('Pippy Activity'): -- 1.7.4.4