[iagno] Update game information grid
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [iagno] Update game information grid
- Date: Mon, 15 Sep 2014 22:22:20 +0000 (UTC)
commit 6543481d443497ad15f8ee232d85a519341e60bf
Author: Iulian Radu <iulian radu67 gmail com>
Date: Mon Sep 15 19:26:19 2014 +0300
Update game information grid
Replace Light/Dark labels with icons. Add icon for active
player turn instead of bolding text.
Update tiles displayed in the game information grid.
Update tiles design to match the ones used by game.
Move tiles out of the theme directory so they don't get displayed
on the themes list.
https://bugzilla.gnome.org/show_bug.cgi?id=664983
data/Makefile.am | 7 ++
data/dark.svg | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
data/light.svg | 192 +++++++++++++++++++++++++++++++++++
data/mark.svg | 125 +++++++++++++++++++++++
src/iagno.vala | 48 +++++----
5 files changed, 650 insertions(+), 20 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 9250162..421fb1d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,6 +3,12 @@ SUBDIRS = icons
uidir = $(datadir)/iagno
ui_DATA = iagno.ui
+imagedir = $(datadir)/iagno/images
+image_DATA = \
+ dark.svg \
+ light.svg \
+ mark.svg
+
themedir = $(datadir)/iagno/themes
theme_DATA = \
sun_and_star.svg \
@@ -30,6 +36,7 @@ man_MANS = iagno.6
EXTRA_DIST = \
$(ui_DATA) \
+ $(image_DATA) \
$(theme_DATA) \
$(sounds_DATA) \
$(appdata_in_files) \
diff --git a/data/dark.svg b/data/dark.svg
new file mode 100644
index 0000000..0111e18
--- /dev/null
+++ b/data/dark.svg
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="24"
+ height="24"
+ id="svg4260"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="light.svg">
+ <defs
+ id="defs4262">
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3653"
+ id="linearGradient5677"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.7536097,0,0,3.2312663,-6.5153492,-7.537471)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ id="linearGradient3653">
+ <stop
+ style="stop-color:#2e3436;stop-opacity:1"
+ offset="0"
+ id="stop3655" />
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="1"
+ id="stop3657" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3687">
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="0"
+ id="stop3689" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="1"
+ id="stop3691" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3663">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="0"
+ id="stop3665" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0"
+ offset="1"
+ id="stop3667" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3653"
+ id="linearGradient5701"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.7536097,0,0,3.2312663,-6.5153492,-7.537471)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ id="linearGradient5703">
+ <stop
+ style="stop-color:#2e3436;stop-opacity:1"
+ offset="0"
+ id="stop5705" />
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="1"
+ id="stop5707" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3687"
+ id="linearGradient5943"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.5997954,0,0,3.5997954,562.18204,242.11814)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3663"
+ id="linearGradient5945"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.78173,0,0,3.78173,560.27071,240.20357)"
+ x1="4.5507631"
+ y1="4.0634403"
+ x2="16.460409"
+ y2="18.705576" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3653"
+ id="linearGradient5961"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.7536097,0,0,3.2312663,-6.5153492,-7.537471)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3687-8"
+ id="linearGradient6022"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.5997954,0,0,3.5997954,562.18204,242.11814)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ id="linearGradient3687-8">
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="0"
+ id="stop3689-7" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="1"
+ id="stop3691-8" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3663-0"
+ id="linearGradient6024"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.78173,0,0,3.78173,560.27071,240.20357)"
+ x1="4.5507631"
+ y1="4.0634403"
+ x2="16.460409"
+ y2="18.705576" />
+ <linearGradient
+ id="linearGradient3663-0">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="0"
+ id="stop3665-0" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0"
+ offset="1"
+ id="stop3667-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3653"
+ id="linearGradient6362"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.7536097,0,0,3.2312663,-6.5153492,-7.537471)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="19.84"
+ inkscape:cx="12.656226"
+ inkscape:cy="14.895836"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1680"
+ inkscape:window-height="984"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4265">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1028.3622)">
+ <g
+ id="g5659"
+ transform="matrix(0.4378255,0,0,0.4378255,9.670061,1031.598)">
+ <g
+ transform="matrix(0.7056258,0,0,0.8153927,-18.060661,-1.2373576)"
+ id="g1000">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3701"
+
style="fill:url(#linearGradient6362);fill-opacity:1;stroke:#2e3436;stroke-width:1.93490958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 70.456568,26.466244 c 0,17.8467 -16.806345,32.314313 -37.53802,32.314313 -20.731686,0
-37.5380305,-14.467613 -37.5380305,-32.314313 0,-17.8467013 16.8063445,-32.3143119 37.5380305,-32.3143119
20.731675,0 37.53802,14.4676106 37.53802,32.3143119 z" />
+ </g>
+ <g
+ transform="matrix(0.7356317,0,0,0.7244548,-436.24694,-182.80393)"
+ id="g1010">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3693"
+
style="fill:url(#linearGradient5943);fill-opacity:1;stroke:#888a85;stroke-width:2.00042057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 635.99979,280 c 0,19.88214 -16.11766,35.99979 -35.99979,35.99979 -19.88214,0
-35.99979,-16.11765 -35.99979,-35.99979 0,-19.88213 16.11765,-35.99979 35.99979,-35.99979 19.88213,0
35.99979,16.11766 35.99979,35.99979 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3695"
+
style="fill:none;stroke:url(#linearGradient5945);stroke-width:2.00179124;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 633.9991,280 c 0,18.77719 -15.22191,33.9991 -33.9991,33.9991 -18.77719,0 -33.9991,-15.22191
-33.9991,-33.9991 0,-18.77718 15.22191,-33.9991 33.9991,-33.9991 18.77719,0 33.9991,15.22192 33.9991,33.9991
l 0,0 z" />
+ </g>
+ <path
+ transform="matrix(1,0,0,0.9923454,-26.412237,-11.387048)"
+ d="M 59,32 C 59,46.911688 46.911688,59 32,59 17.088312,59 5,46.911688 5,32 5,17.088312 17.088312,5
32,5 46.911688,5 59,17.088312 59,32 z"
+ sodipodi:ry="27"
+ sodipodi:rx="27"
+ sodipodi:cy="32"
+ sodipodi:cx="32"
+ id="path1020"
+
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.0000071,0,0,0.992356,-26.412464,-11.387388)"
+ d="M 59,32 C 59,46.911688 46.911688,59 32,59 17.088312,59 5,46.911688 5,32 5,17.088312 17.088312,5
32,5 46.911688,5 59,17.088312 59,32 z"
+ sodipodi:ry="27"
+ sodipodi:rx="27"
+ sodipodi:cy="32"
+ sodipodi:cx="32"
+ id="path1030"
+
style="fill:#f0f0ff;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <use
+ height="256"
+ width="512"
+ id="use3011"
+ xlink:href="#path1030"
+ y="0"
+ x="0"
+ transform="matrix(0.7113015,0.7057827,-0.7113015,0.7057827,16.018263,2.0581665)" />
+ <a
+ id="a5652">
+ <use
+ transform="matrix(0.7113015,0.7057827,-0.7113015,0.7057827,16.018263,2.0581665)"
+ x="0"
+ y="0"
+ xlink:href="#g1000"
+ id="use3012"
+ width="512"
+ height="256" />
+ </a>
+ </g>
+ <g
+ id="g3310"
+ transform="matrix(0.707,0.707,-0.707,0.707,-12.820128,898.44398)">
+ <path
+ transform="matrix(1,0,0,0.9923454,64.5,0.03827293)"
+ d="M 59,32 C 59,46.911688 46.911688,59 32,59 17.088312,59 5,46.911688 5,32 5,17.088312 17.088312,5
32,5 46.911688,5 59,17.088312 59,32 z"
+ sodipodi:ry="27"
+ sodipodi:rx="27"
+ sodipodi:cy="32"
+ sodipodi:cx="32"
+ id="use3311"
+
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <g
+ transform="matrix(0.7356317,0,0,0.7244548,-345.8347,-171.37861)"
+ id="use3312">
+ <path
+ id="path6018"
+
style="fill:url(#linearGradient6022);fill-opacity:1;stroke:#888a85;stroke-width:2.00042057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 635.99979,280 c 0,19.88214 -16.11766,35.99979 -35.99979,35.99979 -19.88214,0
-35.99979,-16.11765 -35.99979,-35.99979 0,-19.88213 16.11765,-35.99979 35.99979,-35.99979 19.88213,0
35.99979,16.11766 35.99979,35.99979 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path6020"
+
style="fill:none;stroke:url(#linearGradient6024);stroke-width:2.00179124;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 633.9991,280 c 0,18.77719 -15.22191,33.9991 -33.9991,33.9991 -18.77719,0 -33.9991,-15.22191
-33.9991,-33.9991 0,-18.77718 15.22191,-33.9991 33.9991,-33.9991 18.77719,0 33.9991,15.22192 33.9991,33.9991
l 0,0 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/data/light.svg b/data/light.svg
new file mode 100644
index 0000000..46bb2c6
--- /dev/null
+++ b/data/light.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="24"
+ height="24"
+ id="svg4260"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="light.svg">
+ <defs
+ id="defs4262">
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3653"
+ id="linearGradient5677"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.7536097,0,0,3.2312663,-6.5153492,-7.537471)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ id="linearGradient3653">
+ <stop
+ style="stop-color:#2e3436;stop-opacity:1"
+ offset="0"
+ id="stop3655" />
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="1"
+ id="stop3657" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3687">
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="0"
+ id="stop3689" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="1"
+ id="stop3691" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3663">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="0"
+ id="stop3665" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0"
+ offset="1"
+ id="stop3667" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3653"
+ id="linearGradient5701"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.7536097,0,0,3.2312663,-6.5153492,-7.537471)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ id="linearGradient5703">
+ <stop
+ style="stop-color:#2e3436;stop-opacity:1"
+ offset="0"
+ id="stop5705" />
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="1"
+ id="stop5707" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3687-8"
+ id="linearGradient6022"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.5997954,0,0,3.5997954,562.18204,242.11814)"
+ x1="12.530968"
+ y1="21.023849"
+ x2="9.9954348"
+ y2="1.8360283" />
+ <linearGradient
+ id="linearGradient3687-8">
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="0"
+ id="stop3689-7" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="1"
+ id="stop3691-8" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3663-0"
+ id="linearGradient6024"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.78173,0,0,3.78173,560.27071,240.20357)"
+ x1="4.5507631"
+ y1="4.0634403"
+ x2="16.460409"
+ y2="18.705576" />
+ <linearGradient
+ id="linearGradient3663-0">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="0"
+ id="stop3665-0" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0"
+ offset="1"
+ id="stop3667-6" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="19.84"
+ inkscape:cx="12.656226"
+ inkscape:cy="14.895836"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1680"
+ inkscape:window-height="984"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4265">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1028.3622)">
+ <g
+ id="g3310"
+ transform="matrix(0.30959985,0.30959985,-0.30959985,0.30959985,-8.0106937,1000.8661)">
+ <path
+ transform="matrix(1,0,0,0.9923454,64.5,0.03827293)"
+ d="M 59,32 C 59,46.911688 46.911688,59 32,59 17.088312,59 5,46.911688 5,32 5,17.088312 17.088312,5
32,5 46.911688,5 59,17.088312 59,32 z"
+ sodipodi:ry="27"
+ sodipodi:rx="27"
+ sodipodi:cy="32"
+ sodipodi:cx="32"
+ id="use3311"
+
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <g
+ transform="matrix(0.7356317,0,0,0.7244548,-345.8347,-171.37861)"
+ id="use3312">
+ <path
+ id="path6018"
+
style="fill:url(#linearGradient6022);fill-opacity:1;stroke:#888a85;stroke-width:2.00042057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 635.99979,280 c 0,19.88214 -16.11766,35.99979 -35.99979,35.99979 -19.88214,0
-35.99979,-16.11765 -35.99979,-35.99979 0,-19.88213 16.11765,-35.99979 35.99979,-35.99979 19.88213,0
35.99979,16.11766 35.99979,35.99979 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path6020"
+
style="fill:none;stroke:url(#linearGradient6024);stroke-width:2.00179124;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 633.9991,280 c 0,18.77719 -15.22191,33.9991 -33.9991,33.9991 -18.77719,0 -33.9991,-15.22191
-33.9991,-33.9991 0,-18.77718 15.22191,-33.9991 33.9991,-33.9991 18.77719,0 33.9991,15.22192 33.9991,33.9991
l 0,0 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/data/mark.svg b/data/mark.svg
new file mode 100644
index 0000000..81c2a7c
--- /dev/null
+++ b/data/mark.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="24"
+ height="24"
+ id="svg4260"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="white.svg">
+ <defs
+ id="defs4262" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="9.92"
+ inkscape:cx="54.641504"
+ inkscape:cy="19.224407"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="702"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:snap-center="false"
+ showguides="false"
+ inkscape:snap-object-midpoints="true"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4455"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4265">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1028.3622)">
+ <g
+ id="g4157"
+ transform="matrix(1.3298443,0,0,1.3298443,1.35204,1029.7028)"
+ style="fill:#2e3436">
+ <g
+ transform="translate(-121.0002,-747)"
+ style="fill:#2e3436;display:inline"
+ inkscape:label="status"
+ id="layer9" />
+ <g
+ transform="translate(-121.0002,-747)"
+ inkscape:label="devices"
+ id="layer10"
+ style="fill:#2e3436" />
+ <g
+ transform="translate(-121.0002,-747)"
+ inkscape:label="apps"
+ id="layer11"
+ style="fill:#2e3436" />
+ <g
+ transform="translate(-121.0002,-747)"
+ inkscape:label="places"
+ id="layer13"
+ style="fill:#2e3436" />
+ <g
+ transform="translate(-121.0002,-747)"
+ inkscape:label="mimetypes"
+ id="layer14"
+ style="fill:#2e3436" />
+ <g
+ transform="translate(-121.0002,-747)"
+ style="fill:#2e3436;display:inline"
+ inkscape:label="emblems"
+ id="layer15" />
+ <g
+ transform="translate(-121.0002,-747)"
+ style="fill:#2e3436;display:inline"
+ inkscape:label="emotes"
+ id="g71291" />
+ <g
+ transform="translate(-121.0002,-747)"
+ style="fill:#2e3436;display:inline"
+ inkscape:label="categories"
+ id="g4953" />
+ <g
+ transform="translate(-121.0002,-747)"
+ style="fill:#2e3436;display:inline"
+ inkscape:label="actions"
+ id="layer12">
+ <path
+
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale
Mono;-inkscape-font-specification:Andale Mono"
+ sodipodi:nodetypes="ccsccccccccccc"
+ id="path10839-9-9-5-9"
+ d="m 125.0004,749 1,0 c 0.0104,-1.2e-4 0.0208,-4.6e-4 0.0313,0 0.25495,0.0112 0.50987,0.12858
0.6875,0.3125 l 6.29767,5.71875 -6.29772,5.71875 c -0.18816,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0
0,-1 c 0,-0.26529 0.0931,-0.53058 0.28125,-0.71875 l 4.82897,-4.28125 -4.82897,-4.28125 c -0.21074,-0.19463
-0.30316,-0.46925 -0.28125,-0.75 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/iagno.vala b/src/iagno.vala
index e731acf..6f49f61 100644
--- a/src/iagno.vala
+++ b/src/iagno.vala
@@ -24,9 +24,9 @@ public class Iagno : Gtk.Application
private int window_height;
private Gtk.HeaderBar headerbar;
private GameView view;
- private Gtk.Label dark_label;
+ private Gtk.Image mark_icon_dark;
+ private Gtk.Image mark_icon_light;
private Gtk.Label dark_score_label;
- private Gtk.Label light_label;
private Gtk.Label light_score_label;
private Gtk.Dialog propbox;
@@ -156,26 +156,36 @@ public class Iagno : Gtk.Application
grid.halign = Gtk.Align.CENTER;
grid.vexpand = true;
grid.hexpand = true;
- grid.set_column_spacing (8);
+ grid.set_column_spacing (12);
+ grid.set_row_spacing (18);
+ grid.margin_end = 12;
grid.show ();
- side_box.pack_start (grid, false, true, 0);
+ side_box.pack_start (grid, false, true, 6);
- dark_label = new Gtk.Label (_("Dark:"));
- dark_label.show ();
- grid.attach (dark_label, 1, 0, 1, 1);
+ var dark = Path.build_filename (DATA_DIRECTORY, "images", "dark.svg");
+ var dark_icon = new Gtk.Image.from_file (dark);
+ dark_icon.show ();
+ grid.attach (dark_icon, 1, 0, 1, 1);
dark_score_label = new Gtk.Label ("00");
dark_score_label.show ();
grid.attach (dark_score_label, 2, 0, 1, 1);
- light_label = new Gtk.Label (_("Light:"));
- light_label.show ();
- grid.attach (light_label, 1, 1, 1, 1);
+ var light = Path.build_filename (DATA_DIRECTORY, "images", "light.svg");
+ var light_icon = new Gtk.Image.from_file (light);
+ light_icon.show ();
+ grid.attach (light_icon, 1, 1, 1, 1);
light_score_label = new Gtk.Label ("00");
light_score_label.show ();
grid.attach (light_score_label, 2, 1, 1, 1);
+ var mark = Path.build_filename (DATA_DIRECTORY, "images", "mark.svg");
+ mark_icon_dark = new Gtk.Image.from_file (mark);
+ mark_icon_light = new Gtk.Image.from_file (mark);
+ grid.attach (mark_icon_dark, 0, 0, 1, 1);
+ grid.attach (mark_icon_light, 0, 1, 1, 1);
+
var new_game_button = new Gtk.Button ();
new_game_button.label = _("_Start Over");
new_game_button.use_underline = true;
@@ -316,21 +326,19 @@ public class Iagno : Gtk.Application
var new_game_action = (SimpleAction) lookup_action ("new-game");
new_game_action.set_enabled (game.can_undo (1));
+ /* Translators: this is a 2 digit representation of the current score. */
+ dark_score_label.set_markup ("<span font_weight='bold'>"+(_("%.2d").printf
(game.n_dark_tiles))+"</span>");
+ light_score_label.set_markup ("<span font_weight='bold'>"+(_("%.2d").printf
(game.n_light_tiles))+"</span>");
+
if (game.current_color == Player.DARK)
{
- dark_label.set_markup ("<span font_weight='bold'>"+_("Dark:")+"</span>");
- light_label.set_markup ("<span font_weight='normal'>"+_("Light:")+"</span>");
- /* Translators: this is a 2 digit representation of the current score. */
- dark_score_label.set_markup ("<span font_weight='bold'>"+(_("%.2d").printf
(game.n_dark_tiles))+"</span>");
- light_score_label.set_markup ("<span font_weight='normal'>"+(_("%.2d").printf
(game.n_light_tiles))+"</span>");
+ mark_icon_light.hide ();
+ mark_icon_dark.show ();
}
else if (game.current_color == Player.LIGHT)
{
- dark_label.set_markup ("<span font_weight='normal'>"+_("Dark:")+"</span>");
- light_label.set_markup ("<span font_weight='bold'>"+_("Light:")+"</span>");
- /* Translators: this is a 2 digit representation of the current score. */
- dark_score_label.set_markup ("<span font_weight='normal'>"+(_("%.2d").printf
(game.n_dark_tiles))+"</span>");
- light_score_label.set_markup ("<span font_weight='bold'>"+(_("%.2d").printf
(game.n_light_tiles))+"</span>");
+ mark_icon_dark.hide ();
+ mark_icon_light.show ();
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
