[gnome-maps] Routing: use symbolic direction icons
- From: Mattias Bengtsson <mattiasb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps] Routing: use symbolic direction icons
- Date: Mon, 13 Oct 2014 08:11:16 +0000 (UTC)
commit 72e7088979281558dec009aabe2cfb1dc3756b92
Author: Mattias Bengtsson <mattias jc bengtsson gmail com>
Date: Sat Oct 11 22:40:01 2014 +0200
Routing: use symbolic direction icons
Symbolic icons is needed for:
- correctly displaying icons on Hi-DPI screens
- color inversion
(ie. selection in a ListBox or when using the dark theme)
https://bugzilla.gnome.org/show_bug.cgi?id=727688
data/icons/Makefile.am | 7 ++
...apps_32x32_maps-direction-continue-symbolic.svg | 84 ++++++++++++++++++++
...lor_apps_32x32_maps-direction-left-symbolic.svg | 81 +++++++++++++++++++
...or_apps_32x32_maps-direction-right-symbolic.svg | 82 +++++++++++++++++++
...pps_32x32_maps-direction-sharpleft-symbolic.svg | 81 +++++++++++++++++++
...ps_32x32_maps-direction-sharpright-symbolic.svg | 81 +++++++++++++++++++
...ps_32x32_maps-direction-slightleft-symbolic.svg | 81 +++++++++++++++++++
...s_32x32_maps-direction-slightright-symbolic.svg | 81 +++++++++++++++++++
data/media/direction-checkpoint.png | Bin 466 -> 0 bytes
data/media/direction-continue.png | Bin 488 -> 0 bytes
data/media/direction-left.png | Bin 587 -> 0 bytes
data/media/direction-right.png | Bin 564 -> 0 bytes
data/media/direction-sharpleft.png | Bin 678 -> 0 bytes
data/media/direction-sharpright.png | Bin 659 -> 0 bytes
data/media/direction-slightleft.png | Bin 616 -> 0 bytes
data/media/direction-slightright.png | Bin 611 -> 0 bytes
src/gnome-maps.data.gresource.xml | 7 --
src/route.js | 21 +++--
src/sidebar.js | 18 +----
src/turnPointBubble.js | 9 +--
src/turnPointMarker.js | 16 +---
21 files changed, 598 insertions(+), 51 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index a349d25..945aaf8 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -25,6 +25,13 @@ private_icons = \
hicolor_apps_16x16_maps-point-end.svg \
hicolor_apps_16x16_maps-point-start-symbolic.svg \
hicolor_apps_16x16_maps-point-end-symbolic.svg \
+ hicolor_apps_32x32_maps-direction-sharpleft-symbolic.svg \
+ hicolor_apps_32x32_maps-direction-left-symbolic.svg \
+ hicolor_apps_32x32_maps-direction-slightleft-symbolic.svg \
+ hicolor_apps_32x32_maps-direction-continue-symbolic.svg \
+ hicolor_apps_32x32_maps-direction-slightright-symbolic.svg \
+ hicolor_apps_32x32_maps-direction-right-symbolic.svg \
+ hicolor_apps_32x32_maps-direction-sharpright-symbolic.svg \
hicolor_apps_16x16_layers-button-symbolic.svg \
hicolor_apps_16x16_route-button-symbolic.svg \
hicolor_apps_16x16_route-pedestrian-symbolic.svg \
diff --git a/data/icons/hicolor_apps_32x32_maps-direction-continue-symbolic.svg
b/data/icons/hicolor_apps_32x32_maps-direction-continue-symbolic.svg
new file mode 100644
index 0000000..3eecf0f
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_maps-direction-continue-symbolic.svg
@@ -0,0 +1,84 @@
+<?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="32px"
+ height="32px"
+ id="svg13790"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="direction-straight.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs13792" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6568542"
+ inkscape:cx="59.324485"
+ inkscape:cy="8.5113984"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:snap-global="true"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="834"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid13798" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13795">
+ <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
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 16.00234,6.033529 -5.65952,8.006363 11.31905,0 z"
+ id="rect13802-1-3-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <rect
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect13805-3-4-8-8-8"
+ width="4.0049858"
+ height="18.024139"
+ x="14.047668"
+ y="-27.039391"
+ transform="scale(1,-1)" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_32x32_maps-direction-left-symbolic.svg
b/data/icons/hicolor_apps_32x32_maps-direction-left-symbolic.svg
new file mode 100644
index 0000000..110fda8
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_maps-direction-left-symbolic.svg
@@ -0,0 +1,81 @@
+<?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="32px"
+ height="32px"
+ id="svg13790"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="direction-left-symbolic.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs13792" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627417"
+ inkscape:cx="16.915613"
+ inkscape:cy="9.6699236"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:snap-global="true"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="834"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid13798" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13795">
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 4.6453,12.01558 8.42654,5.950595 0,-11.901192 z"
+ id="rect13802-1-3-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <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;baseline-shift:baseline;color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 12.8125,10 0,4 9.1875,0 0,13 4,0 0,-15 a 2.0002,2.0002 0 0 0 -2,-2 l -11.1875,0 z"
+ id="path6022"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_32x32_maps-direction-right-symbolic.svg
b/data/icons/hicolor_apps_32x32_maps-direction-right-symbolic.svg
new file mode 100644
index 0000000..c955b77
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_maps-direction-right-symbolic.svg
@@ -0,0 +1,82 @@
+<?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="32px"
+ height="32px"
+ id="svg13790"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="direction-right-symbolic.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs13792" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="127.99999"
+ inkscape:cx="9.4176534"
+ inkscape:cy="20.153213"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:snap-global="true"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="834"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid13798" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13795">
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 28.39767,12.01558 -8.42655,5.950595 0,-11.901192 z"
+ id="rect13802-1-3-2-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <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;baseline-shift:baseline;color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 7,12 0,15 4,0 0,-13 9.1875,0 0,-4 L 9,10 c -1.1188268,0 -1.9754206,1.099085 -2,2 z"
+ id="path6022"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_32x32_maps-direction-sharpleft-symbolic.svg
b/data/icons/hicolor_apps_32x32_maps-direction-sharpleft-symbolic.svg
new file mode 100644
index 0000000..37d46da
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_maps-direction-sharpleft-symbolic.svg
@@ -0,0 +1,81 @@
+<?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="32px"
+ height="32px"
+ id="svg13790"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="direction-left-sharp-symbolic.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs13792" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="22.770653"
+ inkscape:cy="8.8856113"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:snap-global="true"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="834"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid13798" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13795">
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 5.10412,21.98242 8.595,12.275209 15.41986,22.02506 z"
+ id="rect13802-1-3-2-0-0-5-0-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <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;baseline-shift:baseline;color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 21.9375,7.96875 a 2.0002,2.0002 0 0 0 -1.09375,0.375 L 9.4375,16.375 11.75,19.65625 20,13.8125
20,27 24,27 24,9.96875 a 2.0002,2.0002 0 0 0 -2.0625,-2 z"
+ id="path6022"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_32x32_maps-direction-sharpright-symbolic.svg
b/data/icons/hicolor_apps_32x32_maps-direction-sharpright-symbolic.svg
new file mode 100644
index 0000000..deaa22d
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_maps-direction-sharpright-symbolic.svg
@@ -0,0 +1,81 @@
+<?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="32px"
+ height="32px"
+ id="svg13790"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="direction-right-sharp-symbolic.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs13792" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="38.434688"
+ inkscape:cy="11.294029"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:snap-global="true"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="834"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid13798" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13795">
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 27.01125,21.98242 23.52037,12.275209 16.69551,22.02506 z"
+ id="rect13802-1-3-2-0-0-5-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <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;baseline-shift:baseline;color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="M 9.84375,8 A 2.0002,2.0002 0 0 0 8,10 l 0,17.03125 4,0 0,-13.1875 8.25,5.84375 2.3125,-3.28125 L
11.15625,8.375 A 2.0002,2.0002 0 0 0 9.84375,8 z"
+ id="path6022"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_32x32_maps-direction-slightleft-symbolic.svg
b/data/icons/hicolor_apps_32x32_maps-direction-slightleft-symbolic.svg
new file mode 100644
index 0000000..0fc527c
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_maps-direction-slightleft-symbolic.svg
@@ -0,0 +1,81 @@
+<?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="32px"
+ height="32px"
+ id="svg13790"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="direction-left-slight-symbolic.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs13792" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="25.128121"
+ inkscape:cy="20.412902"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:snap-global="true"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="834"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid13798" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13795">
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <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;baseline-shift:baseline;color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="M 15.0625,10.125 12.25,12.9375 18,18.6875 18,27 l 4,0 0,-9.125 A 2.0002,2.0002 0 0 0
21.40625,16.46875 L 15.0625,10.125 z"
+ id="path6054-0"
+ inkscape:connector-curvature="0" />
+ <path
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 8.16883,5.957036 18.335,7.707799 9.91959,16.123212 z"
+ id="rect13802-1-3-2-0-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_32x32_maps-direction-slightright-symbolic.svg
b/data/icons/hicolor_apps_32x32_maps-direction-slightright-symbolic.svg
new file mode 100644
index 0000000..1789329
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_maps-direction-slightright-symbolic.svg
@@ -0,0 +1,81 @@
+<?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="32px"
+ height="32px"
+ id="svg13790"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="direction-right-slight-symbolic.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs13792" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627416"
+ inkscape:cx="14.807953"
+ inkscape:cy="16.454947"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:snap-global="true"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="834"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid13798" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13795">
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <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;baseline-shift:baseline;color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 17,10.03125 -6.40625,6.4375 A 2.0002,2.0002 0 0 0 10,17.875 L 10,27 14,27 14,18.6875
19.84375,12.84375 17,10.03125 z"
+ id="path6054-5"
+ inkscape:connector-curvature="0" />
+ <path
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 23.94653,5.957036 -10.16617,1.750763 8.41541,8.415413 z"
+ id="rect13802-1-3-2-0-0-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+</svg>
diff --git a/src/gnome-maps.data.gresource.xml b/src/gnome-maps.data.gresource.xml
index 9efa996..2a37409 100644
--- a/src/gnome-maps.data.gresource.xml
+++ b/src/gnome-maps.data.gresource.xml
@@ -17,12 +17,5 @@
<file alias="application.css">../data/gnome-maps.css</file>
<file alias="maptype-aerial.png">../data/media/maptype-aerial.png</file>
<file alias="maptype-street.png">../data/media/maptype-street.png</file>
- <file alias="direction-sharpleft">../data/media/direction-sharpleft.png</file>
- <file alias="direction-left">../data/media/direction-left.png</file>
- <file alias="direction-slightleft">../data/media/direction-slightleft.png</file>
- <file alias="direction-continue">../data/media/direction-continue.png</file>
- <file alias="direction-sharpright">../data/media/direction-sharpright.png</file>
- <file alias="direction-right">../data/media/direction-right.png</file>
- <file alias="direction-slightright">../data/media/direction-slightright.png</file>
</gresource>
</gresources>
diff --git a/src/route.js b/src/route.js
index 7fbf0ad..7738631 100644
--- a/src/route.js
+++ b/src/route.js
@@ -85,7 +85,7 @@ const TurnPoint = new Lang.Class({
this._type = type;
this.distance = distance;
this.instruction = instruction;
- this.iconResource = this._getIconResource();
+ this.iconName = this._getIconName();
},
get type() {
@@ -98,15 +98,18 @@ const TurnPoint = new Lang.Class({
|| this._type === TurnPointType.END;
},
- _getIconResource: function() {
+ _getIconName: function() {
switch(this._type) {
- case TurnPointType.SHARP_LEFT: return '/org/gnome/maps/direction-sharpleft';
- case TurnPointType.LEFT: return '/org/gnome/maps/direction-left';
- case TurnPointType.SLIGHT_LEFT: return '/org/gnome/maps/direction-slightleft';
- case TurnPointType.CONTINUE: return '/org/gnome/maps/direction-continue';
- case TurnPointType.SLIGHT_RIGHT: return '/org/gnome/maps/direction-slightright';
- case TurnPointType.RIGHT: return '/org/gnome/maps/direction-right';
- case TurnPointType.SHARP_RIGHT: return '/org/gnome/maps/direction-sharpright';
+ case TurnPointType.SHARP_LEFT: return 'maps-direction-sharpleft-symbolic';
+ case TurnPointType.LEFT: return 'maps-direction-left-symbolic';
+ case TurnPointType.SLIGHT_LEFT: return 'maps-direction-slightleft-symbolic';
+ case TurnPointType.CONTINUE: return 'maps-direction-continue-symbolic';
+ case TurnPointType.SLIGHT_RIGHT: return 'maps-direction-slightright-symbolic';
+ case TurnPointType.RIGHT: return 'maps-direction-right-symbolic';
+ case TurnPointType.SHARP_RIGHT: return 'maps-direction-sharpright-symbolic';
+ case TurnPointType.START: return 'maps-point-start-symbolic';
+ case TurnPointType.VIA: return 'maps-point-via-symbolic';
+ case TurnPointType.END: return 'maps-point-end-symbolic';
default: return '';
}
}
diff --git a/src/sidebar.js b/src/sidebar.js
index 4ee4c11..2872384 100644
--- a/src/sidebar.js
+++ b/src/sidebar.js
@@ -229,22 +229,8 @@ const InstructionRow = new Lang.Class({
'direction-image',
'instruction-label',
'distance-label']);
- ui.instructionLabel.label = this.turnPoint.instruction;
-
- switch(this.turnPoint.type) {
- case Route.TurnPointType.START:
- ui.directionImage.icon_name = 'maps-point-start-symbolic';
- break;
- case Route.TurnPointType.END:
- ui.directionImage.icon_name = 'maps-point-end-symbolic';
- break;
- case Route.TurnPointType.VIA:
- ui.directionImage.icon_name = 'maps-point-end-symbolic';
- break;
- default:
- ui.directionImage.resource = this.turnPoint.iconResource;
- break;
- }
+ ui.instructionLabel.label = this.turnPoint.instruction;
+ ui.directionImage.icon_name = this.turnPoint.iconName;
if (this.turnPoint.distance > 0)
ui.distanceLabel.label = Utils.prettyDistance(this.turnPoint.distance);
diff --git a/src/turnPointBubble.js b/src/turnPointBubble.js
index e29ccfc..04433e9 100644
--- a/src/turnPointBubble.js
+++ b/src/turnPointBubble.js
@@ -33,9 +33,6 @@ const TurnPointBubble = new Lang.Class({
Extends: MapBubble.MapBubble,
_init: function(params) {
- let icon = params.icon;
- delete params.icon;
-
let turnPoint = params.turnPoint;
delete params.turnPoint;
@@ -45,11 +42,7 @@ const TurnPointBubble = new Lang.Class({
'box-right',
'image',
'label-title' ]);
- if (icon)
- ui.image.icon_name = icon;
- else
- ui.image.resource = turnPoint.iconResource;
-
+ ui.image.icon_name = turnPoint.iconName;
ui.labelTitle.label = turnPoint.instruction;
this.add(ui.grid);
diff --git a/src/turnPointMarker.js b/src/turnPointMarker.js
index 7def415..07fdd2a 100644
--- a/src/turnPointMarker.js
+++ b/src/turnPointMarker.js
@@ -36,19 +36,14 @@ const TurnPointMarker = new Lang.Class({
Name: 'TurnPointMarker',
Extends: MapMarker.MapMarker,
- get iconName() {
- switch(this._turnPoint.type) {
- case Route.TurnPointType.START: return 'maps-point-start';
- case Route.TurnPointType.END: return 'maps-point-end';
- case Route.TurnPointType.VIA: return 'maps-point-end';
- default: return null;
- }
- },
-
get turnPoint() {
return this._turnPoint;
},
+ get iconName() {
+ return this._turnPoint.iconName;
+ },
+
_init: function(params) {
this._turnPoint = params.turnPoint
delete params.turnPoint;
@@ -69,8 +64,7 @@ const TurnPointMarker = new Lang.Class({
},
_createBubble: function() {
- return new TurnPointBubble.TurnPointBubble({ icon: this.iconName,
- turnPoint: this.turnPoint,
+ return new TurnPointBubble.TurnPointBubble({ turnPoint: this.turnPoint,
place: this.place,
mapView: this._mapView });
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
