#include <config.h>
-#define _GNU_SOURCE
-
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#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>
#include "utils.h"
#include "poi.h"
+#include "path.h"
#include "route.h"
#include "track.h"
-#include "path.h"
#include "settings.h"
#include "gps.h"
#include "map.h"
#include "mapper-types.h"
-#include "bt.h"
#include "ui-common.h"
#include "db.h"
#include "latlon.h"
#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();
+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;
}
GtkListStore *store;
route_open_file();
-store=route_generate_store();
-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;
}
menu_cb_track_open(GtkAction * action)
{
track_open();
+track_tree_view_update_store(track_tree_view, &_track);
return TRUE;
}
menu_cb_track_save(GtkAction * action)
{
track_save();
+track_tree_view_update_store(track_tree_view, &_track);
return TRUE;
}
menu_cb_track_insert_break(GtkAction * action)
{
track_insert_break();
+track_tree_view_update_store(track_tree_view, &_track);
return TRUE;
}
menu_cb_track_insert_mark(GtkAction * action)
{
track_insert_mark();
+track_tree_view_update_store(track_tree_view, &_track);
return TRUE;
}
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;
}
menu_cb_gps_show_info(GtkAction * action)
{
_gps_info = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-gps_show_info();
+gps_show_info(_gps);
return TRUE;
}
break;
}
-MACRO_RECALC_CENTER(new_center_unitx, new_center_unity);
+MACRO_RECALC_CENTER(_gps->data, new_center_unitx, new_center_unity);
map_center_unit(new_center_unitx, new_center_unity);
return TRUE;
}
gboolean
menu_cb_goto_latlon(GtkAction * action)
{
-GtkWidget *dialog;
-GtkWidget *table;
-GtkWidget *label;
-GtkWidget *txt_lat;
-GtkWidget *txt_lon;
-
-dialog = gtk_dialog_new_with_buttons(_("Go to Lat/Lon"),
- GTK_WINDOW(_window),
- GTK_DIALOG_MODAL, GTK_STOCK_OK,
- GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT, NULL);
-
-gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table = gtk_table_new(2, 3, FALSE), TRUE, TRUE, 0);
-
-gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Latitude")),0, 1, 0, 1, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
-gtk_table_attach(GTK_TABLE(table), txt_lat = gtk_entry_new(), 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
-
-gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Longitude")), 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
-gtk_table_attach(GTK_TABLE(table), txt_lon = gtk_entry_new(), 1, 2, 1, 2, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
-
-#if defined (WITH_DEVICE_770) && !defined(WITH_HILDON_NEW)
-g_object_set(G_OBJECT(txt_lat), HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_NUMERICSPECIAL, NULL);
-g_object_set(G_OBJECT(txt_lon), HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_NUMERICSPECIAL, NULL);
-#endif
-
-/* Initialize with the current center position. */
-{
- gchar buffer[32];
- gdouble lat, lon;
- unit2latlon(_center.unitx, _center.unity, lat, lon);
- snprintf(buffer, sizeof(buffer), "%.06f", lat);
- gtk_label_set_text(GTK_LABEL(txt_lat), buffer);
- snprintf(buffer, sizeof(buffer), "%.06f", lon);
- gtk_label_set_text(GTK_LABEL(txt_lon), buffer);
-}
-
-gtk_widget_show_all(dialog);
-
-while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
- const gchar *text;
- gchar *error_check;
- gdouble lat, lon;
- guint unitx, unity;
-
- text = gtk_entry_get_text(GTK_ENTRY(txt_lat));
- lat = strtof(text, &error_check);
- if (text == error_check || lat < -90.f || lat > 90.f) {
- popup_error(dialog, _("Invalid Latitude"));
- continue;
- }
-
- text = gtk_entry_get_text(GTK_ENTRY(txt_lon));
- lon = strtof(text, &error_check);
- if (text == error_check || lon < -180.f || lon > 180.f) {
- popup_error(dialog, _("Invalid Longitude"));
- continue;
- }
-
- latlon2unit(lat, lon, unitx, unity);
- if (_center_mode > 0)
- set_action_activate("autocenter_none", TRUE);
-
- map_center_unit(unitx, unity);
- break;
-}
-gtk_widget_destroy(dialog);
+map_dialog_goto_latlon();
return TRUE;
}
if (map_goto_position(&_home)==FALSE) {
MACRO_BANNER_SHOW_INFO(_window, _("Home not set."));
} else {
+ map_set_zoom(3);
MACRO_BANNER_SHOW_INFO(_window, _("At home location"));
}
return TRUE;
if (map_goto_position(&_dest)==FALSE) {
MACRO_BANNER_SHOW_INFO(_window, _("Destination not set."));
} else {
+ map_set_zoom(3);
MACRO_BANNER_SHOW_INFO(_window, _("At destination"));
}
return TRUE;
menu_cb_goto_gps(GtkAction *action)
{
_center_mode = CENTER_LATLON;
-map_center_unit(_pos.unitx, _pos.unity);
+map_center_unit(_gps->data.unitx, _gps->data.unity);
map_update_location_from_center();
-
+MACRO_BANNER_SHOW_INFO(_window, _("At GPS coordinates."));
return TRUE;
}
if (_center_mode > 0) {
/* Auto-Center is enabled - use the GPS position. */
- unit2latlon(_pos.unitx, _pos.unity, lat, lon);
+ lat=_gps->data.lat;
+ lon=_gps->data.lon;
} else {
/* Auto-Center is disabled - use the view center. */
unit2latlon(_center.unitx, _center.unity, lat, lon);
gboolean
cb_zoom_auto(GtkAction * action)
{
-map_set_autozoom(TRUE);
+map_set_autozoom(TRUE, _gps->data.speed);
return TRUE;
}
gboolean
cb_zoom_base(GtkAction * action)
{
-map_set_autozoom(FALSE);
+map_set_autozoom(FALSE, 0);
map_set_zoom(3);
return TRUE;
}
gboolean
cb_zoomin(GtkAction * action)
{
-map_set_autozoom(FALSE);
-map_zoom(-1);
+map_set_autozoom(FALSE, 0);
+g_idle_add((GSourceFunc)map_zoom_in, NULL);
return TRUE;
}
gboolean
cb_zoomout(GtkAction * action)
{
-map_set_autozoom(FALSE);
-map_zoom(1);
+map_set_autozoom(FALSE, 0);
+g_idle_add((GSourceFunc)map_zoom_out, NULL);
return TRUE;
}
menu_cb_enable_gps(GtkAction * action)
{
if ((_enable_gps = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))) {
- if (_rcvr_mac) {
- gps_conn_set_state(RCVR_DOWN);
- rcvr_connect_now();
+ if (_gps->io.address) {
+ gps_conn_set_state(_gps, RCVR_DOWN);
+ gps_connect_now(_gps);
} else {
- popup_error(_window, _("Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."));
- set_action_activate("gps_enable", FALSE);
+ 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 (_conn_state > RCVR_OFF)
- gps_conn_set_state(RCVR_OFF);
- rcvr_disconnect();
- track_add(0, FALSE);
+ if (_gps->io.conn > RCVR_OFF)
+ gps_conn_set_state(_gps, RCVR_OFF);
+ gps_disconnect(_gps);
+ track_add(NULL);
_speed_excess=FALSE;
}
-set_action_sensitive("gps_details", _enable_gps);
+if (_enable_gps==FALSE)
+ set_action_activate("autocenter_none", TRUE);
set_action_sensitive("goto_gps", _enable_gps);
set_action_sensitive("autocenter_latlon", _enable_gps);
set_action_sensitive("autocenter_lead", _enable_gps);
map_move_mark();
-gps_show_info();
+gps_show_info(&_gps->data);
return TRUE;
}
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;
}
gboolean
-menu_cb_gps_details(GtkAction * action)
+menu_cb_settings(GtkAction * action)
{
-gps_details();
+settings_dialog();
+MACRO_RECALC_FOCUS_BASE();
+MACRO_RECALC_FOCUS_SIZE();
+map_force_redraw();
return TRUE;
}
gboolean
-menu_cb_settings(GtkAction * action)
+menu_cb_settings_gps(GtkAction * action)
{
-if (settings_dialog()) {
+if (settings_dialog_gps(_gps)) {
/* Settings have changed - reconnect to receiver. */
if (_enable_gps) {
- gps_conn_set_state(RCVR_DOWN);
- rcvr_disconnect();
- rcvr_connect_now();
+ gps_conn_set_state(_gps, RCVR_DOWN);
+ gps_disconnect(_gps);
+ gps_connect_now(_gps);
}
}
MACRO_RECALC_FOCUS_BASE();
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)
{
case CUSTOM_ACTION_ZOOM_IN:
case CUSTOM_ACTION_ZOOM_OUT:
if (!_key_zoom_timeout_sid) {
- _key_zoom_new = _zoom + (_action[custom_key] == CUSTOM_ACTION_ZOOM_IN
- ? -_curr_repo->view_zoom_steps : _curr_repo->view_zoom_steps);
+ _key_zoom_new = _zoom + (_action[custom_key] == CUSTOM_ACTION_ZOOM_IN ? -_curr_repo->view_zoom_steps : _curr_repo->view_zoom_steps);
/* Remember, _key_zoom_new is unsigned. */
if (_key_zoom_new < MAX_ZOOM) {
_key_zoom_timeout_sid = g_timeout_add(400, map_key_zoom_timeout, NULL);
set_action_activate("gps_info", !_gps_info);
break;
case CUSTOM_ACTION_TOGGLE_SPEEDLIMIT:
- _speed_limit_on ^= 1;
+ _speed_on ^= 1;
break;
default:
return FALSE;
gchar buffer[80], tmp1[16], tmp2[16];
unit2latlon(unitx, unity, lat, lon);
-lat_format(lat, tmp1);
-lon_format(lon, tmp2);
+lat_format(_degformat, lat, tmp1);
+lon_format(_degformat, lon, tmp2);
-snprintf(buffer, sizeof(buffer),
+g_snprintf(buffer, sizeof(buffer),
"%s: %s\n"
"%s: %s", _("Latitude"), tmp1, _("Longitude"), tmp2);
gdouble lat, lon;
unit2latlon(unitx, unity, lat, lon);
-snprintf(buffer, sizeof(buffer), "%.06f,%.06f", lat, lon);
+g_snprintf(buffer, sizeof(buffer), "%.06f,%.06f", lat, lon);
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), buffer, -1);
}
g_ascii_formatd(strlat, 32, "%.06f", lat);
g_ascii_formatd(strlon, 32, "%.06f", lon);
-snprintf(buffer, sizeof(buffer), "%s, %s", strlat, strlon);
+g_snprintf(buffer, sizeof(buffer), "%s, %s", strlat, strlon);
route_download(buffer);
}
unit2latlon(unitx, unity, lat, lon);
-snprintf(buffer, sizeof(buffer), "%s: %.02lf %s", _("Distance"),
- calculate_distance(_gps.lat, _gps.lon, lat, lon) * UNITS_CONVERT[_units], UNITS_TEXT[_units]);
+g_snprintf(buffer, sizeof(buffer), "%s: %.02lf %s", _("Distance"),
+ calculate_distance(_gps->data.lat, _gps->data.lon, lat, lon) * UNITS_CONVERT[_units], UNITS_TEXT[_units]);
MACRO_BANNER_SHOW_INFO(_window, buffer);
}
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
unit2latlon(unitx, unity, lat, lon);
- lat_format(lat, tmp1);
- lon_format(lon, tmp2);
+ lat_format(_degformat, lat, tmp1);
+ lon_format(_degformat, lon, tmp2);
p_latlon = g_strdup_printf("%s, %s", tmp1, tmp2);
gtk_table_attach(GTK_TABLE(table),
label = gtk_label_new(p_latlon),
gdouble lat, lon;
if (_center_mode>0) {
- lat=_gps.lat;
- lon=_gps.lon;
+ lat=_gps->data.lat;
+ lon=_gps->data.lon;
} else {
unit2latlon(_center.unitx, _center.unity, lat, lon);
}
poi_info *p;
if (_center_mode>0) {
- lat=_gps.lat;
- lon=_gps.lon;
+ lat=_gps->data.lat;
+ lon=_gps->data.lon;
} else {
unit2latlon(_center.unitx, _center.unity, lat, lon);
}
gdouble lat, lon;
if (_center_mode>0) {
- lat=_gps.lat;
- lon=_gps.lon;
+ lat=_gps->data.lat;
+ lon=_gps->data.lon;
} else {
unit2latlon(_center.unitx, _center.unity, lat, lon);
}
gboolean
cmenu_cb_loc_set_gps(GtkAction * action)
{
-_pos.unitx = x2unit(_cmenu_position_x);
-_pos.unity = y2unit(_cmenu_position_y);
-unit2latlon(_pos.unitx, _pos.unity, _gps.lat, _gps.lon);
+_gps->data.unitx = x2unit(_cmenu_position_x);
+_gps->data.unity = y2unit(_cmenu_position_y);
+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;
}
gchar buffer[BUFFER_SIZE];
GtkWidget *confirm;
- snprintf(buffer, sizeof(buffer), "%s:\n%s\n", _("Confirm delete of waypoint"), way->desc);
+ g_snprintf(buffer, sizeof(buffer), "%s:\n%s\n", _("Confirm delete of waypoint"), way->desc);
confirm = hildon_note_new_confirmation(GTK_WINDOW(_window), buffer);
if (GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm))) {
projects / mapper / blobdiff