Vitali Perchonok is com gmail from vitali.pe

	Graphical improvements. Images taken from openclipart.

	Matieu Ignacio: New original background for the target activity.

svn path=/trunk/; revision=3713

2 files changed, 15 insertions, 38 deletions

diff --git a/src/boards/reversecount.c b/src/boards/reversecount.c
index e301a74..13735bd 100644
--- a/src/boards/reversecount.c
+++ b/src/boards/reversecount.c
@@ -88,41 +88,17 @@ static gchar *imageList[] =
   "opt/epaulard.png",
   "opt/narval.png",
 };
-#define NUMBER_OF_IMAGES 10
+#define NUM_IMAGELIST G_N_ELEMENTS(imageList)
 
 // List of fish to use in the game
 static gchar *fishList[] =
 {
-  "fishes/blueking2_0.png",
-  "fishes/butfish_0.png",
-  "fishes/cichlid1_0.png",
-  "fishes/cichlid4_0.png",
-  "fishes/collaris_0.png",
-  "fishes/discus2_0.png",
-  "fishes/discus3_0.png",
-  "fishes/eel_0.png",
-  "fishes/f00_0.png",
-  "fishes/f01_0.png",
-  "fishes/f02_0.png",
-  "fishes/f03_0.png",
-  "fishes/f04_0.png",
-  "fishes/f05_0.png",
-  "fishes/f06_0.png",
-  "fishes/f07_0.png",
-  "fishes/f08_0.png",
-  "fishes/f09_0.png",
-  "fishes/f10_0.png",
-  "fishes/f11_0.png",
-  "fishes/f12_0.png",
-  "fishes/f13_0.png",
-  "fishes/manta_0.png",
-  "fishes/newf1_0.png",
-  "fishes/QueenAngel_0.png",
-  "fishes/shark1_0.png",
-  "fishes/six_barred_0.png",
-  "fishes/teeth_0.png"
+  "images/fish00.png",
+  "images/fish01.png",
+  "images/fish02.png",
+  "images/fish03.png",
 };
-#define NUMBER_OF_FISHES 27
+#define NUMBER_OF_FISHES G_N_ELEMENTS(fishList)
 
 /* Description of this plugin */
 static BoardPlugin menu_bp =
@@ -330,6 +306,7 @@ static void process_ok()
 /* set initial values for the next level */
 static void reversecount_next_level()
 {
+  g_assert(NUM_IMAGELIST > gcomprisBoard->level-1);
 
   gc_set_background(gnome_canvas_root(gcomprisBoard->canvas),
 			  imageList[gcomprisBoard->level-1]);
@@ -529,7 +506,7 @@ static GnomeCanvasItem *reversecount_create_item(GnomeCanvasGroup *parent)
 
   //----------------------------------------
   // Create the dices
-  pixmap = gc_pixmap_load("gcompris/dice/gnome-dice1.png");
+  pixmap = gc_pixmap_load("gcompris/dice/small_dice_1.png");
 
   for(d=0; d<number_of_dices; d++)
     {
@@ -710,7 +687,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gint *dice_index)
 	  break;
 	}
 
-      str = g_strdup_printf("gcompris/dice/gnome-dice%d.png", dicevalue_array[i]);
+      str = g_strdup_printf("gcompris/dice/small_dice_%d.png", dicevalue_array[i]);
 
       pixmap = gc_pixmap_load(str);
 
@@ -742,7 +719,7 @@ static void create_clock(double x, double y, int value)
   if(value<0)
     return;
 
-  str = g_strdup_printf("%s%d.png", "gcompris/timers/clock",value);
+  str = g_strdup_printf("%s%d.png", "gcompris/timers/tux",value);
 
   pixmap = gc_pixmap_load(str);
 
@@ -765,7 +742,7 @@ static void update_clock(int value)
   if(value<0)
     return;
 
-  str = g_strdup_printf("%s%d.png", "gcompris/timers/clock",value);
+  str = g_strdup_printf("%s%d.png", "gcompris/timers/tux",value);
 
   pixmap = gc_pixmap_load(str);
 
diff --git a/src/boards/target.c b/src/boards/target.c
index ee250e7..60b2af1 100644
--- a/src/boards/target.c
+++ b/src/boards/target.c
@@ -376,7 +376,7 @@ static void display_windspeed()
   gnome_canvas_item_new (speedRootItem,
 			 gnome_canvas_line_get_type (),
 			 "points", canvasPoints,
-			 "fill_color_rgba", 0x6df438FF,
+			 "fill_color", "red",
 			 "width_units", (double)1,
 			 "width_pixels", (guint) 4,
 			 "last_arrowhead", TRUE,
@@ -394,7 +394,7 @@ static void display_windspeed()
 			 "y1", (double)SPEED_CENTER_Y-5,
 			 "x2", (double)SPEED_CENTER_X+5,
 			 "y2", (double)SPEED_CENTER_Y+5,
-			 "fill_color_rgba", 0x6df438FF,
+			 "fill_color", "red",
 			 "outline_color", "red",
 			 "width_units", (double)1,
 			 NULL);
@@ -475,7 +475,7 @@ static GnomeCanvasItem *target_create_item(GnomeCanvasGroup *parent)
 			 "x", (double) 0,
 			 "y", (double) BOARDHEIGHT-TARGET_CENTER_Y -45,
 			 "anchor", GTK_ANCHOR_CENTER,
-			 "fill_color", "white",
+			 "fill_color", "black",
 			 NULL);
   g_free(tmpstr);
 
@@ -550,7 +550,7 @@ static void request_score()
 				       "x", (double) x_offset + gdk_pixbuf_get_width(button_pixmap)/2,
 				       "y", (double) y_offset + gdk_pixbuf_get_height(button_pixmap)/2,
 				       "anchor", GTK_ANCHOR_CENTER,
-				       "fill_color", "white",
+				       "fill_color", "black",
 				       NULL);
   g_free(tmpstr);