gcompris r3661 - in branches/gcomprixogoo: . boards/skins/babytoy boards/skins/gartoon src/boards src/gcompris
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3661 - in branches/gcomprixogoo: . boards/skins/babytoy boards/skins/gartoon src/boards src/gcompris
- Date: Thu, 1 Jan 2009 22:11:24 +0000 (UTC)
Author: bcoudoin
Date: Thu Jan 1 22:11:24 2009
New Revision: 3661
URL: http://svn.gnome.org/viewvc/gcompris?rev=3661&view=rev
Log:
More integration of the single file skin.
Removed:
branches/gcomprixogoo/boards/skins/babytoy/about.png
branches/gcomprixogoo/boards/skins/babytoy/button_exit.png
branches/gcomprixogoo/boards/skins/babytoy/config.png
branches/gcomprixogoo/boards/skins/babytoy/dialog_help.svgz
branches/gcomprixogoo/boards/skins/babytoy/gcompris-menu2bg.png
branches/gcomprixogoo/boards/skins/babytoy/help.png
branches/gcomprixogoo/boards/skins/babytoy/home.png
branches/gcomprixogoo/boards/skins/babytoy/level_down.png
branches/gcomprixogoo/boards/skins/babytoy/level_up.png
branches/gcomprixogoo/boards/skins/gartoon/about.png
branches/gcomprixogoo/boards/skins/gartoon/button_exit.png
branches/gcomprixogoo/boards/skins/gartoon/config.png
branches/gcomprixogoo/boards/skins/gartoon/dialog_help.svgz
branches/gcomprixogoo/boards/skins/gartoon/dialogbox.svgz
branches/gcomprixogoo/boards/skins/gartoon/gcompris-menu2bg.png
branches/gcomprixogoo/boards/skins/gartoon/help.png
branches/gcomprixogoo/boards/skins/gartoon/home.png
branches/gcomprixogoo/boards/skins/gartoon/level_down.png
branches/gcomprixogoo/boards/skins/gartoon/level_up.png
branches/gcomprixogoo/boards/skins/gartoon/voice.png
branches/gcomprixogoo/boards/skins/gartoon/voice_bad.png
Modified:
branches/gcomprixogoo/ChangeLog
branches/gcomprixogoo/boards/skins/gartoon/skin.svg
branches/gcomprixogoo/src/boards/menu2.c
branches/gcomprixogoo/src/gcompris/about.c
branches/gcomprixogoo/src/gcompris/config.c
branches/gcomprixogoo/src/gcompris/dialog.c
branches/gcomprixogoo/src/gcompris/gcompris_confirm.c
branches/gcomprixogoo/src/gcompris/help.c
branches/gcomprixogoo/src/gcompris/skin.c
Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.svg
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.svg (original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.svg Thu Jan 1 22:11:24 2009
@@ -816,6 +816,87 @@
y1="284.70993"
x2="324.22366"
y2="480.46399" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="275.67569"
+ x2="-7.5184274"
+ y1="271.91644"
+ x1="80.196571"
+ id="linearGradient5808"
+ xlink:href="#linearGradient5802"
+ inkscape:collect="always"
+ gradientTransform="matrix(0.9998905,0,0,1.0580951,3.8231749e-2,-27.929599)" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="43.482586"
+ x2="-50.122849"
+ y1="43.482586"
+ x1="85.208847"
+ id="linearGradient5800"
+ xlink:href="#linearGradient5794"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2252">
+ <stop
+ id="stop2254"
+ offset="0"
+ style="stop-color:#a1d5ff;stop-opacity:1;" />
+ <stop
+ id="stop2256"
+ offset="1"
+ style="stop-color:#a1d5ff;stop-opacity:0.81412637;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5794"
+ inkscape:collect="always">
+ <stop
+ id="stop5796"
+ offset="0"
+ style="stop-color:#e0cca6;stop-opacity:1;" />
+ <stop
+ id="stop5798"
+ offset="1"
+ style="stop-color:#e0cca6;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5802"
+ inkscape:collect="always">
+ <stop
+ id="stop5804"
+ offset="0"
+ style="stop-color:#f3eacd;stop-opacity:1;" />
+ <stop
+ id="stop5806"
+ offset="1"
+ style="stop-color:#f3eacd;stop-opacity:0;" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective3057"
+ inkscape:persp3d-origin="350 : 170 : 1"
+ inkscape:vp_z="700 : 255 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 255 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2806"
+ id="linearGradient3159"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.196489,0,0,0.196489,328.79625,367.78793)"
+ x1="274.81769"
+ y1="284.70993"
+ x2="324.22366"
+ y2="480.46399" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2806"
+ id="linearGradient3179"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.122817,0,0,0.122817,678.77995,189.36269)"
+ x1="274.81769"
+ y1="284.70993"
+ x2="324.22366"
+ y2="480.46399" />
</defs>
<sodipodi:namedview
inkscape:document-units="mm"
@@ -824,14 +905,14 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.7713475"
- inkscape:cx="371.55904"
- inkscape:cy="214.7962"
+ inkscape:zoom="1.542695"
+ inkscape:cx="626.34637"
+ inkscape:cy="300.25474"
inkscape:current-layer="layer1"
id="namedview6255"
- inkscape:window-width="768"
+ inkscape:window-width="1107"
inkscape:window-height="726"
- inkscape:window-x="361"
+ inkscape:window-x="108"
inkscape:window-y="25"
showguides="true"
inkscape:guide-bbox="true"
@@ -844,6 +925,14 @@
orientation="0,1"
position="644.32697,915.28137"
id="guide3661" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="178.90769,519.86945"
+ id="guide3076" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="0,198.35418"
+ id="guide3078" />
</sodipodi:namedview>
<metadata
id="metadata6257">
@@ -957,27 +1046,30 @@
sodipodi:nodetypes="csscssscsc" />
</g>
<g
- id="g17392"
+ id="SOUND"
transform="translate(275.24342,-81.573152)">
- <path
- transform="matrix(-0.183872,0,0,0.183872,340.60494,401.45813)"
- d="M -157.47986,322.08786 A 168.28732,168.28732 0 1 1 -494.0545,322.08786 A 168.28732,168.28732 0 1 1 -157.47986,322.08786 z"
- sodipodi:ry="168.28732"
- sodipodi:rx="168.28732"
- sodipodi:cy="322.08786"
- sodipodi:cx="-325.76718"
- id="path17329"
- style="fill:#0055d4;fill-opacity:1;stroke-linecap:round"
- sodipodi:type="arc" />
- <path
- id="path3786"
- d="M 400.97665,428.46537 C 383.31285,428.46537 368.97355,442.80472 368.97355,460.46852 C 368.97355,478.13232 383.31285,492.46553 400.97665,492.46553 C 418.64045,492.46553 432.97365,478.13232 432.97365,460.46852 C 432.97365,442.80472 418.64045,428.46538 400.97665,428.46537 z M 410.01515,435.5574 L 410.31605,435.58196 C 417.21065,437.9863 422.49935,443.95442 424.94835,450.74231 C 428.75525,461.01979 426.44555,473.56745 418.43965,481.24109 C 416.62715,482.80523 414.72335,484.65223 412.35465,485.23227 C 409.78335,485.17896 409.09775,481.22806 411.23705,480.01918 C 418.41775,476.21989 422.32025,467.81082 421.89045,459.86677 C 421.63075,451.84335 416.80015,443.71742 409.08185,440.87488 C 406.77415,439.81168 407.34085,435.61141 410.01515,435.5574 z M 396.54335,436.56441 C 400.84895,436.56441 404.34155,447.3966 404.34155,460.74483 C 404.34155,474.09306 400.84895,484.92526 396.54335,484.92526 C 395.74765,484.92526 394.97665,484.55663 394.25305,483.86913 C 394.17215,483.87636
394.09685,483.8408 394.02585,483.75247 L 383.56895,470.82103 L 379.73745,470.81489 C 377.49085,470.81045 375.98145,469.28995 375.67875,467.47458 C 374.96675,463.20509 374.96675,458.14949 375.67875,453.88 C 375.98145,452.06464 377.49095,450.52229 379.73745,450.53969 L 383.56285,450.57039 L 393.69425,438.03193 C 393.76205,437.9477 393.83855,437.91206 393.91535,437.91527 C 393.92975,437.91587 393.94365,437.91821 393.95835,437.92141 C 394.76695,437.04156 395.63845,436.56441 396.54335,436.56441 z M 396.54335,439.917 C 394.57965,439.917 392.90875,445.78352 392.30045,453.9414 C 393.55715,454.01079 394.56625,457.03008 394.56625,460.74483 C 394.56625,464.45348 393.56045,467.4693 392.30655,467.54826 C 392.73865,473.33924 393.70035,477.97881 394.92845,480.17882 L 395.78815,481.27179 C 396.03495,481.46724 396.28465,481.57267 396.54335,481.57267 C 399.02055,481.57267 401.03195,472.24123 401.03195,460.74483 C 401.03195,449.24843 399.02055,439.917 396.54335,439.917 z M 408.48625,445.29589
C 408.66835,445.30283 408.85485,445.30591 409.03275,445.35115 C 413.20895,447.22017 416.22945,451.14909 417.59845,455.45191 C 419.38745,461.24179 418.53265,468.06329 414.55285,472.77364 C 413.49885,473.87762 412.50845,475.48203 410.80115,475.49379 C 408.84615,475.36598 407.93535,472.84887 408.75635,471.24471 C 409.36765,470.36287 410.27695,469.70854 410.90545,468.82544 C 414.60165,464.20538 414.19235,456.92474 410.05195,452.71335 C 409.15965,451.60409 407.73425,451.18442 406.73015,450.21425 C 405.11925,448.67967 406.16545,445.32441 408.48625,445.29589 z M 390.01625,447.51253 L 383.81455,455.47647 C 383.80905,455.49437 383.79005,455.55016 383.79005,455.55016 C 383.76545,455.56134 383.74055,455.57882 383.71635,455.59314 L 383.05935,456.4405 C 382.61755,457.38154 382.32865,458.93368 382.32865,460.69571 C 382.32865,462.41677 382.60415,463.94088 383.02865,464.88952 L 383.76545,465.83513 C 383.77325,465.83904 383.78215,465.84382 383.79005,465.84741 L 383.79005,465.86583 L 389.979
45,473.81749 C 389.19475,470.04662 388.73905,465.5615 388.73905,460.74483 C 388.73905,455.85964 389.21095,451.31623 390.01625,447.51253 z"
- style="fill:#1a1a1a;fill-opacity:1;stroke-linecap:round" />
- <path
- sodipodi:nodetypes="csss"
- id="path3897"
- d="M 430.72635,457.23619 C 430.79205,464.16058 371.27495,463.52451 371.26705,457.23619 C 371.24845,442.29267 384.58595,430.16456 400.99675,430.16456 C 417.40745,430.16456 430.58465,442.29598 430.72635,457.23619 z"
- style="fill:url(#linearGradient2372);fill-opacity:1;stroke-linecap:round" />
+ <g
+ id="g3144">
+ <path
+ sodipodi:type="arc"
+ style="fill:#0055d4;fill-opacity:1;stroke-linecap:round"
+ id="path17329"
+ sodipodi:cx="-325.76718"
+ sodipodi:cy="322.08786"
+ sodipodi:rx="168.28732"
+ sodipodi:ry="168.28732"
+ d="M -157.47986,322.08786 A 168.28732,168.28732 0 1 1 -494.0545,322.08786 A 168.28732,168.28732 0 1 1 -157.47986,322.08786 z"
+ transform="matrix(-0.183872,0,0,0.183872,340.60494,401.45813)" />
+ <path
+ style="fill:#1a1a1a;fill-opacity:1;stroke-linecap:round"
+ d="M 400.97665,428.46537 C 383.31285,428.46537 368.97355,442.80472 368.97355,460.46852 C 368.97355,478.13232 383.31285,492.46553 400.97665,492.46553 C 418.64045,492.46553 432.97365,478.13232 432.97365,460.46852 C 432.97365,442.80472 418.64045,428.46538 400.97665,428.46537 z M 410.01515,435.5574 L 410.31605,435.58196 C 417.21065,437.9863 422.49935,443.95442 424.94835,450.74231 C 428.75525,461.01979 426.44555,473.56745 418.43965,481.24109 C 416.62715,482.80523 414.72335,484.65223 412.35465,485.23227 C 409.78335,485.17896 409.09775,481.22806 411.23705,480.01918 C 418.41775,476.21989 422.32025,467.81082 421.89045,459.86677 C 421.63075,451.84335 416.80015,443.71742 409.08185,440.87488 C 406.77415,439.81168 407.34085,435.61141 410.01515,435.5574 z M 396.54335,436.56441 C 400.84895,436.56441 404.34155,447.3966 404.34155,460.74483 C 404.34155,474.09306 400.84895,484.92526 396.54335,484.92526 C 395.74765,484.92526 394.97665,484.55663 394.25305,483.86913 C 394.17215,483.876
36 394.09685,483.8408 394.02585,483.75247 L 383.56895,470.82103 L 379.73745,470.81489 C 377.49085,470.81045 375.98145,469.28995 375.67875,467.47458 C 374.96675,463.20509 374.96675,458.14949 375.67875,453.88 C 375.98145,452.06464 377.49095,450.52229 379.73745,450.53969 L 383.56285,450.57039 L 393.69425,438.03193 C 393.76205,437.9477 393.83855,437.91206 393.91535,437.91527 C 393.92975,437.91587 393.94365,437.91821 393.95835,437.92141 C 394.76695,437.04156 395.63845,436.56441 396.54335,436.56441 z M 396.54335,439.917 C 394.57965,439.917 392.90875,445.78352 392.30045,453.9414 C 393.55715,454.01079 394.56625,457.03008 394.56625,460.74483 C 394.56625,464.45348 393.56045,467.4693 392.30655,467.54826 C 392.73865,473.33924 393.70035,477.97881 394.92845,480.17882 L 395.78815,481.27179 C 396.03495,481.46724 396.28465,481.57267 396.54335,481.57267 C 399.02055,481.57267 401.03195,472.24123 401.03195,460.74483 C 401.03195,449.24843 399.02055,439.917 396.54335,439.917 z M 408.48625,445.295
89 C 408.66835,445.30283 408.85485,445.30591 409.03275,445.35115 C 413.20895,447.22017 416.22945,451.14909 417.59845,455.45191 C 419.38745,461.24179 418.53265,468.06329 414.55285,472.77364 C 413.49885,473.87762 412.50845,475.48203 410.80115,475.49379 C 408.84615,475.36598 407.93535,472.84887 408.75635,471.24471 C 409.36765,470.36287 410.27695,469.70854 410.90545,468.82544 C 414.60165,464.20538 414.19235,456.92474 410.05195,452.71335 C 409.15965,451.60409 407.73425,451.18442 406.73015,450.21425 C 405.11925,448.67967 406.16545,445.32441 408.48625,445.29589 z M 390.01625,447.51253 L 383.81455,455.47647 C 383.80905,455.49437 383.79005,455.55016 383.79005,455.55016 C 383.76545,455.56134 383.74055,455.57882 383.71635,455.59314 L 383.05935,456.4405 C 382.61755,457.38154 382.32865,458.93368 382.32865,460.69571 C 382.32865,462.41677 382.60415,463.94088 383.02865,464.88952 L 383.76545,465.83513 C 383.77325,465.83904 383.78215,465.84382 383.79005,465.84741 L 383.79005,465.86583 L 389.9
7945,473.81749 C 389.19475,470.04662 388.73905,465.5615 388.73905,460.74483 C 388.73905,455.85964 389.21095,451.31623 390.01625,447.51253 z"
+ id="path3786" />
+ <path
+ style="fill:url(#linearGradient2372);fill-opacity:1;stroke-linecap:round"
+ d="M 430.72635,457.23619 C 430.79205,464.16058 371.27495,463.52451 371.26705,457.23619 C 371.24845,442.29267 384.58595,430.16456 400.99675,430.16456 C 417.40745,430.16456 430.58465,442.29598 430.72635,457.23619 z"
+ id="path3897"
+ sodipodi:nodetypes="csss" />
+ </g>
</g>
<g
id="g17346"
@@ -1493,5 +1585,94 @@
d="M 622.3339,197.65941 C 622.39815,201.98751 564.09821,201.58991 564.09053,197.65941 C 564.0722,188.31881 577.13709,180.73811 593.21214,180.73811 C 609.28734,180.73811 622.19505,188.32091 622.3339,197.65941 z"
style="fill:url(#linearGradient3655);fill-opacity:1;stroke-linecap:round" />
</g>
+ <g
+ id="SOUND_UNCHECKED">
+ <g
+ transform="matrix(0.5640385,0,0,0.5640385,259.01121,-43.423724)"
+ id="g3149">
+ <g
+ id="g3151">
+ <path
+ transform="matrix(-0.183872,0,0,0.183872,340.60494,401.45813)"
+ d="M -157.47986,322.08786 A 168.28732,168.28732 0 1 1 -494.0545,322.08786 A 168.28732,168.28732 0 1 1 -157.47986,322.08786 z"
+ sodipodi:ry="168.28732"
+ sodipodi:rx="168.28732"
+ sodipodi:cy="322.08786"
+ sodipodi:cx="-325.76718"
+ id="path3153"
+ style="fill:#0055d4;fill-opacity:1;stroke-linecap:round"
+ sodipodi:type="arc" />
+ <path
+ id="path3155"
+ d="M 400.97665,428.46537 C 383.31285,428.46537 368.97355,442.80472 368.97355,460.46852 C 368.97355,478.13232 383.31285,492.46553 400.97665,492.46553 C 418.64045,492.46553 432.97365,478.13232 432.97365,460.46852 C 432.97365,442.80472 418.64045,428.46538 400.97665,428.46537 z M 410.01515,435.5574 L 410.31605,435.58196 C 417.21065,437.9863 422.49935,443.95442 424.94835,450.74231 C 428.75525,461.01979 426.44555,473.56745 418.43965,481.24109 C 416.62715,482.80523 414.72335,484.65223 412.35465,485.23227 C 409.78335,485.17896 409.09775,481.22806 411.23705,480.01918 C 418.41775,476.21989 422.32025,467.81082 421.89045,459.86677 C 421.63075,451.84335 416.80015,443.71742 409.08185,440.87488 C 406.77415,439.81168 407.34085,435.61141 410.01515,435.5574 z M 396.54335,436.56441 C 400.84895,436.56441 404.34155,447.3966 404.34155,460.74483 C 404.34155,474.09306 400.84895,484.92526 396.54335,484.92526 C 395.74765,484.92526 394.97665,484.55663 394.25305,483.86913 C 394.17215,483.8
7636 394.09685,483.8408 394.02585,483.75247 L 383.56895,470.82103 L 379.73745,470.81489 C 377.49085,470.81045 375.98145,469.28995 375.67875,467.47458 C 374.96675,463.20509 374.96675,458.14949 375.67875,453.88 C 375.98145,452.06464 377.49095,450.52229 379.73745,450.53969 L 383.56285,450.57039 L 393.69425,438.03193 C 393.76205,437.9477 393.83855,437.91206 393.91535,437.91527 C 393.92975,437.91587 393.94365,437.91821 393.95835,437.92141 C 394.76695,437.04156 395.63845,436.56441 396.54335,436.56441 z M 396.54335,439.917 C 394.57965,439.917 392.90875,445.78352 392.30045,453.9414 C 393.55715,454.01079 394.56625,457.03008 394.56625,460.74483 C 394.56625,464.45348 393.56045,467.4693 392.30655,467.54826 C 392.73865,473.33924 393.70035,477.97881 394.92845,480.17882 L 395.78815,481.27179 C 396.03495,481.46724 396.28465,481.57267 396.54335,481.57267 C 399.02055,481.57267 401.03195,472.24123 401.03195,460.74483 C 401.03195,449.24843 399.02055,439.917 396.54335,439.917 z M 408.48625,445.2
9589 C 408.66835,445.30283 408.85485,445.30591 409.03275,445.35115 C 413.20895,447.22017 416.22945,451.14909 417.59845,455.45191 C 419.38745,461.24179 418.53265,468.06329 414.55285,472.77364 C 413.49885,473.87762 412.50845,475.48203 410.80115,475.49379 C 408.84615,475.36598 407.93535,472.84887 408.75635,471.24471 C 409.36765,470.36287 410.27695,469.70854 410.90545,468.82544 C 414.60165,464.20538 414.19235,456.92474 410.05195,452.71335 C 409.15965,451.60409 407.73425,451.18442 406.73015,450.21425 C 405.11925,448.67967 406.16545,445.32441 408.48625,445.29589 z M 390.01625,447.51253 L 383.81455,455.47647 C 383.80905,455.49437 383.79005,455.55016 383.79005,455.55016 C 383.76545,455.56134 383.74055,455.57882 383.71635,455.59314 L 383.05935,456.4405 C 382.61755,457.38154 382.32865,458.93368 382.32865,460.69571 C 382.32865,462.41677 382.60415,463.94088 383.02865,464.88952 L 383.76545,465.83513 C 383.77325,465.83904 383.78215,465.84382 383.79005,465.84741 L 383.79005,465.86583 L 389
.97945,473.81749 C 389.19475,470.04662 388.73905,465.5615 388.73905,460.74483 C 388.73905,455.85964 389.21095,451.31623 390.01625,447.51253 z"
+ style="fill:#1a1a1a;fill-opacity:1;stroke-linecap:round" />
+ <path
+ sodipodi:nodetypes="csss"
+ id="path3157"
+ d="M 430.72635,457.23619 C 430.79205,464.16058 371.27495,463.52451 371.26705,457.23619 C 371.24845,442.29267 384.58595,430.16456 400.99675,430.16456 C 417.40745,430.16456 430.58465,442.29598 430.72635,457.23619 z"
+ style="fill:url(#linearGradient3159);fill-opacity:1;stroke-linecap:round" />
+ </g>
+ </g>
+ <g
+ transform="matrix(0.4652724,0,0,0.4652724,158.67733,111.47199)"
+ id="g3171">
+ <path
+ sodipodi:type="arc"
+ style="fill:#aa0000;fill-opacity:1;stroke-linecap:round"
+ id="path3173"
+ sodipodi:cx="-325.76718"
+ sodipodi:cy="322.08786"
+ sodipodi:rx="168.28732"
+ sodipodi:ry="168.28732"
+ d="M -157.47986,322.08786 A 168.28732,168.28732 0 1 1 -494.0545,322.08786 A 168.28732,168.28732 0 1 1 -157.47986,322.08786 z"
+ transform="matrix(-0.1087594,0,0,0.1087594,688.40496,212.75828)" />
+ <path
+ style="fill:#1a1a1a;fill-opacity:1;stroke-linecap:round"
+ d="M 723.88565,227.61682 C 712.84475,227.61682 703.88565,236.5759 703.88565,247.6168 C 703.88565,258.65769 712.84475,267.62062 723.88565,267.62062 C 734.92655,267.62062 743.88565,258.6577 743.88565,247.6168 C 743.88565,236.5759 734.92655,227.61682 723.88565,227.61682 z M 714.18305,235.55003 C 715.03285,235.51851 715.93205,235.85969 716.62795,236.55559 L 723.88565,243.81331 L 731.14335,236.55559 C 732.38055,235.31842 734.26165,235.20641 735.36135,236.30612 C 736.46105,237.40582 736.34905,239.28694 735.11185,240.52411 L 728.02305,247.6168 L 735.11185,254.70948 C 736.34905,255.94664 736.46105,257.82777 735.36135,258.92747 C 734.26165,260.02718 732.38055,259.91516 731.14335,258.678 L 723.88565,251.42029 L 716.62795,258.678 C 715.39075,259.91518 713.50965,260.02718 712.40995,258.92747 C 711.31025,257.82777 711.42225,255.94665 712.65935,254.70948 L 719.74825,247.6168 L 712.65935,240.52411 C 711.42225,239.28695 711.31025,237.40582 712.40995,236.30612 C 712.89105,235.825
713.52215,235.57453 714.18305,235.55003 z"
+ id="path3175" />
+ <path
+ style="fill:url(#linearGradient3179);fill-opacity:1;stroke-linecap:round"
+ d="M 742.49205,245.27303 C 742.53315,249.60117 705.33155,249.20359 705.32665,245.27303 C 705.31495,235.93246 713.65165,228.35169 723.90935,228.35169 C 734.16705,228.35169 742.40355,235.93453 742.49205,245.27303 z"
+ id="path3177"
+ sodipodi:nodetypes="csss" />
+ </g>
+ </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" />
+ <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>
</svg>
Modified: branches/gcomprixogoo/src/boards/menu2.c
==============================================================================
--- branches/gcomprixogoo/src/boards/menu2.c (original)
+++ branches/gcomprixogoo/src/boards/menu2.c Thu Jan 1 22:11:24 2009
@@ -217,7 +217,6 @@
{
RsvgHandle *svg_handle;
- printf("menu2 start\n");
gcomprisBoard=agcomprisBoard;
/* set initial values for this level */
@@ -506,23 +505,24 @@
/* We search a fixed path sound file */
soundfile = gc_file_find_absolute(board->mandatory_sound_file);
- if (!soundfile || !gc_prop_get()->fx)
- {
- pixmap = gc_skin_pixmap_load("voice_bad.png");
- }
- else
- {
- pixmap = gc_skin_pixmap_load("voice.png");
- }
+ if (!soundfile || !gc_prop_get()->fx) {
+ GooCanvasItem *item = \
+ goo_canvas_svg_new (parent,
+ gc_skin_rsvg_get(),
+ "svg-id", "#SOUND_UNCHECKED",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
+
+ GooCanvasBounds bounds;
+ goo_canvas_item_get_bounds(item, &bounds);
+
+ SET_ITEM_LOCATION(item,
+ current_x - pixmap_w/2 - 25 -
+ (bounds.x2 - bounds.x1)/2,
+ current_y - pixmap_h/2 + 28-
+ (bounds.y2 - bounds.y1)/2);
+ }
- goo_canvas_image_new (parent,
- pixmap,
- current_x - pixmap_w/2 - 25 -
- gdk_pixbuf_get_width(pixmap)/2,
- current_y - pixmap_h/2 + 28-
- gdk_pixbuf_get_height(pixmap)/2,
- NULL);
- gdk_pixbuf_unref(pixmap);
g_free(soundfile);
}
Modified: branches/gcomprixogoo/src/gcompris/about.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/about.c (original)
+++ branches/gcomprixogoo/src/gcompris/about.c Thu Jan 1 22:11:24 2009
@@ -45,7 +45,6 @@
gint y = 0;
GooCanvasItem *item, *item2;
gint plane_y;
- RsvgHandle *svg_handle = NULL;
static gchar *content =
N_("Author: Bruno Coudoin\n"
@@ -69,15 +68,18 @@
rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
NULL);
- svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
- RsvgDimensionData dimension;
- rsvg_handle_get_dimensions(svg_handle, &dimension);
- x_start = (BOARDWIDTH - dimension.width)/2;
- y_start = (BOARDHEIGHT - dimension.height)/2;
- item = goo_canvas_svg_new (rootitem, svg_handle, NULL);
- goo_canvas_item_translate(item, x_start, y_start);
- y = y_start + dimension.height;
- g_object_unref (svg_handle);
+ item = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#DIALOG",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
+
+ GooCanvasBounds bounds;
+ goo_canvas_item_get_bounds(item, &bounds);
+ x_start = bounds.x1;
+ y_start = bounds.y1;
+
+ y = bounds.y2;
goo_canvas_text_new (rootitem,
_("About GCompris"),
Modified: branches/gcomprixogoo/src/gcompris/config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/config.c (original)
+++ branches/gcomprixogoo/src/gcompris/config.c Thu Jan 1 22:11:24 2009
@@ -159,7 +159,6 @@
gint x_text_start = 0;
gint y = 0;
GooCanvasItem *item, *item2;
- RsvgHandle *svg_handle = NULL;
/* Pause the board */
gc_board_pause(TRUE);
@@ -172,15 +171,18 @@
rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
NULL);
- svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
- RsvgDimensionData dimension;
- rsvg_handle_get_dimensions(svg_handle, &dimension);
- x_start = (BOARDWIDTH - dimension.width)/2;
- y_start = (BOARDHEIGHT - dimension.height)/2;
- item = goo_canvas_svg_new (rootitem, svg_handle, NULL);
- goo_canvas_item_translate(item, x_start, y_start);
- y = y_start + dimension.height;
- g_object_unref (svg_handle);
+ item = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#DIALOG",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
+
+ GooCanvasBounds bounds;
+ goo_canvas_item_get_bounds(item, &bounds);
+ x_start = bounds.x1;
+ y_start = bounds.y1;
+
+ y = bounds.y2;
goo_canvas_text_new (rootitem,
_("GCompris Configuration"),
@@ -212,13 +214,14 @@
y_flag_start = y_start - gdk_pixbuf_get_width(pixmap_checked)/2;
/* Display a bad icon if this locale is not available */
- pixmap = gc_skin_pixmap_load("mini_bad.png");
- item_bad_flag = goo_canvas_image_new (rootitem,
- pixmap,
- (double) x_flag_start - 20,
- (double) y_start - gdk_pixbuf_get_width(pixmap_checked)/2,
- NULL);
- gdk_pixbuf_unref(pixmap);
+ item_bad_flag = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#UNCHECKED",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
+ SET_ITEM_LOCATION(item_bad_flag,
+ x_flag_start + 5,
+ y_start - gdk_pixbuf_get_width(pixmap_checked)/2);
/*
* The current locale is the one found in the config file
Modified: branches/gcomprixogoo/src/gcompris/dialog.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/dialog.c (original)
+++ branches/gcomprixogoo/src/gcompris/dialog.c Thu Jan 1 22:11:24 2009
@@ -52,7 +52,9 @@
{
GooCanvasItem *item_text = NULL;
GooCanvasItem *item_text_ok = NULL;
- RsvgHandle *svg_handle = NULL;
+ GdkPixbuf *pixmap;
+ gint y_start;
+ gint x_start;
g_warning("Dialog=%s\n", str);
@@ -76,29 +78,47 @@
rootDialogItem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
NULL);
- svg_handle = gc_skin_rsvg_load("dialogbox.svgz");
- itemDialogText = goo_canvas_svg_new (rootDialogItem, svg_handle, NULL);
+ itemDialogText = goo_canvas_svg_new (rootDialogItem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#DIALOG",
+ NULL);
+ g_signal_connect(itemDialogText, "button_press_event",
+ (GtkSignalFunc) item_event_ok,
+ dbcb);
- RsvgDimensionData dimension;
- rsvg_handle_get_dimensions(svg_handle, &dimension);
- goo_canvas_item_translate(itemDialogText,
- (BOARDWIDTH - dimension.width)/2,
- (BOARDHEIGHT - dimension.height)/2);
- g_object_unref (svg_handle);
+ GooCanvasBounds bounds;
+ goo_canvas_item_get_bounds(itemDialogText, &bounds);
+ x_start = bounds.x1;
+ y_start = bounds.y1;
+
+ /* OK Button */
+ pixmap = gc_skin_pixmap_load("button_large.png");
+ GooCanvasItem *item = \
+ goo_canvas_image_new (rootDialogItem,
+ pixmap,
+ BOARDWIDTH * 0.5 - gdk_pixbuf_get_width(pixmap)/2,
+ bounds.y2 - gdk_pixbuf_get_height(pixmap) - 5,
+ NULL);
+ g_signal_connect(item, "button_press_event",
+ (GtkSignalFunc) item_event_ok,
+ dbcb);
+ gc_item_focus_init(item, NULL);
/* OK Text */
item_text_ok = goo_canvas_text_new (rootDialogItem,
_("OK"),
BOARDWIDTH * 0.5,
- BOARDHEIGHT - 30 -
- (BOARDHEIGHT - dimension.height)/2,
+ bounds.y2 - gdk_pixbuf_get_height(pixmap) + 15,
-1,
GTK_ANCHOR_CENTER,
"font", gc_skin_font_title,
"fill-color-rgba", gc_skin_color_text_button,
NULL);
+ gc_item_focus_init(item_text_ok, item);
+ gdk_pixbuf_unref(pixmap);
+
g_signal_connect(itemDialogText, "button_press_event",
(GtkSignalFunc) item_event_ok,
dbcb);
@@ -106,7 +126,7 @@
item_text = goo_canvas_text_new (rootDialogItem,
str,
BOARDWIDTH / 2,
- (BOARDHEIGHT - dimension.height)/2 + 60,
+ (bounds.y2 - bounds.y1)/2 - 100,
BOARDWIDTH / 2,
GTK_ANCHOR_CENTER,
"alignment", PANGO_ALIGN_CENTER,
Modified: branches/gcomprixogoo/src/gcompris/gcompris_confirm.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_confirm.c (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_confirm.c Thu Jan 1 22:11:24 2009
@@ -160,7 +160,6 @@
GdkPixbuf *pixmap = NULL;
GdkPixbuf *pixmap_cross = NULL;
GdkPixbuf *pixmap_stick = NULL;
- RsvgHandle *svg_handle = NULL;
if(rootitem)
return;
@@ -195,14 +194,11 @@
rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
NULL);
- svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
- item = goo_canvas_svg_new (rootitem, svg_handle, NULL);
-
- RsvgDimensionData dimension;
- rsvg_handle_get_dimensions(svg_handle, &dimension);
- goo_canvas_item_translate(item, (BOARDWIDTH - dimension.width)/2,
- (BOARDHEIGHT - dimension.height)/2);
- g_object_unref (svg_handle);
+ item = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#DIALOG",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
/* Title */
goo_canvas_text_new (rootitem,
Modified: branches/gcomprixogoo/src/gcompris/help.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/help.c (original)
+++ branches/gcomprixogoo/src/gcompris/help.c Thu Jan 1 22:11:24 2009
@@ -96,7 +96,6 @@
gint x_start = 0;
gchar *name = NULL;
gchar *text_to_display = NULL;
- RsvgHandle *svg_handle = NULL;
if(rootitem)
return;
@@ -112,19 +111,20 @@
rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
NULL);
- svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
+ item = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#DIALOG",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
+
+ GooCanvasBounds bounds;
+ goo_canvas_item_get_bounds(item, &bounds);
+ x_start = bounds.x1;
+ y_start = bounds.y1;
- RsvgDimensionData dimension;
- rsvg_handle_get_dimensions(svg_handle, &dimension);
- x_start = (BOARDWIDTH - dimension.width)/2;
- y_start = (BOARDHEIGHT - dimension.height)/2;
-
- item = goo_canvas_svg_new (rootitem, svg_handle, NULL);
- goo_canvas_item_translate(item, x_start, y_start);
- y = y_start + dimension.height;
- g_object_unref (svg_handle);
+ y = bounds.y2;
- y_start += 14;
+ y_start += 15;
if(gcomprisBoard->section && gcomprisBoard->name) {
text_to_display = g_strdup_printf("%s/%s", gcomprisBoard->section, gcomprisBoard->name);
goo_canvas_text_new (rootitem,
@@ -139,7 +139,7 @@
g_free(text_to_display);
}
- y_start += 35;
+ y_start += 30;
goo_canvas_text_new (rootitem,
name,
BOARDWIDTH/2,
Modified: branches/gcomprixogoo/src/gcompris/skin.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/skin.c (original)
+++ branches/gcomprixogoo/src/gcompris/skin.c Thu Jan 1 22:11:24 2009
@@ -106,6 +106,8 @@
* skin directory.
* If not found, try in the default skin directory
* If not found abort gcompris
+ * @WARNING: Do not free the returned handle, it is kept
+ * cached internally.
*/
RsvgHandle *
gc_skin_rsvg_get()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
