Fix:xpm: replace unknown.xpm with nicer unknown.svg, had to edit the svg to set non...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4860 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/gui/internal/gui_internal.c b/navit/navit/gui/internal/gui_internal.c
index 71d8196..9080014 100644 (file)
--- a/navit/navit/gui/internal/gui_internal.c
+++ b/navit/navit/gui/internal/gui_internal.c
@@ -1524,6 +1524,8 @@ gui_internal_prune_menu_count(struct gui_priv *this, int count, int render)
        if (l) {
                w=l->data;
                gui_internal_prune_menu_do(this, w, render);
+       } else {
+               gui_internal_prune_menu(this, NULL);
        }
 }
 

diff --git a/navit/navit/navit_shipped.xml b/navit/navit/navit_shipped.xml
index 9018e1f..af221b5 100644 (file)
--- a/navit/navit/navit_shipped.xml
+++ b/navit/navit/navit_shipped.xml
@@ -1763,7 +1763,7 @@ Navigation</text></img>
                                        <icon src="nav_destination_bk.svg" w="32" h="32"/>
                                </itemgra>
                                <itemgra item_types="nav_none" order="0-">
-                                       <icon src="unknown.xpm"/>
+                                       <icon src="unknown.svg"/>
                                </itemgra>
                                <itemgra item_types="announcement" order="7-">
                                        <icon src="gui_sound_32_32.png"/>
@@ -3134,7 +3134,7 @@ Navigation</text></img>
                                        <icon src="nav_destination_wh.svg" w="32" h="32"/>
                                </itemgra>
                                <itemgra item_types="nav_none" order="0-">
-                                       <icon src="unknown.xpm"/>
+                                       <icon src="unknown.svg"/>
                                </itemgra>
                                <itemgra item_types="announcement" order="7-">
                                        <icon src="gui_sound_32_32.png"/>
@@ -5928,7 +5928,7 @@ Navigation</text></img>
                                        <icon src="nav_destination_bk.svg" w="32" h="32"/>
                                </itemgra>
                                <itemgra item_types="nav_none" order="0-">
-                                       <icon src="unknown.xpm"/>
+                                       <icon src="unknown.svg"/>
                                </itemgra>
                                <itemgra item_types="announcement" order="7-">
                                        <icon src="gui_sound_32_32.png"/>

