gcompris r3685 - in branches/gcomprixogoo/src: gcompris leftright-activity scalesboard-activity superbrain-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sat Jan 17 23:28:21 2009
New Revision: 3685
URL: http://svn.gnome.org/viewvc/gcompris?rev=3685&view=rev

Log:
more skin work


Modified:
   branches/gcomprixogoo/src/gcompris/file_selector.c
   branches/gcomprixogoo/src/gcompris/images_selector.c
   branches/gcomprixogoo/src/leftright-activity/leftright.c
   branches/gcomprixogoo/src/scalesboard-activity/scale.c
   branches/gcomprixogoo/src/superbrain-activity/superbrain.c

Modified: branches/gcomprixogoo/src/gcompris/file_selector.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/file_selector.c	(original)
+++ branches/gcomprixogoo/src/gcompris/file_selector.c	Sat Jan 17 23:28:21 2009
@@ -152,7 +152,6 @@
 		      FileSelectorCallBack iscb)
 {
   GooCanvasItem    *item;
-  GooCanvasItem    *item2;
   GdkPixbuf	   *pixmap = NULL;
   gint		    y = 0;
   gint		    y_start = 0;
@@ -250,61 +249,22 @@
    * -------
    */
 
-  pixmap = gc_skin_pixmap_load("button_large.png");
-
   // CANCEL
-  item = goo_canvas_image_new (rootitem,
-			       pixmap,
-			       (double) (BOARDWIDTH*0.33) - gdk_pixbuf_get_width(pixmap)/2,
-			       (double) y - gdk_pixbuf_get_height(pixmap) - 25,
-				NULL);
-
-  g_signal_connect(item, "button_press_event",
-		   (GtkSignalFunc) item_event_file_selector,
-		   "/cancel/");
-  gc_item_focus_init(item, NULL);
-
-  item2 = goo_canvas_text_new (rootitem,
-			      _("CANCEL"),
-			      (gdouble)  BOARDWIDTH*0.33,
-			      (gdouble)  y - gdk_pixbuf_get_height(pixmap),
-			      -1,
-			      GTK_ANCHOR_CENTER,
-			      "font", gc_skin_font_title,
-			      "fill-color-rgba", gc_skin_color_text_button,
-			      NULL);
-  g_signal_connect(item2, "button_press_event",
-		   (GtkSignalFunc) item_event_file_selector,
-		   "/cancel/");
-  gc_item_focus_init(item2, item);
-
+  gc_util_button_text_svg(rootitem,
+			  BOARDWIDTH * 1/3,
+			  y - 48,
+			  "#BUTTON_TEXT",
+			  _("CANCEL"),
+			  (GtkSignalFunc) item_event_file_selector,
+			  "/cancel/");
   // OK
-  item = goo_canvas_image_new (rootitem,
-			       pixmap,
-			       (double) (BOARDWIDTH*0.66) - gdk_pixbuf_get_width(pixmap)/2,
-			       (double) y - gdk_pixbuf_get_height(pixmap) - 25,
-				NULL);
-
-  g_signal_connect(item, "button_press_event",
-		     (GtkSignalFunc) item_event_file_selector,
-		     "/ok/");
-  gc_item_focus_init(item, NULL);
-
-  item2 = goo_canvas_text_new (rootitem,
-			      (mode==MODE_LOAD ? _("LOAD") : _("SAVE")),
-			      (gdouble)  BOARDWIDTH*0.66,
-			      (gdouble)  y - gdk_pixbuf_get_height(pixmap),
-			      -1,
-			      GTK_ANCHOR_CENTER,
-			      "font", gc_skin_font_title,
-			      "fill-color-rgba", gc_skin_color_text_button,
-			      NULL);
-  g_signal_connect(item2, "button_press_event",
-		   (GtkSignalFunc) item_event_file_selector,
-		   "/ok/");
-  gc_item_focus_init(item2, item);
-  gdk_pixbuf_unref(pixmap);
-
+  gc_util_button_text_svg(rootitem,
+			  BOARDWIDTH * 2/3,
+			  y - 48,
+			  "#BUTTON_TEXT",
+			  (mode==MODE_LOAD ? _("LOAD") : _("SAVE")),
+			  (GtkSignalFunc) item_event_file_selector,
+			  "/cancel/");
 
   file_selector_displayed = TRUE;
 

Modified: branches/gcomprixogoo/src/gcompris/images_selector.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/images_selector.c	(original)
+++ branches/gcomprixogoo/src/gcompris/images_selector.c	Sat Jan 17 23:28:21 2009
@@ -105,7 +105,7 @@
 			  ImageSelectorCallBack iscb)
 {
 
-  GooCanvasItem *item, *item2;
+  GooCanvasItem *item;
   GdkPixbuf	*pixmap = NULL;
   gint		 y = 0;
   gint		 y_start = 0;
@@ -141,8 +141,6 @@
 
   y_start += 110;
 
-  pixmap = gc_skin_pixmap_load("button_large.png");
-
   /*
    * Create the list scrollbar
    * -------------------------
@@ -276,32 +274,13 @@
    * OK Button
    * ---------
    */
-  item = goo_canvas_image_new (rootitem,
-			       pixmap,
-			       (double) (BOARDWIDTH*0.5) - gdk_pixbuf_get_width(pixmap)/2,
-			       (double) y - gdk_pixbuf_get_height(pixmap) - 10,
-				NULL);
-
-  g_signal_connect(item, "button_press_event",
-		     (GtkSignalFunc) item_event_images_selector,
-		     "/ok/");
-  gc_item_focus_init(item, NULL);
-
-  item2 = goo_canvas_text_new (rootitem,
-			       _("OK"),
-			       (gdouble)  BOARDWIDTH*0.5,
-			       (gdouble)  y - gdk_pixbuf_get_height(pixmap) + 15,
-			       -1,
-			       GTK_ANCHOR_CENTER,
-			       "font", gc_skin_font_title,
-			       "fill-color-rgba", gc_skin_color_text_button,
-			       NULL);
-  g_signal_connect(item2, "button_press_event",
-		     (GtkSignalFunc) item_event_images_selector,
-		     "/ok/");
-  gc_item_focus_init(item2, item);
-  gdk_pixbuf_unref(pixmap);
-
+  gc_util_button_text_svg(rootitem,
+			  (BOARDWIDTH*0.5),
+			  y - 30,
+			  "#BUTTON_TEXT",
+			  _("OK"),
+			  (GtkSignalFunc) item_event_images_selector,
+			  "/ok/");
 }
 
 /*

Modified: branches/gcomprixogoo/src/leftright-activity/leftright.c
==============================================================================
--- branches/gcomprixogoo/src/leftright-activity/leftright.c	(original)
+++ branches/gcomprixogoo/src/leftright-activity/leftright.c	Sat Jan 17 23:28:21 2009
@@ -39,11 +39,6 @@
 #define LEFT 0
 #define RIGHT 1
 
-#define CENTER_LEFT_X 110
-#define CENTER_LEFT_Y 365
-#define CENTER_RIGHT_X 520
-#define CENTER_RIGHT_Y CENTER_LEFT_Y
-
 #define HAND_X 400
 #define HAND_Y 200
 
@@ -229,17 +224,17 @@
   boardRootItem = goo_canvas_group_new (goo_canvas_get_root_item(gcomprisBoard->canvas),
 					NULL);
 
-  gc_util_button_text(boardRootItem,
-		      CENTER_LEFT_X, CENTER_LEFT_Y,
-		      "button_large.png",
-		      _("left"),
-		      (GtkSignalFunc) clicked_left, NULL);
-
-  gc_util_button_text(boardRootItem,
-		      CENTER_RIGHT_X, CENTER_RIGHT_Y,
-		      "button_large.png",
-		      _("right"),
-		      (GtkSignalFunc) clicked_right, NULL);
+  gc_util_button_text_svg(boardRootItem,
+			  BOARDWIDTH/3, BOARDHEIGHT*2/3 + 50,
+			  "#BUTTON_TEXT",
+			  _("left"),
+			  (GtkSignalFunc) clicked_left, NULL);
+
+  gc_util_button_text_svg(boardRootItem,
+			  BOARDWIDTH*2/3, BOARDHEIGHT*2/3 + 50,
+			  "#BUTTON_TEXT",
+			  _("right"),
+			  (GtkSignalFunc) clicked_right, NULL);
 
   // make sure that next hand is not the same as previous
   do {

Modified: branches/gcomprixogoo/src/scalesboard-activity/scale.c
==============================================================================
--- branches/gcomprixogoo/src/scalesboard-activity/scale.c	(original)
+++ branches/gcomprixogoo/src/scalesboard-activity/scale.c	Sat Jan 17 23:28:21 2009
@@ -157,6 +157,7 @@
       gcomprisBoard->maxlevel = 4;
 
       gc_bar_set(GC_BAR_LEVEL|GC_BAR_CONFIG);
+      gc_bar_location(-1, -1, 0.7);
 
       gamewon = FALSE;
       pause_board(FALSE);
@@ -337,23 +338,23 @@
   if(diff == 0 && (gcomprisBoard->level == 2
 		   || gcomprisBoard->level == 4))
     {
-      GdkPixbuf *button_pixmap;
-      double x_offset = BOARDWIDTH/2, y_offset = BOARDHEIGHT*0.6;
 
-      button_pixmap = gc_skin_pixmap_load("button_large2.png");
-      int w = gdk_pixbuf_get_width(button_pixmap);
-      int h = gdk_pixbuf_get_height(button_pixmap);
-      goo_canvas_image_new (boardRootItem,
-			    button_pixmap,
-			    x_offset - w/2,
-			    y_offset,
-			    NULL);
-      gdk_pixbuf_unref(button_pixmap);
+      double x_offset = BOARDWIDTH/2;
+      double y_offset = BOARDHEIGHT*0.7;
+
+      GooCanvasItem *item = goo_canvas_svg_new (boardRootItem,
+						gc_skin_rsvg_get(),
+						"svg-id", "#BUTTON_TEXT",
+						NULL);
+      SET_ITEM_LOCATION_CENTER(item,
+			       x_offset / 2,
+			       y_offset);
+      goo_canvas_item_scale(item, 2, 1);
 
       answer_item = goo_canvas_text_new(boardRootItem,
 					"",
 					x_offset,
-					y_offset + h/2,
+					y_offset,
 					-1,
 					GTK_ANCHOR_CENTER,
 					"font", gc_skin_font_board_title_bold,
@@ -519,6 +520,7 @@
 	      plate=0;
 	  }
 	scale_item_move_to(scale, plate);
+	gc_item_focus_init(scale->item, NULL);
       }
       break;
     default:

Modified: branches/gcomprixogoo/src/superbrain-activity/superbrain.c
==============================================================================
--- branches/gcomprixogoo/src/superbrain-activity/superbrain.c	(original)
+++ branches/gcomprixogoo/src/superbrain-activity/superbrain.c	Sat Jan 17 23:28:21 2009
@@ -279,11 +279,14 @@
 					NULL);
 
   /* The OK Button */
-  gc_util_button_text(boardLogoItem,
-		      270, 50,
-		      "button_large.png",
-		      _("OK"),
-		      (GtkSignalFunc) process_ok, NULL);
+  GooCanvasItem *item = goo_canvas_svg_new (boardLogoItem,
+					    gc_skin_rsvg_get(),
+					    "svg-id", "#OK",
+					    NULL);
+  SET_ITEM_LOCATION(item, 270, 50);
+  g_signal_connect(item, "button_press_event",
+		   (GtkSignalFunc) process_ok, NULL);
+  gc_item_focus_init(item, NULL);
 
   /* The list of the pieces */
   for(i=0; i<number_of_color; i++)