From f4482208cb9644f52f534853c52fa856eb3a9ba9 Mon Sep 17 00:00:00 2001 From: Agustin Zubiaga Date: Tue, 26 Nov 2013 14:22:31 +0000 Subject: Using SimpleActivity toolbar methods Signed-off-by: Agustin Zubiaga --- diff --git a/historietaactivity.py b/historietaactivity.py index b367981..67a6717 100644 --- a/historietaactivity.py +++ b/historietaactivity.py @@ -9,9 +9,10 @@ import cairo import globos import persistencia -from sugar3.activity import activity +from simpleactivity.sharedactivity import SharedActivity from gettext import gettext as _ +from sugar3.activity import activity from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton from sugar3.activity.widgets import StopButton from sugar3.activity.widgets import ActivityToolbarButton @@ -32,91 +33,55 @@ import dbus import logging -class HistorietaActivity(activity.Activity): +class HistorietaActivity(SharedActivity): _EXPORT_FORMATS = [['image/png', _('Save as Image'), _('PNG'), ""]] def __init__(self, handle): print "INICIALIZANDO FOTOTOON" - activity.Activity.__init__(self, handle) + SharedActivity.__init__(self, handle) self.set_title('FotoToon') self._max_participants = 1 - toolbar_box = ToolbarBox() - activity_button = ActivityToolbarButton(self) - activity_toolbar = activity_button.page - toolbar_box.toolbar.insert(activity_button, 0) - - view_subtoolbar = ToolbarButton() - view_toolbar = Gtk.Toolbar() - view_subtoolbar.props.page = view_toolbar - view_subtoolbar.props.icon_name = 'toolbar-view' - view_subtoolbar.label = _('View') - toolbar_box.toolbar.insert(view_subtoolbar, -1) + view_toolbar = self.add_toolbar('toolbar-view')[1] # 1 Toolbar page slideview_btn = ToggleToolButton('slideshow') slideview_btn.set_tooltip(_('Slideshow')) slideview_btn.set_active(False) - view_toolbar.insert(slideview_btn, -1) - slideview_btn.show() + self.add_to_toolbar(slideview_btn, + toolbar=view_toolbar) - fullscreen_btn = ToolButton('view-fullscreen') - fullscreen_btn.set_tooltip(_('Fullscreen')) - fullscreen_btn.props.accelerator = 'Return' - fullscreen_btn.connect('clicked', lambda w: self.fullscreen()) - view_toolbar.insert(fullscreen_btn, -1) - fullscreen_btn.show() + self.add_toolbutton('view-fullscreen', lambda w: self.fullscreen(), + _('Fullscreen'), 'Return', + toolbar=view_toolbar) #self._add_toolbar_buttons(toolbar_box) - self.set_toolbar_box(toolbar_box) - - toolbar = toolbar_box.toolbar self.page = Page() - self.globes_manager = GlobesManager(toolbar, self.page, self) + self.globes_manager = GlobesManager(self.page, self) + self.toolbarbox.toolbar.show_all() # fonts - text_button = ToolbarButton() - text_button.props.page = TextToolbar(self.page) - text_button.props.icon_name = 'format-text-size' - text_button.props.label = _('Text') - slideview_btn.connect('clicked', self._switch_view_mode, text_button) - toolbar_box.toolbar.insert(text_button, -1) - separator = Gtk.SeparatorToolItem() - separator.props.draw = False - separator.set_expand(True) - - toolbar_box.toolbar.insert(separator, -1) + text_button = self.add_toolbar('format-text-size', + page=TextToolbar(self.page))[0] # 0 ToolbarButton + slideview_btn.connect('clicked', self._switch_view_mode, text_button) - stop = StopButton(self) - toolbar_box.toolbar.insert(stop, -1) + # add export button + self.add_separator(toolbar=self.activity_toolbar) - toolbar_box.show_all() + self.bt_save_as_image = self.add_toolbutton('save-as-image', + self.write_image, + _('Save as Image'), + toolbar=self.activity_toolbar) - # add export button + self.add_toolbutton('save-as-pdf', self._save_as_pdf, + _('Save as a Book (PDF)'), + toolbar=self.activity_toolbar) - separator_2 = Gtk.SeparatorToolItem() - separator_2.show() - activity_toolbar.insert(separator_2, -1) - - self.bt_save_as_image = ToolButton() - self.bt_save_as_image.props.icon_name = 'save-as-image' - self.bt_save_as_image.connect('clicked', self.write_image) - self.bt_save_as_image.set_tooltip(_('Save as Image')) - activity_toolbar.insert(self.bt_save_as_image, -1) - self.bt_save_as_image.show() - - save_as_pdf = ToolButton() - save_as_pdf.props.icon_name = 'save-as-pdf' - save_as_pdf.connect('clicked', self._save_as_pdf) - save_as_pdf.set_tooltip(_('Save as a Book (PDF)')) - activity_toolbar.insert(save_as_pdf, -1) - save_as_pdf.show() - - activity_button.page.title.connect("focus-in-event", self.on_title) + self.activity_toolbar.title.connect("focus-in-event", self.on_title) scrolled = Gtk.ScrolledWindow() #scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.ALWAYS) diff --git a/simpleactivity b/simpleactivity -Subproject 309dcb1dc3d00ca41204531dba28d78e2df466f +Subproject 43201247b6e87d1d20ff39ba5fea38b6508e33c diff --git a/toolbar.py b/toolbar.py index 25de1a2..3746a88 100644 --- a/toolbar.py +++ b/toolbar.py @@ -68,25 +68,23 @@ logger = logging.getLogger('fototoon-activity') class GlobesManager(): - def __init__(self, toolbar, page, activity): + def __init__(self, page, activity): self._page = page self._activity = activity # agregar cuadro - self.add_photo = ToolButton() - self.add_photo.props.icon_name = 'insert-picture' - self.add_photo.connect('clicked', self.__add_photo_clicked_cb) - self.add_photo.set_tooltip(_('Add Photo')) - toolbar.insert(self.add_photo, -1) + self.add_photo = activity.add_toolbutton('insert-picture', + self.__add_photo_clicked_cb, + _('Add Photo')) self._globes = { 'globe': _('Globe'), 'think': _('Think'), 'whisper': _('Whisper'), 'exclamation': _('Exclamation'), 'box': _('Box')} - self._globes_menu = ToolButton(icon_name='globe') - self._globes_menu.props.tooltip = _('Add a globe') + self._globes_menu = activity.add_toolbutton('globe', + tooltip=_('Add Globe')) self._globes_menu.props.hide_tooltip_on_click = False self._globes_menu.palette_invoker.props.toggle_palette = True @@ -100,7 +98,6 @@ class GlobesManager(): menu_item.connect('activate', self.__activate_add_globe_cb, globe) menu_box.append_item(menu_item) menu_item.show() - toolbar.insert(self._globes_menu, -1) # lineas de movimiento # Agregar aqui el nombre de archivo de una linea de moviemiento @@ -108,8 +105,8 @@ class GlobesManager(): 'curves': _('Curves'), 'straight': _('Straight'), 'highlight': _('Highlight'), 'idea': _('Idea')} - self._lines_menu = ToolButton(icon_name='curves') - self._lines_menu.props.tooltip = _('Choose a movement line') + self._lines_menu = activity.add_toolbutton('curves', + tooltip=_('Choose a movement line')) self._lines_menu.props.hide_tooltip_on_click = False self._lines_menu.palette_invoker.props.toggle_palette = True @@ -123,23 +120,16 @@ class GlobesManager(): menu_item.connect('activate', self.__activate_add_line_cb, line) menu_box.append_item(menu_item) menu_item.show() - toolbar.insert(self._lines_menu, -1) - separator = Gtk.SeparatorToolItem() - separator.set_draw(True) - toolbar.insert(separator, -1) + activity.add_separator() # girar - self.b_girar = ToolButton('object-rotate-right') - self.b_girar.connect('clicked', self.girar) - self.b_girar.set_tooltip(_('Turn')) - toolbar.insert(self.b_girar, -1) + self.b_girar = activity.add_toolbutton('object-rotate-right', + self.girar, _('Turn')) # borrar - self.b_borrar = ToolButton('gtk-delete') - self.b_borrar.connect('clicked', self.borrar) - self.b_borrar.set_tooltip(_('Delete')) - toolbar.insert(self.b_borrar, -1) + self.b_borrar = activity.add_toolbutton('gtk-delete', self.borrar, + _('Delete')) def set_buttons_sensitive(self, sensitive): self._globes_menu.set_sensitive(sensitive) -- cgit v0.9.1