gcompris r3687 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/gcompris
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3687 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/gcompris
- Date: Sun, 18 Jan 2009 22:07:38 +0000 (UTC)
Author: bcoudoin
Date: Sun Jan 18 22:07:37 2009
New Revision: 3687
URL: http://svn.gnome.org/viewvc/gcompris?rev=3687&view=rev
Log:
moved file selector and image selector in skin.svg
Removed:
branches/gcomprixogoo/boards/skins/babytoy/file_selector_bg.png
branches/gcomprixogoo/boards/skins/gartoon/file_selector_bg.png
branches/gcomprixogoo/boards/skins/gartoon/images_selector_bg.png
Modified:
branches/gcomprixogoo/boards/skins/gartoon/skin.svg
branches/gcomprixogoo/boards/skins/gartoon/skin.xml
branches/gcomprixogoo/src/gcompris/file_selector.c
branches/gcomprixogoo/src/gcompris/images_selector.c
Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.svg
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.svg (original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.svg Sun Jan 18 22:07:37 2009
@@ -1639,7 +1639,7 @@
id="stop4456" />
<stop
id="stop4464"
- offset="0.24538536"
+ offset="0.34829167"
style="stop-color:#f1f1f1;stop-opacity:1;" />
<stop
id="stop4462"
@@ -1647,7 +1647,7 @@
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
style="stop-color:#f0f0f0;stop-opacity:1;"
- offset="0.74538535"
+ offset="0.69413382"
id="stop4466" />
<stop
style="stop-color:#d4d4d4;stop-opacity:1;"
@@ -1844,7 +1844,7 @@
style="stop-color:#323232;stop-opacity:1.0000000;" />
<stop
id="stop1320"
- offset="0.65260679"
+ offset="0.33688125"
style="stop-color:#000000;stop-opacity:1.0000000;" />
<stop
id="stop1220"
@@ -1982,7 +1982,7 @@
<stop
id="stop3860"
offset="1"
- style="stop-color:#d6d6d6;stop-opacity:1;" />
+ style="stop-color:#d6d6d6;stop-opacity:0" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
@@ -2173,6 +2173,154 @@
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 64 : 1"
sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3002"
+ 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="#linearGradient4454"
+ id="linearGradient3837"
+ x1="194.98721"
+ y1="14.517201"
+ x2="195.88721"
+ y2="-35.971344"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(5.1857302,59.635897)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15037"
+ id="radialGradient3845"
+ cx="36.948326"
+ cy="47.126228"
+ fx="36.948326"
+ fy="47.126228"
+ r="5.8339462"
+ gradientTransform="matrix(1.8647227e-6,1.7083333,-2.111111,2.1145387e-6,136.43695,-15.993924)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15037"
+ id="radialGradient3865"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.8647227e-6,1.7083333,-2.111111,2.1145387e-6,136.43695,-15.993924)"
+ cx="36.948326"
+ cy="47.126228"
+ fx="36.948326"
+ fy="47.126228"
+ r="5.8339462" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1218"
+ id="linearGradient3873"
+ x1="311.1438"
+ y1="92.33931"
+ x2="323.4624"
+ y2="92.33931"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.9765625,1.2964325,-42.400666)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1222"
+ id="linearGradient3887"
+ gradientUnits="userSpaceOnUse"
+ x1="757.90308"
+ y1="188.30093"
+ x2="812.08466"
+ y2="188.69006"
+ gradientTransform="matrix(1,0,0,2.0870036,-3.5416415,-120.2157)" />
+ <inkscape:perspective
+ id="perspective3973"
+ 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="#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"
+ gradientTransform="translate(12.67498,9.8156413)"
+ x1="881.96094"
+ y1="399.22516"
+ x2="888.36029"
+ y2="399.22516" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29660"
+ id="linearGradient4001"
+ gradientUnits="userSpaceOnUse"
+ x1="303.77036"
+ y1="652.60626"
+ x2="302.63507"
+ y2="449.38547"
+ gradientTransform="matrix(0.995056,0,0,4.3813722,2.7903081,-1618.0691)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient21876"
+ id="linearGradient4003"
+ 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="#linearGradient10745"
+ id="linearGradient4041"
+ 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" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient613"
+ id="linearGradient4051"
+ x1="-309.81882"
+ y1="956.72131"
+ x2="-202.80441"
+ y2="696.75458"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
inkscape:document-units="mm"
@@ -2181,13 +2329,13 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.542695"
- inkscape:cx="597.53923"
- inkscape:cy="318.57928"
- inkscape:current-layer="layer1"
+ inkscape:zoom="0.54542505"
+ inkscape:cx="250.00318"
+ inkscape:cy="195.91499"
+ inkscape:current-layer="FILE_SELECTOR"
id="namedview6255"
- inkscape:window-width="1280"
- inkscape:window-height="974"
+ inkscape:window-width="1272"
+ inkscape:window-height="743"
inkscape:window-x="0"
inkscape:window-y="25"
showguides="true"
@@ -2215,6 +2363,165 @@
</metadata>
<g
inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="Image Selector"
+ style="display:inline">
+ <g
+ id="IMAGE_SELECTOR">
+ <g
+ id="g4022">
+ <g
+ style="display:inline"
+ id="g3979"
+ transform="matrix(0.835729,0,0,1.0177439,-650.59337,-79.815413)">
+ <rect
+ transform="matrix(0,-1,1,0,0,0)"
+ ry="6.491662"
+ y="796.47705"
+ x="-586.16199"
+ height="104.39806"
+ width="498.01904"
+ id="rect3981"
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4051);stroke-width:4.86780774999999988;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ rx="6.491662" />
+ <path
+ sodipodi:nodetypes="cscc"
+ id="path3985"
+ d="M 897.05889,576.22571 C 895.72141,576.22571 894.63592,501.32688 894.63592,409.04081 C 894.63592,316.75474 895.72141,241.85589 897.05889,241.85589 L 897.05889,576.22571 z"
+ style="fill:url(#linearGradient3993);fill-opacity:1;stroke:none;stroke-width:2.41653538;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter14966)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g3995"
+ transform="matrix(1.0190314,0,0,1.0321404,-123.18426,-484.57591)">
+ <rect
+ ry="7.6771631"
+ y="480.6474"
+ x="230.37987"
+ height="486.58542"
+ width="668.00891"
+ id="rect3997"
+ style="opacity:1;fill:#b4b4b4;fill-opacity:1;stroke:url(#linearGradient4001);stroke-width:6.32906294;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ rx="5.9767313" />
+ </g>
+ </g>
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="File Selector"
+ style="display:inline">
+ <g
+ id="FILE_SELECTOR">
+ <path
+ sodipodi:nodetypes="ccccccccc"
+ id="rect3031"
+ d="M 90.750281,48.098555 L 758.41304,48.098555 C 779.24154,48.098555 796.00954,57.824395 796.00954,84.398664 L 781.74884,473.32844 C 781.74884,499.90272 766.27724,520.00002 745.44874,520.00002 L 90.750281,512.22142 C 69.921791,512.22142 53.153731,490.82769 53.153731,464.25341 L 53.153731,96.066554 C 53.153731,69.492284 69.921791,48.098555 90.750281,48.098555 z"
+ style="fill:#ff9200;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-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cscc"
+ id="path3875"
+ d="M 781.44825,479.80636 C 780.39406,506.8547 740.61062,378.74223 740.61062,276.43584 C 740.61062,174.12947 706.15302,87.874462 793.73179,102.13776 C 790.62718,219.32598 785.87283,357.0332 781.44825,479.80636 z"
+ style="fill:url(#linearGradient3887);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-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path3046"
+ d="M 656.71432,77.429124 L 699.32675,75.666317 C 712.6739,75.114167 733.8247,70.924372 737.94698,68.315457 L 736.73695,89.895669 L 654.65877,90.434516 C 654.65877,83.82657 653.06033,77.429124 656.71432,77.429124 z"
+ style="fill:#fffad0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.49618039;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" />
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="rect3043"
+ d="M 369.48326,76.62007 L 605.43397,48.098554 C 640.30511,43.883361 660.20825,36.308793 671.55203,33.189576 L 674.46901,90.880825 L 351.3332,90.880824 C 351.3332,82.980364 359.42813,76.62007 369.48326,76.62007 z"
+ style="fill:#efefed;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-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccccccccccccc"
+ id="rect3040"
+ d="M 41.687781,20.873474 L 337.07454,20.912794 C 351.85594,22.317264 354.66075,30.812784 356.35161,38.051204 L 356.2243,70.596264 C 357.15475,80.355264 363.44394,85.142004 371.733,89.260284 L 740.7611,89.806834 C 750.91412,89.806834 783.15451,106.251 781.30323,132.48579 L 780.37759,495.49807 C 780.37759,503.39853 766.65002,520.75943 750.94315,521.67614 L 44.305889,521.29643 C 30.880233,521.29643 20.74292,503.26823 20.74292,491.47848 L 20.74292,39.023524 C 20.74292,31.123064 31.534759,20.873474 41.687781,20.873474 z"
+ style="fill:#ffc100;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-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ ry="14.260756"
+ rx="18.150055"
+ y="116.80948"
+ x="33.707241"
+ 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" />
+ <rect
+ ry="23.983999"
+ rx="20.418812"
+ y="24.247824"
+ x="25.737818"
+ height="49.322002"
+ width="320.60052"
+ id="rect3050"
+ style="opacity:1;fill:url(#linearGradient3837);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.16654372;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="14.260756"
+ rx="6.482162"
+ y="30.272604"
+ x="47.968002"
+ height="36.30011"
+ width="259.2865"
+ id="rect3048"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#322e2e;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" />
+ <path
+ sodipodi:nodetypes="csssc"
+ id="rect3058"
+ d="M 313.89872,27.517689 C 317.31028,27.517689 324.59706,29.431351 324.75634,47.61619 C 324.91839,66.118211 317.14823,68.031199 313.73667,68.031199 C 312.75591,68.031199 312.44023,58.838435 312.44023,47.61619 C 312.44023,36.393947 312.4318,27.675944 313.89872,27.517689 z"
+ style="fill:url(#linearGradient3873);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" />
+ <g
+ id="g3861">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#radialGradient3845);fill-opacity:1;fill-rule:evenodd;stroke:#434343;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"
+ id="path3052"
+ sodipodi:cx="36.948326"
+ sodipodi:cy="47.126232"
+ sodipodi:rx="5.8339462"
+ sodipodi:ry="6.1580544"
+ d="M 42.782272,47.126232 A 5.8339462,6.1580544 0 1 1 31.11438,47.126232 A 5.8339462,6.1580544 0 1 1 42.782272,47.126232 z"
+ transform="matrix(0.8388214,0,0,0.8388214,5.8337401,6.6927189)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:#434343;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"
+ id="path3849"
+ sodipodi:cx="14.503839"
+ sodipodi:cy="47.369312"
+ sodipodi:rx="1.0533514"
+ sodipodi:ry="2.8359461"
+ d="M 15.55719,47.369312 A 1.0533514,2.8359461 0 1 1 13.450487,47.369312 A 1.0533514,2.8359461 0 1 1 15.55719,47.369312 z"
+ transform="matrix(1.2361383,0,0,0.4591371,18.898036,24.474202)" />
+ </g>
+ <g
+ transform="translate(-36.300111,78.434169)"
+ id="g3857">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#radialGradient3865);fill-opacity:1;fill-rule:evenodd;stroke:#434343;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"
+ id="path3851"
+ sodipodi:cx="36.948326"
+ sodipodi:cy="47.126232"
+ sodipodi:rx="5.8339462"
+ sodipodi:ry="6.1580544"
+ d="M 42.782272,47.126232 A 5.8339462,6.1580544 0 1 1 31.11438,47.126232 A 5.8339462,6.1580544 0 1 1 42.782272,47.126232 z"
+ transform="matrix(0.8388214,0,0,0.8388214,343.02774,-71.810755)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:#434343;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"
+ id="path3853"
+ sodipodi:cx="14.503839"
+ sodipodi:cy="47.369312"
+ sodipodi:rx="1.0533514"
+ sodipodi:ry="2.8359461"
+ d="M 15.55719,47.369312 A 1.0533514,2.8359461 0 1 1 13.450487,47.369312 A 1.0533514,2.8359461 0 1 1 15.55719,47.369312 z"
+ transform="matrix(1.2361383,0,0,0.4591371,356.09204,-54.029272)" />
+ </g>
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
id="layer2"
inkscape:label="Dialog"
style="display:inline">
Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.xml
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.xml (original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.xml Sun Jan 18 22:07:37 2009
@@ -8,18 +8,19 @@
<color id="gcompris/content" rgba="0X424243ff"/>
<color id="gcompris/subtitle" rgba="0X424243ff"/>
<color id="gcompris/shadow" rgba="0XFFFFFFFF"/>
- <color id="gcompris/imageselectbg" rgba="0X6280d9FF"/>
+ <color id="gcompris/imageselectbg_left" rgba="0X000000FF"/>
+ <color id="gcompris/imageselectbg_right" rgba="0XB4B4B4FF"/>
<color id="gcompris/helpbg" rgba="0XA1A0A0FF"/>
<color id="gcompris/helpfg" rgba="0X000000FF"/>
<color id="gcompris/helpselect" rgba="0X34682aFF"/>
<color id="gcompris/helpunselect" rgba="0X4252ffFF"/>
- <color id="gcompris/fileselectbg" rgba="0X018404FF"/>
+ <color id="gcompris/fileselectbg" rgba="0xF8F8AEFF"/>
<color id="gcompris/fileselectcol" rgba="0X000000FF"/>
- <number id="gcompris/fileselectx" value="85"/>
- <number id="gcompris/fileselecty" value="80"/>
- <number id="gcompris/fileselectdiry" value="180"/>
+ <number id="gcompris/fileselectx" value="63"/>
+ <number id="gcompris/fileselecty" value="35"/>
+ <number id="gcompris/fileselectdiry" value="80"/>
<!-- Defines the main gcompris fonts -->
<font id="gcompris/title" name="sans 20"/>
Modified: branches/gcomprixogoo/src/gcompris/file_selector.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/file_selector.c (original)
+++ branches/gcomprixogoo/src/gcompris/file_selector.c Sun Jan 18 22:07:37 2009
@@ -73,9 +73,9 @@
/* Represent the limits of the file area */
#define DRAWING_AREA_X1 40.0
-#define DRAWING_AREA_Y1 220.0
+#define DRAWING_AREA_Y1 130.0
#define DRAWING_AREA_X2 760.0
-#define DRAWING_AREA_Y2 500.0
+#define DRAWING_AREA_Y2 490.0
#define HORIZONTAL_NUMBER_OF_IMAGE 5
#define VERTICAL_NUMBER_OF_IMAGE 3
@@ -152,10 +152,6 @@
FileSelectorCallBack iscb)
{
GooCanvasItem *item;
- GdkPixbuf *pixmap = NULL;
- gint y = 0;
- gint y_start = 0;
- gint x_start = 0;
gchar *name = NULL;
gchar *full_rootdir;
@@ -179,18 +175,11 @@
rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
NULL);
- pixmap = gc_skin_pixmap_load("file_selector_bg.png");
- y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
- x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2;
-
- item = goo_canvas_image_new (rootitem,
- pixmap,
- x_start,
- y_start,
- NULL);
-
- y = BOARDHEIGHT - (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2 + 20;
- gdk_pixbuf_unref(pixmap);
+ item = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#FILE_SELECTOR",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
/* Entry area */
widget_entry = gtk_entry_new ();
@@ -242,8 +231,6 @@
gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_combo_filetypes), 0);
}
- y_start += 110;
-
/*
* Buttons
* -------
@@ -252,7 +239,7 @@
// CANCEL
gc_util_button_text_svg(rootitem,
BOARDWIDTH * 1/3,
- y - 48,
+ BOARDHEIGHT - 32,
"#BUTTON_TEXT",
_("CANCEL"),
(GtkSignalFunc) item_event_file_selector,
@@ -260,7 +247,7 @@
// OK
gc_util_button_text_svg(rootitem,
BOARDWIDTH * 2/3,
- y - 48,
+ BOARDHEIGHT - 32,
"#BUTTON_TEXT",
(mode==MODE_LOAD ? _("LOAD") : _("SAVE")),
(GtkSignalFunc) item_event_file_selector,
@@ -380,6 +367,7 @@
(gdouble)directory_label_y,
-1,
GTK_ANCHOR_NW,
+ "font", "Sans 7",
"fill-color-rgba",
gc_skin_get_color("gcompris/fileselectcol"),
NULL);
Modified: branches/gcomprixogoo/src/gcompris/images_selector.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/images_selector.c (original)
+++ branches/gcomprixogoo/src/gcompris/images_selector.c Sun Jan 18 22:07:37 2009
@@ -106,10 +106,7 @@
{
GooCanvasItem *item;
- GdkPixbuf *pixmap = NULL;
- gint y = 0;
gint y_start = 0;
- gint x_start = 0;
gchar *dataseturl = NULL;
GtkWidget *w;
@@ -128,16 +125,11 @@
images_selector_displayed = TRUE;
- pixmap = gc_skin_pixmap_load("images_selector_bg.png");
- y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
- x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2;
- item = goo_canvas_image_new (rootitem,
- pixmap,
- (double) x_start,
- (double) y_start,
- NULL);
- y = BOARDHEIGHT - (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
- gdk_pixbuf_unref(pixmap);
+ item = goo_canvas_svg_new (rootitem,
+ gc_skin_rsvg_get(),
+ "svg-id", "#IMAGE_SELECTOR",
+ "pointer-events", GOO_CANVAS_EVENTS_NONE,
+ NULL);
y_start += 110;
@@ -165,7 +157,8 @@
* gc_zoom_factor_get(),
(LIST_AREA_Y2 - LIST_AREA_Y1)
* gc_zoom_factor_get(),
- "fill-color-rgba", gc_skin_get_color("gcompris/imageselectbg"),
+ "fill-color-rgba",
+ gc_skin_get_color("gcompris/imageselectbg_left"),
"line-width", 0.0,
NULL);
@@ -218,7 +211,8 @@
* gc_zoom_factor_get(),
(DRAWING_AREA_Y2 - DRAWING_AREA_Y1)
* gc_zoom_factor_get(),
- "fill-color-rgba", gc_skin_get_color("gcompris/imageselectbg"),
+ "fill-color-rgba",
+ gc_skin_get_color("gcompris/imageselectbg_right"),
"line-width", 0.0,
NULL);
@@ -276,7 +270,7 @@
*/
gc_util_button_text_svg(rootitem,
(BOARDWIDTH*0.5),
- y - 30,
+ BOARDHEIGHT - 32,
"#BUTTON_TEXT",
_("OK"),
(GtkSignalFunc) item_event_images_selector,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
