From f4482208cb9644f52f534853c52fa856eb3a9ba9 Mon Sep 17 00:00:00 2001
From: Agustin Zubiaga <aguz@sugarlabs.org>
Date: Tue, 26 Nov 2013 14:22:31 +0000
Subject: Using SimpleActivity toolbar methods

Signed-off-by: Agustin Zubiaga <aguz@sugarlabs.org>
---
(limited to 'historietaactivity.py')

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 = '<Alt>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'), '<Alt>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)
--
cgit v0.9.1