diff options
-rw-r--r-- | activity.py | 22 | ||||
-rw-r--r--[-rwxr-xr-x] | game.py | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | setup.py | 0 |
3 files changed, 13 insertions, 11 deletions
diff --git a/activity.py b/activity.py index fff8a66..2e197b6 100644 --- a/activity.py +++ b/activity.py @@ -49,10 +49,10 @@ class Activity(activity.Activity): activity.Activity.__init__(self, handle, True) # Canvas - canvas = game.Canvas() - canvas.connect('cross-added', self.send_new_cross) - canvas.connect('circle-added', self.send_new_circle) - self.set_canvas(canvas) + self.game = game.Canvas() + self.game.connect('cross-added', self.send_new_cross) + self.game.connect('circle-added', self.send_new_circle) + self.set_canvas(self.game) # Toolbar toolbarbox = ToolbarBox() @@ -73,7 +73,7 @@ class Activity(activity.Activity): # ToolButtons new_game_btn = ToolButton() - new_game_btn.connect('clicked', lambda w: canvas.clear()) + new_game_btn.connect('clicked', lambda w: self.game.clear()) new_game_btn.set_tooltip(_('New Game')) new_game_btn.props.icon_name = 'new-game' toolbarbox.toolbar.insert(new_game_btn, -1) @@ -84,21 +84,21 @@ class Activity(activity.Activity): toolbarbox.toolbar.insert(separator, -1) cross_btn = RadioToolButton() - cross_btn.connect('clicked', lambda w: canvas.set_mode( + cross_btn.connect('clicked', lambda w: self.game.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( + circle_btn.connect('clicked', lambda w: self.game.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) + self.game.set_mode(game.MODE_CROSS) separator = Gtk.SeparatorToolItem() toolbarbox.toolbar.insert(separator, -1) @@ -131,6 +131,8 @@ class Activity(activity.Activity): self._share = "" self.connect('shared', self._shared_cb) self.connect('joined', self._joined_cb) + + self._setup_dispatch_table() def _shared_cb(self, activity): """Either set up initial share...""" @@ -196,8 +198,8 @@ params=%r state=%d' % (id, initiator, type, service, params, state)) def _setup_dispatch_table(self): """Associate tokens with commands.""" self._processing_methods = { - 'x': [self._receive_cross, 'get a cross'], - 'o': [self._receive_circle, 'get a circle'], + 'x': [self._receive_new_cross, 'get a cross'], + 'o': [self._receive_new_circle, 'get a circle'], } def event_received_cb(self, event_message): @@ -167,7 +167,7 @@ class Canvas(Gtk.DrawingArea): if emit_signal: self.emit('cross-added', self.squares.index(square)) self.queue_draw() - + def add_circle(self, square, emit_signal=True): self.circles.append( square if type(square) == tuple else self.squares[square]) |