fix warnings, toolbar and cleanup gui_gtk

git-svn-id: http://svn.code.sf.net/p/navit/code/branches/libglade/navit@71 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 26 insertions, 53 deletions

diff --git a/src/gui/gtk/gui_gtk.c b/src/gui/gtk/gui_gtk.c
index f9444336..b29e780f 100644
--- a/src/gui/gtk/gui_gtk.c
+++ b/src/gui/gtk/gui_gtk.c
@@ -3,9 +3,12 @@
 #include <glib/gprintf.h>
 #include <glade/glade.h>
 #include "coord.h"
+#include "graphics.h"
 #include "transform.h"
 #include "container.h"
 #include "gui_gtk.h"
+#include "menu.h"
+#include "destination.h"
 
 
 extern void container_init_gra(struct container *co);
@@ -34,8 +37,6 @@ void on_Zoom_in_clicked(GtkWidget *widget, gpointer user_data)
 	unsigned long scale;
 	struct container *co;
 
-	g_print("Zoom in\n");
-
 	co=get_container(widget);
         graphics_get_view(co, NULL, NULL, &scale);
         scale/=2;
@@ -46,27 +47,45 @@ void on_Zoom_in_clicked(GtkWidget *widget, gpointer user_data)
 
 void on_Zoom_out_clicked(GtkWidget *widget, gpointer user_data)
 {
-	g_print("Zoom out\n");
+	unsigned long scale;
+	struct container *co;
+
+	co=get_container(widget);
+        graphics_get_view(co, NULL, NULL, &scale);
+        scale*=2;
+        graphics_set_view(co, NULL, NULL, &scale);
 }
 
 void on_Refresh_clicked(GtkWidget *widget, gpointer user_data)
 {
-	g_print("Refresh\n");
+	struct container *co;
+
+	co=get_container(widget);
+	menu_route_update(co);
 }
 
 void on_Cursor_toggled(GtkWidget *widget, gpointer user_data)
 {
-	g_print("Cursor\n");
+	struct container *co;
+
+	co=get_container(widget);
+	co->flags->track=gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget));
 }
 
 void  on_Orientation_toggled(GtkWidget *widget, gpointer user_data)
 {
-	g_print("Orientation\n");
+	struct container *co;
+
+	co=get_container(widget);
+	co->flags->orient_north=gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget));
 }
 
 void on_Destination_clicked(GtkWidget *widget, gpointer user_data)
 {
-	g_print("Destination\n");
+	struct container *co;
+
+	co=get_container(widget);
+	destination_address(co);
 }
 
 void on_Quit_clicked(GtkWidget *widget, gpointer user_data)
@@ -104,21 +123,6 @@ container_new(GtkWidget **widget)
 	return co;
 }
 
-static void glade_signal_connect (const gchar *handler_name, GObject *object, const gchar *signal_name, const gchar *signal_data,
-		GObject *connect_object, gboolean after, gpointer user_data)
-{
-	g_printf("signal connect handler_name: %s signal_name: %s signal_data: %s\n",
-			handler_name?handler_name:"NULL",
-			signal_name?signal_name:"NULL",
-			signal_data?signal_data:"NULL");
-#if 0
-	if(after)
-		g_signal_connect_after(G_OBJECT(object),signal_name,G_CALLBACK(),user_data);
-	else
-		g_signal_connect(G_OBJECT(object),signal_name,G_CALLBACK()user_data);
-#endif
-}
-
 struct container *
 gui_gtk_window(int x, int y, int scale)
 {
@@ -144,36 +148,5 @@ gui_gtk_window(int x, int y, int scale)
 
 	container_init_gra(co);
 	return co;
-#if 0
-	GtkWidget *window,*map_widget;
-	GtkWidget *vbox;
-	GtkWidget *statusbar;
-	struct container *co;
-
-	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size(GTK_WINDOW(window), 792, 547);
-	gtk_window_set_title(GTK_WINDOW(window), "Map");
-	gtk_widget_realize(window);
-	vbox = gtk_vbox_new(FALSE, 0);
-	co=container_new(&map_widget);
-	
-	transform_setup(co->trans, x, y, scale, 0);
-
-	co->win=(struct window *) window;
-	co->statusbar=gui_gtk_statusbar_new(&statusbar);
-	gui_gtk_actions_new(co,&vbox);
-	
-/*
-	gtk_box_pack_start(GTK_BOX(vbox), menu, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
-*/
-	gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(vbox), map_widget, TRUE, TRUE, 0);
-	gtk_container_add(GTK_CONTAINER(window), vbox);
-	
-	gtk_widget_show_all(window);
-	container_init_gra(co);
-	return co;
-#endif
 }