gcompris r3690 - in branches/gcomprixogoo: . boards/skins/babytoy boards/skins/gartoon src/babymatch-activity src/imageid-activity
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3690 - in branches/gcomprixogoo: . boards/skins/babytoy boards/skins/gartoon src/babymatch-activity src/imageid-activity
- Date: Mon, 19 Jan 2009 00:17:44 +0000 (UTC)
Author: bcoudoin
Date: Mon Jan 19 00:17:44 2009
New Revision: 3690
URL: http://svn.gnome.org/viewvc/gcompris?rev=3690&view=rev
Log:
Now shapegame tooltip is a a transparent rectangle instead
of a fixed button. The rectangle follow the tooltip size to
avoid the text growing after the button effect.
Removed:
branches/gcomprixogoo/boards/skins/babytoy/button_large.png
branches/gcomprixogoo/boards/skins/babytoy/button_large_selected.png
branches/gcomprixogoo/boards/skins/gartoon/button_large.png
branches/gcomprixogoo/boards/skins/gartoon/button_large_selected.png
Modified:
branches/gcomprixogoo/ChangeLog
branches/gcomprixogoo/boards/skins/gartoon/skin.svg
branches/gcomprixogoo/src/babymatch-activity/shapegame.c
branches/gcomprixogoo/src/imageid-activity/imageid.c
Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.svg
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.svg (original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.svg Mon Jan 19 00:17:44 2009
@@ -2241,38 +2241,6 @@
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient6851"
- id="linearGradient3987"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6226211,0,0,1.3070176,-1080.4811,332.64992)"
- spreadMethod="reflect"
- x1="1176.9315"
- y1="407.09982"
- x2="1177.0143"
- y2="336.43954" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient3989"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6226211,0,0,1.3070176,-1080.4811,332.64992)"
- x1="897.44598"
- y1="299.4411"
- x2="896.80713"
- y2="435.95776" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10745"
- id="linearGradient3991"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-0.9736789,1,0,-21.806726,145.50227)"
- spreadMethod="pad"
- x1="75.21579"
- y1="818.20477"
- x2="-155.22664"
- y2="818.20477" />
- <linearGradient
- inkscape:collect="always"
xlink:href="#linearGradient10745"
id="linearGradient3993"
gradientUnits="userSpaceOnUse"
@@ -2293,8 +2261,26 @@
gradientTransform="matrix(0.995056,0,0,4.3813722,2.7903081,-1618.0691)" />
<linearGradient
inkscape:collect="always"
+ xlink:href="#linearGradient613"
+ id="linearGradient4051"
+ x1="-309.81882"
+ y1="956.72131"
+ x2="-202.80441"
+ y2="696.75458"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29660"
+ id="linearGradient4575"
+ gradientUnits="userSpaceOnUse"
+ x1="303.77036"
+ y1="652.60626"
+ x2="302.63507"
+ y2="449.38547" />
+ <linearGradient
+ inkscape:collect="always"
xlink:href="#linearGradient21876"
- id="linearGradient4003"
+ id="linearGradient4577"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.8137852,0,0,0.862287,-407.11334,174.00315)"
x1="1118.4465"
@@ -2303,24 +2289,23 @@
y2="456.37189" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient10745"
- id="linearGradient4041"
+ xlink:href="#linearGradient29660"
+ id="linearGradient4579"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-0.9736789,1,0,-184.14883,158.11254)"
- spreadMethod="pad"
- x1="75.21579"
- y1="818.20477"
- x2="-155.22664"
- y2="818.20477" />
+ x1="303.77036"
+ y1="652.60626"
+ x2="302.63507"
+ y2="449.38547" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient613"
- id="linearGradient4051"
- x1="-309.81882"
- y1="956.72131"
- x2="-202.80441"
- y2="696.75458"
- gradientUnits="userSpaceOnUse" />
+ xlink:href="#linearGradient21876"
+ id="linearGradient4581"
+ 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"
@@ -2331,8 +2316,8 @@
inkscape:pageshadow="2"
inkscape:zoom="0.54542505"
inkscape:cx="250.00318"
- inkscape:cy="195.91499"
- inkscape:current-layer="FILE_SELECTOR"
+ inkscape:cy="342.58959"
+ inkscape:current-layer="layer6"
id="namedview6255"
inkscape:window-width="1272"
inkscape:window-height="743"
@@ -2447,7 +2432,7 @@
height="350.03677"
width="722.11292"
id="rect3038"
- style="opacity:1;fill:#f8f8ae;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;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="opacity:1;fill:#f8f8ae;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998000000003;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="23.983999"
rx="20.418812"
@@ -2558,25 +2543,10 @@
</g>
</g>
<g
- inkscape:label="Layer 1"
+ inkscape:label="Menu"
inkscape:groupmode="layer"
id="layer1"
style="display:inline">
- <path
- sodipodi:type="arc"
- style="fill:#1a1a1a;fill-opacity:1;stroke-linecap:round"
- id="path5435"
- sodipodi:cx="368.57144"
- sodipodi:cy="472.36218"
- sodipodi:rx="162.85715"
- sodipodi:ry="162.85715"
- d="M 531.42859,472.36218 A 162.85715,162.85715 0 1 1 205.71429,472.36218 A 162.85715,162.85715 0 1 1 531.42859,472.36218 z"
- transform="matrix(0.196491,0,0,0.196491,527.11905,123.12725)" />
- <path
- style="fill:url(#linearGradient30349);fill-opacity:1;stroke-linecap:round"
- d="M 629.5492,212.46979 C 629.6149,219.39426 570.0973,218.75817 570.0895,212.46979 C 570.0708,197.52613 583.4085,185.3979 599.8194,185.3979 C 616.2302,185.3979 629.4075,197.52943 629.5492,212.46979 z"
- id="path5741"
- sodipodi:nodetypes="csss" />
<g
id="BACKGROUND"
style="opacity:1"
@@ -2659,6 +2629,53 @@
sodipodi:nodetypes="csscssscsc" />
</g>
<g
+ id="BAR_BG"
+ transform="matrix(0.9971447,0,0,0.5081251,-785.25536,175.88814)">
+ <rect
+ y="596.13507"
+ x="788.71179"
+ height="79.875031"
+ width="799.875"
+ id="rect11722"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.41653538;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ ry="4.9667749"
+ y="596.13507"
+ x="788.71179"
+ height="79.875031"
+ width="799.875"
+ id="rect2511"
+ style="opacity:1;fill:url(#linearGradient12704);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient12706);stroke-width:2.41653538;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ rx="4.9667749" />
+ <path
+ sodipodi:nodetypes="csscssscsc"
+ id="rect3931"
+ d="M 793.73033,596.67344 C 793.73033,596.67344 1385.1524,595.52305 1583.5964,596.67344 C 1586.4906,596.69022 1588.3318,598.62121 1587.7981,601.21569 C 1586.3503,608.25444 1582.8579,625.33449 1583.0677,638.3224 C 1515.7277,636.33769 1453.8722,640.04301 1387.3177,638.3224 C 1317.6622,636.52163 1254.1186,640.15042 1187.5677,638.3224 C 1122.0085,636.52163 1054.3303,635.62411 987.81765,638.3224 C 921.23441,641.02357 852.77956,635.16937 792.35992,638.196 C 792.94425,625.20808 791.28155,610.03218 789.23641,601.08928 C 788.65617,598.55205 790.83605,596.67344 793.73033,596.67344 z"
+ style="opacity:1;fill:url(#linearGradient12708);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Buttons"
+ style="display:inline">
+ <path
+ sodipodi:type="arc"
+ style="fill:#1a1a1a;fill-opacity:1;stroke-linecap:round;display:inline"
+ id="path5435"
+ sodipodi:cx="368.57144"
+ sodipodi:cy="472.36218"
+ sodipodi:rx="162.85715"
+ sodipodi:ry="162.85715"
+ d="M 531.42859,472.36218 A 162.85715,162.85715 0 1 1 205.71429,472.36218 A 162.85715,162.85715 0 1 1 531.42859,472.36218 z"
+ transform="matrix(0.196491,0,0,0.196491,527.11905,123.12725)" />
+ <path
+ style="fill:url(#linearGradient30349);fill-opacity:1;stroke-linecap:round;display:inline"
+ d="M 629.5492,212.46979 C 629.6149,219.39426 570.0973,218.75817 570.0895,212.46979 C 570.0708,197.52613 583.4085,185.3979 599.8194,185.3979 C 616.2302,185.3979 629.4075,197.52943 629.5492,212.46979 z"
+ id="path5741"
+ sodipodi:nodetypes="csss" />
+ <g
+ style="display:inline"
id="SOUND"
transform="translate(275.24342,-81.573152)">
<g
@@ -2685,6 +2702,7 @@
</g>
</g>
<g
+ style="display:inline"
id="g17346"
transform="translate(39.22292,65.930662)">
<path
@@ -2708,6 +2726,7 @@
style="fill:url(#linearGradient2392);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="g17422"
transform="translate(38.925889,-239.37633)">
<path
@@ -2731,6 +2750,7 @@
style="fill:url(#linearGradient2402);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="g17417"
transform="translate(35.73107,-88.684454)">
<path
@@ -2754,6 +2774,7 @@
style="fill:url(#linearGradient2397);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="UNCHECKED"
transform="translate(-186.02593,24.44029)">
<path
@@ -2777,6 +2798,7 @@
style="fill:url(#linearGradient2470);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="CHECKED"
transform="translate(-186.02613,29.89894)">
<path
@@ -2800,31 +2822,7 @@
style="fill:url(#linearGradient2490);fill-opacity:1;stroke-linecap:round" />
</g>
<g
- id="BAR_BG"
- transform="matrix(0.9971447,0,0,0.5081251,-785.25536,175.88814)">
- <rect
- y="596.13507"
- x="788.71179"
- height="79.875031"
- width="799.875"
- id="rect11722"
- style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.41653538;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- ry="4.9667749"
- y="596.13507"
- x="788.71179"
- height="79.875031"
- width="799.875"
- id="rect2511"
- style="opacity:1;fill:url(#linearGradient12704);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient12706);stroke-width:2.41653538;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- rx="4.9667749" />
- <path
- sodipodi:nodetypes="csscssscsc"
- id="rect3931"
- d="M 793.73033,596.67344 C 793.73033,596.67344 1385.1524,595.52305 1583.5964,596.67344 C 1586.4906,596.69022 1588.3318,598.62121 1587.7981,601.21569 C 1586.3503,608.25444 1582.8579,625.33449 1583.0677,638.3224 C 1515.7277,636.33769 1453.8722,640.04301 1387.3177,638.3224 C 1317.6622,636.52163 1254.1186,640.15042 1187.5677,638.3224 C 1122.0085,636.52163 1054.3303,635.62411 987.81765,638.3224 C 921.23441,641.02357 852.77956,635.16937 792.35992,638.196 C 792.94425,625.20808 791.28155,610.03218 789.23641,601.08928 C 788.65617,598.55205 790.83605,596.67344 793.73033,596.67344 z"
- style="opacity:1;fill:url(#linearGradient12708);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
- </g>
- <g
+ style="display:inline"
id="HOME"
transform="translate(-143.09038,16.101188)">
<path
@@ -2848,6 +2846,7 @@
style="fill:url(#linearGradient20738);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="g17432"
transform="translate(37.5645,-160.18832)">
<path
@@ -2871,6 +2870,7 @@
style="fill:url(#linearGradient2412);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="REPEAT"
transform="translate(73.93017,86.46002)">
<path
@@ -2894,6 +2894,7 @@
style="fill:url(#linearGradient2407);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="g17442"
transform="translate(37.5645,-160.18832)">
<path
@@ -2917,6 +2918,7 @@
style="fill:url(#linearGradient2427);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="g17437"
transform="translate(-43.328968,70.916311)">
<path
@@ -2940,6 +2942,7 @@
style="fill:url(#linearGradient2417);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="CONFIG"
transform="translate(14.96454,89.0529)">
<path
@@ -2963,6 +2966,7 @@
style="fill:url(#linearGradient2382);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="OK"
transform="translate(-79.933202,87.75642)">
<path
@@ -2986,6 +2990,7 @@
style="fill:url(#linearGradient2422);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="ABOUT"
transform="translate(-213.21571,166.40697)">
<path
@@ -3009,6 +3014,7 @@
style="fill:url(#linearGradient15076);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="NEXT"
transform="translate(-186.02653,28.30821)">
<path
@@ -3032,6 +3038,7 @@
style="fill:url(#linearGradient2485);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="PREVIOUS"
transform="translate(-186.02613,24.77852)">
<path
@@ -3055,6 +3062,7 @@
style="fill:url(#linearGradient2465);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="DOWN"
transform="translate(-185.80624,-262.13927)">
<path
@@ -3078,6 +3086,7 @@
style="fill:url(#linearGradient2480);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="EXIT"
transform="translate(-65.518493,318.64948)">
<path
@@ -3101,6 +3110,7 @@
style="fill:url(#linearGradient15060);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="HELP"
transform="translate(-283.21479,242.53412)">
<path
@@ -3124,6 +3134,7 @@
style="fill:url(#linearGradient19936);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="LEVEL_DOWN"
transform="matrix(0,1,-1,0,413.73901,-173.41898)">
<g
@@ -3152,6 +3163,7 @@
</g>
</g>
<g
+ style="display:inline"
id="LEVEL_UP"
transform="matrix(0,1,-1,0,921.8333,-121.39919)">
<path
@@ -3176,6 +3188,7 @@
style="fill:url(#linearGradient3655);fill-opacity:1;stroke-linecap:round" />
</g>
<g
+ style="display:inline"
id="SOUND_UNCHECKED">
<g
transform="matrix(0.5640385,0,0,0.5640385,259.01121,-43.423724)"
@@ -3278,7 +3291,7 @@
<g
style="display:inline"
id="BUTTON_TEXT"
- transform="matrix(0.284109,0,0,0.4233615,50.724494,9.774585)">
+ transform="matrix(0.284109,0,0,0.4233615,52.144342,35.766875)">
<rect
ry="23.049728"
y="479.00894"
@@ -3286,39 +3299,21 @@
height="111.05777"
width="671.32794"
id="rect3479"
- style="opacity:1;fill:#151515;fill-opacity:1;stroke:url(#linearGradient3483);stroke-width:3.03117204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:1;fill:#151515;fill-opacity:1;stroke:url(#linearGradient4579);stroke-width:3.03117204;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"
+ style="opacity:1;fill:url(#linearGradient4581);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="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.03117204;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>
<path
style="fill:#30a230;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 477.7524,265.38206 L 486.65788,265.6983 L 486.44057,260.60258 L 497.23191,268.62833 L 486.24495,276.58746 L 486.59363,271.3902 L 477.79728,271.8633 L 477.7524,265.38206 z"
id="MENUICON"
sodipodi:nodetypes="cccccccc" />
<g
+ style="display:inline"
transform="matrix(0.5596747,0,0,0.5596747,418.79193,289.90621)"
id="DIFFICULTY1">
<path
@@ -3339,6 +3334,7 @@
d="M 35.973752,39.712833 L 24.028333,33.709386 L 12.082531,39.678326 L 14.362768,27.008543 L 4.7776396,18.070249 L 18.056076,16.247921 L 24.062792,4.6783526 L 30.045232,16.255741 L 43.322959,18.11306 L 33.713703,27.034785 L 35.973752,39.712833 z" />
</g>
<g
+ style="display:inline"
id="DIFFICULTY2"
inkscape:label="#DIFFICULTY"
transform="matrix(1.1359334,0,0,1.1359334,-71.871044,-39.181705)">
@@ -3386,6 +3382,7 @@
</g>
</g>
<g
+ style="display:inline"
id="DIFFICULTY3"
transform="matrix(1.1359334,0,0,1.1359334,-72.106633,-36.343689)">
<g
@@ -3499,6 +3496,7 @@
sodipodi:nodetypes="ccccccsccccccc" />
</g>
<g
+ style="display:inline"
id="DIFFICULTY5"
transform="matrix(1.1359334,0,0,1.1359334,-73.570992,-38.129683)">
<g
@@ -3595,6 +3593,7 @@
</g>
</g>
<g
+ style="display:inline"
id="DIFFICULTY6"
transform="matrix(1.1359334,0,0,1.1359334,-72.106633,-36.363211)">
<g
@@ -3737,6 +3736,7 @@
</g>
</g>
<g
+ style="display:inline"
transform="matrix(0.4362563,0,0,0.4347315,361.84171,83.071922)"
id="FILE"
inkscape:label="#FILE">
@@ -3758,6 +3758,7 @@
</g>
</g>
<g
+ style="display:inline"
id="FOLDER"
transform="matrix(0.4198801,0,0,0.4198801,406.1498,121.83512)">
<g
@@ -3822,4 +3823,29 @@
</g>
</g>
</g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="Buttons Selected"
+ style="display:inline">
+ <g
+ style="display:inline"
+ id="BUTTON_TEXT_SELECTED"
+ transform="matrix(0.284109,0,0,0.4233615,52.144342,35.766875)">
+ <rect
+ 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(#linearGradient4575);stroke-width:3.03117204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ rx="23.049728" />
+ <path
+ style="opacity:1;fill:url(#linearGradient4577);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/babymatch-activity/shapegame.c
==============================================================================
--- branches/gcomprixogoo/src/babymatch-activity/shapegame.c (original)
+++ branches/gcomprixogoo/src/babymatch-activity/shapegame.c Mon Jan 19 00:17:44 2009
@@ -115,8 +115,6 @@
/* The continue button */
static GooCanvasItem *continue_root_item;
-static GooCanvasItem *continue_text_item;
-static GooCanvasItem *continue_bg_item;
static void start_board (GcomprisBoard *agcomprisBoard);
static void pause_board (gboolean pause);
@@ -451,9 +449,6 @@
gamewon = TRUE;
/* Show the tooltip to let the user continue the game */
- g_object_set(continue_text_item,
- "text", _("Continue"),
- NULL);
g_object_set (continue_root_item, "visibility", GOO_CANVAS_ITEM_VISIBLE, NULL);
}
@@ -510,7 +505,6 @@
static void shapegame_init_canvas(GooCanvasItem *parent)
{
- GdkPixbuf *pixmap = NULL;
shape_root_item = goo_canvas_group_new (parent, NULL);
goo_canvas_item_translate(shape_root_item,
@@ -525,25 +519,29 @@
goo_canvas_item_translate(tooltip_root_item, 10, BOARDHEIGHT-70);
- pixmap = gc_skin_pixmap_load("button_large.png");
tooltip_bg_item = \
- goo_canvas_image_new (tooltip_root_item,
- pixmap,
- 0,
- 0,
- NULL);
+ goo_canvas_rect_new (tooltip_root_item,
+ 0,
+ 0,
+ 0,
+ 0,
+ "stroke_color_rgba", 0xFFFFFFFFL,
+ "fill_color_rgba", 0x0000FF90L,
+ "line-width", (double) 2,
+ "radius-x", (double) 10,
+ "radius-y", (double) 10,
+ NULL);
tooltip_text_item = \
goo_canvas_text_new (tooltip_root_item,
"",
- gdk_pixbuf_get_width(pixmap)/2,
- 24.0,
+ 15,
+ 15,
-1,
- GTK_ANCHOR_CENTER,
+ GTK_ANCHOR_WEST,
"font", gc_skin_font_board_small,
"fill_color_rgba", gc_skin_color_text_button,
NULL);
- gdk_pixbuf_unref(pixmap);
/* Hide the tooltip */
g_object_set (tooltip_root_item, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
@@ -555,34 +553,18 @@
goo_canvas_item_translate(continue_root_item, 5, 5);
- pixmap = gc_skin_pixmap_load("button_large.png");
- continue_bg_item = \
- goo_canvas_image_new (continue_root_item,
- pixmap,
- 0,
- 0,
- NULL);
-
- continue_text_item = \
- goo_canvas_text_new (continue_root_item,
- "",
- gdk_pixbuf_get_width(pixmap)/2,
- 24.0,
- -1,
- GTK_ANCHOR_CENTER,
- "font", gc_skin_font_board_small,
- "fill_color_rgba", gc_skin_color_text_button,
- NULL);
- gdk_pixbuf_unref(pixmap);
+ continue_root_item = \
+ goo_canvas_svg_new (continue_root_item,
+ gc_skin_rsvg_get(),
+ "svg-id", "#OK",
+ NULL);
+ SET_ITEM_LOCATION(continue_root_item, 15, 15);
+ gc_item_focus_init(continue_root_item, NULL);
g_signal_connect(continue_root_item,
"button_press_event",
(GtkSignalFunc) item_event_ok,
"continue_click");
- g_signal_connect(continue_text_item,
- "button_press_event",
- (GtkSignalFunc) item_event_ok,
- "continue_click");
/* Hide the continue */
g_object_set (continue_root_item, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
@@ -1100,6 +1082,15 @@
"text", shape->tooltip,
NULL);
g_object_set (tooltip_root_item, "visibility", GOO_CANVAS_ITEM_VISIBLE, NULL);
+
+ /* Set the background */
+ GooCanvasBounds bounds;
+ goo_canvas_item_get_bounds (tooltip_text_item, &bounds);
+ g_object_set(tooltip_bg_item,
+ "width", bounds.x2 - bounds.x1 + 30,
+ "height", bounds.y2 - bounds.y1 + 15,
+ NULL);
+
}
break;
Modified: branches/gcomprixogoo/src/imageid-activity/imageid.c
==============================================================================
--- branches/gcomprixogoo/src/imageid-activity/imageid.c (original)
+++ branches/gcomprixogoo/src/imageid-activity/imageid.c Mon Jan 19 00:17:44 2009
@@ -288,7 +288,6 @@
int x, y, xp, yp;
guint vertical_separation;
GdkPixbuf *pixmap = NULL;
- GdkPixbuf *button_pixmap = NULL;
Board *board;
guint i;
@@ -300,7 +299,6 @@
goo_canvas_group_new (goo_canvas_get_root_item(gcomprisBoard->canvas),
NULL);
- button_pixmap = gc_skin_pixmap_load("button_large.png");
/* display the image */
board = g_list_nth_data(board_list, board_number);
g_assert(board != NULL);
@@ -328,8 +326,10 @@
vertical_separation = 10 + 60 / i;
+ guint button_pixmap_height = 48;
+ guint button_pixmap_width = 191;
yp = (BOARDHEIGHT -
- i * gdk_pixbuf_get_height(button_pixmap)
+ i * button_pixmap_height
- 2 * vertical_separation)/2 - 20;
i = 0;
@@ -338,11 +338,13 @@
group = goo_canvas_group_new (boardRootItem,
NULL);
- button = goo_canvas_image_new (group,
- button_pixmap,
- xp,
- yp,
- NULL);
+ button = goo_canvas_svg_new (group,
+ gc_skin_rsvg_get(),
+ "svg-id", "#BUTTON_TEXT",
+ NULL);
+ SET_ITEM_LOCATION(button,
+ xp,
+ yp);
g_object_set_data(G_OBJECT(group),
"button", button);
@@ -353,8 +355,8 @@
item = goo_canvas_text_new (group,
board->text[i],
- xp + gdk_pixbuf_get_width(button_pixmap)/2 + 1.0,
- yp + gdk_pixbuf_get_height(button_pixmap)/2 + 1.0,
+ xp + button_pixmap_width/2 + 1.0,
+ yp + button_pixmap_height/2 + 1.0,
-1,
GTK_ANCHOR_CENTER,
"font", gc_skin_font_board_big,
@@ -367,8 +369,8 @@
item = goo_canvas_text_new (group,
board->text[i],
- xp + gdk_pixbuf_get_width(button_pixmap)/2,
- yp + gdk_pixbuf_get_height(button_pixmap)/2,
+ xp + button_pixmap_width/2,
+ yp + button_pixmap_height/2,
-1,
GTK_ANCHOR_CENTER,
"font", gc_skin_font_board_big,
@@ -379,13 +381,11 @@
(GtkSignalFunc) item_event,
GINT_TO_POINTER(i));
- yp += gdk_pixbuf_get_height(button_pixmap) + vertical_separation;
+ yp += button_pixmap_height + vertical_separation;
i++;
}
- gdk_pixbuf_unref(button_pixmap);
-
}
/* ==================================== */
static void game_won()
@@ -456,21 +456,19 @@
static void
highlight_selected(GooCanvasItem * button)
{
- GdkPixbuf *button_pixmap_selected = NULL, *button_pixmap = NULL;
-
if (selected_button != NULL && selected_button != button)
{
- button_pixmap = gc_skin_pixmap_load("button_large.png");
- g_object_set(selected_button, "pixbuf", button_pixmap, NULL);
- gdk_pixbuf_unref(button_pixmap);
+ g_object_set(selected_button,
+ "svg-id", "#BUTTON_TEXT",
+ NULL);
}
if (selected_button != button)
{
- button_pixmap_selected = gc_skin_pixmap_load("button_large_selected.png");
- g_object_set(button, "pixbuf", button_pixmap_selected, NULL);
+ g_object_set(button,
+ "svg-id", "#BUTTON_TEXT_SELECTED",
+ NULL);
selected_button = button;
- gdk_pixbuf_unref(button_pixmap_selected);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
