Add:GTK:Added options to disable menubar/toolbar/statusbar, thanks Matt Callow for...

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

diff --git a/navit/src/attr_def.h b/navit/src/attr_def.h
index 1e773e7..c8714bf 100644 (file)
--- a/navit/src/attr_def.h
+++ b/navit/src/attr_def.h
@@ -43,6 +43,9 @@ ATTR(active)
 ATTR(cursor)
 ATTR(orientation)
 ATTR(tracking)
+ATTR(menubar)
+ATTR(statusbar)
+ATTR(toolbar)
 ATTR2(0x0002ffff,type_int_end)
 ATTR2(0x00030000,type_string_begin)
 ATTR(type)

diff --git a/navit/src/gui/gtk/gui_gtk_window.c b/navit/src/gui/gtk/gui_gtk_window.c
index 34c5780..13c2850 100644 (file)
--- a/navit/src/gui/gtk/gui_gtk_window.c
+++ b/navit/src/gui/gtk/gui_gtk_window.c
@@ -8,6 +8,7 @@
 #include <libintl.h>
 #include <gtk/gtk.h>
 #include "config.h"
+#include "item.h"
 #include "navit.h"
 #include "debug.h"
 #include "gui.h"
@@ -158,11 +159,24 @@ gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs)
        int w=792, h=547;
        char *cp = getenv("NAVIT_XID");
        unsigned xid = 0;
+       struct attr *menubar, *toolbar, *statusbar;
 
        if (cp) {
                xid = strtol(cp, NULL, 0);
        }
 
+       menubar = attr_search(attrs, NULL, attr_menubar);
+       if (menubar && menubar->u.num == 0) {
+               gui_gtk_methods.menubar_new = NULL;
+       }
+       toolbar = attr_search(attrs, NULL, attr_toolbar);
+       if (toolbar && toolbar->u.num == 0) {
+               gui_gtk_methods.toolbar_new = NULL;
+       }
+       statusbar = attr_search(attrs, NULL, attr_statusbar);
+       if (statusbar && statusbar->u.num == 0) {
+               gui_gtk_methods.statusbar_new = NULL;
+       }
        *meth=gui_gtk_methods;
 
        this=g_new0(struct gui_priv, 1);

diff --git a/navit/src/navit.xml b/navit/src/navit.xml
index 8e4b66f..64e3b20 100644 (file)
--- a/navit/src/navit.xml
+++ b/navit/src/navit.xml
@@ -14,7 +14,7 @@ Center coordinates format:
 Change to your home coordinates.
 -->
 <navit center="4808 N 1134 E" zoom="256" tracking="1" cursor="1" orientation="0">
-       <gui type="gtk" />
+       <gui type="gtk" menubar="1" toolbar="1" statusbar="1" />
        <graphics type="gtk_drawing_area" />
 <!-- For SDL, use rather the following lines
        <gui type="sdl" />