#include "background.h"
#include "acquire.h"
#include "datasources.h"
-#include "googlesearch.h"
+#include "viksearch.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 <stdlib.h>
+#endif
+#ifdef HAVE_MATH_H
#include <math.h>
+#endif
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
#include <ctype.h>
#include <glib.h>
#include <glib/gstdio.h>
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);
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_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 )
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);
switch ( mode ) {
#ifdef VIK_CONFIG_EXPEDIA
case VIK_VIEWPORT_DRAWMODE_EXPEDIA: buttonname = "/ui/MainMenu/View/ModeExpedia"; break;
-#endif
-#ifdef VIK_CONFIG_OLD_GOOGLE
- case VIK_VIEWPORT_DRAWMODE_GOOGLE: buttonname = "/ui/MainMenu/View/ModeGoogle"; break;
- case VIK_VIEWPORT_DRAWMODE_KH: buttonname = "/ui/MainMenu/View/ModeKH"; break;
#endif
case VIK_VIEWPORT_DRAWMODE_MERCATOR: buttonname = "/ui/MainMenu/View/ModeMercator"; break;
default: buttonname = "/ui/MainMenu/View/ModeUTM";
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 ) )
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 ) );
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 )
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.") );
static void goto_address( GtkAction *a, VikWindow *vw)
{
- a_google_search(vw, vw->viking_vlp, vw->viking_vvp);
+ a_vik_search(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 )
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;
}
{ "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"), "<control>N", N_("New file"), (GCallback)newwindow_cb },
{ "Open", GTK_STOCK_OPEN, N_("_Open"), "<control>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 },
{ "Exit", GTK_STOCK_QUIT, N_("E_xit"), "<control>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_JUMP_TO, N_("Go To Google Maps location"), NULL, N_("Go to address/place using Google Maps search"), (GCallback)goto_address },
+ { "GotoSearch", GTK_STOCK_JUMP_TO, N_("Go To location"), NULL, N_("Go to address/place using text 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 },
{ "SetBGColor",GTK_STOCK_SELECT_COLOR, N_("Set Background Color..."), NULL, NULL, (GCallback)set_bg_color },
{ "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 },
static GtkRadioActionEntry mode_entries[] = {
{ "ModeUTM", NULL, N_("_UTM Mode"), "<control>u", NULL, 0 },
{ "ModeExpedia", NULL, N_("_Expedia Mode"), "<control>e", NULL, 1 },
- { "ModeGoogle", NULL, N_("_Old Google Mode"), "<control>o", NULL, 2 },
- { "ModeKH", NULL, N_("Old _KH Mode"), "<control>k", NULL, 3 },
- { "ModeMercator", NULL, N_("_Google Mode"), "<control>g", NULL, 4 }
+ { "ModeMercator", NULL, N_("_Mercator Mode"), "<control>g", NULL, 4 }
};
static GtkRadioActionEntry tool_entries[] = {
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);
}
projects / andy / viking.git / blobdiff