[gnome-maps/wip/hidpi-icons: 2/2] Use real scalable icons
- From: Mattias Bengtsson <mattiasb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/hidpi-icons: 2/2] Use real scalable icons
- Date: Wed, 30 Jul 2014 16:34:39 +0000 (UTC)
commit aebf2fb91f6d444663f0f8005e25c30f0686a6cd
Author: Mattias Bengtsson <mattias jc bengtsson gmail com>
Date: Wed Jul 30 18:23:26 2014 +0200
Use real scalable icons
Use installed icons instead of including icons inside the data resource.
This makes it possible for GDk to scale the icons manually and also
seems to be the preferred way to deal with icons.
data/icons/Makefile.am | 13 ++++
...icolor_actions_scalable_direction-continue.svg} | 46 ++++++++++-----
...lor_actions_scalable_direction-destination.svg} | 59 ++++++++++++--------
...olor_actions_scalable_direction-left-sharp.svg} | 45 ++++++++++-----
...lor_actions_scalable_direction-left-slight.svg} | 46 ++++++++++-----
...=> hicolor_actions_scalable_direction-left.svg} | 48 ++++++++++------
...lor_actions_scalable_direction-right-sharp.svg} | 48 ++++++++++------
...or_actions_scalable_direction-right-slight.svg} | 46 ++++++++++-----
...> hicolor_actions_scalable_direction-right.svg} | 46 ++++++++++-----
...ton.svg => hicolor_actions_scalable_layers.svg} | 0
...> hicolor_actions_scalable_route-mode-bike.svg} | 0
...=> hicolor_actions_scalable_route-mode-car.svg} | 0
...lor_actions_scalable_route-mode-pedestrian.svg} | 0
...tton.svg => hicolor_actions_scalable_route.svg} | 0
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 | 15 -----
src/main-window.ui | 4 +-
src/route.js | 25 ++++----
src/sidebar.js | 2 +-
src/sidebar.ui | 7 +-
27 files changed, 282 insertions(+), 168 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 4dca5a1..9f49977 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -11,6 +11,19 @@ public_icons = \
hicolor_apps_32x32_gnome-maps.png \
hicolor_apps_48x48_gnome-maps.png \
hicolor_apps_256x256_gnome-maps.png \
+ hicolor_actions_scalable_direction-continue.svg \
+ hicolor_actions_scalable_direction-left-sharp.svg \
+ hicolor_actions_scalable_direction-left-slight.svg \
+ hicolor_actions_scalable_direction-left.svg \
+ hicolor_actions_scalable_direction-right-sharp.svg \
+ hicolor_actions_scalable_direction-right-slight.svg \
+ hicolor_actions_scalable_direction-right.svg \
+ hicolor_actions_scalable_direction-destination.svg \
+ hicolor_actions_scalable_layers.svg \
+ hicolor_actions_scalable_route.svg \
+ hicolor_actions_scalable_route-mode-bike.svg \
+ hicolor_actions_scalable_route-mode-car.svg \
+ hicolor_actions_scalable_route-mode-pedestrian.svg \
$(NULL)
imagesdir = $(datadir)/gnome-maps/pixmaps
diff --git a/data/icons/route-transit-symbolic.svg
b/data/icons/hicolor_actions_scalable_direction-continue.svg
similarity index 56%
copy from data/icons/route-transit-symbolic.svg
copy to data/icons/hicolor_actions_scalable_direction-continue.svg
index 05a49d5..3eecf0f 100644
--- a/data/icons/route-transit-symbolic.svg
+++ b/data/icons/hicolor_actions_scalable_direction-continue.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-driving-symbolic.svg">
+ 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="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,26 +27,31 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.696216"
- inkscape:cx="5.7511062"
- inkscape:cy="13.453719"
+ 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="841"
+ inkscape:window-height="834"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid7232" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ id="metadata13795">
<rdf:RDF>
<cc:Work
rdf:about="">
@@ -59,10 +67,18 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
-
style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 1.9375,1 C 1.418125,1 1,1.418125 1,1.9375 L 1,14.90625 C 1,15.512187 1.487812,16 2.09375,16 l
0.8125,0 C 3.512188,16 4,15.512187 4,14.90625 L 4,14 l 8,0 0,0.90625 C 12,15.512187 12.487812,16 13.09375,16
l 0.8125,0 C 14.512188,16 15,15.512187 15,14.90625 L 15,1.9375 C 15,1.418125 14.581875,1 14.0625,1 z m
1.15625,1 9.8125,0 C 13.512188,2 14,2.4878125 14,3.09375 l 0,4.8125 C 14,8.5121875 13.512188,9 12.90625,9 L
3.09375,9 C 2.487812,9 2,8.5121875 2,7.90625 L 2,3.09375 C 2,2.4878125 2.487812,2 3.09375,2 z M 3.5,10 C
4.328427,10 5,10.671573 5,11.5 5,12.328427 4.328427,13 3.5,13 2.671573,13 2,12.328427 2,11.5 2,10.671573
2.671573,10 3.5,10 z m 9,0 C 13.328427,10 14,10.671573 14,11.5 14,12.328427 13.328427,13 12.5,13 11.671573,13
11,12.328427 11,11.5 11,10.671573 11.671573,10 12.5,10 z"
- id="rect6086-1"
+
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="sccsssccsssccsssssssssssssssssssss" />
+ 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/route-button.svg b/data/icons/hicolor_actions_scalable_direction-destination.svg
similarity index 56%
copy from data/icons/route-button.svg
copy to data/icons/hicolor_actions_scalable_direction-destination.svg
index d9547d6..c3ad303 100644
--- a/data/icons/route-button.svg
+++ b/data/icons/hicolor_actions_scalable_direction-destination.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-button.svg">
+ sodipodi:docname="direction-left.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
- id="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,33 +27,38 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="32"
- inkscape:cx="1.3467868"
- inkscape:cy="10.557173"
+ inkscape:zoom="16"
+ inkscape:cx="21.759052"
+ inkscape:cy="14.294584"
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:window-width="3200"
- inkscape:window-height="1687"
+ 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="55"
+ inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid11943" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ 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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -59,15 +67,20 @@
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:#000000;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 3.2775895,4.035839 1.9206862,5.3844176 6.4091132,9.901661 7.7660166,8.5530826
3.2775895,4.0358388 z"
- id="path11774-5"
- inkscape:connector-curvature="0" />
- <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;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="M 15,19 15,25.016529 16.001156,26 17,25.016529 17,19 z"
+ id="path11878"
inkscape:connector-curvature="0"
-
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:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 9.0000001,3.0039062 10.4375,4.4414061 5.9999999,8.8789063 l 0,6.1210937 3.0000002,0 0,-4.871094
L 12.5625,6.5664061 14,8.0039063 14,3.0039061 z"
- id="path11004-4"
- sodipodi:nodetypes="cccccccccc" />
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:type="arc"
+
style="color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:2.69565200999999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path11876"
+ sodipodi:cx="8.40625"
+ sodipodi:cy="4.5625"
+ sodipodi:rx="3.875"
+ sodipodi:ry="3.875"
+ d="m 12.28125,4.5625 a 3.875,3.875 0 1 1 -7.75,0 3.875,3.875 0 1 1 7.75,0 z"
+ transform="matrix(1.5483871,0,0,1.5483871,2.9838705,4.9354836)" />
</g>
</svg>
diff --git a/data/icons/route-car-symbolic.svg b/data/icons/hicolor_actions_scalable_direction-left-sharp.svg
similarity index 55%
copy from data/icons/route-car-symbolic.svg
copy to data/icons/hicolor_actions_scalable_direction-left-sharp.svg
index c511fe1..6ffdc47 100644
--- a/data/icons/route-car-symbolic.svg
+++ b/data/icons/hicolor_actions_scalable_direction-left-sharp.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-walking-symbolic.svg">
+ sodipodi:docname="direction-left-sharp.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
- id="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,33 +27,38 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="22.197802"
- inkscape:cx="9.2245257"
- inkscape:cy="9.6312031"
+ 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="841"
+ inkscape:window-height="834"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid7232" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ 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>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -59,9 +67,16 @@
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"
-
style="color:#000000;fill:#2e3436;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,4 C 3.480625,4 3.19205,4.4345415 3.0625,4.9375 L 2.28125,8 1.9375,8 C 1.418125,8 1,8.418125
1,8.9375 l 0,4.125 C 1,13.581875 1.480625,14 2,14 l 0,0.90625 C 2,15.512187 2.446,16 3,16 3.554,16
4,15.512187 4,14.90625 L 4,14 l 8,0 0,0.90625 C 12,15.512187 12.446,16 13,16 c 0.554,0 1,-0.487813 1,-1.09375
L 14,14 c 0.546725,0 1,-0.418125 1,-0.9375 l 0,-4.125 C 15,8.418125 14.581875,8 14.0625,8 L 13.71875,8
12.9375,4.9375 C 12.80795,4.4345415 12.519375,4 12,4 L 4,4 z m 1.0625,1 5.875,0 C 11.543438,5
11.816859,5.5161519 12,6.09375 L 12.625,8 c 0.183141,0.577598 -0.112812,1 -0.71875,1 L 4.09375,9 C 3.487812,9
3.153528,8.606555 3.34375,8.03125 L 4,6.09375 C 4.190222,5.5184449 4.456562,5 5.0625,5 z M 4,10 c 0.552285,0
1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z m
8,0 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285
0.447715,-1 1,-1 z"
- id="rect6086" />
+ sodipodi:nodetypes="cccc" />
+ <path
+
style="fill:none;stroke:#555753;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 22,27 22,9.9700784 10.597903,18.010277"
+ id="path6022"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
</g>
</svg>
diff --git a/data/icons/route-transit-symbolic.svg
b/data/icons/hicolor_actions_scalable_direction-left-slight.svg
similarity index 55%
copy from data/icons/route-transit-symbolic.svg
copy to data/icons/hicolor_actions_scalable_direction-left-slight.svg
index 05a49d5..024d78e 100644
--- a/data/icons/route-transit-symbolic.svg
+++ b/data/icons/hicolor_actions_scalable_direction-left-slight.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-driving-symbolic.svg">
+ sodipodi:docname="direction-left-slight.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
- id="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,33 +27,38 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.696216"
- inkscape:cx="5.7511062"
- inkscape:cy="13.453719"
+ 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="841"
+ inkscape:window-height="834"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid7232" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ 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>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -59,10 +67,16 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
-
style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 1.9375,1 C 1.418125,1 1,1.418125 1,1.9375 L 1,14.90625 C 1,15.512187 1.487812,16 2.09375,16 l
0.8125,0 C 3.512188,16 4,15.512187 4,14.90625 L 4,14 l 8,0 0,0.90625 C 12,15.512187 12.487812,16 13.09375,16
l 0.8125,0 C 14.512188,16 15,15.512187 15,14.90625 L 15,1.9375 C 15,1.418125 14.581875,1 14.0625,1 z m
1.15625,1 9.8125,0 C 13.512188,2 14,2.4878125 14,3.09375 l 0,4.8125 C 14,8.5121875 13.512188,9 12.90625,9 L
3.09375,9 C 2.487812,9 2,8.5121875 2,7.90625 L 2,3.09375 C 2,2.4878125 2.487812,2 3.09375,2 z M 3.5,10 C
4.328427,10 5,10.671573 5,11.5 5,12.328427 4.328427,13 3.5,13 2.671573,13 2,12.328427 2,11.5 2,10.671573
2.671573,10 3.5,10 z m 9,0 C 13.328427,10 14,10.671573 14,11.5 14,12.328427 13.328427,13 12.5,13 11.671573,13
11,12.328427 11,11.5 11,10.671573 11.671573,10 12.5,10 z"
- id="rect6086-1"
+
style="fill:none;stroke:#555753;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 20.007813,27 0,-9.125 -6.359375,-6.34375"
+ id="path6054-0"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="sccsssccsssccsssssssssssssssssssss" />
+ sodipodi:nodetypes="ccc" />
+ <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/route-transit-symbolic.svg b/data/icons/hicolor_actions_scalable_direction-left.svg
similarity index 55%
copy from data/icons/route-transit-symbolic.svg
copy to data/icons/hicolor_actions_scalable_direction-left.svg
index 05a49d5..48fbc50 100644
--- a/data/icons/route-transit-symbolic.svg
+++ b/data/icons/hicolor_actions_scalable_direction-left.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-driving-symbolic.svg">
+ sodipodi:docname="direction-left.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
- id="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,33 +27,38 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.696216"
- inkscape:cx="5.7511062"
- inkscape:cy="13.453719"
+ inkscape:zoom="22.627417"
+ inkscape:cx="16.915613"
+ inkscape:cy="9.6699236"
inkscape:current-layer="layer1"
- showgrid="false"
+ 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="841"
+ inkscape:window-height="834"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid7232" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ 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>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -59,10 +67,16 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
-
style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 1.9375,1 C 1.418125,1 1,1.418125 1,1.9375 L 1,14.90625 C 1,15.512187 1.487812,16 2.09375,16 l
0.8125,0 C 3.512188,16 4,15.512187 4,14.90625 L 4,14 l 8,0 0,0.90625 C 12,15.512187 12.487812,16 13.09375,16
l 0.8125,0 C 14.512188,16 15,15.512187 15,14.90625 L 15,1.9375 C 15,1.418125 14.581875,1 14.0625,1 z m
1.15625,1 9.8125,0 C 13.512188,2 14,2.4878125 14,3.09375 l 0,4.8125 C 14,8.5121875 13.512188,9 12.90625,9 L
3.09375,9 C 2.487812,9 2,8.5121875 2,7.90625 L 2,3.09375 C 2,2.4878125 2.487812,2 3.09375,2 z M 3.5,10 C
4.328427,10 5,10.671573 5,11.5 5,12.328427 4.328427,13 3.5,13 2.671573,13 2,12.328427 2,11.5 2,10.671573
2.671573,10 3.5,10 z m 9,0 C 13.328427,10 14,10.671573 14,11.5 14,12.328427 13.328427,13 12.5,13 11.671573,13
11,12.328427 11,11.5 11,10.671573 11.671573,10 12.5,10 z"
- id="rect6086-1"
+
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="sccsssccsssccsssssssssssssssssssss" />
+ sodipodi:nodetypes="cccc" />
+ <path
+
style="fill:none;stroke:#555753;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 12.818874,12 24,12 24,27.005263"
+ id="path6022"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
</g>
</svg>
diff --git a/data/icons/route-transit-symbolic.svg
b/data/icons/hicolor_actions_scalable_direction-right-sharp.svg
similarity index 55%
copy from data/icons/route-transit-symbolic.svg
copy to data/icons/hicolor_actions_scalable_direction-right-sharp.svg
index 05a49d5..54f4ae4 100644
--- a/data/icons/route-transit-symbolic.svg
+++ b/data/icons/hicolor_actions_scalable_direction-right-sharp.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-driving-symbolic.svg">
+ sodipodi:docname="direction-right-sharp.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
- id="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,33 +27,38 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.696216"
- inkscape:cx="5.7511062"
- inkscape:cy="13.453719"
+ inkscape:zoom="11.313708"
+ inkscape:cx="38.434688"
+ inkscape:cy="11.294029"
inkscape:current-layer="layer1"
- showgrid="false"
+ 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="841"
+ inkscape:window-height="834"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid7232" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ 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>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -59,10 +67,16 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
-
style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 1.9375,1 C 1.418125,1 1,1.418125 1,1.9375 L 1,14.90625 C 1,15.512187 1.487812,16 2.09375,16 l
0.8125,0 C 3.512188,16 4,15.512187 4,14.90625 L 4,14 l 8,0 0,0.90625 C 12,15.512187 12.487812,16 13.09375,16
l 0.8125,0 C 14.512188,16 15,15.512187 15,14.90625 L 15,1.9375 C 15,1.418125 14.581875,1 14.0625,1 z m
1.15625,1 9.8125,0 C 13.512188,2 14,2.4878125 14,3.09375 l 0,4.8125 C 14,8.5121875 13.512188,9 12.90625,9 L
3.09375,9 C 2.487812,9 2,8.5121875 2,7.90625 L 2,3.09375 C 2,2.4878125 2.487812,2 3.09375,2 z M 3.5,10 C
4.328427,10 5,10.671573 5,11.5 5,12.328427 4.328427,13 3.5,13 2.671573,13 2,12.328427 2,11.5 2,10.671573
2.671573,10 3.5,10 z m 9,0 C 13.328427,10 14,10.671573 14,11.5 14,12.328427 13.328427,13 12.5,13 11.671573,13
11,12.328427 11,11.5 11,10.671573 11.671573,10 12.5,10 z"
- id="rect6086-1"
+
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="sccsssccsssccsssssssssssssssssssss" />
+ sodipodi:nodetypes="cccc" />
+ <path
+
style="fill:none;stroke:#555753;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 10,27.029922 10,10 21.402097,18.040199"
+ id="path6022"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
</g>
</svg>
diff --git a/data/icons/route-transit-symbolic.svg
b/data/icons/hicolor_actions_scalable_direction-right-slight.svg
similarity index 55%
copy from data/icons/route-transit-symbolic.svg
copy to data/icons/hicolor_actions_scalable_direction-right-slight.svg
index 05a49d5..cfc4de0 100644
--- a/data/icons/route-transit-symbolic.svg
+++ b/data/icons/hicolor_actions_scalable_direction-right-slight.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-driving-symbolic.svg">
+ sodipodi:docname="direction-right-slight.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
- id="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,33 +27,38 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.696216"
- inkscape:cx="5.7511062"
- inkscape:cy="13.453719"
+ 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="841"
+ inkscape:window-height="834"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid7232" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ 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>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -59,10 +67,16 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
-
style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 1.9375,1 C 1.418125,1 1,1.418125 1,1.9375 L 1,14.90625 C 1,15.512187 1.487812,16 2.09375,16 l
0.8125,0 C 3.512188,16 4,15.512187 4,14.90625 L 4,14 l 8,0 0,0.90625 C 12,15.512187 12.487812,16 13.09375,16
l 0.8125,0 C 14.512188,16 15,15.512187 15,14.90625 L 15,1.9375 C 15,1.418125 14.581875,1 14.0625,1 z m
1.15625,1 9.8125,0 C 13.512188,2 14,2.4878125 14,3.09375 l 0,4.8125 C 14,8.5121875 13.512188,9 12.90625,9 L
3.09375,9 C 2.487812,9 2,8.5121875 2,7.90625 L 2,3.09375 C 2,2.4878125 2.487812,2 3.09375,2 z M 3.5,10 C
4.328427,10 5,10.671573 5,11.5 5,12.328427 4.328427,13 3.5,13 2.671573,13 2,12.328427 2,11.5 2,10.671573
2.671573,10 3.5,10 z m 9,0 C 13.328427,10 14,10.671573 14,11.5 14,12.328427 13.328427,13 12.5,13 11.671573,13
11,12.328427 11,11.5 11,10.671573 11.671573,10 12.5,10 z"
- id="rect6086-1"
+
style="fill:none;stroke:#555753;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 12,27 0,-9.125 6.419845,-6.441942"
+ id="path6054-5"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="sccsssccsssccsssssssssssssssssssss" />
+ sodipodi:nodetypes="ccc" />
+ <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/data/icons/route-transit-symbolic.svg b/data/icons/hicolor_actions_scalable_direction-right.svg
similarity index 55%
rename from data/icons/route-transit-symbolic.svg
rename to data/icons/hicolor_actions_scalable_direction-right.svg
index 05a49d5..04a2e39 100644
--- a/data/icons/route-transit-symbolic.svg
+++ b/data/icons/hicolor_actions_scalable_direction-right.svg
@@ -9,14 +9,17 @@
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="16px"
- height="16px"
- id="svg6558"
+ width="32px"
+ height="32px"
+ id="svg13790"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="route-driving-symbolic.svg">
+ sodipodi:docname="direction-right.svg"
+ inkscape:export-filename="/home/andreasn/SparkleShare/gnome-icons/maps-symbolic/direction-roundabout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
- id="defs6560" />
+ id="defs13792" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -24,33 +27,38 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.696216"
- inkscape:cx="5.7511062"
- inkscape:cy="13.453719"
+ inkscape:zoom="11.313708"
+ inkscape:cx="16.337509"
+ inkscape:cy="1.2426539"
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="841"
+ inkscape:window-height="834"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
- id="grid7232" />
+ id="grid13798" />
</sodipodi:namedview>
<metadata
- id="metadata6563">
+ 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>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -59,10 +67,16 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
-
style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 1.9375,1 C 1.418125,1 1,1.418125 1,1.9375 L 1,14.90625 C 1,15.512187 1.487812,16 2.09375,16 l
0.8125,0 C 3.512188,16 4,15.512187 4,14.90625 L 4,14 l 8,0 0,0.90625 C 12,15.512187 12.487812,16 13.09375,16
l 0.8125,0 C 14.512188,16 15,15.512187 15,14.90625 L 15,1.9375 C 15,1.418125 14.581875,1 14.0625,1 z m
1.15625,1 9.8125,0 C 13.512188,2 14,2.4878125 14,3.09375 l 0,4.8125 C 14,8.5121875 13.512188,9 12.90625,9 L
3.09375,9 C 2.487812,9 2,8.5121875 2,7.90625 L 2,3.09375 C 2,2.4878125 2.487812,2 3.09375,2 z M 3.5,10 C
4.328427,10 5,10.671573 5,11.5 5,12.328427 4.328427,13 3.5,13 2.671573,13 2,12.328427 2,11.5 2,10.671573
2.671573,10 3.5,10 z m 9,0 C 13.328427,10 14,10.671573 14,11.5 14,12.328427 13.328427,13 12.5,13 11.671573,13
11,12.328427 11,11.5 11,10.671573 11.671573,10 12.5,10 z"
- id="rect6086-1"
+
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="sccsssccsssccsssssssssssssssssssss" />
+ sodipodi:nodetypes="cccc" />
+ <path
+
style="fill:none;stroke:#555753;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 20.181127,12 9,12 9,27.005264"
+ id="path6022"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
</g>
</svg>
diff --git a/data/icons/layers-button.svg b/data/icons/hicolor_actions_scalable_layers.svg
similarity index 100%
rename from data/icons/layers-button.svg
rename to data/icons/hicolor_actions_scalable_layers.svg
diff --git a/data/icons/route-bike-symbolic.svg b/data/icons/hicolor_actions_scalable_route-mode-bike.svg
similarity index 100%
rename from data/icons/route-bike-symbolic.svg
rename to data/icons/hicolor_actions_scalable_route-mode-bike.svg
diff --git a/data/icons/route-car-symbolic.svg b/data/icons/hicolor_actions_scalable_route-mode-car.svg
similarity index 100%
rename from data/icons/route-car-symbolic.svg
rename to data/icons/hicolor_actions_scalable_route-mode-car.svg
diff --git a/data/icons/route-pedestrian-symbolic.svg
b/data/icons/hicolor_actions_scalable_route-mode-pedestrian.svg
similarity index 100%
rename from data/icons/route-pedestrian-symbolic.svg
rename to data/icons/hicolor_actions_scalable_route-mode-pedestrian.svg
diff --git a/data/icons/route-button.svg b/data/icons/hicolor_actions_scalable_route.svg
similarity index 100%
rename from data/icons/route-button.svg
rename to data/icons/hicolor_actions_scalable_route.svg
diff --git a/src/gnome-maps.data.gresource.xml b/src/gnome-maps.data.gresource.xml
index 14edf1e..3562e4a 100644
--- a/src/gnome-maps.data.gresource.xml
+++ b/src/gnome-maps.data.gresource.xml
@@ -17,20 +17,5 @@
<file alias="zoom-out-insensitive.png">../data/media/zoom-out-insensitive.png</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="route-car-symbolic">../data/icons/route-car-symbolic.svg</file>
- <file alias="route-pedestrian-symbolic">../data/icons/route-pedestrian-symbolic.svg</file>
- <file alias="route-transit-symbolic">../data/icons/route-transit-symbolic.svg</file>
- <file alias="route-bike-symbolic">../data/icons/route-bike-symbolic.svg</file>
- <file alias="layers-button.svg">../data/icons/layers-button.svg</file>
- <file alias="route-button">../data/icons/route-button.svg</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>
- <file alias="direction-start">../data/media/direction-checkpoint.png</file>
- <file alias="direction-end">../data/media/direction-checkpoint.png</file>
</gresource>
</gresources>
diff --git a/src/main-window.ui b/src/main-window.ui
index b46933c..62e318a 100644
--- a/src/main-window.ui
+++ b/src/main-window.ui
@@ -47,7 +47,7 @@
<object class="GtkImage" id="layers-button-image">
<property name="visible">True</property>
<property name="icon-size">1</property>
- <property name="pixbuf">layers-button.svg</property>
+ <property name="icon-name">layers</property>
</object>
</child>
</object>
@@ -65,7 +65,7 @@
<object class="GtkImage" id="toggle-sidebar-button-image">
<property name="visible">True</property>
<property name="icon-size">1</property>
- <property name="pixbuf">route-button</property>
+ <property name="icon-name">route</property>
</object>
</child>
</object>
diff --git a/src/route.js b/src/route.js
index 8775443..3348b78 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();
},
isDestination: function() {
@@ -94,18 +94,19 @@ const TurnPoint = new Lang.Class({
|| this._type === TurnPointType.STOP;
},
- _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.END: return '/org/gnome/maps/direction-end';
- case TurnPointType.START: return '/org/gnome/maps/direction-start';
- default: return '';
+ case TurnPointType.SHARP_LEFT: return 'direction-left-sharp';
+ case TurnPointType.LEFT: return 'direction-left';
+ case TurnPointType.SLIGHT_LEFT: return 'direction-left-slight';
+ case TurnPointType.CONTINUE: return 'direction-continue';
+ case TurnPointType.SLIGHT_RIGHT: return 'direction-right-slight';
+ case TurnPointType.RIGHT: return 'direction-right';
+ case TurnPointType.SHARP_RIGHT: return 'direction-right-sharp';
+ case TurnPointType.END: return 'direction-destination';
+ case TurnPointType.START: return 'direction-destination';
+ default:
+ return '';
}
}
});
diff --git a/src/sidebar.js b/src/sidebar.js
index f4f4a52..7877512 100644
--- a/src/sidebar.js
+++ b/src/sidebar.js
@@ -142,7 +142,7 @@ const InstructionRow = new Lang.Class({
'direction-image',
'instruction-label']);
ui.instructionLabel.label = this.turnPoint.instruction;
- ui.directionImage.resource = this.turnPoint.iconResource;
+ ui.directionImage.icon_name = this.turnPoint.iconName;
this.add(ui.instructionBox);
}
diff --git a/src/sidebar.ui b/src/sidebar.ui
index 5416e01..758a712 100644
--- a/src/sidebar.ui
+++ b/src/sidebar.ui
@@ -41,7 +41,7 @@
<object class="GtkImage" id="mode-pedestrian-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">route-pedestrian-symbolic</property>
+ <property name="icon-name">route-mode-pedestrian</property>
</object>
</child>
<style>
@@ -67,7 +67,7 @@
<object class="GtkImage" id="mode-bike-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">route-bike-symbolic</property>
+ <property name="icon-name">route-mode-bike</property>
</object>
</child>
<style>
@@ -94,7 +94,7 @@
<object class="GtkImage" id="mode-car-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">route-car-symbolic</property>
+ <property name="icon-name">route-mode-car</property>
</object>
</child>
<style>
@@ -181,6 +181,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">2</property>
+ <property name="icon-size">5</property>
</object>
<packing>
<property name="expand">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
