gcompris r3513 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/boards src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sat Aug 30 21:50:28 2008
New Revision: 3513
URL: http://svn.gnome.org/viewvc/gcompris?rev=3513&view=rev

Log:
Now the menu description background color is managed through the skin.xml
property file.


Modified:
   branches/gcomprixogoo/boards/skins/babytoy/skin.xml
   branches/gcomprixogoo/boards/skins/gartoon/skin.xml
   branches/gcomprixogoo/src/boards/menu2.c
   branches/gcomprixogoo/src/gcompris/bar.c

Modified: branches/gcomprixogoo/boards/skins/babytoy/skin.xml
==============================================================================
--- branches/gcomprixogoo/boards/skins/babytoy/skin.xml	(original)
+++ branches/gcomprixogoo/boards/skins/babytoy/skin.xml	Sat Aug 30 21:50:28 2008
@@ -39,14 +39,15 @@
     <font id="gcompris/board/title bold" name="Sans bold 20"/>
     <font id="gcompris/board/huge"       name="Sans 28"/>
     <font id="gcompris/board/huge bold"  name="Sans bold 28"/>
-    
+
     <color id="menu/text"             rgba="0xFFFFFFFF"/>
     <color id="menu/text_shadow"      rgba="0x000000FF"/>
+    <color id="menu/description_bg_color" rgba="0x0000FFCCL"/>
 
     <!-- Here you may define some other properties that will -->
     <!-- affect a particular game. -->
     <!-- For example, in futur, the colors of the canal lock game will be -->
-    <!-- customisable with some lines like: --> 
+    <!-- customisable with some lines like: -->
     <!-- <color id="canal_lock/canal color"        rgba="0x0010FFFF"/>-->
     <!-- <color id="canal_lock/lock color"         rgba="0x8cc679FF"/>-->
     <!-- <color id="canal_lock/lock color h"       rgba="0x71A65FFF"/>-->

Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.xml
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.xml	(original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.xml	Sat Aug 30 21:50:28 2008
@@ -41,6 +41,7 @@
 
     <color id="menu/text"             rgba="0x597ad7FF"/>
     <color id="menu/text_shadow"      rgba="0x000000FF"/>
+    <color id="menu/description_bg_color" rgba="0xe8e7e2CCL"/>
 
     <!-- Here you may define some other properties that will -->
     <!-- affect a particular game. -->

Modified: branches/gcomprixogoo/src/boards/menu2.c
==============================================================================
--- branches/gcomprixogoo/src/boards/menu2.c	(original)
+++ branches/gcomprixogoo/src/boards/menu2.c	Sat Aug 30 21:50:28 2008
@@ -651,6 +651,7 @@
 
   g_assert(parent);
 
+  /* The description background */
   menuitems->bg =
     goo_canvas_rect_new (parent,
 			 info_x,
@@ -658,7 +659,8 @@
 			 info_w,
 			 info_h,
 			 "stroke_color_rgba", 0xFFFFFFFFL,
-			 "fill_color_rgba", 0x0000FF90L,
+			 "fill_color_rgba",
+			 gc_skin_get_color("menu/description_bg_color"),
 			 "line-width", (double) 2,
 			 "radius-x", (double) 10,
 			 "radius-y", (double) 10,

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Sat Aug 30 21:50:28 2008
@@ -629,8 +629,8 @@
 	{
 	  /* Decrease the level */
 	  current_level--;
-	  if(current_level<1)
-	    current_level=1;
+	  if(current_level < 1)
+	    current_level = gcomprisBoard->maxlevel;
 	}
 
       if(tmp!=current_level)