X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/94807fabb20acf5ec3e74c491dac0421cddafeae..99a3e19093de9408cb066670376edf8dcf98c294:/src/vikwindow.c?ds=sidebyside diff --git a/src/vikwindow.c b/src/vikwindow.c index 35faa252..4fde5268 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -27,20 +27,29 @@ #include "background.h" #include "acquire.h" #include "datasources.h" -#include "googlesearch.h" +#include "vikgoto.h" #include "dems.h" +#include "mapcache.h" #include "print.h" #include "preferences.h" #include "icons/icons.h" +#include "vikexttools.h" +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_MATH_H #include +#endif +#ifdef HAVE_STRING_H #include +#endif #include #include #include #include #include +#include #define VIKING_WINDOW_WIDTH 1000 #define VIKING_WINDOW_HEIGHT 800 @@ -288,12 +297,13 @@ static void window_init ( VikWindow *vw ) gtk_toolbar_set_icon_size(GTK_TOOLBAR(gtk_ui_manager_get_widget (vw->uim, "/MainToolbar")), GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_toolbar_set_style (GTK_TOOLBAR(gtk_ui_manager_get_widget (vw->uim, "/MainToolbar")), GTK_TOOLBAR_ICONS); + vik_ext_tools_add_menu_items ( vw, vw->uim ); g_signal_connect (G_OBJECT (vw), "delete_event", G_CALLBACK (delete_event), NULL); g_signal_connect_swapped (G_OBJECT(vw->viking_vvp), "expose_event", G_CALLBACK(draw_sync), vw); g_signal_connect_swapped (G_OBJECT(vw->viking_vvp), "configure_event", G_CALLBACK(window_configure_event), vw); - gtk_widget_add_events ( GTK_WIDGET(vw->viking_vvp), GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK ); + gtk_widget_add_events ( GTK_WIDGET(vw->viking_vvp), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK ); g_signal_connect_swapped (G_OBJECT(vw->viking_vvp), "scroll_event", G_CALLBACK(draw_scroll), vw); g_signal_connect_swapped (G_OBJECT(vw->viking_vvp), "button_press_event", G_CALLBACK(draw_click), vw); g_signal_connect_swapped (G_OBJECT(vw->viking_vvp), "button_release_event", G_CALLBACK(draw_release), vw); @@ -396,7 +406,8 @@ static void draw_status ( VikWindow *vw ) void vik_window_set_redraw_trigger(VikLayer *vl) { VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vl)); - vw->trigger = vl; + if (NULL != vw) + vw->trigger = vl; } static void window_configure_event ( VikWindow *vw ) @@ -488,16 +499,26 @@ static void draw_mouse_motion (VikWindow *vw, GdkEventMotion *event) static VikCoord coord; static struct UTM utm; static struct LatLon ll; - static char pointer_buf[36]; + #define BUFFER_SIZE 50 + static char pointer_buf[BUFFER_SIZE]; + gchar *lat = NULL, *lon = NULL; gint16 alt; gdouble zoom; VikDemInterpol interpol_method; + /* This is a hack, but work far the best, at least for single pointer systems. + * See http://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */ + gint x, y; + gdk_window_get_pointer (event->window, &x, &y, NULL); + event->x = x; + event->y = y; + toolbox_move(vw->vt, event); vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord ); vik_coord_to_utm ( &coord, &utm ); a_coords_utm_to_latlon ( &utm, &ll ); + a_coords_latlon_to_string ( &ll, &lat, &lon ); /* Change interpolate method according to scale */ zoom = vik_viewport_get_zoom(vw->viking_vvp); if (zoom > 2.0) @@ -507,12 +528,22 @@ static void draw_mouse_motion (VikWindow *vw, GdkEventMotion *event) else interpol_method = VIK_DEM_INTERPOL_BEST; if ((alt = a_dems_get_elev_by_coord(&coord, interpol_method)) != VIK_DEM_INVALID_ELEVATION) - g_snprintf ( pointer_buf, 36, _("Cursor: %f %f %dm"), ll.lat, ll.lon, alt ); + g_snprintf ( pointer_buf, BUFFER_SIZE, _("%s %s %dm"), lat, lon, alt ); else - g_snprintf ( pointer_buf, 36, _("Cursor: %f %f"), ll.lat, ll.lon ); + g_snprintf ( pointer_buf, BUFFER_SIZE, _("%s %s"), lat, lon ); + g_free (lat); + lat = NULL; + g_free (lon); + lon = NULL; vik_statusbar_set_message ( vw->viking_vs, 4, pointer_buf ); vik_window_pan_move ( vw, event ); + + /* This is recommended by the GTK+ documentation, but does not work properly. + * Use deprecated way until GTK+ gets a solution for correct motion hint handling: + * http://bugzilla.gnome.org/show_bug.cgi?id=587714 + */ + /* gdk_event_request_motions ( event ); */ } static void vik_window_pan_release ( VikWindow *vw, GdkEventButton *event ) @@ -540,42 +571,33 @@ static void draw_release ( VikWindow *vw, GdkEventButton *event ) static void draw_scroll (VikWindow *vw, GdkEventScroll *event) { - if ( event->state == GDK_CONTROL_MASK ) { + guint modifiers = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK); + if ( modifiers == GDK_CONTROL_MASK ) { /* control == pan up & down */ if ( event->direction == GDK_SCROLL_UP ) vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/2, vik_viewport_get_height(vw->viking_vvp)/3 ); else vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/2, vik_viewport_get_height(vw->viking_vvp)*2/3 ); - } else if ( event->state == GDK_SHIFT_MASK ) { - /* control-shift == pan left & right */ + } else if ( modifiers == GDK_SHIFT_MASK ) { + /* shift == pan left & right */ if ( event->direction == GDK_SCROLL_UP ) vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/3, vik_viewport_get_height(vw->viking_vvp)/2 ); else vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)*2/3, vik_viewport_get_height(vw->viking_vvp)/2 ); - } else if ( event->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) ) { - if ( event->direction == GDK_SCROLL_UP ) { - /* make sure mouse is still over the same point on the map when we zoom */ - VikCoord coord; - gint x, y; - gint center_x = vik_viewport_get_width ( vw->viking_vvp ) / 2; - gint center_y = vik_viewport_get_height ( vw->viking_vvp ) / 2; - vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord ); + } else if ( modifiers == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) ) { + /* control+shift == make sure mouse is still over the same point on the map when we zoom */ + VikCoord coord; + gint x, y; + gint center_x = vik_viewport_get_width ( vw->viking_vvp ) / 2; + gint center_y = vik_viewport_get_height ( vw->viking_vvp ) / 2; + vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord ); + if ( event->direction == GDK_SCROLL_UP ) vik_viewport_zoom_in (vw->viking_vvp); - vik_viewport_coord_to_screen ( vw->viking_vvp, &coord, &x, &y ); - vik_viewport_set_center_screen ( vw->viking_vvp, center_x + (x - event->x), - center_y + (y - event->y) ); - } - else { - VikCoord coord; - gint x, y; - gint center_x = vik_viewport_get_width ( vw->viking_vvp ) / 2; - gint center_y = vik_viewport_get_height ( vw->viking_vvp ) / 2; - vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord ); + else vik_viewport_zoom_out(vw->viking_vvp); - vik_viewport_coord_to_screen ( vw->viking_vvp, &coord, &x, &y ); - vik_viewport_set_center_screen ( vw->viking_vvp, center_x + (x - event->x), - center_y + (y - event->y) ); - } + vik_viewport_coord_to_screen ( vw->viking_vvp, &coord, &x, &y ); + vik_viewport_set_center_screen ( vw->viking_vvp, center_x + (x - event->x), + center_y + (y - event->y) ); } else { if ( event->direction == GDK_SCROLL_UP ) vik_viewport_zoom_in (vw->viking_vvp); @@ -703,13 +725,30 @@ static void draw_ruler(VikViewport *vvp, GdkDrawable *d, GdkGC *gc, gint x1, gin gdk_draw_layout(d, gc, x1-5, y1-CR-3*CW-8, pl); /* draw label with distance */ - if (distance >= 1000 && distance < 100000) { - g_sprintf(str, "%3.2f km", distance/1000.0); - } else if (distance < 1000) { - g_sprintf(str, "%d m", (int)distance); - } else { - g_sprintf(str, "%d km", (int)distance/1000); + vik_units_distance_t dist_units = a_vik_get_units_distance (); + switch (dist_units) { + case VIK_UNITS_DISTANCE_KILOMETRES: + if (distance >= 1000 && distance < 100000) { + g_sprintf(str, "%3.2f km", distance/1000.0); + } else if (distance < 1000) { + g_sprintf(str, "%d m", (int)distance); + } else { + g_sprintf(str, "%d km", (int)distance/1000); + } + break; + case VIK_UNITS_DISTANCE_MILES: + if (distance >= 1600 && distance < 160000) { + g_sprintf(str, "%3.2f miles", distance/1600.0); + } else if (distance < 1600) { + g_sprintf(str, "%d yards", (int)(distance*1.0936133)); + } else { + g_sprintf(str, "%d miles", (int)distance/1600); + } + break; + default: + g_critical("Houston, we've had a problem. distance=%d", dist_units); } + pango_layout_set_text(pl, str, -1); pango_layout_get_pixel_size ( pl, &wd, &hd ); @@ -782,14 +821,28 @@ static VikLayerToolFuncStatus ruler_click (VikLayer *vl, GdkEventButton *event, VikCoord coord; gchar *temp; if ( event->button == 1 ) { + gchar *lat=NULL, *lon=NULL; vik_viewport_screen_to_coord ( s->vvp, (gint) event->x, (gint) event->y, &coord ); vik_coord_to_latlon ( &coord, &ll ); + a_coords_latlon_to_string ( &ll, &lat, &lon ); if ( s->has_oldcoord ) { - temp = g_strdup_printf ( "%f %f DIFF %f meters", ll.lat, ll.lon, vik_coord_diff( &coord, &(s->oldcoord) ) ); + vik_units_distance_t dist_units = a_vik_get_units_distance (); + switch (dist_units) { + case VIK_UNITS_DISTANCE_KILOMETRES: + temp = g_strdup_printf ( "%s %s DIFF %f meters", lat, lon, vik_coord_diff( &coord, &(s->oldcoord) ) ); + break; + case VIK_UNITS_DISTANCE_MILES: + temp = g_strdup_printf ( "%s %s DIFF %f miles", lat, lon, vik_coord_diff( &coord, &(s->oldcoord) )* 0.000621371192); + break; + default: + temp = g_strdup_printf ("Just to keep the compiler happy"); + g_critical("Houston, we've had a problem. distance=%d", dist_units); + } + s->has_oldcoord = FALSE; } else { - temp = g_strdup_printf ( "%f %f", ll.lat, ll.lon ); + temp = g_strdup_printf ( "%s %s", lat, lon ); s->has_oldcoord = TRUE; } @@ -817,6 +870,7 @@ static VikLayerToolFuncStatus ruler_move (VikLayer *vl, GdkEventMotion *event, r if ( s->has_oldcoord ) { int oldx, oldy, w1, h1, w2, h2; static GdkPixmap *buf = NULL; + gchar *lat=NULL, *lon=NULL; w1 = vik_viewport_get_width(vvp); h1 = vik_viewport_get_height(vvp); if (!buf) { @@ -843,8 +897,19 @@ static VikLayerToolFuncStatus ruler_move (VikLayer *vl, GdkEventMotion *event, r g_idle_add_full (G_PRIORITY_HIGH_IDLE + 10, draw_buf, pass_along, NULL); draw_buf_done = FALSE; } - - temp = g_strdup_printf ( "%f %f DIFF %f meters", ll.lat, ll.lon, vik_coord_diff( &coord, &(s->oldcoord) ) ); + a_coords_latlon_to_string(&ll, &lat, &lon); + vik_units_distance_t dist_units = a_vik_get_units_distance (); + switch (dist_units) { + case VIK_UNITS_DISTANCE_KILOMETRES: + temp = g_strdup_printf ( "%s %s DIFF %f meters", lat, lon, vik_coord_diff( &coord, &(s->oldcoord) ) ); + break; + case VIK_UNITS_DISTANCE_MILES: + temp = g_strdup_printf ( "%s %s DIFF %f miles", lat, lon, vik_coord_diff( &coord, &(s->oldcoord) )* 0.000621371192); + break; + default: + temp = g_strdup_printf ("Just to keep the compiler happy"); + g_critical("Houston, we've had a problem. distance=%d", dist_units); + } vik_statusbar_set_message ( vw->viking_vs, 3, temp ); g_free ( temp ); } @@ -1304,17 +1369,93 @@ GtkWidget *vik_window_get_drawmode_button ( VikWindow *vw, VikViewportDrawMode m GtkWidget *mode_button; gchar *buttonname; switch ( mode ) { - case VIK_VIEWPORT_DRAWMODE_UTM: buttonname = "/ui/MainMenu/View/ModeUTM"; break; +#ifdef VIK_CONFIG_EXPEDIA case VIK_VIEWPORT_DRAWMODE_EXPEDIA: buttonname = "/ui/MainMenu/View/ModeExpedia"; break; - case VIK_VIEWPORT_DRAWMODE_GOOGLE: buttonname = "/ui/MainMenu/View/ModeGoogle"; break; +#endif case VIK_VIEWPORT_DRAWMODE_MERCATOR: buttonname = "/ui/MainMenu/View/ModeMercator"; break; - default: buttonname = "/ui/MainMenu/View/ModeKH"; + default: buttonname = "/ui/MainMenu/View/ModeUTM"; } mode_button = gtk_ui_manager_get_widget ( vw->uim, buttonname ); g_assert ( mode_button ); return mode_button; } +static void on_activate_recent_item (GtkRecentChooser *chooser, + VikWindow *self) +{ + gchar *filename; + + filename = gtk_recent_chooser_get_current_uri (chooser); + if (filename != NULL) + { + GFile *file = g_file_new_for_uri ( filename ); + gchar *path = g_file_get_path ( file ); + g_object_unref ( file ); + if ( self->filename ) + { + gchar *filenames[] = { path, NULL }; + g_signal_emit ( G_OBJECT(self), window_signals[VW_OPENWINDOW_SIGNAL], 0, filenames ); + } + else + vik_window_open_file ( self, filename, TRUE ); + g_free ( path ); + } + + g_free (filename); +} + +static void setup_recent_files (VikWindow *self) +{ + GtkRecentManager *manager; + GtkRecentFilter *filter; + GtkWidget *menu, *menu_item; + + filter = gtk_recent_filter_new (); + /* gtk_recent_filter_add_application (filter, g_get_application_name()); */ + gtk_recent_filter_add_group(filter, "viking"); + + manager = gtk_recent_manager_get_default (); + menu = gtk_recent_chooser_menu_new_for_manager (manager); + gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu), GTK_RECENT_SORT_MRU); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter); + + menu_item = gtk_ui_manager_get_widget (self->uim, "/ui/MainMenu/File/OpenRecentFile"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu); + + g_signal_connect (G_OBJECT (menu), "item-activated", + G_CALLBACK (on_activate_recent_item), (gpointer) self); +} + +static void update_recently_used_document(const gchar *filename) +{ + /* Update Recently Used Document framework */ + GtkRecentManager *manager = gtk_recent_manager_get_default(); + GtkRecentData *recent_data = g_slice_new (GtkRecentData); + gchar *groups[] = {"viking", NULL}; + GFile *file = g_file_new_for_commandline_arg(filename); + gchar *uri = g_file_get_uri(file); + gchar *basename = g_path_get_basename(filename); + g_object_unref(file); + file = NULL; + + recent_data->display_name = basename; + recent_data->description = NULL; + recent_data->mime_type = "text/x-gps-data"; + recent_data->app_name = (gchar *) g_get_application_name (); + recent_data->app_exec = g_strjoin (" ", g_get_prgname (), "%f", NULL); + recent_data->groups = groups; + recent_data->is_private = FALSE; + if (!gtk_recent_manager_add_full (manager, uri, recent_data)) + { + g_warning (_("Unable to add '%s' to the list of recently used documents"), uri); + } + + g_free (uri); + g_free (basename); + g_free (recent_data->app_exec); + g_slice_free (GtkRecentData, recent_data); +} + void vik_window_open_file ( VikWindow *vw, const gchar *filename, gboolean change_filename ) { switch ( a_file_load ( vik_layers_panel_get_top_layer(vw->viking_vlp), vw->viking_vvp, filename ) ) @@ -1325,6 +1466,7 @@ void vik_window_open_file ( VikWindow *vw, const gchar *filename, gboolean chang case 1: { GtkWidget *mode_button; + /* Update UI */ if ( change_filename ) window_set_filename ( vw, filename ); mode_button = vik_window_get_drawmode_button ( vw, vik_viewport_get_drawmode ( vw->viking_vvp ) ); @@ -1342,7 +1484,9 @@ void vik_window_open_file ( VikWindow *vw, const gchar *filename, gboolean chang g_assert ( mode_button ); gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM(mode_button),vik_viewport_get_draw_centermark(vw->viking_vvp) ); } - default: draw_update ( vw ); + default: + update_recently_used_document(filename); + draw_update ( vw ); } } static void load_file ( GtkAction *a, VikWindow *vw ) @@ -1434,7 +1578,10 @@ static gboolean save_file_as ( GtkAction *a, VikWindow *vw ) static gboolean window_save ( VikWindow *vw ) { if ( a_file_save ( vik_layers_panel_get_top_layer ( vw->viking_vlp ), vw->viking_vvp, vw->filename ) ) + { + update_recently_used_document ( vw->filename ); return TRUE; + } else { a_dialog_error_msg ( GTK_WINDOW(vw), _("The filename you requested could not be opened for writing.") ); @@ -1472,12 +1619,18 @@ static void acquire_from_gc ( GtkAction *a, VikWindow *vw ) static void goto_address( GtkAction *a, VikWindow *vw) { - a_google_search(vw, vw->viking_vlp, vw->viking_vvp); + a_vik_goto(vw, vw->viking_vlp, vw->viking_vvp); +} + +static void mapcache_flush_cb ( GtkAction *a, VikWindow *vw ) +{ + a_mapcache_flush(); } static void preferences_cb ( GtkAction *a, VikWindow *vw ) { a_preferences_show_window ( GTK_WINDOW(vw) ); + draw_update ( vw ); } static void clear_cb ( GtkAction *a, VikWindow *vw ) @@ -1653,7 +1806,19 @@ static void draw_to_image_file_total_area_cb (GtkSpinButton *spinbutton, gpointe w *= gtk_spin_button_get_value(GTK_SPIN_BUTTON(pass_along[4])); h *= gtk_spin_button_get_value(GTK_SPIN_BUTTON(pass_along[5])); } - label_text = g_strdup_printf ( _("Total area: %ldm x %ldm (%.3f sq. km)"), (glong)w, (glong)h, (w*h/1000000)); + vik_units_distance_t dist_units = a_vik_get_units_distance (); + switch (dist_units) { + case VIK_UNITS_DISTANCE_KILOMETRES: + label_text = g_strdup_printf ( _("Total area: %ldm x %ldm (%.3f sq. km)"), (glong)w, (glong)h, (w*h/1000000)); + break; + case VIK_UNITS_DISTANCE_MILES: + label_text = g_strdup_printf ( _("Total area: %ldm x %ldm (%.3f sq. miles)"), (glong)w, (glong)h, (w*h/2589988.11)); + break; + default: + label_text = g_strdup_printf ("Just to keep the compiler happy"); + g_critical("Houston, we've had a problem. distance=%d", dist_units); + } + gtk_label_set_text(GTK_LABEL(pass_along[6]), label_text); g_free ( label_text ); } @@ -1842,12 +2007,6 @@ static void window_change_coord_mode_cb ( GtkAction *old_a, GtkAction *a, VikWin else if (!strcmp(gtk_action_get_name(a), "ModeExpedia")) { drawmode = VIK_VIEWPORT_DRAWMODE_EXPEDIA; } - else if (!strcmp(gtk_action_get_name(a), "ModeGoogle")) { - drawmode = VIK_VIEWPORT_DRAWMODE_GOOGLE; - } - else if (!strcmp(gtk_action_get_name(a), "ModeKH")) { - drawmode = VIK_VIEWPORT_DRAWMODE_KH; - } else if (!strcmp(gtk_action_get_name(a), "ModeMercator")) { drawmode = VIK_VIEWPORT_DRAWMODE_MERCATOR; } @@ -1921,10 +2080,12 @@ static GtkActionEntry entries[] = { { "SetPan", NULL, N_("_Pan"), 0, 0, 0 }, { "Layers", NULL, N_("_Layers"), 0, 0, 0 }, { "Tools", NULL, N_("_Tools"), 0, 0, 0 }, + { "Exttools", NULL, N_("_Webtools"), 0, 0, 0 }, { "Help", NULL, N_("_Help"), 0, 0, 0 }, { "New", GTK_STOCK_NEW, N_("_New"), "N", N_("New file"), (GCallback)newwindow_cb }, { "Open", GTK_STOCK_OPEN, N_("_Open"), "O", N_("Open a file"), (GCallback)load_file }, + { "OpenRecentFile", NULL, N_("Open _Recent file"), NULL, NULL, (GCallback)NULL }, { "Append", GTK_STOCK_ADD, N_("A_ppend File"), NULL, N_("Append data from a different file"), (GCallback)load_file }, { "Acquire", NULL, N_("A_cquire"), 0, 0, 0 }, { "AcquireGPS", NULL, N_("From _GPS"), NULL, N_("Transfer data from a GPS device"), (GCallback)acquire_from_gps }, @@ -1944,13 +2105,13 @@ static GtkActionEntry entries[] = { { "Exit", GTK_STOCK_QUIT, N_("E_xit"), "W", N_("Exit the program"), (GCallback)window_close }, { "SaveExit", GTK_STOCK_QUIT, N_("Save and Exit"), NULL, N_("Save and Exit the program"), (GCallback)save_file_and_exit }, - { "GoogleMapsSearch", GTK_STOCK_GO_FORWARD, N_("Go To Google Maps location"), NULL, N_("Go to address/place using Google Maps search"), (GCallback)goto_address }, - { "GotoLL", GTK_STOCK_QUIT, N_("_Go to Lat\\/Lon..."), NULL, N_("Go to arbitrary lat\\/lon coordinate"), (GCallback)draw_goto_cb }, - { "GotoUTM", GTK_STOCK_QUIT, N_("Go to UTM..."), NULL, N_("Go to arbitrary UTM coordinate"), (GCallback)draw_goto_cb }, + { "GotoSearch", GTK_STOCK_JUMP_TO, N_("Go To location"), NULL, N_("Go to address/place using text search"), (GCallback)goto_address }, + { "GotoLL", GTK_STOCK_JUMP_TO, N_("_Go to Lat\\/Lon..."), NULL, N_("Go to arbitrary lat\\/lon coordinate"), (GCallback)draw_goto_cb }, + { "GotoUTM", GTK_STOCK_JUMP_TO, N_("Go to UTM..."), NULL, N_("Go to arbitrary UTM coordinate"), (GCallback)draw_goto_cb }, { "SetBGColor",GTK_STOCK_SELECT_COLOR, N_("Set Background Color..."), NULL, NULL, (GCallback)set_bg_color }, { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "plus", NULL, (GCallback)draw_zoom_cb }, { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "minus", NULL, (GCallback)draw_zoom_cb }, - { "ZoomTo", GTK_STOCK_ZOOM_FIT, N_("Zoom _To"), "Z", NULL, (GCallback)zoom_to_cb }, + { "ZoomTo", GTK_STOCK_ZOOM_FIT, N_("Zoom _To"), "Z", NULL, (GCallback)zoom_to_cb }, { "Zoom0.25", NULL, N_("0.25"), NULL, NULL, (GCallback)draw_zoom_cb }, { "Zoom0.5", NULL, N_("0.5"), NULL, NULL, (GCallback)draw_zoom_cb }, { "Zoom1", NULL, N_("1"), NULL, NULL, (GCallback)draw_zoom_cb }, @@ -1972,7 +2133,8 @@ static GtkActionEntry entries[] = { { "Paste", GTK_STOCK_PASTE, N_("_Paste"), NULL, NULL, (GCallback)menu_paste_layer_cb }, { "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL, NULL, (GCallback)menu_delete_layer_cb }, { "DeleteAll", NULL, N_("Delete All"), NULL, NULL, (GCallback)clear_cb }, - { "Preferences",GTK_STOCK_PREFERENCES, N_("_Preferences..."), NULL, NULL, (GCallback)preferences_cb }, + { "MapCacheFlush",NULL, N_("Flush Map cache"), NULL, NULL, (GCallback)mapcache_flush_cb }, + { "Preferences",GTK_STOCK_PREFERENCES, N_("_Preferences..."), NULL, NULL, (GCallback)preferences_cb }, { "Properties",GTK_STOCK_PROPERTIES, N_("_Properties"), NULL, NULL, (GCallback)menu_properties_cb }, { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, (GCallback)help_about_cb }, @@ -1982,9 +2144,7 @@ static GtkActionEntry entries[] = { static GtkRadioActionEntry mode_entries[] = { { "ModeUTM", NULL, N_("_UTM Mode"), "u", NULL, 0 }, { "ModeExpedia", NULL, N_("_Expedia Mode"), "e", NULL, 1 }, - { "ModeGoogle", NULL, N_("_Old Google Mode"), "o", NULL, 2 }, - { "ModeKH", NULL, N_("Old _KH Mode"), "k", NULL, 3 }, - { "ModeMercator", NULL, N_("_Google Mode"), "g", NULL, 4 } + { "ModeMercator", NULL, N_("_Mercator Mode"), "g", NULL, 4 } }; static GtkRadioActionEntry tool_entries[] = { @@ -2113,6 +2273,8 @@ static void window_create_ui( VikWindow *window ) accel_group = gtk_ui_manager_get_accel_group (uim); gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); gtk_ui_manager_ensure_update (uim); + + setup_recent_files(window); }