Move buttons to Edit subtoolbar

Is needed because we have too many buttons in the main toolbar now,
and they do not fill with the screen rotated

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>

2 files changed, 21 insertions, 12 deletions

diff --git a/historietaactivity.py b/historietaactivity.py
index f71c304..bca40da 100644
--- a/historietaactivity.py
+++ b/historietaactivity.py
@@ -47,12 +47,19 @@ class HistorietaActivity(activity.Activity):
         activity_toolbar = activity_button.page
         toolbar_box.toolbar.insert(activity_button, 0)
 
-        view_subtoolbar = ToolbarButton()
+        edit_toolbar_btn = ToolbarButton()
+        edit_toolbar = Gtk.Toolbar()
+        edit_toolbar_btn.props.page = edit_toolbar
+        edit_toolbar_btn.props.icon_name = 'toolbar-edit'
+        edit_toolbar_btn.label = _('Edit')
+        toolbar_box.toolbar.insert(edit_toolbar_btn, -1)
+
+        view_toolbar_btn = 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_btn.props.page = view_toolbar
+        view_toolbar_btn.props.icon_name = 'toolbar-view'
+        view_toolbar_btn.label = _('View')
+        toolbar_box.toolbar.insert(view_toolbar_btn, -1)
 
         slideview_btn = ToggleToolButton('slideshow')
         slideview_btn.set_tooltip(_('Slideshow'))
@@ -73,7 +80,7 @@ class HistorietaActivity(activity.Activity):
 
         self.page = Page()
 
-        self.globes_manager = GlobesManager(toolbar, self.page, self)
+        self.globes_manager = GlobesManager(toolbar, edit_toolbar, self)
 
         # fonts
         text_button = ToolbarButton()
@@ -87,13 +94,13 @@ class HistorietaActivity(activity.Activity):
         reorder_img_btn.set_icon_name('thumbs-view')
         reorder_img_btn.set_tooltip(_('Change image order'))
         reorder_img_btn.connect('clicked', self.__image_order_cb)
-        toolbar_box.toolbar.insert(reorder_img_btn, -1)
+        edit_toolbar.insert(reorder_img_btn, -1)
         reorder_img_btn.show()
 
         bgchange = ToolButton(icon_name='contract-coordinates')
         bgchange.set_tooltip(_('Edit background image'))
         bgchange.connect('clicked', self.__bgchange_clicked_cb)
-        toolbar_box.toolbar.insert(bgchange, -1)
+        edit_toolbar.insert(bgchange, -1)
         bgchange.show()
 
         separator = Gtk.SeparatorToolItem()
diff --git a/toolbar.py b/toolbar.py
index 06c6291..f741504 100644
--- a/toolbar.py
+++ b/toolbar.py
@@ -67,9 +67,9 @@ logger = logging.getLogger('fototoon-activity')
 
 class GlobesManager():
 
-    def __init__(self, toolbar, page, activity):
+    def __init__(self, toolbar, edit_toolbar, activity):
 
-        self._page = page
+        self._page = activity.page
         self._activity = activity
 
         # agregar cuadro
@@ -132,13 +132,15 @@ class GlobesManager():
         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.show()
+        edit_toolbar.insert(self.b_girar, -1)
 
         # 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.show()
+        edit_toolbar.insert(self.b_borrar, -1)
 
     def set_buttons_sensitive(self, sensitive):
         self._globes_menu.set_sensitive(sensitive)