#include "background.h"
#include "acquire.h"
#include "datasources.h"
+#ifdef VIK_CONFIG_GOOGLE
#include "googlesearch.h"
+#endif
+#ifdef VIK_CONFIG_GEONAMES
+#include "geonamessearch.h"
+#endif
#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>
#include <glib/gprintf.h>
#include <glib/gi18n.h>
-#ifdef WINDOWS
-/* TODO IMPORTANT: mkdir for windows header? is it called 'mkdir' */
-#define make_dir(dir) mkdir(dir)
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#define make_dir(dir) mkdir(dir,0777)
-#endif
#define VIKING_WINDOW_WIDTH 1000
#define VIKING_WINDOW_HEIGHT 800
static void toolbox_add_tool(toolbox_tools_t *vt, VikToolInterface *vti, gint layer_type );
static int toolbox_get_tool(toolbox_tools_t *vt, const gchar *tool_name);
static void toolbox_activate(toolbox_tools_t *vt, const gchar *tool_name);
+static const GdkCursor *toolbox_get_cursor(toolbox_tools_t *vt, const gchar *tool_name);
static void toolbox_click (toolbox_tools_t *vt, GdkEventButton *event);
-static void toolbox_move (toolbox_tools_t *vt, GdkEventButton *event);
+static void toolbox_move (toolbox_tools_t *vt, GdkEventMotion *event);
static void toolbox_release (toolbox_tools_t *vt, GdkEventButton *event);
};
enum {
- TOOL_ZOOM = 0,
+ TOOL_PAN = 0,
+ TOOL_ZOOM,
TOOL_RULER,
TOOL_LAYER,
NUMBER_OF_TOOLS
static guint window_signals[VW_LAST_SIGNAL] = { 0 };
-static gchar *tool_names[NUMBER_OF_TOOLS] = { N_("Zoom"), N_("Ruler"), N_("Pan") };
-
-GdkCursor *vw_cursor_zoom = NULL;
-GdkCursor *vw_cursor_ruler = NULL;
+static gchar *tool_names[NUMBER_OF_TOOLS] = { N_("Pan"), N_("Zoom"), N_("Ruler") };
GType vik_window_get_type (void)
{
window_create_ui(vw);
window_set_filename (vw, NULL);
- toolbox_activate(vw->vt, "Zoom");
+ toolbox_activate(vw->vt, "Pan");
vw->filename = NULL;
vw->item_factory = NULL;
vw->modified = FALSE;
vw->only_updating_coord_mode_ui = FALSE;
-
vw->pan_x = vw->pan_y = -1;
vw->draw_image_width = DRAW_IMAGE_DEFAULT_WIDTH;
vw->draw_image_height = DRAW_IMAGE_DEFAULT_HEIGHT;
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);
gtk_window_set_default_size ( GTK_WINDOW(vw), VIKING_WINDOW_WIDTH, VIKING_WINDOW_HEIGHT);
hpaned = gtk_hpaned_new ();
- gtk_paned_add1 ( GTK_PANED(hpaned), GTK_WIDGET (vw->viking_vlp) );
- gtk_paned_add2 ( GTK_PANED(hpaned), GTK_WIDGET (vw->viking_vvp) );
+ gtk_paned_pack1 ( GTK_PANED(hpaned), GTK_WIDGET (vw->viking_vlp), FALSE, FALSE );
+ gtk_paned_pack2 ( GTK_PANED(hpaned), GTK_WIDGET (vw->viking_vvp), TRUE, TRUE );
/* This packs the button into the window (a gtk container). */
gtk_box_pack_start (GTK_BOX(main_vbox), hpaned, TRUE, TRUE, 0);
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 )
{
+ static int first = 1;
draw_redraw ( vw );
- gdk_window_set_cursor ( GTK_WIDGET(vw->viking_vvp)->window, vw_cursor_zoom );
+ if (first) {
+ // This is a hack to set the cursor corresponding to the first tool
+ // FIXME find the correct way to initialize both tool and its cursor
+ const GdkCursor *cursor = NULL;
+ first = 0;
+ cursor = toolbox_get_cursor(vw->vt, "Pan");
+ /* We set cursor, even if it is NULL: it resets to default */
+ gdk_window_set_cursor ( GTK_WIDGET(vw->viking_vvp)->window, cursor );
+ }
}
static void draw_redraw ( VikWindow *vw )
/* Mouse event handlers ************************************************************************/
+static void vik_window_pan_click (VikWindow *vw, GdkEventButton *event)
+{
+ /* set panning origin */
+ vw->pan_x = (gint) event->x;
+ vw->pan_y = (gint) event->y;
+}
+
static void draw_click (VikWindow *vw, GdkEventButton *event)
{
gtk_widget_grab_focus ( GTK_WIDGET(vw->viking_vvp) );
* for panning and zooming; tools only get left/right/movement
*/
if ( event->button == 2) {
- /* set panning origin */
- vw->pan_x = (gint) event->x;
- vw->pan_y = (gint) event->y;
+ vik_window_pan_click ( vw, event );
}
else {
toolbox_click(vw->vt, event);
}
}
+static void vik_window_pan_move (VikWindow *vw, GdkEventMotion *event)
+{
+ if ( vw->pan_x != -1 ) {
+ vik_viewport_pan_sync ( vw->viking_vvp, event->x - vw->pan_x, event->y - vw->pan_y );
+ }
+}
+
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;
- toolbox_move(vw->vt, (GdkEventButton *)event);
+ 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)
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 );
- if ( vw->pan_x != -1 ) {
- vik_viewport_pan_sync ( vw->viking_vvp, event->x - vw->pan_x, event->y - vw->pan_y );
- }
+ vik_window_pan_move ( vw, event );
+}
+
+static void vik_window_pan_release ( VikWindow *vw, GdkEventButton *event )
+{
+ if ( ABS(vw->pan_x - event->x) <= 1 && ABS(vw->pan_y - event->y) <= 1 )
+ vik_viewport_set_center_screen ( vw->viking_vvp, vw->pan_x, vw->pan_y );
+ else
+ vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/2 - event->x + vw->pan_x,
+ vik_viewport_get_height(vw->viking_vvp)/2 - event->y + vw->pan_y );
+ draw_update ( vw );
+ vw->pan_x = vw->pan_y = -1;
}
static void draw_release ( VikWindow *vw, GdkEventButton *event )
gtk_widget_grab_focus ( GTK_WIDGET(vw->viking_vvp) );
if ( event->button == 2 ) { /* move / pan */
- if ( ABS(vw->pan_x - event->x) <= 1 && ABS(vw->pan_y - event->y) <= 1 )
- vik_viewport_set_center_screen ( vw->viking_vvp, vw->pan_x, vw->pan_y );
- else
- vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/2 - event->x + vw->pan_x,
- vik_viewport_get_height(vw->viking_vvp)/2 - event->y + vw->pan_y );
- draw_update ( vw );
- vw->pan_x = vw->pan_y = -1;
+ vik_window_pan_release(vw, event);
}
else {
toolbox_release(vw->vt, 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);
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) ) );
+ temp = g_strdup_printf ( "%s %s DIFF %f meters", lat, lon, vik_coord_diff( &coord, &(s->oldcoord) ) );
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;
}
return VIK_LAYER_TOOL_ACK;
}
-static VikLayerToolFuncStatus ruler_move (VikLayer *vl, GdkEventButton *event, ruler_tool_state_t *s)
+static VikLayerToolFuncStatus ruler_move (VikLayer *vl, GdkEventMotion *event, ruler_tool_state_t *s)
{
VikViewport *vvp = s->vvp;
VikWindow *vw = s->vw;
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) {
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);
+ temp = g_strdup_printf ( "%s %s DIFF %f meters", lat, lon, vik_coord_diff( &coord, &(s->oldcoord) ) );
vik_statusbar_set_message ( vw->viking_vs, 3, temp );
g_free ( temp );
}
(VikToolActivationFunc) NULL,
(VikToolActivationFunc) ruler_deactivate,
(VikToolMouseFunc) ruler_click,
- (VikToolMouseFunc) ruler_move,
- (VikToolMouseFunc) ruler_release };
+ (VikToolMouseMoveFunc) ruler_move,
+ (VikToolMouseFunc) ruler_release,
+ NULL,
+ GDK_CURSOR_IS_PIXMAP,
+ &cursor_ruler_pixbuf };
/*** end ruler code ********************************************************/
return VIK_LAYER_TOOL_ACK;
}
-static VikLayerToolFuncStatus zoomtool_move (VikLayer *vl, GdkEventButton *event, VikViewport *vvp)
+static VikLayerToolFuncStatus zoomtool_move (VikLayer *vl, GdkEventMotion *event, VikViewport *vvp)
{
return VIK_LAYER_TOOL_ACK;
}
(VikToolActivationFunc) NULL,
(VikToolActivationFunc) NULL,
(VikToolMouseFunc) zoomtool_click,
- (VikToolMouseFunc) zoomtool_move,
- (VikToolMouseFunc) zoomtool_release };
-/*** end ruler code ********************************************************/
+ (VikToolMouseMoveFunc) zoomtool_move,
+ (VikToolMouseFunc) zoomtool_release,
+ NULL,
+ GDK_CURSOR_IS_PIXMAP,
+ &cursor_zoom_pixbuf };
+/*** end zoom code ********************************************************/
+
+/********************************************************************************
+ ** Pan tool code
+ ********************************************************************************/
+static gpointer pantool_create (VikWindow *vw, VikViewport *vvp)
+{
+ return vw;
+}
+
+static VikLayerToolFuncStatus pantool_click (VikLayer *vl, GdkEventButton *event, VikWindow *vw)
+{
+ vw->modified = TRUE;
+ if ( event->button == 1 )
+ vik_window_pan_click ( vw, event );
+ draw_update ( vw );
+ return VIK_LAYER_TOOL_ACK;
+}
+
+static VikLayerToolFuncStatus pantool_move (VikLayer *vl, GdkEventMotion *event, VikWindow *vw)
+{
+ vik_window_pan_move ( vw, event );
+ return VIK_LAYER_TOOL_ACK;
+}
+
+static VikLayerToolFuncStatus pantool_release (VikLayer *vl, GdkEventButton *event, VikWindow *vw)
+{
+ if ( event->button == 1 )
+ vik_window_pan_release ( vw, event );
+ return VIK_LAYER_TOOL_ACK;
+}
+
+static VikToolInterface pan_tool =
+ { "Pan",
+ (VikToolConstructorFunc) pantool_create,
+ (VikToolDestructorFunc) NULL,
+ (VikToolActivationFunc) NULL,
+ (VikToolActivationFunc) NULL,
+ (VikToolMouseFunc) pantool_click,
+ (VikToolMouseMoveFunc) pantool_move,
+ (VikToolMouseFunc) pantool_release,
+ NULL,
+ GDK_FLEUR };
+/*** end pan code ********************************************************/
static void draw_pan_cb ( GtkAction *a, VikWindow *vw )
{
draw_update ( vw );
}
+static void full_screen_cb ( GtkAction *a, VikWindow *vw )
+{
+ GtkWidget *check_box = gtk_ui_manager_get_widget ( vw->uim, "/ui/MainMenu/View/FullScreen" );
+ g_assert(check_box);
+ gboolean state = gtk_check_menu_item_get_active ( GTK_CHECK_MENU_ITEM(check_box));
+ if ( state )
+ gtk_window_fullscreen ( GTK_WINDOW(vw) );
+ else
+ gtk_window_unfullscreen ( GTK_WINDOW(vw) );
+}
static void draw_zoom_cb ( GtkAction *a, VikWindow *vw )
{
return;
}
else {
- g_critical("Houston we have a problem\n");
+ g_critical("Houston, we've had a problem.");
return;
}
a_dialog_info_msg ( GTK_WINDOW(vw), _("You must select a layer to delete.") );
}
+static void view_side_panel_cb ( GtkAction *a, VikWindow *vw )
+{
+ GtkWidget *check_box = gtk_ui_manager_get_widget ( vw->uim, "/ui/MainMenu/View/ViewSidePanel" );
+ g_assert(check_box);
+ gboolean state = gtk_check_menu_item_get_active ( GTK_CHECK_MENU_ITEM(check_box));
+ if ( state )
+ gtk_widget_show(GTK_WIDGET(vw->viking_vlp));
+ else
+ gtk_widget_hide(GTK_WIDGET(vw->viking_vlp));
+}
+
/***************************************
** tool management routines
**
vt->active_tool = tool;
}
+static const GdkCursor *toolbox_get_cursor(toolbox_tools_t *vt, const gchar *tool_name)
+{
+ int tool = toolbox_get_tool(vt, tool_name);
+ toolbox_tool_t *t = &vt->tools[tool];
+ if (t->ti.cursor == NULL) {
+ if (t->ti.cursor_type == GDK_CURSOR_IS_PIXMAP && t->ti.cursor_data != NULL) {
+ GError *cursor_load_err = NULL;
+ GdkPixbuf *cursor_pixbuf = gdk_pixbuf_from_pixdata (t->ti.cursor_data, FALSE, &cursor_load_err);
+ /* TODO: settable offeset */
+ t->ti.cursor = gdk_cursor_new_from_pixbuf ( gdk_display_get_default(), cursor_pixbuf, 3, 3 );
+ g_object_unref ( G_OBJECT(cursor_pixbuf) );
+ } else {
+ t->ti.cursor = gdk_cursor_new ( t->ti.cursor_type );
+ }
+ }
+ return t->ti.cursor;
+}
+
static void toolbox_click (toolbox_tools_t *vt, GdkEventButton *event)
{
VikLayer *vl = vik_layers_panel_get_selected ( vt->vw->viking_vlp );
}
}
-static void toolbox_move (toolbox_tools_t *vt, GdkEventButton *event)
+static void toolbox_move (toolbox_tools_t *vt, GdkEventMotion *event)
{
VikLayer *vl = vik_layers_panel_get_selected ( vt->vw->viking_vlp );
if (vt->active_tool != -1 && vt->tools[vt->active_tool].ti.move) {
{
/* White Magic, my friends ... White Magic... */
int layer_id, tool_id;
+ const GdkCursor *cursor = NULL;
toolbox_activate(vw->vt, gtk_action_get_name(a));
- if (!strcmp(gtk_action_get_name(a), "Zoom")) {
+ cursor = toolbox_get_cursor(vw->vt, gtk_action_get_name(a));
+ /* We set cursor, even if it is NULL: it resets to default */
+ gdk_window_set_cursor ( GTK_WIDGET(vw->viking_vvp)->window, cursor );
+
+ if (!strcmp(gtk_action_get_name(a), "Pan")) {
+ vw->current_tool = TOOL_PAN;
+ }
+ else if (!strcmp(gtk_action_get_name(a), "Zoom")) {
vw->current_tool = TOOL_ZOOM;
- gdk_window_set_cursor ( GTK_WIDGET(vw->viking_vvp)->window, vw_cursor_zoom );
}
else if (!strcmp(gtk_action_get_name(a), "Ruler")) {
vw->current_tool = TOOL_RULER;
- gdk_window_set_cursor ( GTK_WIDGET(vw->viking_vvp)->window, vw_cursor_ruler );
}
else {
/* TODO: only enable tools from active layer */
vw->current_tool = TOOL_LAYER;
vw->tool_layer_id = layer_id;
vw->tool_tool_id = tool_id;
- gdk_window_set_cursor ( GTK_WIDGET(vw->viking_vvp)->window, vik_layer_get_tool_cursor ( layer_id, tool_id ) );
}
}
}
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 );
}
static void load_file ( GtkAction *a, VikWindow *vw )
{
+ GSList *files = NULL;
+ GSList *cur_file = NULL;
gboolean newwindow;
if (!strcmp(gtk_action_get_name(a), "Open")) {
newwindow = TRUE;
newwindow = FALSE;
}
else {
- g_critical("Houston we got a problem\n");
+ g_critical("Houston, we've had a problem.");
return;
}
if ( ! vw->open_dia )
{
- vw->open_dia = gtk_file_selection_new ( _("Please select a GPS data file to open. ") );
- gtk_file_selection_set_select_multiple ( GTK_FILE_SELECTION(vw->open_dia), TRUE );
+ vw->open_dia = gtk_file_chooser_dialog_new (_("Please select a GPS data file to open. "),
+ GTK_WINDOW(vw),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_file_chooser_set_select_multiple ( GTK_FILE_CHOOSER(vw->open_dia), TRUE );
gtk_window_set_transient_for ( GTK_WINDOW(vw->open_dia), GTK_WINDOW(vw) );
gtk_window_set_destroy_with_parent ( GTK_WINDOW(vw->open_dia), TRUE );
}
- if ( gtk_dialog_run ( GTK_DIALOG(vw->open_dia) ) == GTK_RESPONSE_OK )
+ if ( gtk_dialog_run ( GTK_DIALOG(vw->open_dia) ) == GTK_RESPONSE_ACCEPT )
{
gtk_widget_hide ( vw->open_dia );
#ifdef VIKING_PROMPT_IF_MODIFIED
#else
if ( vw->filename && newwindow )
#endif
- g_signal_emit ( G_OBJECT(vw), window_signals[VW_OPENWINDOW_SIGNAL], 0, gtk_file_selection_get_selections (GTK_FILE_SELECTION(vw->open_dia) ) );
+ g_signal_emit ( G_OBJECT(vw), window_signals[VW_OPENWINDOW_SIGNAL], 0, gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER(vw->open_dia) ) );
else {
- gchar **files = gtk_file_selection_get_selections (GTK_FILE_SELECTION(vw->open_dia) );
- gboolean change_fn = newwindow && (!files[1]); /* only change fn if one file */
- while ( *files ) {
- vik_window_open_file ( vw, *files, change_fn );
- files++;
+ files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER(vw->open_dia) );
+ gboolean change_fn = newwindow && (g_slist_length(files)==1); /* only change fn if one file */
+
+ cur_file = files;
+ while ( cur_file ) {
+ gchar *file_name = cur_file->data;
+ vik_window_open_file ( vw, file_name, change_fn );
+ g_free (file_name);
+ cur_file = g_slist_next (cur_file);
}
+ g_slist_free (files);
}
}
else
const gchar *fn;
if ( ! vw->save_dia )
{
- vw->save_dia = gtk_file_selection_new ( _("Save as Viking File.") );
+ vw->save_dia = gtk_file_chooser_dialog_new (_("Save as Viking File."),
+ GTK_WINDOW(vw),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_window_set_transient_for ( GTK_WINDOW(vw->save_dia), GTK_WINDOW(vw) );
gtk_window_set_destroy_with_parent ( GTK_WINDOW(vw->save_dia), TRUE );
}
- while ( gtk_dialog_run ( GTK_DIALOG(vw->save_dia) ) == GTK_RESPONSE_OK )
+ while ( gtk_dialog_run ( GTK_DIALOG(vw->save_dia) ) == GTK_RESPONSE_ACCEPT )
{
- fn = gtk_file_selection_get_filename (GTK_FILE_SELECTION(vw->save_dia) );
- if ( access ( fn, F_OK ) != 0 || a_dialog_overwrite ( GTK_WINDOW(vw->save_dia), _("The file \"%s\" exists, do you wish to overwrite it?"), a_file_basename ( fn ) ) )
+ fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(vw->save_dia) );
+ if ( g_file_test ( fn, G_FILE_TEST_EXISTS ) == FALSE || a_dialog_overwrite ( GTK_WINDOW(vw->save_dia), _("The file \"%s\" exists, do you wish to overwrite it?"), a_file_basename ( fn ) ) )
{
window_set_filename ( vw, fn );
rv = window_save ( vw );
static void goto_address( GtkAction *a, VikWindow *vw)
{
+#if defined(VIK_CONFIG_GOOGLE) && VIK_CONFIG_SEARCH==VIK_CONFIG_SEARCH_GOOGLE
a_google_search(vw, vw->viking_vlp, vw->viking_vvp);
+#endif
+#if defined(VIK_CONFIG_GEONAMES) && VIK_CONFIG_SEARCH==VIK_CONFIG_SEARCH_GEONAMES
+ a_geonames_search(vw, vw->viking_vlp, vw->viking_vvp);
+#endif
+
+}
+
+static void mapcache_flush_cb ( GtkAction *a, VikWindow *vw )
+{
+ a_mapcache_flush();
}
static void preferences_cb ( GtkAction *a, VikWindow *vw )
g_assert ( vik_viewport_get_coord_mode ( vw->viking_vvp ) == VIK_COORD_UTM );
- make_dir(fn);
+ g_mkdir(fn,0777);
utm_orig = *((const struct UTM *)vik_viewport_get_center ( vw->viking_vvp ));
{
const gchar *fn;
if (!vw->save_img_dia) {
- vw->save_img_dia = gtk_file_selection_new ( _("Save Image") );
+ vw->save_img_dia = gtk_file_chooser_dialog_new (_("Save Image"),
+ GTK_WINDOW(vw),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_window_set_transient_for ( GTK_WINDOW(vw->save_img_dia), GTK_WINDOW(vw) );
gtk_window_set_destroy_with_parent ( GTK_WINDOW(vw->save_img_dia), TRUE );
}
- while ( gtk_dialog_run ( GTK_DIALOG(vw->save_img_dia) ) == GTK_RESPONSE_OK )
+ while ( gtk_dialog_run ( GTK_DIALOG(vw->save_img_dia) ) == GTK_RESPONSE_ACCEPT )
{
- fn = gtk_file_selection_get_filename (GTK_FILE_SELECTION(vw->save_img_dia) );
- if ( access ( fn, F_OK ) != 0 || a_dialog_overwrite ( GTK_WINDOW(vw->save_img_dia), _("The file \"%s\" exists, do you wish to overwrite it?"), a_file_basename ( fn ) ) )
+ fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(vw->save_img_dia) );
+ if ( g_file_test ( fn, G_FILE_TEST_EXISTS ) == FALSE || a_dialog_overwrite ( GTK_WINDOW(vw->save_img_dia), _("The file \"%s\" exists, do you wish to overwrite it?"), a_file_basename ( fn ) ) )
{
draw_to_image_file ( vw, fn, TRUE );
break;
static void draw_to_image_dir_cb ( GtkAction *a, VikWindow *vw )
{
- const gchar *fn;
+ gchar *fn = NULL;
+
if (!vw->save_img_dir_dia) {
- vw->save_img_dir_dia = gtk_file_selection_new ( _("Choose a name for a new directory to hold images"));
+ vw->save_img_dir_dia = gtk_file_chooser_dialog_new (_("Choose a directory to hold images"),
+ GTK_WINDOW(vw),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_window_set_transient_for ( GTK_WINDOW(vw->save_img_dir_dia), GTK_WINDOW(vw) );
gtk_window_set_destroy_with_parent ( GTK_WINDOW(vw->save_img_dir_dia), TRUE );
}
-
- while ( gtk_dialog_run ( GTK_DIALOG(vw->save_img_dir_dia) ) == GTK_RESPONSE_OK )
+
+ while ( gtk_dialog_run ( GTK_DIALOG(vw->save_img_dir_dia) ) == GTK_RESPONSE_ACCEPT )
{
- fn = gtk_file_selection_get_filename (GTK_FILE_SELECTION(vw->save_img_dir_dia) );
- if ( access ( fn, F_OK ) == 0 )
- a_dialog_info_msg_extra ( GTK_WINDOW(vw->save_img_dir_dia), _("The file %s exists. Please choose a name for a new directory to hold images in that does not exist."), a_file_basename(fn) );
- else
+ fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(vw->save_img_dir_dia) );
+ if ( fn )
{
draw_to_image_file ( vw, fn, FALSE );
+ g_free(fn);
+ fn = NULL;
break;
}
}
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;
}
else {
- g_critical("Houston, we got a problem!\n");
+ g_critical("Houston, we've had a problem.");
return;
}
{ "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 },
{ "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_GO_FORWARD, 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 },
{ "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus", NULL, (GCallback)draw_zoom_cb },
{ "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus", NULL, (GCallback)draw_zoom_cb },
- { "ZoomTo", GTK_STOCK_ZOOM_FIT, N_("Zoom _To"), "<control><shift>Z", NULL, (GCallback)zoom_to_cb },
+ { "ZoomTo", GTK_STOCK_ZOOM_FIT, N_("Zoom _To"), "<control>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 },
{ "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[] = {
- { "Zoom", "vik-icon-zoom", N_("_Zoom"), "<control><shift>Z", N_("Zoom Tool"), 0 },
- { "Ruler", "vik-icon-ruler", N_("_Ruler"), "<control><shift>R", N_("Ruler Tool"), 1 }
+ { "Pan", "vik-icon-pan", N_("_Pan"), "<control><shift>P", N_("Pan Tool"), 0 },
+ { "Zoom", "vik-icon-zoom", N_("_Zoom"), "<control><shift>Z", N_("Zoom Tool"), 1 },
+ { "Ruler", "vik-icon-ruler", N_("_Ruler"), "<control><shift>R", N_("Ruler Tool"), 2 }
};
static GtkToggleActionEntry toggle_entries[] = {
- { "ShowScale", NULL, N_("Show Scale"), NULL, NULL, (GCallback)set_draw_scale, TRUE },
- { "ShowCenterMark", NULL, N_("Show Center Mark"), NULL, NULL, (GCallback)set_draw_centermark, TRUE },
+ { "ShowScale", NULL, N_("Show Scale"), NULL, N_("Show Scale"), (GCallback)set_draw_scale, TRUE },
+ { "ShowCenterMark", NULL, N_("Show Center Mark"), NULL, N_("Show Center Mark"), (GCallback)set_draw_centermark, TRUE },
+ { "FullScreen", GTK_STOCK_FULLSCREEN, N_("Full Screen"), "F11", N_("Activate full screen mode"), (GCallback)full_screen_cb, FALSE },
+ { "ViewSidePanel", GTK_STOCK_INDEX, N_("Show Side Panel"), "F9", N_("Show Side Panel"), (GCallback)view_side_panel_cb, TRUE },
};
#include "menu.xml.h"
toolbox_add_tool(window->vt, &ruler_tool, TOOL_LAYER_TYPE_NONE);
toolbox_add_tool(window->vt, &zoom_tool, TOOL_LAYER_TYPE_NONE);
+ toolbox_add_tool(window->vt, &pan_tool, TOOL_LAYER_TYPE_NONE);
error = NULL;
if (!(mid = gtk_ui_manager_add_ui_from_string (uim, menu_xml, -1, &error))) {
-#include "icons/icons.h"
static struct {
const GdkPixdata *data;
gchar *stock_id;
} stock_icons[] = {
- { &addtr_18, "Create Track" },
- { &begintr_18, "Begin Track" },
- { &edtr_18, "Edit Trackpoint" },
- { &addwp_18, "Create Waypoint" },
- { &edwp_18, "Edit Waypoint" },
- { &iscissors_18, "Magic Scissors" },
- { &zoom_18, "vik-icon-zoom" },
- { &ruler_18, "vik-icon-ruler" },
- { &geozoom_18, "Georef Zoom Tool" },
- { &geomove_18, "Georef Move Map" },
- { &mapdl_18, "Maps Download" },
- { &demdl_18, "DEM Download/Import" },
- { &showpic_18, "Show Picture" },
+ { &begintr_18_pixbuf, "Begin Track" },
+ { &iscissors_18_pixbuf, "Magic Scissors" },
+ { &mover_22_pixbuf, "vik-icon-pan" },
+ { &demdl_18_pixbuf, "DEM Download/Import" },
+ { &showpic_18_pixbuf, "Show Picture" },
+ { &addtr_18_pixbuf, "Create Track" },
+ { &edtr_18_pixbuf, "Edit Trackpoint" },
+ { &addwp_18_pixbuf, "Create Waypoint" },
+ { &edwp_18_pixbuf, "Edit Waypoint" },
+ { &zoom_18_pixbuf, "vik-icon-zoom" },
+ { &ruler_18_pixbuf, "vik-icon-ruler" },
+ { &geozoom_18_pixbuf, "Georef Zoom Tool" },
+ { &geomove_18_pixbuf, "Georef Move Map" },
+ { &mapdl_18_pixbuf, "Maps Download" },
+ { &showpic_18_pixbuf, "Show Picture" },
};
static gint n_stock_icons = G_N_ELEMENTS (stock_icons);
}
}
-void vik_window_cursors_init()
-{
- GdkPixbuf *cursor_pixbuf;
- GError *cursor_load_err;
-
- cursor_pixbuf = gdk_pixbuf_from_pixdata (&cursor_zoom, FALSE, &cursor_load_err);
- vw_cursor_zoom = gdk_cursor_new_from_pixbuf ( gdk_display_get_default(), cursor_pixbuf, 6, 6 );
-
- g_object_unref ( G_OBJECT(cursor_pixbuf) );
-
- cursor_pixbuf = gdk_pixbuf_from_pixdata (&cursor_ruler, FALSE, &cursor_load_err);
- vw_cursor_ruler = gdk_cursor_new_from_pixbuf ( gdk_display_get_default(), cursor_pixbuf, 6, 6 );
-
- g_object_unref ( G_OBJECT(cursor_pixbuf) );
-}
-
-void vik_window_cursors_uninit()
-{
- gdk_cursor_unref ( vw_cursor_zoom );
- gdk_cursor_unref ( vw_cursor_ruler );
-}
projects / andy / viking.git / blobdiff