Fix:Various:Applied trac tickets 284,285,287

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

diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c
index ca3b0e7..f841073 100644 (file)
--- a/navit/gui/gtk/destination.c
+++ b/navit/gui/gtk/destination.c
@@ -135,8 +135,6 @@ static void set_columns(struct search_param *param, int mode)
        }
        g_list_free(columns_list);
        while (*column_text) {
-               printf("column_text=%p\n", column_text);
-               printf("*column_text=%s\n", *column_text);
                GtkCellRenderer *cell=gtk_cell_renderer_text_new();
                gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (param->treeview),-1, gettext(*column_text), cell, "text", i, NULL);
                i++;

diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 9e465b2..2130303 100644 (file)
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -324,7 +324,15 @@ static void gui_internal_search_country(struct gui_priv *this, struct widget *wi
 
 static struct widget *gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode);
 static struct menu_data * gui_internal_menu_data(struct gui_priv *this);
-
+/*
+ * * Display image scaled to specific size
+ * * searches for scaleable and pre-scaled image
+ * * @param this Our gui context
+ * * @param name image name
+ * * @param w desired width of image
+ * * @param h desired height of image
+ * * @returns image_struct Ptr to scaled image struct or NULL if not scaled or found
+ * */
 static struct graphics_image *
 image_new_scaled(struct gui_priv *this, char *name, int w, int h)
 {
@@ -335,13 +343,13 @@ image_new_scaled(struct gui_priv *this, char *name, int w, int h)
        for (i = 1 ; i < 6 ; i++) {
                full_name=NULL;
                switch (i) {
-               case 1:
+               case 3:
                        full_name=g_strdup_printf("%s/xpm/%s.svg", getenv("NAVIT_SHAREDIR"), name);
                        break;
                case 2:
                        full_name=g_strdup_printf("%s/xpm/%s.svgz", getenv("NAVIT_SHAREDIR"), name);
                        break;
-               case 3:
+               case 1:
                        if (w != -1 && h != -1) {
                                full_name=g_strdup_printf("%s/xpm/%s_%d_%d.png", getenv("NAVIT_SHAREDIR"), name, w, h);
                        }

diff --git a/navit/xpm/gui_display.svg b/navit/xpm/gui_display.svg
index 1e17a4e..0e89c86 100644 (file)
--- a/navit/xpm/gui_display.svg
+++ b/navit/xpm/gui_display.svg
@@ -9,8 +9,8 @@
    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="48.000000px"
-   height="48.000000px"
+   width="48px"
+   height="48px"
    id="svg3304"
    sodipodi:version="0.32"
    inkscape:version="0.44"

diff --git a/navit/xpm/gui_fullscreen.svg b/navit/xpm/gui_fullscreen.svg
index 1c191f2..1c025cc 100644 (file)
--- a/navit/xpm/gui_fullscreen.svg
+++ b/navit/xpm/gui_fullscreen.svg
@@ -12,8 +12,8 @@
    version="1.0"
    x="0.0000000"
    y="0.0000000"
-   width="48.000000"
-   height="48.000000"
+   width="48"
+   height="48"
    id="svg11300"
    sodipodi:version="0.32"
    inkscape:version="0.44"

diff --git a/navit/xpm/gui_leave_fullscreen.svg b/navit/xpm/gui_leave_fullscreen.svg
index 022b380..d1d351b 100644 (file)
--- a/navit/xpm/gui_leave_fullscreen.svg
+++ b/navit/xpm/gui_leave_fullscreen.svg
@@ -12,8 +12,8 @@
    version="1.0"
    x="0.0000000"
    y="0.0000000"
-   width="48.000000"
-   height="48.000000"
+   width="48"
+   height="48"
    id="svg11300"
    sodipodi:version="0.32"
    inkscape:version="0.44"

diff --git a/navit/xpm/gui_quit.svg b/navit/xpm/gui_quit.svg
index 1f54659..c15b62b 100644 (file)
--- a/navit/xpm/gui_quit.svg
+++ b/navit/xpm/gui_quit.svg
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-<svg width="48pt" height="48pt" viewBox="0 0 256 256" overflow="visible" enable-background="new 0 0 256 256" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg548" sodipodi:version="0.32" sodipodi:docname="/home/cschalle/gnome-themes-extras/Nuvola/icons/scalable/stock/stock_quit.svg" sodipodi:docbase="/home/cschalle/gnome-themes-extras/Nuvola/icons/scalable/stock">
+<svg 
+       width="48px"
+       height="48px"
+       viewBox="0 0 256 256"
+       overflow="visible"
+       enable-background="new 0 0 256 256"
+       xml:space="preserve"
+       xmlns="http://www.w3.org/2000/svg"
+       xmlns:xml="http://www.w3.org/XML/1998/namespace"
+       xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+               xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               id="svg548" sodipodi:version="0.32"
+               sodipodi:docname="/home/cschalle/gnome-themes-extras/Nuvola/icons/scalable/stock/stock_quit.svg" sodipodi:docbase="/home/cschalle/gnome-themes-extras/Nuvola/icons/scalable/stock">
   <defs id="defs600"/>
   <sodipodi:namedview id="base"/>
   <g id="Layer_1" stroke="#000000">
@@ -61,4 +74,4 @@
     <path fill="#660000" stroke="none" d="M112.307,33c-1.657,0-3,1.246-3,2.783v122.435c0,1.537,1.343,2.782,3,2.782h33    c1.657,0,3-1.245,3-2.782V35.783c0-1.537-1.343-2.783-3-2.783H112.307z" id="path597"/>
     <path fill="#FFFFFF" stroke="none" d="M145.307,158.218h-33V35.783h33V158.218z" id="path598"/>
   </g>
-</svg>
\ No newline at end of file
+</svg>

diff --git a/navit/xpm/gui_zoom_in.svg b/navit/xpm/gui_zoom_in.svg
index 1a98cdf..bb7f76a 100644 (file)
--- a/navit/xpm/gui_zoom_in.svg
+++ b/navit/xpm/gui_zoom_in.svg
@@ -17,8 +17,8 @@
    inkscape:version="0.44"
    sodipodi:version="0.32"
    id="svg249"
-   height="48.000000px"
-   width="48.000000px"
+   height="48px"
+   width="48px"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs3">