Mover la toolbar a Widgets.py

2 files changed, 83 insertions, 84 deletions

diff --git a/Widgets.py b/Widgets.py
index ef27cc2..c3b688e 100644
--- a/Widgets.py
+++ b/Widgets.py
@@ -24,24 +24,67 @@ from gettext import gettext as _
 
 from gi.repository import Gtk
 
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.activity.widgets import StopButton
+from sugar3.activity.widgets import ActivityToolbarButton
+
+class Toolbar(ToolbarBox):
+
+    def __init__(self):
+
+        ToolbarBox.__init__(self)
+
+        toolbar_box = ToolbarBox()
+        activity_button = ActivityToolbarButton(self)
+        self.toolbar.insert(activity_button, 0)
+        activity_button.show()
+
+        separator = Gtk.SeparatorToolItem()
+        self.toolbar.insert(separator, -1)
+
+        self.choose_button = ToolButton('view-list')
+        self.choose_button.set_tooltip(_('Choose a Poll'))
+        self.toolbar.insert(self.choose_button, -1)
+
+        self.create_button = ToolButton('view-source')
+        self.create_button.set_tooltip(_('Build a Poll'))
+        self.toolbar.insert(self.create_button, -1)
+
+        self.settings_button = ToolButton('preferences-system')
+        self.settings_button.set_tooltip(_('Settings'))
+        self.toolbar.insert(self.settings_button, -1)
+
+        self.help_button = ToolButton('toolbar-help')
+        self.help_button.set_tooltip(_('Lesson Plans'))
+        self.toolbar.insert(self.help_button, -1)
+
+        separator = Gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        self.toolbar.insert(separator, -1)
+        separator.show()
+
+        self.toolbar.insert(StopButton(self), -1)
+
+        self.show_all()
+
 class NewPollCanvas(Gtk.Box):
+    """
+    widgets to set up a new poll or editing existing poll.
+        editing is False to start a new poll.
+        editing is True to edit the current poll.
+
+    highlight is a list of strings denoting items failing validation.
+    """
 
     def __init__(self, poll, editing=False, highlight=[]):
 
         # FIXME: El parámetro highlight nunca se utilizó, la idea era
         # resaltar el texto en las etiquetas para aquellas opciones no
-        # validadas de una encuesta.
+        # validadas en la encuesta.
         Gtk.Box.__init__(self, orientation = Gtk.Orientation.VERTICAL)
 
-        """
-        Show the canvas to set up a new poll.
-
-        editing is False to start a new poll, or
-        True to edit the current poll
-
-        highlight is a list of strings denoting items failing validation.
-        """
-
         #self._current_view = 'build'
 
         label = Gtk.Label()
@@ -104,7 +147,7 @@ class NewPollCanvas(Gtk.Box):
         if failed_items:
             # FIXME: El parámetro highlight nunca se utilizó, la idea era
             # resaltar el texto en las etiquetas para aquellas opciones no
-            # validadas de una encuesta.
+            # validadas en la encuesta.
             #self.set_root(self._build_canvas(highlight=failed_items))
             #self.show_all()
             return
@@ -129,7 +172,7 @@ class NewPollCanvas(Gtk.Box):
         if failed_items:
             # FIXME: El parámetro highlight nunca se utilizó, la idea era
             # resaltar el texto en las etiquetas para aquellas opciones no
-            # validadas de una encuesta.
+            # validadas en la encuesta.
             #self.set_root(self._build_canvas(highlight=failed_items))
             #self.show_all()
             return
@@ -181,6 +224,27 @@ class NewPollCanvas(Gtk.Box):
 
         return failed_items
 
+    def _entry_activate_cb(self, entry, data=None):
+
+        text = entry.get_text()
+
+        if text and data:
+            if data == 'title':
+                self._poll.title = text
+
+            elif data == 'question':
+                self._poll.question = text
+
+            elif data == 'maxvoters':
+                try:
+                    self._poll.maxvoters = int(text)
+
+                except ValueError:
+                    self._poll.maxvoters = 0 # invalid, will be trapped
+
+            else:
+                self._poll.options[int(data)] = text
+
 class ItemNewPoll(Gtk.Box):
 
     def __init__(self, label_text, entry_text):
