Move some variables and enums around

[mapper] / src / cb.c

diff --git a/src/cb.c b/src/cb.c
index 567933bae2311c1e05ae277327269fb762310d1e..41cd62e7e4f37f69b71b7238f9125e90c2214e99 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -35,6 +35,7 @@
 #include <sys/wait.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <fcntl.h>
 #include <libintl.h>
 #include <locale.h>
@@ -58,19 +59,28 @@
 #include "gps-panels.h"
 #include "gps-conn.h"
 #include "search.h"
+#include "dialogs.h"
+#include "filter-gui.h"
 #include "help.h"
+#include "map-repo.h"
 
-gboolean 
-menu_cb_route_download(GtkAction * action)
+static void
+track_tree_view_update_store(GtkWidget *tree_view, Path *track)
 {
 GtkListStore *store;
 
-route_download(NULL);
-store=route_generate_store(&_route);
+store=path_generate_store(track);
 if (store!=NULL) {
-       gtk_tree_view_set_model(route_tree_view, store);
+       gtk_tree_view_set_model(tree_view, store);
        g_object_unref(G_OBJECT(store));
 }
+}
+
+gboolean 
+menu_cb_route_download(GtkAction * action)
+{
+route_download(NULL);
+track_tree_view_update_store(route_tree_view, &_route);
 return TRUE;
 }
 
@@ -80,11 +90,7 @@ menu_cb_route_open(GtkAction * action)
 GtkListStore *store;
 
 route_open_file();
-store=route_generate_store(&_route);
-if (store!=NULL) {
-       gtk_tree_view_set_model(route_tree_view, store);
-       g_object_unref(G_OBJECT(store));
-}
+track_tree_view_update_store(route_tree_view, &_route);
 return TRUE;
 }
 
@@ -123,6 +129,7 @@ gboolean
 menu_cb_track_open(GtkAction * action)
 {
 track_open();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -130,6 +137,7 @@ gboolean
 menu_cb_track_save(GtkAction * action)
 {
 track_save();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -137,6 +145,7 @@ gboolean
 menu_cb_track_insert_break(GtkAction * action)
 {
 track_insert_break();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -144,6 +153,7 @@ gboolean
 menu_cb_track_insert_mark(GtkAction * action)
 {
 track_insert_mark();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -172,13 +182,14 @@ gboolean
 menu_cb_track_clear(GtkAction * action)
 {
 track_clear();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
 gboolean 
 menu_cb_track_filter(GtkAction * action)
 {
-filter_dialog();
+filter_dialog(_window);
 return TRUE;
 }
 
@@ -433,16 +444,18 @@ gboolean
 menu_cb_enable_gps(GtkAction * action)
 {
 if ((_enable_gps = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))) {
+       if (_gps->io.address) {
                gps_conn_set_state(_gps, RCVR_DOWN);
-       if (gps_connect_now(_gps)==FALSE) {
-               popup_error(_window, _("Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."));
-               set_action_activate("gps_enable", FALSE);
+               gps_connect_now(_gps);
+       } else {
+               popup_error(_window, _("Cannot enable GPS until a GPS Receiver has been configured in the GPS Settings dialog."));
+               set_action_activate("gps_enabled", FALSE);
        }
 } else {
        if (_gps->io.conn > RCVR_OFF)
                gps_conn_set_state(_gps, RCVR_OFF);
        gps_disconnect(_gps);
-       track_add(0, FALSE);
+       track_add(NULL);
        _speed_excess=FALSE;
 }
 if (_enable_gps==FALSE)
@@ -461,9 +474,13 @@ gboolean
 menu_cb_auto_download(GtkAction * action)
 {
 if ((_auto_download = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)) )) {
-       if (_curr_repo->url == REPOTYPE_NONE)
+       if (_curr_repo->url == REPOTYPE_NONE) {
                popup_error(_window, _("NOTE: You must set a Map URI in the current repository in order to download maps."));
+               /* set_action_activate("", FALSE); */
+       }
        map_force_redraw();
+} else {
+       map_download_stop();
 }
 
 return TRUE;
@@ -472,7 +489,17 @@ return TRUE;
 gboolean 
 menu_cb_settings(GtkAction * action)
 {
-if (settings_dialog()) {
+settings_dialog();
+MACRO_RECALC_FOCUS_BASE();
+MACRO_RECALC_FOCUS_SIZE();
+map_force_redraw();
+return TRUE;
+}
+
+gboolean 
+menu_cb_settings_gps(GtkAction * action)
+{
+if (settings_dialog_gps(_gps)) {
        /* Settings have changed - reconnect to receiver. */
        if (_enable_gps) {
                gps_conn_set_state(_gps, RCVR_DOWN);
@@ -486,6 +513,29 @@ map_force_redraw();
 return TRUE;
 }
 
+gboolean 
+menu_cb_settings_colors(GtkAction * action)
+{
+settings_dialog_colors();
+map_force_redraw();
+return TRUE;
+}
+
+gboolean 
+menu_cb_settings_osm(GtkAction * action)
+{
+settings_dialog_osm();
+return TRUE;
+}
+
+gboolean 
+menu_cb_import_osm(GtkAction * action)
+{
+osm_import_dialog(_window);
+return TRUE;
+}
+
+
 gboolean 
 menu_cb_help(GtkAction * action)
 {
@@ -1030,7 +1080,8 @@ unit2latlon(_gps->data.unitx, _gps->data.unity, _gps->data.lat, _gps->data.lon);
 
 /* Move mark to new location. */
 map_refresh_mark();
-track_add(time(NULL), FALSE);
+_gps->data.time=time(NULL);
+track_add(&_gps->data);
 
 return TRUE;
 }