diff --git a/navit/navit/osd/core/osd_core.c b/navit/navit/osd/core/osd_core.c
index 3705772..ff91c2f 100644 (file)
--- a/navit/navit/osd/core/osd_core.c
+++ b/navit/navit/osd/core/osd_core.c
@@ -1720,7 +1720,7 @@ osd_nav_next_turn_draw(struct osd_priv_common *opc, struct navit *navit,
                        if (!gr_image) {
                                dbg(0,"failed to load %s in %dx%d\n",image,this->icon_w,this->icon_h);
                                g_free(image);
-                               image = graphics_icon_path("unknown.xpm");
+                               image = graphics_icon_path("unknown.png");
                                gr_image =
                                    graphics_image_new_scaled(opc->
                                                              osd_item.gr,
@@ -1863,7 +1863,7 @@ osd_nav_toggle_announcer_draw(struct osd_priv_common *opc, struct navit *navit,
         if (!gr_image)
         {
             g_free(path);
-            path = graphics_icon_path("unknown.xpm");
+            path = graphics_icon_path("unknown.png");
             gr_image = graphics_image_new_scaled(opc->osd_item.gr, path, this->icon_w, this->icon_h);
         }
         

diff --git a/navit/navit/xpm/Makefile.am b/navit/navit/xpm/Makefile.am
index 333a8fa..9beade4 100644 (file)
--- a/navit/navit/xpm/Makefile.am
+++ b/navit/navit/xpm/Makefile.am
@@ -18,7 +18,6 @@ xpm_DATA += theater.xpm
 xpm_DATA += tower.xpm
 xpm_DATA += townhall.xpm
 xpm_DATA += trailerpark.xpm
-xpm_DATA += unknown.xpm
 xpm_DATA += public_office.xpm
 
 
@@ -155,6 +154,7 @@ svgs += zoo.svg
 svgs += heliport.svg
 svgs += wifi.svg
 svgs += viewpoint.svg
+svgs += unknown.svg
 
 
 nav_svgs =  nav_left_1_bk.svg nav_left_1_wh.svg nav_left_2_bk.svg nav_left_2_wh.svg nav_left_3_bk.svg nav_left_3_wh.svg

diff --git a/navit/navit/xpm/unknown.svg b/navit/navit/xpm/unknown.svg
new file mode 100644 (file)
index 0000000..5ad18ea
--- /dev/null
+++ b/navit/navit/xpm/unknown.svg
@@ -0,0 +1,41 @@
+<?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" version="1.2" width="333" height="339" id="svg3094">
+  <defs id="defs3096"/>
+  <metadata id="metadata3099">
+    <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 transform="translate(-262.85715,-363.79074)" id="layer1">
+    <rect width="332.4278" height="339.07635" x="262.85715" y="363.79074" id="rect3104" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+    <rect width="274.28571" height="280" x="291.42856" y="395.21933" id="rect3874" style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+    <path d="m 354.12571,497.53789 c 0.20664,-13.43317 1.96331,-25.21316
+    5.27,-35.34 3.5133,-10.12647 7.74996,-17.9798 12.71,-23.56
+    5.16662,-5.78645 11.26328,-10.43645 18.29,-13.95 7.0266,-3.51311
+    13.53659,-5.78644 19.53,-6.82 6.19991,-1.23977 12.70991,-1.85977
+    19.53,-1.86 22.73321,2.3e-4 41.22986,6.61356 55.49,19.84
+    14.4665,13.22686 21.69982,30.38018 21.7,51.46 -1.8e-4,13.02014
+    -2.58351,23.7668 -7.75,32.24 -5.16683,8.47345 -14.98349,17.77344
+    -29.45,27.9 -9.30013,6.61342 -15.08679,11.88342 -17.36,15.81
+    -2.27345,3.92674 -3.41012,10.9534 -3.41,21.08 l -38.44,0 0,-4.34 c
+    -8e-5,-10.33326 1.75658,-19.32325 5.27,-26.97 3.71991,-7.85323
+    8.16324,-14.15656 13.33,-18.91 5.16656,-4.75322 10.33322,-9.19655
+    15.5,-13.33 5.16655,-4.13321 9.50654,-8.88653 13.02,-14.26
+    3.71987,-5.37319 5.57987,-11.46985 5.58,-18.29 -1.3e-4,-10.1265
+    -3.10013,-18.59982 -9.3,-25.42 -6.20012,-6.81981 -13.95011,-10.22981
+    -23.25,-10.23 -9.71342,1.9e-4 -17.87675,3.92685 -24.49,11.78
+    -6.40674,7.85351 -9.61007,17.7735 -9.61,29.76 l 0,2.79 0,0.62
+    -42.16,0" id="path3986"
+    style="font-size:310px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans
+    Bold"/>
+    <path d="m 453.63571,601.38789 0,45.26 -46.5,0 0,-45.26 46.5,0"
+    id="path3981"
+    style="font-size:310px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans
+    Bold"/>
+  </g>
+</svg>

diff --git a/navit/navit/xpm/unknown.xpm b/navit/navit/xpm/unknown.xpm
deleted file mode 100644 (file)
index 150ee23..0000000
--- a/navit/navit/xpm/unknown.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *noname[] = {
-/* width height ncolors chars_per_pixel */
-"13 14 3 1",
-/* colors */
-"  c #FFFF00",
-". c blue",
-"X c None",
-/* pixels */
-"             ",
-" ........... ",
-" ...     ... ",
-" .. ..... .. ",
-" ........ .. ",
-" ........ .. ",
-" ......  ... ",
-" ..... ..... ",
-" ..... ..... ",
-" ........... ",
-" ..... ..... ",
-" ........... ",
-" ........... ",
-"             "
-};