gcompris r3222 - in branches/gcomprixogoo/src: anim-activity anim-activity/resources/anim babyshapes-activity/resources/babyshapes/dog1 babyshapes-activity/resources/babyshapes/dog2 babyshapes-activity/resources/babyshapes/dog3 babyshapes-activity/resources/babyshapes/food redraw-activity/resources/redraw redraw_symmetrical-activity/resources/redraw_symmetrical

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Jan 24 22:20:57 2008
New Revision: 3222
URL: http://svn.gnome.org/viewvc/gcompris?rev=3222&view=rev

Log:
update svn:ignome prop


Modified:
   branches/gcomprixogoo/src/anim-activity/anim.py
   branches/gcomprixogoo/src/anim-activity/resources/anim/   (props changed)
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/dog1/   (props changed)
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/dog2/   (props changed)
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/dog3/   (props changed)
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/food/   (props changed)
   branches/gcomprixogoo/src/redraw-activity/resources/redraw/   (props changed)
   branches/gcomprixogoo/src/redraw_symmetrical-activity/resources/redraw_symmetrical/   (props changed)

Modified: branches/gcomprixogoo/src/anim-activity/anim.py
==============================================================================
--- branches/gcomprixogoo/src/anim-activity/anim.py	(original)
+++ branches/gcomprixogoo/src/anim-activity/anim.py	Thu Jan 24 22:20:57 2008
@@ -1364,7 +1364,7 @@
 
   def playing_start(self):
     if not self.running:
-      self.running=True
+      self.running = True
       self.root_coloritem.props.visibility = goocanvas.ITEM_INVISIBLE
       self.root_toolitem.props.visibility = goocanvas.ITEM_INVISIBLE
       self.root_playingitem.props.visibility = goocanvas.ITEM_VISIBLE
@@ -1402,12 +1402,13 @@
 
     # Image Number
     self.item_frame_counter = \
-      goocanvas.Text(
-        parent = self.rootitem,
+        goocanvas.Text(
+      parent = self.rootitem,
       text = self.current_frame + 1,
       x = x_left + minibutton_width + 14,
       y = y_top + 15,
-      font = gcompris.skin.get_font("gcompris/board/medium"))
+      font = gcompris.skin.get_font("gcompris/board/medium"),
+      fill_color = "white")
 
   def object_set_size_and_pos(self, object, x1, y1, x2, y2):
     if gobject.type_name(object.get_child(0)) == "GooCanvasLine":
@@ -1877,9 +1878,10 @@
         self.list_z_last_shot.remove(anAnimItem.z_previous)
 
   def get_modified_parameters(self, animItem):
-
+        print "get_modified_parameters=", animItem
         modified= {}
         dict_properties = self.get_animitem_properties(animItem)
+        print "dict_properties=", dict_properties
         frames = animItem.frames_info.keys()
         if frames != []:
           frames.sort()
@@ -1887,7 +1889,7 @@
 
           for property in dict_properties.keys():
             for frame in frames:
-#              print animItem.type, property, frame, animItem.frames_info[frame]
+              print animItem.type, property, frame, animItem.frames_info[frame]
               if animItem.frames_info[frame].has_key(property):
                 if not animItem.frames_info[frame][property]==dict_properties[property]:
                   modified[property]=dict_properties[property]
@@ -1922,11 +1924,12 @@
           # deleted without being in any shot
           continue
       else:
-#
         modified = self.get_modified_parameters(anAnimItem)
+        print "Anim2Shot modified", modified
 
 
       if len(modified) != 0:
+        print ">>MARKING MODIFIED"
         anAnimItem.frames_info[self.current_frame] = modified
 #
     self.current_frame = self.current_frame + 1
@@ -1944,10 +1947,13 @@
 #    self.z_reinit()
 
   def apply_frame(self, frame):
+    print "apply_frame", frame, self.playlist
     for item in self.playlist:
+      print "item ",item
       if not item.frames_info.has_key(frame):
         continue
       modif = item.frames_info[frame].copy()
+      print "modif ",modif
       if modif.has_key('delete'):
         item.canvas_item.remove()
         continue
@@ -1958,7 +1964,7 @@
         matrice = modif['matrice']
         del modif['matrice']
         if item.type == 'IMAGE':
-          image =  modif['image_name']
+          image = modif['image_name']
           del modif['image_name']
           pixmap = gcompris.utils.load_pixmap(image)
           modif['pixbuf']= pixmap
@@ -2022,7 +2028,9 @@
       )
 
     self.playlist = []
+    print "Creating list"
     for aItem in self.animlist:
+      print aItem
       playItem = self.AnimItem()
       playItem.frames_info = aItem.frames_info.copy()
       playItem.type = aItem.type