diff --git a/poll.py b/poll.py
index 37de2e8..b4791b6 100644
--- a/poll.py
+++ b/poll.py
@@ -47,11 +47,6 @@ from dbus.gobject_service import ExportedGObject
 
 from sugar3.presence.tubeconn import TubeConnection'''
 
-from sugar3.graphics.toolbarbox import ToolbarBox
-from sugar3.graphics.toolbutton import ToolButton
-from sugar3.activity.widgets import StopButton
-from sugar3.activity.widgets import ActivityToolbarButton
-
 from sugar3.activity import activity
 '''
 from sugar3.graphics import style
@@ -93,6 +88,7 @@ IMAGE_THUMBNAIL_WIDTH = 80
 '''
 
 from Widgets import NewPollCanvas
+from Widgets import Toolbar
 
 class PollBuilder(activity.Activity):
     """
@@ -156,10 +152,12 @@ class PollBuilder(activity.Activity):
         # Lesson plan widget
         self._lessonplan_widget = None
         '''
-        self.set_toolbar_box(self.get_toolbar())
-
-        #self._root = Gtk.VBox()
-        #self.set_canvas(self._root)
+        toolbar = Toolbar()
+        toolbar.create_button.connect('clicked', self.__button_new_clicked)
+        # choose_button.connect('clicked', self.button_select_clicked)
+        # settings_button.connect('clicked', self.button_options_clicked)
+        # help_button.connect('clicked', self._button_lessonplan_cb)
+        self.set_toolbar_box(toolbar)
 
         self.set_canvas(self._select_canvas())
 
@@ -169,48 +167,6 @@ class PollBuilder(activity.Activity):
         #self.connect('shared', self._shared_cb)
         #self.connect('joined', self._joined_cb)
 
-    def get_toolbar(self):
-
-        toolbar_box = ToolbarBox()
-        activity_button = ActivityToolbarButton(self)
-        toolbar_box.toolbar.insert(activity_button, 0)
-        activity_button.show()
-
-        separator = Gtk.SeparatorToolItem()
-        toolbar_box.toolbar.insert(separator, -1)
-
-        choose_button = ToolButton('view-list')
-        choose_button.set_tooltip(_('Choose a Poll'))
-        #choose_button.connect('clicked', self.button_select_clicked)
-        toolbar_box.toolbar.insert(choose_button, -1)
-
-        create_button = ToolButton('view-source')
-        create_button.set_tooltip(_('Build a Poll'))
-        create_button.connect('clicked', self.__button_new_clicked)
-        toolbar_box.toolbar.insert(create_button, -1)
-
-        settings_button = ToolButton('preferences-system')
-        settings_button.set_tooltip(_('Settings'))
-        #settings_button.connect('clicked', self.button_options_clicked)
-        toolbar_box.toolbar.insert(settings_button, -1)
-
-        help_button = ToolButton('toolbar-help')
-        help_button.set_tooltip(_('Lesson Plans'))
-        #help_button.connect('clicked', self._button_lessonplan_cb)
-        toolbar_box.toolbar.insert(help_button, -1)
-
-        separator = Gtk.SeparatorToolItem()
-        separator.props.draw = False
-        separator.set_expand(True)
-        toolbar_box.toolbar.insert(separator, -1)
-        separator.show()
-
-        toolbar_box.toolbar.insert(StopButton(self), -1)
-
-        toolbar_box.show_all()
-
-        return toolbar_box
-
     def _select_canvas(self):
         """
         Show the select canvas where children choose an existing poll.
@@ -967,28 +923,7 @@ class PollBuilder(activity.Activity):
         self.add_alert(alert)
         alert.connect('response', self._alert_cancel_cb)
         alert.show()'''
-    '''
-    def _entry_activate_cb(self, entrycontrol, data=None):
-
-        text = entrycontrol.props.text
 
-        if data:
-            if text:
-                if data == 'title':
-                    self._poll.title = text
-
-                elif data == 'question':
-                    self._poll.question = text
-
-                elif data == 'maxvoters':
-                    try:
-                        self._poll.maxvoters = int(text)
-
-                    except ValueError:
-                        self._poll.maxvoters = 0  # invalid, will be trapped
-
-                else:
-                    self._poll.options[int(data)] = text'''
     '''
     def _entry_image_size_cb(self, entrycontrol, data=None):