Connect toolbar buttons

1 files changed, 12 insertions, 5 deletions

diff --git a/activity.py b/activity.py
index 4d806d5..e8f3c4f 100644
--- a/activity.py
+++ b/activity.py
@@ -24,13 +24,17 @@ from sugar3.graphics.toolbarbox import ToolbarBox
 from sugar3.graphics.radiotoolbutton import RadioToolButton
 from sugar3.graphics.toolbutton import ToolButton
 
-from game import Canvas
+import game
 
 
 class Activity(activity.Activity):
     def __init__(self, handle):
         activity.Activity.__init__(self, handle, True)
 
+        # Canvas
+        canvas = game.Canvas()
+        self.set_canvas(canvas)
+
         # Toolbar
         toolbarbox = ToolbarBox()
 
@@ -50,6 +54,7 @@ class Activity(activity.Activity):
 
         # ToolButtons
         new_game_btn = ToolButton()
+        new_game_btn.connect('clicked', lambda w: canvas.clear())
         new_game_btn.set_tooltip('New Game')
         new_game_btn.props.icon_name = 'new-game'
         toolbarbox.toolbar.insert(new_game_btn, -1)
@@ -60,16 +65,22 @@ class Activity(activity.Activity):
         toolbarbox.toolbar.insert(separator, -1)
 
         cross_btn = RadioToolButton()
+        cross_btn.connect('clicked', lambda w: canvas.set_mode(
+                                                             game.MODE_CROSS))
         cross_btn.set_tooltip('Cross')
         cross_btn.props.icon_name = 'cross'
         toolbarbox.toolbar.insert(cross_btn, -1)
 
         circle_btn = RadioToolButton()
+        circle_btn.connect('clicked', lambda w: canvas.set_mode(
+                                                             game.MODE_CIRCLE))
         circle_btn.set_tooltip('Circle')
         circle_btn.props.icon_name = 'circle'
         circle_btn.props.group = cross_btn
         toolbarbox.toolbar.insert(circle_btn, -1)
 
+        canvas.set_mode(game.MODE_CROSS)
+
         separator = Gtk.SeparatorToolItem()
         toolbarbox.toolbar.insert(separator, -1)
 
@@ -86,10 +97,6 @@ class Activity(activity.Activity):
         stopbtn = StopButton(self)
         toolbarbox.toolbar.insert(stopbtn, -1)
 
-        # Canvas
-        canvas = Canvas()
-        self.set_canvas(canvas)
-
         self.set_toolbar_box(toolbarbox)
         self.show_all()