gcompris r3300 - branches/gcomprixo/src/mosaic-activity
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3300 - branches/gcomprixo/src/mosaic-activity
- Date: Fri, 14 Mar 2008 20:37:08 +0000 (GMT)
Author: bcoudoin
Date: Fri Mar 14 20:37:08 2008
New Revision: 3300
URL: http://svn.gnome.org/viewvc/gcompris?rev=3300&view=rev
Log:
Merged from GCompris trunk 3238:
* src/boards/python/mosaic.py: fixed a major bug. this activity was making GCompris
crash one you clicked on the grey target button.
Modified:
branches/gcomprixo/src/mosaic-activity/mosaic.py
Modified: branches/gcomprixo/src/mosaic-activity/mosaic.py
==============================================================================
--- branches/gcomprixo/src/mosaic-activity/mosaic.py (original)
+++ branches/gcomprixo/src/mosaic-activity/mosaic.py Fri Mar 14 20:37:08 2008
@@ -291,8 +291,7 @@
y = orig_y + y * (self.palette_item_height + gap_y))
if not colored:
- item.connect("event", self.set_focus_item_event, (i,
- item, palette))
+ item.connect("event", self.set_focus_item_event, (i, palette))
self.user_list.append((-1, -1))
else:
self.target_list.append((color_index_x, color_index_y))
@@ -333,13 +332,13 @@
y = coord_y)
item.connect("event", gcompris.utils.item_event_focus)
- item.connect("event", self.set_color_item_event, (item, palette_x, palette_y,
+ item.connect("event", self.set_color_item_event, (palette_x, palette_y,
coord_x, coord_y))
# Event when a target square is selected
def set_focus_item_event(self, item, event, data):
- (index, box_item, palette) = data
+ (index, palette) = data
if event.type == gtk.gdk.BUTTON_PRESS:
# A color is selected
@@ -350,7 +349,7 @@
self.current_index_y * self.palette_item_height,
self.palette_item_width, self.palette_item_height)
- box_item.set(pixbuf = image)
+ item.set(pixbuf = image)
self.user_list[index] = (self.current_index_x,
self.current_index_y)
@@ -366,7 +365,7 @@
if event.type == gtk.gdk.BUTTON_PRESS:
gcompris.sound.play_ogg("sounds/paint1.wav");
- (box_item, color_index_x, color_index_y, coord_x, coord_y) = data
+ (color_index_x, color_index_y, coord_x, coord_y) = data
self.current_index_x = color_index_x
self.current_index_y = color_index_y
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]