Code review: connecting main toolbarbox

2 files changed, 17 insertions, 10 deletions

diff --git a/TODO b/TODO
index 4c49fa3..3a3c405 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
+Urgent:
+    - Finish code review
+
 New functions:
     - Export to other formats.
 Fixes:
diff --git a/toolbars.py b/toolbars.py
index 5e9a316..b349e6f 100644
--- a/toolbars.py
+++ b/toolbars.py
@@ -21,6 +21,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+import gobject
 import gtk
 
 from sugar.activity.widgets import StopButton
@@ -34,6 +35,9 @@ from gettext import gettext as _
 
 
 class AnimateToolbarBox(ToolbarBox):
+    __gsignals__ = {'add-frame': (gobject.SIGNAL_RUN_LAST,
+                                  gobject.TYPE_NONE,
+                                  tuple())}
 
     def __init__(self, activity):
         super(AnimateToolbarBox, self).__init__()
@@ -46,12 +50,12 @@ class AnimateToolbarBox(ToolbarBox):
 
         add_frame = ToolButton('list-add')
         add_frame.set_tooltip(_('Add a frame'))
-        #add_frame.connect('clicked', self._add_frame)
+        add_frame.connect('clicked', activity._add_frame)
         self.toolbar.insert(add_frame, -1)
 
         remove_frame = ToolButton('list-remove')
         remove_frame.set_tooltip(_('Remove the selected frame'))
-        #remove_frame.connect('clicked', self._remove_frame)
+        remove_frame.connect('clicked', activity._remove_frame)
         self.toolbar.insert(remove_frame, -1)
 
         separator = gtk.SeparatorToolItem()
@@ -59,17 +63,17 @@ class AnimateToolbarBox(ToolbarBox):
 
         back_btn = ToolButton('media-seek-backward')
         back_btn.set_tooltip(_('Previous Frame'))
-        #back_btn.connect('clicked', self._previous_frame)
+        back_btn.connect('clicked', activity._previous_frame)
         self.toolbar.insert(back_btn, -1)
 
         run_btn = ToolButton('media-playback-start')
         run_btn.set_tooltip(_('Run animation'))
-        #run_btn.connect('clicked', self._run_pause_animation)
+        run_btn.connect('clicked', activity._run_pause_animation)
         self.toolbar.insert(run_btn, -1)
 
         next_btn = ToolButton('media-seek-forward')
         next_btn.set_tooltip(_('Next Frame'))
-        #next_btn.connect('clicked', self._next_frame)
+        next_btn.connect('clicked', activity._next_frame)
         self.toolbar.insert(next_btn, -1)
 
         separator = gtk.SeparatorToolItem()
@@ -81,19 +85,19 @@ class AnimateToolbarBox(ToolbarBox):
         returnbutton = RadioToolButton(icon_name='media-playlist-repeat')
         returnbutton.set_tooltip(_('Repeat Mode'))
         returnbutton.set_active(True)
-        #returnbutton.connect('clicked', self._set_return_mode)
+        returnbutton.connect('clicked', activity._set_return_mode)
         options_toolbar.insert(returnbutton, -1)
 
         normalmode = RadioToolButton(icon_name='normal-mode')
         normalmode.props.group = returnbutton
         normalmode.set_tooltip(_('Normal Mode'))
-        #normalmode.connect('clicked', self._set_normal_mode)
+        normalmode.connect('clicked', activity._set_normal_mode)
         options_toolbar.insert(normalmode, -1)
 
         pingpong = RadioToolButton(icon_name='ping-pong')
         pingpong.props.group = returnbutton
         pingpong.set_tooltip(_('Ping Pong Mode'))
-        #pingpong.connect('clicked', self._set_pingpong_mode)
+        pingpong.connect('clicked', activity._set_pingpong_mode)
         options_toolbar.insert(pingpong, -1)
 
         self.modes_buttons = [normalmode, returnbutton, pingpong]
@@ -112,7 +116,7 @@ class AnimateToolbarBox(ToolbarBox):
         toolspin = gtk.ToolItem()
         adjustment = gtk.Adjustment(2, 1, 24, 1, 1)
         self._fpsbutton = gtk.SpinButton(adjustment, 0, 0)
-        #self._fpsbutton.connect('value-changed', self._fps_changed_cb)
+        self._fpsbutton.connect('value-changed', activity._fps_changed_cb)
         toolspin.add(self._fpsbutton)
         options_toolbar.insert(toolspin, -1)
 
@@ -126,7 +130,7 @@ class AnimateToolbarBox(ToolbarBox):
 
         fullscreen_btn = ToolButton('view-fullscreen')
         fullscreen_btn.set_tooltip(_('Fullscreen'))
-        #fullscreen_btn.connect('clicked', self._view_fullscreen)
+        fullscreen_btn.connect('clicked', activity._view_fullscreen)
 
         self.toolbar.insert(fullscreen_btn, -1)