gcompris r3664 - in branches/gcomprixogoo: boards/skins/gartoon src/gcompris
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3664 - in branches/gcomprixogoo: boards/skins/gartoon src/gcompris
- Date: Fri, 2 Jan 2009 20:23:25 +0000 (UTC)
Author: bcoudoin
Date: Fri Jan 2 20:23:25 2009
New Revision: 3664
URL: http://svn.gnome.org/viewvc/gcompris?rev=3664&view=rev
Log:
more svg skin work
Removed:
branches/gcomprixogoo/boards/skins/gartoon/gcomprislogo.png
Modified:
branches/gcomprixogoo/boards/skins/gartoon/skin.svg
branches/gcomprixogoo/src/gcompris/about.c
branches/gcomprixogoo/src/gcompris/config.c
branches/gcomprixogoo/src/gcompris/gameutil.c
branches/gcomprixogoo/src/gcompris/gameutil.h
branches/gcomprixogoo/src/gcompris/help.c
Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.svg
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.svg (original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.svg Fri Jan 2 20:23:25 2009
@@ -907,6 +907,51 @@
y1="284.70993"
x2="324.22366"
y2="480.46399" />
+ <inkscape:perspective
+ id="perspective3470"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29660"
+ id="linearGradient3483"
+ gradientUnits="userSpaceOnUse"
+ x1="303.77036"
+ y1="652.60626"
+ x2="302.63507"
+ y2="449.38547" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient21876"
+ id="linearGradient3485"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8137852,0,0,0.862287,-407.11334,174.00315)"
+ x1="1118.4465"
+ y1="362.61246"
+ x2="1118.8473"
+ y2="456.37189" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29660"
+ id="linearGradient3493"
+ gradientUnits="userSpaceOnUse"
+ x1="303.77036"
+ y1="652.60626"
+ x2="302.63507"
+ y2="449.38547" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient21876"
+ id="linearGradient3495"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8137852,0,0,0.862287,-407.11334,174.00315)"
+ x1="1118.4465"
+ y1="362.61246"
+ x2="1118.8473"
+ y2="456.37189" />
</defs>
<sodipodi:namedview
inkscape:document-units="mm"
@@ -915,10 +960,10 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="3.08539"
- inkscape:cx="506.74976"
- inkscape:cy="428.88067"
- inkscape:current-layer="layer1"
+ inkscape:zoom="0.7713475"
+ inkscape:cx="249.2935"
+ inkscape:cy="256.74494"
+ inkscape:current-layer="BUTTON_TEXT"
id="namedview6255"
inkscape:window-width="1107"
inkscape:window-height="726"
@@ -956,6 +1001,43 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Dialog"
+ style="display:inline">
+ <g
+ id="DIALOG"
+ transform="translate(49.298689,6.4170438)">
+ <rect
+ rx="20.049141"
+ ry="20.049141"
+ y="1.2326088"
+ x="2.485666"
+ height="507.53482"
+ width="698.00165"
+ id="rect2250"
+ style="opacity:1;fill:#e9e7e2;fill-opacity:0.96078431;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.45905685;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ ry="20.049141"
+ rx="20.049141"
+ y="17.360764"
+ x="22.440418"
+ height="52.243645"
+ width="658.09216"
+ id="rect2260"
+ style="opacity:1;fill:url(#linearGradient5800);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.48417807;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ ry="21.213898"
+ rx="20.046944"
+ y="79.996887"
+ x="24.968691"
+ height="400.11282"
+ width="648.05005"
+ id="rect3242"
+ style="opacity:1;fill:url(#linearGradient5808);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.55517888;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ </g>
+ <g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
@@ -1673,42 +1755,43 @@
d="M 742.52895,470.62094 C 742.56995,474.94904 705.36835,474.55144 705.36345,470.62094 C 705.35175,461.28034 713.68855,453.69964 723.94615,453.69964 C 734.20385,453.69964 742.44035,461.28244 742.52895,470.62094 z"
style="fill:url(#linearGradient2658);fill-opacity:1;stroke-linecap:round" />
</g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="Dialog"
- style="display:inline">
<g
- id="DIALOG"
- transform="translate(49.298689,6.4170438)">
- <rect
- rx="20.049141"
- ry="20.049141"
- y="1.2326088"
- x="2.485666"
- height="507.53482"
- width="698.00165"
- id="rect2250"
- style="opacity:1;fill:#e9e7e2;fill-opacity:0.96078431;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.45905685;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ style="display:inline"
+ id="BUTTON_TEXT"
+ transform="matrix(0.284109,0,0,0.4233615,50.724494,9.774585)">
<rect
- ry="20.049141"
- rx="20.049141"
- y="17.360764"
- x="22.440418"
- height="52.243645"
- width="658.09216"
- id="rect2260"
- style="opacity:1;fill:url(#linearGradient5800);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.48417807;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ ry="23.049728"
+ y="479.00894"
+ x="228.72035"
+ height="111.05777"
+ width="671.32794"
+ id="rect3479"
+ style="opacity:1;fill:#151515;fill-opacity:1;stroke:url(#linearGradient3483);stroke-width:3.03117203999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ rx="23.049728" />
+ <path
+ style="opacity:1;fill:url(#linearGradient3485);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 249.6335,481.42387 L 877.86521,480.7083 C 889.62299,480.69491 896.98393,489.58799 897.26517,497.64075 C 897.51349,504.75121 892.87387,517.51813 893.0446,530.46057 C 838.24432,528.48281 780.2747,525.3974 726.11363,523.68282 C 669.42902,521.88835 617.71818,525.50444 563.56005,523.68282 C 510.20896,521.88835 455.13344,520.99398 401.00644,523.68282 C 346.82199,526.37453 288.25218,526.98093 239.08358,529.99696 C 239.55909,517.05452 236.17669,506.89324 234.34207,497.81219 C 232.67634,489.56709 241.87173,480.7083 249.6335,481.42387 z"
+ id="path3481"
+ sodipodi:nodetypes="csscssscsc" />
+ </g>
+ <g
+ style="display:inline"
+ id="BUTTON_TEXT_SELECTED"
+ transform="matrix(0.284109,0,0,0.4233615,51.730758,78.260058)">
<rect
- ry="21.213898"
- rx="20.046944"
- y="79.996887"
- x="24.968691"
- height="400.11282"
- width="648.05005"
- id="rect3242"
- style="opacity:1;fill:url(#linearGradient5808);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.55517888;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ ry="23.049728"
+ y="479.00894"
+ x="228.72035"
+ height="111.05777"
+ width="671.32794"
+ id="rect3489"
+ style="opacity:1;fill:#42aa42;fill-opacity:1;stroke:url(#linearGradient3493);stroke-width:3.03117203999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ rx="23.049728" />
+ <path
+ style="opacity:1;fill:url(#linearGradient3495);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 249.6335,481.42387 L 877.86521,480.7083 C 889.62299,480.69491 896.98393,489.58799 897.26517,497.64075 C 897.51349,504.75121 892.87387,517.51813 893.0446,530.46057 C 838.24432,528.48281 780.2747,525.3974 726.11363,523.68282 C 669.42902,521.88835 617.71818,525.50444 563.56005,523.68282 C 510.20896,521.88835 455.13344,520.99398 401.00644,523.68282 C 346.82199,526.37453 288.25218,526.98093 239.08358,529.99696 C 239.55909,517.05452 236.17669,506.89324 234.34207,497.81219 C 232.67634,489.56709 241.87173,480.7083 249.6335,481.42387 z"
+ id="path3491"
+ sodipodi:nodetypes="csscssscsc" />
</g>
</g>
</svg>
Modified: branches/gcomprixogoo/src/gcompris/about.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/about.c (original)
+++ branches/gcomprixogoo/src/gcompris/about.c Fri Jan 2 20:23:25 2009
@@ -43,7 +43,7 @@
gdouble y_start = 0;
gdouble x_start = 0;
gint y = 0;
- GooCanvasItem *item, *item2;
+ GooCanvasItem *item;
gint plane_y;
static gchar *content =
@@ -79,12 +79,12 @@
x_start = bounds.x1;
y_start = bounds.y1;
- y = bounds.y2;
+ y = bounds.y2 - 26;
goo_canvas_text_new (rootitem,
_("About GCompris"),
(gdouble) BOARDWIDTH/2,
- (gdouble) y_start + 40,
+ (gdouble) y_start + 35,
-1,
GTK_ANCHOR_CENTER,
"font", gc_skin_font_title,
@@ -92,6 +92,16 @@
NULL);
goo_canvas_text_new (rootitem,
+ _("GCompris Home Page: http://gcompris.net";),
+ (gdouble) BOARDWIDTH/2,
+ (gdouble) y_start + 58,
+ -1,
+ GTK_ANCHOR_CENTER,
+ "font", gc_skin_font_content,
+ "fill-color-rgba", gc_skin_color_subtitle,
+ NULL);
+
+ goo_canvas_text_new (rootitem,
_("Translators:"),
(gdouble) BOARDWIDTH/2-320,
(gdouble) y_start + 90,
@@ -188,32 +198,11 @@
NULL);
}
- // GCompris Reference
- y_start += 80;
- pixmap = gc_skin_pixmap_load("gcomprislogo.png");
- item = goo_canvas_image_new (rootitem,
- pixmap,
- (double) (BOARDWIDTH*0.3) - gdk_pixbuf_get_width(pixmap)/2,
- (double) y_start - gdk_pixbuf_get_height(pixmap)/2,
- NULL);
-
- gdk_pixbuf_unref(pixmap);
-
- item = goo_canvas_text_new (rootitem,
- _("GCompris Home Page\nhttp://gcompris.net";),
- (gdouble) BOARDWIDTH/2-320,
- (gdouble) y_start + 5,
- -1,
- GTK_ANCHOR_NORTH_WEST,
- "font", gc_skin_font_content,
- "fill-color-rgba", gc_skin_color_subtitle,
- NULL);
-
// Copyright
item = goo_canvas_text_new (rootitem,
"Copyright 2000-2008 Bruno Coudoin and Others",
(gdouble) BOARDWIDTH/2,
- (gdouble) y - 95,
+ (gdouble) y - 55,
-1,
GTK_ANCHOR_CENTER,
"font", gc_skin_font_content,
@@ -224,7 +213,7 @@
item = goo_canvas_text_new (rootitem,
_("This software is a GNU Package and is released under the GNU General Public License"),
(gdouble) BOARDWIDTH/2,
- (gdouble) y - 80,
+ (gdouble) y - 40,
-1,
GTK_ANCHOR_CENTER,
"font", gc_skin_font_content,
@@ -232,54 +221,27 @@
NULL);
// OK
- pixmap = gc_skin_pixmap_load("button_large.png");
- item = goo_canvas_image_new (rootitem,
- pixmap,
- (double) BOARDWIDTH*0.5 - gdk_pixbuf_get_width(pixmap)/2,
- (double) y - gdk_pixbuf_get_height(pixmap) - 5,
- NULL);
-
- g_signal_connect(item, "button_press_event",
- (GtkSignalFunc) item_event_ok,
- "ok");
- gc_item_focus_init(item, NULL);
-
- goo_canvas_text_new (rootitem,
- _("OK"),
- (gdouble) BOARDWIDTH*0.5 + 1.0,
- (gdouble) y - gdk_pixbuf_get_height(pixmap) + 20 + 1.0,
- -1,
- GTK_ANCHOR_CENTER,
- "font", gc_skin_font_title,
- "fill-color-rgba", gc_skin_color_shadow,
- NULL);
- item2 = goo_canvas_text_new (rootitem,
- _("OK"),
- (gdouble) BOARDWIDTH*0.5,
- (gdouble) y - gdk_pixbuf_get_height(pixmap) + 20,
- -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_ok,
- "ok");
- gc_item_focus_init(item2, item);
- gdk_pixbuf_unref(pixmap);
-
+ gc_util_button_text_svg(rootitem,
+ BOARDWIDTH * 0.5,
+ y,
+ "#BUTTON_TEXT",
+ _("OK"),
+ (GtkSignalFunc) item_event_ok,
+ "ok");
+ // The animation
pixmap = gc_skin_pixmap_load("gcompris-about.png");
plane_y = BOARDHEIGHT - gdk_pixbuf_get_height(pixmap);
item = goo_canvas_image_new (rootitem,
pixmap,
- -gdk_pixbuf_get_width(pixmap),
- plane_y);
+ -1 * gdk_pixbuf_get_width(pixmap),
+ plane_y,
+ NULL);
goo_canvas_item_animate (item,
BOARDWIDTH + gdk_pixbuf_get_width(pixmap),
- -gdk_pixbuf_get_height(pixmap),
+ -1 * gdk_pixbuf_get_height(pixmap),
0.4,
-30,
TRUE,
Modified: branches/gcomprixogoo/src/gcompris/config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/config.c (original)
+++ branches/gcomprixogoo/src/gcompris/config.c Fri Jan 2 20:23:25 2009
@@ -154,12 +154,11 @@
gc_config_start ()
{
GcomprisProperties *properties = gc_prop_get();
- GdkPixbuf *pixmap = NULL;
gint y_start = 0;
gint x_start = 0;
gint x_text_start = 0;
gint y = 0;
- GooCanvasItem *item, *item2;
+ GooCanvasItem *item;
/* Pause the board */
gc_board_pause(TRUE);
@@ -183,7 +182,7 @@
x_start = bounds.x1;
y_start = bounds.y1;
- y = bounds.y2;
+ y = bounds.y2 - 26;
goo_canvas_text_new (rootitem,
_("GCompris Configuration"),
@@ -417,42 +416,13 @@
// OK
- pixmap = gc_skin_pixmap_load("button_large.png");
- item = goo_canvas_image_new (rootitem,
- pixmap,
- (double) (BOARDWIDTH*0.5) - gdk_pixbuf_get_width(pixmap)/2,
- (double) y - gdk_pixbuf_get_height(pixmap) - 5,
- NULL);
-
- g_signal_connect(item, "button_press_event",
- (GtkSignalFunc) item_event_ok,
- "ok");
- gc_item_focus_init(item, NULL);
-
- goo_canvas_text_new (rootitem,
- _("OK"),
- (gdouble) BOARDWIDTH*0.5 + 1.0,
- (gdouble) y - gdk_pixbuf_get_height(pixmap) + 20 + 1.0,
- -1,
- GTK_ANCHOR_CENTER,
- "font", gc_skin_font_title,
- "fill-color-rgba", gc_skin_color_shadow,
- NULL);
- item2 = goo_canvas_text_new (rootitem,
- _("OK"),
- (gdouble) BOARDWIDTH*0.5,
- (gdouble) y - gdk_pixbuf_get_height(pixmap) + 20,
- -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_ok,
- "ok");
- gc_item_focus_init(item2, item);
- gdk_pixbuf_unref(pixmap);
-
+ gc_util_button_text_svg(rootitem,
+ BOARDWIDTH * 0.5,
+ y,
+ "#BUTTON_TEXT",
+ _("OK"),
+ (GtkSignalFunc) item_event_ok,
+ "ok");
is_displayed = TRUE;
}
Modified: branches/gcomprixogoo/src/gcompris/gameutil.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gameutil.c (original)
+++ branches/gcomprixogoo/src/gcompris/gameutil.c Fri Jan 2 20:23:25 2009
@@ -703,3 +703,55 @@
gc_item_focus_init(item_text, item);
gdk_pixbuf_unref(pixmap);
}
+
+/** Display a button with the given text (BY SKIN'S SVG ID)
+ *
+ * \param x the x coordinate of the button
+ * \param y the y coordinate of the button
+ * \param button_file the image file to use as the button
+ * \param text is the text to display in the button
+ * \param process is the callback function
+ * \param data is the user data passed to the callback function
+ *
+ * \return void
+ */
+void
+gc_util_button_text_svg(GooCanvasItem *rootitem,
+ guint x, guint y,
+ char *button_id,
+ char *text,
+ GtkSignalFunc process,
+ gpointer data)
+{
+ GooCanvasItem *item;
+ GooCanvasItem *item_text;
+
+ /* The Button */
+ item = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", button_id,
+ "autocrop", TRUE,
+ NULL);
+ SET_ITEM_LOCATION_CENTER(item, x, y);
+
+ g_signal_connect(item,
+ "button_press_event",
+ (GtkSignalFunc) process, data);
+ gc_item_focus_init(item, NULL);
+
+ /* The Text */
+ item_text =
+ goo_canvas_text_new (rootitem,
+ text,
+ x,
+ y,
+ -1,
+ GTK_ANCHOR_CENTER,
+ "font", gc_skin_font_board_small,
+ "fill_color_rgba", gc_skin_color_text_button,
+ NULL);
+ g_signal_connect(item_text,
+ "button_press_event",
+ process, data);
+ gc_item_focus_init(item_text, item);
+}
Modified: branches/gcomprixogoo/src/gcompris/gameutil.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gameutil.h (original)
+++ branches/gcomprixogoo/src/gcompris/gameutil.h Fri Jan 2 20:23:25 2009
@@ -44,14 +44,25 @@
// source file.
// This reset the item at its 0,0 coordinate and then translate
// it to x,y
-#define SET_ITEM_LOCATION(item, x, y) \
- { \
- GooCanvasBounds bounds; \
- goo_canvas_item_set_transform(item, NULL); \
- goo_canvas_item_get_bounds(item, &bounds); \
- goo_canvas_item_translate(item, \
- -1 * bounds.x1 + x, \
- -1 * bounds.y1 + y); \
+#define SET_ITEM_LOCATION(item, x, y) \
+ { \
+ GooCanvasBounds bounds; \
+ goo_canvas_item_set_transform(item, NULL); \
+ goo_canvas_item_get_bounds(item, &bounds); \
+ goo_canvas_item_translate(item, \
+ -1 * bounds.x1 + x, \
+ -1 * bounds.y1 + y); \
+ }
+
+/* Same as above but centerer around x,y */
+#define SET_ITEM_LOCATION_CENTER(item, x, y) \
+ { \
+ GooCanvasBounds bounds; \
+ goo_canvas_item_set_transform(item, NULL); \
+ goo_canvas_item_get_bounds(item, &bounds); \
+ goo_canvas_item_translate(item, \
+ -1 * bounds.x1 + x - (bounds.x2 - bounds.x1)/2, \
+ -1 * bounds.y1 + y - (bounds.y2 - bounds.y1)/2); \
}
gchar *g_utf8_strndup(gchar*,gint);
@@ -82,4 +93,10 @@
char *text,
GtkSignalFunc process,
gpointer data);
+void gc_util_button_text_svg(GooCanvasItem *rootitem,
+ guint x, guint y,
+ char *button_id,
+ char *text,
+ GtkSignalFunc process,
+ gpointer data);
#endif
Modified: branches/gcomprixogoo/src/gcompris/help.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/help.c (original)
+++ branches/gcomprixogoo/src/gcompris/help.c Fri Jan 2 20:23:25 2009
@@ -89,9 +89,8 @@
void gc_help_start (GcomprisBoard *gcomprisBoard)
{
- GdkPixbuf *pixmap;
gchar *item_id = "#UP";
- GooCanvasItem *item, *item2;
+ GooCanvasItem *item;
gint y = 0;
gint y_start = 0;
gint x_start = 0;
@@ -124,7 +123,7 @@
x_start = bounds.x1;
y_start = bounds.y1;
- y = bounds.y2;
+ y = bounds.y2 - 26;
y_start += 15;
if(gcomprisBoard->section && gcomprisBoard->name) {
@@ -348,33 +347,13 @@
set_content(text_to_display);
// OK
- pixmap = gc_skin_pixmap_load("button_large.png");
-
- item = goo_canvas_image_new (rootitem,
- pixmap,
- (BOARDWIDTH*0.5) - gdk_pixbuf_get_width(pixmap)/2,
- y - gdk_pixbuf_get_height(pixmap) - 5,
- NULL);
-
- g_signal_connect(item, "button_press_event",
- (GtkSignalFunc) item_event_help,
- "ok");
- gc_item_focus_init(item, NULL);
-
- item2 = goo_canvas_text_new (rootitem,
- _("OK"),
- BOARDWIDTH*0.5,
- y - gdk_pixbuf_get_height(pixmap) + 20,
- -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_help,
- "ok");
- gc_item_focus_init(item2, item);
- gdk_pixbuf_unref(pixmap);
+ gc_util_button_text_svg(rootitem,
+ BOARDWIDTH * 0.5,
+ y,
+ "#BUTTON_TEXT",
+ _("OK"),
+ (GtkSignalFunc) item_event_help,
+ "ok");
gc_bar_hide(TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
