GNOME.org
 

gcompris r3713 - in trunk: . boards/colors boards/gcompris/dice boards/gcompris/misc boards/gcompris/timers boards/images boards/opt boards/skins/babytoy src/boards src/gcompris

Author: bcoudoin
Date: Sat Jan 31 01:14:34 2009
New Revision: 3713
URL: http://svn.gnome.org/viewvc/gcompris?rev=3713&view=rev

Log:
       Vitali Perchonok is com gmail from vitali.pe
	Graphical improvements. Images taken from openclipart.

	Matieu Ignacio: New original background for the target activity.


Added:
   trunk/boards/gcompris/dice/small_dice_0.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_1.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_2.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_3.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_4.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_5.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_6.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_7.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_8.png   (contents, props changed)
   trunk/boards/gcompris/dice/small_dice_9.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux0.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux1.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux10.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux2.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux3.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux4.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux5.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux6.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux7.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux8.png   (contents, props changed)
   trunk/boards/gcompris/timers/tux9.png   (contents, props changed)
   trunk/boards/images/fish00.png   (contents, props changed)
   trunk/boards/images/fish01.png   (contents, props changed)
   trunk/boards/images/fish02.png   (contents, props changed)
   trunk/boards/images/fish03.png   (contents, props changed)
Removed:
   trunk/boards/gcompris/dice/gnome-dice0.png
   trunk/boards/gcompris/dice/gnome-dice1.png
   trunk/boards/gcompris/dice/gnome-dice2.png
   trunk/boards/gcompris/dice/gnome-dice3.png
   trunk/boards/gcompris/dice/gnome-dice4.png
   trunk/boards/gcompris/dice/gnome-dice5.png
   trunk/boards/gcompris/dice/gnome-dice6.png
   trunk/boards/gcompris/dice/gnome-dice7.png
   trunk/boards/gcompris/dice/gnome-dice8.png
   trunk/boards/gcompris/dice/gnome-dice9.png
Modified:
   trunk/ChangeLog
   trunk/boards/colors/colors_bg.png
   trunk/boards/gcompris/misc/toomanyerrors.png
   trunk/boards/opt/target_background.jpg
   trunk/boards/skins/babytoy/button_up_selected.png
   trunk/src/boards/reversecount.c
   trunk/src/boards/target.c
   trunk/src/gcompris/timer.c
   trunk/src/gcompris/timer.h

Modified: trunk/boards/colors/colors_bg.png
==============================================================================
Binary files. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_0.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_1.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_2.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_3.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_4.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_5.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_6.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_7.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_8.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/dice/small_dice_9.png
==============================================================================
Binary file. No diff available.

Modified: trunk/boards/gcompris/misc/toomanyerrors.png
==============================================================================
Binary files. No diff available.

Added: trunk/boards/gcompris/timers/tux0.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux1.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux10.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux2.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux3.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux4.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux5.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux6.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux7.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux8.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/gcompris/timers/tux9.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/images/fish00.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/images/fish01.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/images/fish02.png
==============================================================================
Binary file. No diff available.

Added: trunk/boards/images/fish03.png
==============================================================================
Binary file. No diff available.

Modified: trunk/boards/opt/target_background.jpg
==============================================================================
Binary files. No diff available.

Modified: trunk/boards/skins/babytoy/button_up_selected.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/boards/reversecount.c
==============================================================================
--- trunk/src/boards/reversecount.c	(original)
+++ trunk/src/boards/reversecount.c	Sat Jan 31 01:14:34 2009
@@ -88,41 +88,17 @@
   "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 @@
 /* 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 @@
 
   //----------------------------------------
   // 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 @@
 	  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 @@
   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 @@
   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);
 

Modified: trunk/src/boards/target.c
==============================================================================
--- trunk/src/boards/target.c	(original)
+++ trunk/src/boards/target.c	Sat Jan 31 01:14:34 2009
@@ -376,7 +376,7 @@
   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 @@
 			 "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 @@
 			 "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 @@
 				       "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);
 

Modified: trunk/src/gcompris/timer.c
==============================================================================
--- trunk/src/gcompris/timer.c	(original)
+++ trunk/src/gcompris/timer.c	Sat Jan 31 01:14:34 2009
@@ -46,6 +46,8 @@
   GdkFont *gdk_font;
   GdkPixbuf *pixmap = NULL;
   GcomprisProperties *properties = gc_prop_get();
+  char *image_prefix;
+
 
   /* Timer is not requested */
   if(properties->timer==0)
@@ -76,18 +78,28 @@
     {
     case GCOMPRIS_TIMER_SAND:
     case GCOMPRIS_TIMER_CLOCK:
+    case GCOMPRIS_TIMER_TUX:
       {
 	gchar		*filefull = NULL;
 	gchar		*filename = NULL;
 	gint		fileid;
 
-	fileid = (gint)timer;
-	if(type==GCOMPRIS_TIMER_SAND)
-	  filename = g_strdup_printf("gcompris/timers/sablier%d.png", fileid);
-	else
-	  filename = g_strdup_printf("gcompris/timers/clock%d.png", fileid);
+	switch(type)
+	  {
+	  case GCOMPRIS_TIMER_SAND:
+	    image_prefix = "gcompris/timers/sablier%d.png";
+	  case GCOMPRIS_TIMER_CLOCK:
+	    image_prefix = "gcompris/timers/clock%d.png";
+	  case GCOMPRIS_TIMER_TUX:
+	    image_prefix = "gcompris/timers/tux%d.png";
+	  default:
+	    break;
+	  }
 
+	fileid = (gint)timer;
+	filename = g_strdup_printf(image_prefix, fileid);
 	filefull = g_strdup_printf("%s/%s", properties->package_data_dir, filename);
+
 	if (g_file_test ((filefull), G_FILE_TEST_EXISTS))
 	  {
 	    pixmap = gc_pixmap_load(filename);
@@ -221,6 +233,7 @@
     {
     case GCOMPRIS_TIMER_SAND:
     case GCOMPRIS_TIMER_CLOCK:
+    case GCOMPRIS_TIMER_TUX:
       /* No subanimation */
       break;
     case GCOMPRIS_TIMER_TEXT:

Modified: trunk/src/gcompris/timer.h
==============================================================================
--- trunk/src/gcompris/timer.h	(original)
+++ trunk/src/gcompris/timer.h	Sat Jan 31 01:14:34 2009
@@ -32,6 +32,7 @@
   GCOMPRIS_TIMER_SAND,
   GCOMPRIS_TIMER_BALLOON,
   GCOMPRIS_TIMER_CLOCK,
+  GCOMPRIS_TIMER_TUX,
 } TimerList;
 
 /* Callback when the timer is completed */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]