X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/e9165710392239ab5ac84b66fe15354f3314026c..44871dd11ce2566d2ffd45c447219bac1c7f7aff:/src/vikgeoreflayer.c?ds=inline diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c index 4ba541a8..caef8bac 100644 --- a/src/vikgeoreflayer.c +++ b/src/vikgeoreflayer.c @@ -19,34 +19,53 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "viking.h" -#include "vikgeoreflayer_pixmap.h" -#include +#include "vikutils.h" +#include +#include +#include #include +#include +#include + +#include "icons/icons.h" +/* +static VikLayerParamData image_default ( void ) +{ + VikLayerParamData data; + data.s = g_strdup (""); + return data; +} +*/ VikLayerParam georef_layer_params[] = { - { "image", VIK_LAYER_PARAM_STRING, VIK_LAYER_NOT_IN_PROPERTIES }, - { "corner_easting", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES }, - { "corner_northing", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES }, - { "mpp_easting", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES }, - { "mpp_northing", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES }, + { VIK_LAYER_GEOREF, "image", VIK_LAYER_PARAM_STRING, VIK_LAYER_NOT_IN_PROPERTIES, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_GEOREF, "corner_easting", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_GEOREF, "corner_northing", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_GEOREF, "mpp_easting", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_GEOREF, "mpp_northing", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_NOT_IN_PROPERTIES, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL }, }; enum { PARAM_IMAGE = 0, PARAM_CE, PARAM_CN, PARAM_ME, PARAM_MN, NUM_PARAMS }; +static const gchar* georef_layer_tooltip ( VikGeorefLayer *vgl ); static void georef_layer_marshall( VikGeorefLayer *vgl, guint8 **data, gint *len ); static VikGeorefLayer *georef_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ); -static gboolean georef_layer_set_param ( VikGeorefLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp ); -static VikLayerParamData georef_layer_get_param ( VikGeorefLayer *vgl, guint16 id ); -VikGeorefLayer *georef_layer_new ( ); -VikGeorefLayer *georef_layer_create ( VikViewport *vp ); +static gboolean georef_layer_set_param ( VikGeorefLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ); +static VikLayerParamData georef_layer_get_param ( VikGeorefLayer *vgl, guint16 id, gboolean is_file_operation ); +static VikGeorefLayer *georef_layer_new ( VikViewport *vvp ); +static VikGeorefLayer *georef_layer_create ( VikViewport *vp ); static void georef_layer_free ( VikGeorefLayer *vgl ); -gboolean georef_layer_properties ( VikGeorefLayer *vgl, gpointer vp ); -static void georef_layer_draw ( VikGeorefLayer *vgl, gpointer data ); +static gboolean georef_layer_properties ( VikGeorefLayer *vgl, gpointer vp ); +static void georef_layer_draw ( VikGeorefLayer *vgl, VikViewport *vp ); static void georef_layer_add_menu_items ( VikGeorefLayer *vgl, GtkMenu *menu, gpointer vlp ); static void georef_layer_set_image ( VikGeorefLayer *vgl, const gchar *image ); static gboolean georef_layer_dialog ( VikGeorefLayer **vgl, gpointer vp, GtkWindow *w ); -static void georef_layer_load_image ( VikGeorefLayer *vgl ); +static void georef_layer_load_image ( VikGeorefLayer *vgl, VikViewport *vp, gboolean from_file ); /* tools */ static gpointer georef_layer_move_create ( VikWindow *vw, VikViewport *vvp); @@ -55,17 +74,28 @@ static gboolean georef_layer_move_press ( VikGeorefLayer *vgl, GdkEventButton *e static gpointer georef_layer_zoom_create ( VikWindow *vw, VikViewport *vvp); static gboolean georef_layer_zoom_press ( VikGeorefLayer *vgl, GdkEventButton *event, VikViewport *vvp ); +// See comment in viktrwlayer.c for advice on values used static VikToolInterface georef_tools[] = { - { "Georef Move Map", (VikToolConstructorFunc) georef_layer_move_create, NULL, NULL, NULL, - (VikToolMouseFunc) georef_layer_move_press, NULL, (VikToolMouseFunc) georef_layer_move_release }, - - { "Georef Zoom Tool", (VikToolConstructorFunc) georef_layer_zoom_create, NULL, NULL, NULL, - (VikToolMouseFunc) georef_layer_zoom_press, NULL, NULL }, + { { "GeorefMoveMap", "vik-icon-Georef Move Map", N_("_Georef Move Map"), NULL, N_("Georef Move Map"), 0 }, + (VikToolConstructorFunc) georef_layer_move_create, NULL, NULL, NULL, + (VikToolMouseFunc) georef_layer_move_press, NULL, (VikToolMouseFunc) georef_layer_move_release, + (VikToolKeyFunc) NULL, + FALSE, + GDK_CURSOR_IS_PIXMAP, &cursor_geomove_pixbuf, NULL }, + + { { "GeorefZoomTool", "vik-icon-Georef Zoom Tool", N_("Georef Z_oom Tool"), NULL, N_("Georef Zoom Tool"), 0 }, + (VikToolConstructorFunc) georef_layer_zoom_create, NULL, NULL, NULL, + (VikToolMouseFunc) georef_layer_zoom_press, NULL, NULL, + (VikToolKeyFunc) NULL, + FALSE, + GDK_CURSOR_IS_PIXMAP, &cursor_geozoom_pixbuf, NULL }, }; VikLayerInterface vik_georef_layer_interface = { "GeoRef Map", - &georeflayer_pixbuf, /*icon */ + N_("GeoRef Map"), + NULL, + &vikgeoreflayer_pixbuf, /*icon */ georef_tools, sizeof(georef_tools) / sizeof(VikToolInterface), @@ -94,21 +124,31 @@ VikLayerInterface vik_georef_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, + (VikLayerFuncSublayerTooltip) NULL, + (VikLayerFuncLayerTooltip) georef_layer_tooltip, + (VikLayerFuncLayerSelected) NULL, (VikLayerFuncMarshall) georef_layer_marshall, (VikLayerFuncUnmarshall) georef_layer_unmarshall, (VikLayerFuncSetParam) georef_layer_set_param, (VikLayerFuncGetParam) georef_layer_get_param, + (VikLayerFuncChangeParam) NULL, (VikLayerFuncReadFileData) NULL, (VikLayerFuncWriteFileData) NULL, (VikLayerFuncDeleteItem) NULL, + (VikLayerFuncCutItem) NULL, (VikLayerFuncCopyItem) NULL, (VikLayerFuncPasteItem) NULL, (VikLayerFuncFreeCopiedItem) NULL, (VikLayerFuncDragDropRequest) NULL, + + (VikLayerFuncSelectClick) NULL, + (VikLayerFuncSelectMove) NULL, + (VikLayerFuncSelectRelease) NULL, + (VikLayerFuncSelectedViewportMenu) NULL, }; struct _VikGeorefLayer { @@ -119,6 +159,9 @@ struct _VikGeorefLayer { gdouble mpp_easting, mpp_northing; guint width, height; + GdkPixbuf *scaled; + guint32 scaled_width, scaled_height; + gint click_x, click_y; }; @@ -148,6 +191,11 @@ GType vik_georef_layer_get_type () return vgl_type; } +static const gchar* georef_layer_tooltip ( VikGeorefLayer *vgl ) +{ + return vgl->image; +} + static void georef_layer_marshall( VikGeorefLayer *vgl, guint8 **data, gint *len ) { vik_layer_marshall_params ( VIK_LAYER(vgl), data, len ); @@ -158,12 +206,12 @@ static VikGeorefLayer *georef_layer_unmarshall( guint8 *data, gint len, VikViewp VikGeorefLayer *rv = georef_layer_new ( vvp ); vik_layer_unmarshall_params ( VIK_LAYER(rv), data, len, vvp ); if (rv->image) { - georef_layer_load_image ( rv ); + georef_layer_load_image ( rv, vvp, TRUE ); } return rv; } -static gboolean georef_layer_set_param ( VikGeorefLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp ) +static gboolean georef_layer_set_param ( VikGeorefLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ) { switch ( id ) { @@ -172,57 +220,123 @@ static gboolean georef_layer_set_param ( VikGeorefLayer *vgl, guint16 id, VikLay case PARAM_CE: vgl->corner.easting = data.d; break; case PARAM_MN: vgl->mpp_northing = data.d; break; case PARAM_ME: vgl->mpp_easting = data.d; break; + default: break; } return TRUE; } -static VikLayerParamData georef_layer_get_param ( VikGeorefLayer *vgl, guint16 id ) +static VikLayerParamData georef_layer_get_param ( VikGeorefLayer *vgl, guint16 id, gboolean is_file_operation ) { VikLayerParamData rv; switch ( id ) { - case PARAM_IMAGE: rv.s = vgl->image ? vgl->image : ""; break; + case PARAM_IMAGE: { + gboolean set = FALSE; + if ( is_file_operation ) { + if ( a_vik_get_file_ref_format() == VIK_FILE_REF_FORMAT_RELATIVE ) { + gchar *cwd = g_get_current_dir(); + if ( cwd ) { + rv.s = file_GetRelativeFilename ( cwd, vgl->image ); + if ( !rv.s ) rv.s = ""; + set = TRUE; + } + } + } + if ( !set ) + rv.s = vgl->image ? vgl->image : ""; + break; + } case PARAM_CN: rv.d = vgl->corner.northing; break; case PARAM_CE: rv.d = vgl->corner.easting; break; case PARAM_MN: rv.d = vgl->mpp_northing; break; case PARAM_ME: rv.d = vgl->mpp_easting; break; + default: break; } return rv; } -VikGeorefLayer *georef_layer_new ( ) +static VikGeorefLayer *georef_layer_new ( VikViewport *vvp ) { VikGeorefLayer *vgl = VIK_GEOREF_LAYER ( g_object_new ( VIK_GEOREF_LAYER_TYPE, NULL ) ); - vik_layer_init ( VIK_LAYER(vgl), VIK_LAYER_GEOREF ); + vik_layer_set_type ( VIK_LAYER(vgl), VIK_LAYER_GEOREF ); + + // Since GeoRef layer doesn't use uibuilder + // initializing this way won't do anything yet.. + vik_layer_set_defaults ( VIK_LAYER(vgl), vvp ); + + // Make these defaults based on the current view + vgl->mpp_northing = vik_viewport_get_ympp ( vvp ); + vgl->mpp_easting = vik_viewport_get_xmpp ( vvp ); + vik_coord_to_utm ( vik_viewport_get_center ( vvp ), &(vgl->corner) ); vgl->image = NULL; vgl->pixbuf = NULL; vgl->click_x = -1; vgl->click_y = -1; + vgl->scaled = NULL; + vgl->scaled_width = 0; + vgl->scaled_height = 0; return vgl; } -static void georef_layer_draw ( VikGeorefLayer *vgl, gpointer data ) +static void georef_layer_draw ( VikGeorefLayer *vgl, VikViewport *vp ) { -/* bla, bla */ + if ( vik_viewport_get_drawmode(vp) != VIK_VIEWPORT_DRAWMODE_UTM ) + return; + if ( vgl->pixbuf ) { - VikViewport *vp = VIK_VIEWPORT(data); struct UTM utm_middle; gdouble xmpp = vik_viewport_get_xmpp(vp), ympp = vik_viewport_get_ympp(vp); + GdkPixbuf *pixbuf = vgl->pixbuf; + guint layer_width = vgl->width; + guint layer_height = vgl->height; + vik_coord_to_utm ( vik_viewport_get_center ( vp ), &utm_middle ); - if ( xmpp == vgl->mpp_easting && ympp == vgl->mpp_northing ) + guint width = vik_viewport_get_width(vp), height = vik_viewport_get_height(vp); + gint32 x, y; + vgl->corner.zone = utm_middle.zone; + vgl->corner.letter = utm_middle.letter; + VikCoord corner_coord; + vik_coord_load_from_utm ( &corner_coord, vik_viewport_get_coord_mode(vp), &(vgl->corner) ); + vik_viewport_coord_to_screen ( vp, &corner_coord, &x, &y ); + + /* mark to scale the pixbuf if it doesn't match our dimensions */ + gboolean scale = FALSE; + if ( xmpp != vgl->mpp_easting || ympp != vgl->mpp_northing ) { - guint width = vik_viewport_get_width(vp), height = vik_viewport_get_height(vp); - gint32 x, y; - vgl->corner.zone = utm_middle.zone; - vgl->corner.letter = utm_middle.letter; - VikCoord corner_coord; - vik_coord_load_from_utm ( &corner_coord, vik_viewport_get_coord_mode(vp), &(vgl->corner) ); - vik_viewport_coord_to_screen ( vp, &corner_coord, &x, &y ); - if ( (x < 0 || x < width) && (y < 0 || y < height) && x+vgl->width > 0 && y+vgl->height > 0 ) - vik_viewport_draw_pixbuf ( vp, vgl->pixbuf, 0, 0, x, y, vgl->width, vgl->height ); /* todo: draw only what we need to. */ + scale = TRUE; + layer_width = round(vgl->width * vgl->mpp_easting / xmpp); + layer_height = round(vgl->height * vgl->mpp_northing / ympp); + } + + // If image not in viewport bounds - no need to draw it (or bother with any scaling) + if ( (x < 0 || x < width) && (y < 0 || y < height) && x+layer_width > 0 && y+layer_height > 0 ) { + + if ( scale ) + { + /* rescale if necessary */ + if (layer_width == vgl->scaled_width && layer_height == vgl->scaled_height && vgl->scaled != NULL) + pixbuf = vgl->scaled; + else + { + pixbuf = gdk_pixbuf_scale_simple( + vgl->pixbuf, + layer_width, + layer_height, + GDK_INTERP_BILINEAR + ); + + if (vgl->scaled != NULL) + g_object_unref(vgl->scaled); + + vgl->scaled = pixbuf; + vgl->scaled_width = layer_width; + vgl->scaled_height = layer_height; + } + } + vik_viewport_draw_pixbuf ( vp, pixbuf, 0, 0, x, y, layer_width, layer_height ); /* todo: draw only what we need to. */ } } } @@ -231,19 +345,21 @@ static void georef_layer_free ( VikGeorefLayer *vgl ) { if ( vgl->image != NULL ) g_free ( vgl->image ); + if ( vgl->scaled != NULL ) + g_object_unref ( vgl->scaled ); } -VikGeorefLayer *georef_layer_create ( VikViewport *vp ) +static VikGeorefLayer *georef_layer_create ( VikViewport *vp ) { - return georef_layer_new (); + return georef_layer_new ( vp ); } -gboolean georef_layer_properties ( VikGeorefLayer *vgl, gpointer vp ) +static gboolean georef_layer_properties ( VikGeorefLayer *vgl, gpointer vp ) { return georef_layer_dialog ( &vgl, vp, VIK_GTK_WINDOW_FROM_WIDGET(vp) ); } -static void georef_layer_load_image ( VikGeorefLayer *vgl ) +static void georef_layer_load_image ( VikGeorefLayer *vgl, VikViewport *vp, gboolean from_file ) { GError *gx = NULL; if ( vgl->image == NULL ) @@ -251,12 +367,18 @@ static void georef_layer_load_image ( VikGeorefLayer *vgl ) if ( vgl->pixbuf ) g_object_unref ( G_OBJECT(vgl->pixbuf) ); + if ( vgl->scaled ) + { + g_object_unref ( G_OBJECT(vgl->scaled) ); + vgl->scaled = NULL; + } vgl->pixbuf = gdk_pixbuf_new_from_file ( vgl->image, &gx ); if (gx) { - g_warning ( "Couldn't open image file: %s", gx->message ); + if ( !from_file ) + a_dialog_error_msg_extra ( VIK_GTK_WINDOW_FROM_WIDGET(vp), _("Couldn't open image file: %s"), gx->message ); g_error_free ( gx ); } else @@ -265,6 +387,14 @@ static void georef_layer_load_image ( VikGeorefLayer *vgl ) vgl->height = gdk_pixbuf_get_height ( vgl->pixbuf ); } + if ( !from_file ) + { + if ( vik_viewport_get_drawmode(vp) != VIK_VIEWPORT_DRAWMODE_UTM ) + { + a_dialog_warning_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vp), + _("GeoRef map cannot be displayed in the current drawmode.\nSelect \"UTM Mode\" from View menu to view it.") ); + } + } /* should find length and width here too */ } @@ -272,23 +402,33 @@ static void georef_layer_set_image ( VikGeorefLayer *vgl, const gchar *image ) { if ( vgl->image ) g_free ( vgl->image ); + if ( vgl->scaled ) + { + g_object_unref ( vgl->scaled ); + vgl->scaled = NULL; + } if ( image == NULL ) vgl->image = NULL; - vgl->image = g_strdup ( image ); + + if ( g_strcmp0 (image, "") != 0 ) + vgl->image = vu_get_canonical_filename ( VIK_LAYER(vgl), image ); + else + vgl->image = g_strdup (image); } static gboolean world_file_read_line ( gchar *buffer, gint size, FILE *f, GtkWidget *widget, gboolean use_value ) { if (!fgets ( buffer, 1024, f )) { - a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_WIDGET(widget), "Unexpected end of file reading World file." ); + a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_WIDGET(widget), _("Unexpected end of file reading World file.") ); g_free ( buffer ); fclose ( f ); + f = NULL; return FALSE; } if ( use_value ) { - gdouble val = strtod ( buffer, NULL ); + gdouble val = g_strtod ( buffer, NULL ); gtk_spin_button_set_value ( GTK_SPIN_BUTTON(widget), val > 0 ? val : -val ); } return TRUE; @@ -296,26 +436,32 @@ static gboolean world_file_read_line ( gchar *buffer, gint size, FILE *f, GtkWid static void georef_layer_dialog_load ( GtkWidget *pass_along[4] ) { - GtkWidget *file_selector = gtk_file_selection_new ("Choose World file"); - - if ( gtk_dialog_run ( GTK_DIALOG ( file_selector ) ) == GTK_RESPONSE_OK ) + GtkWidget *file_selector = gtk_file_chooser_dialog_new (_("Choose World file"), + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + + if ( gtk_dialog_run ( GTK_DIALOG ( file_selector ) ) == GTK_RESPONSE_ACCEPT ) { - FILE *f = fopen ( gtk_file_selection_get_filename ( GTK_FILE_SELECTION(file_selector) ), "r" ); + FILE *f = g_fopen ( gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER(file_selector) ), "r" ); gtk_widget_destroy ( file_selector ); if ( !f ) { - a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_WIDGET(pass_along[0]), "The World file you requested could not be opened for reading." ); + a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_WIDGET(pass_along[0]), _("The World file you requested could not be opened for reading.") ); return; } else { gchar *buffer = g_malloc ( 1024 * sizeof(gchar) ); - if ( world_file_read_line ( buffer, 1024, f, pass_along[0], TRUE ) && world_file_read_line ( buffer, 1024, f, pass_along[1], TRUE ) - && world_file_read_line ( buffer, 1024, f, pass_along[0], FALSE ) && world_file_read_line ( buffer, 1024, f, pass_along[0], FALSE ) + if ( world_file_read_line ( buffer, 1024, f, pass_along[0], TRUE ) && world_file_read_line ( buffer, 1024, f, pass_along[0], FALSE) + && world_file_read_line ( buffer, 1024, f, pass_along[0], FALSE ) && world_file_read_line ( buffer, 1024, f, pass_along[1], TRUE) && world_file_read_line ( buffer, 1024, f, pass_along[2], TRUE ) && world_file_read_line ( buffer, 1024, f, pass_along[3], TRUE ) ) { g_free ( buffer ); fclose ( f ); + f = NULL; } } } @@ -335,21 +481,27 @@ We need a static void georef_layer_export_params ( gpointer *pass_along[2] ) { VikGeorefLayer *vgl = VIK_GEOREF_LAYER(pass_along[0]); - GtkWidget *file_selector = gtk_file_selection_new ("Choose World file"); - - if ( gtk_dialog_run ( GTK_DIALOG ( file_selector ) ) == GTK_RESPONSE_OK ) + GtkWidget *file_selector = gtk_file_chooser_dialog_new (_("Choose World file"), + NULL, + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + if ( gtk_dialog_run ( GTK_DIALOG ( file_selector ) ) == GTK_RESPONSE_ACCEPT ) { - FILE *f = fopen ( gtk_file_selection_get_filename ( GTK_FILE_SELECTION(file_selector) ), "w" ); + FILE *f = g_fopen ( gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER(file_selector) ), "w" ); + gtk_widget_destroy ( file_selector ); if ( !f ) { - a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_WIDGET(pass_along[0]), "The file you requested could not be opened for writing." ); + a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_WIDGET(pass_along[0]), _("The file you requested could not be opened for writing.") ); return; } else { fprintf ( f, "%f\n%f\n%f\n%f\n%f\n%f\n", vgl->mpp_easting, vgl->mpp_northing, 0.0, 0.0, vgl->corner.easting, vgl->corner.northing ); fclose ( f ); + f = NULL; } } else @@ -359,7 +511,7 @@ static void georef_layer_export_params ( gpointer *pass_along[2] ) /* returns TRUE if OK was pressed. */ static gboolean georef_layer_dialog ( VikGeorefLayer **vgl, gpointer vp, GtkWindow *w ) { - GtkWidget *dialog = gtk_dialog_new_with_buttons ("Layer Properties", + GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Layer Properties"), w, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, @@ -367,34 +519,44 @@ static gboolean georef_layer_dialog ( VikGeorefLayer **vgl, gpointer vp, GtkWind GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL ); + /* Default to reject as user really needs to specify map file first */ + gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_REJECT ); + GtkWidget *response_w = NULL; +#if GTK_CHECK_VERSION (2, 20, 0) + response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(dialog), GTK_RESPONSE_REJECT ); +#endif GtkWidget *table, *wfp_hbox, *wfp_label, *wfp_button, *ce_label, *ce_spin, *cn_label, *cn_spin, *xlabel, *xspin, *ylabel, *yspin, *imagelabel, *imageentry; GtkWidget *pass_along[4]; table = gtk_table_new ( 6, 2, FALSE ); - gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), table, TRUE, TRUE, 0 ); + gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), table, TRUE, TRUE, 0 ); wfp_hbox = gtk_hbox_new ( FALSE, 0 ); - wfp_label = gtk_label_new ( "World File Parameters:" ); - wfp_button = gtk_button_new_with_label ( "Load From File..." ); + wfp_label = gtk_label_new ( _("World File Parameters:") ); + wfp_button = gtk_button_new_with_label ( _("Load From File...") ); gtk_box_pack_start ( GTK_BOX(wfp_hbox), wfp_label, TRUE, TRUE, 0 ); gtk_box_pack_start ( GTK_BOX(wfp_hbox), wfp_button, FALSE, FALSE, 3 ); - ce_label = gtk_label_new ( "Corner pixel easting:" ); - ce_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, 0.0, 1500000.0, 1, 5, 5 ), 1, 4 ); + ce_label = gtk_label_new ( _("Corner pixel easting:") ); + ce_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, 0.0, 1500000.0, 1, 5, 0 ), 1, 4 ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(ce_spin), _("the UTM \"easting\" value of the upper-left corner pixel of the map") ); - cn_label = gtk_label_new ( "Corner pixel northing:" ); - cn_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, 0.0, 9000000.0, 1, 5, 5 ), 1, 4 ); + cn_label = gtk_label_new ( _("Corner pixel northing:") ); + cn_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, 0.0, 9000000.0, 1, 5, 0 ), 1, 4 ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(cn_spin), _("the UTM \"northing\" value of the upper-left corner pixel of the map") ); - xlabel = gtk_label_new ( "X (easting) scale (mpp): "); - ylabel = gtk_label_new ( "Y (northing) scale (mpp): "); + xlabel = gtk_label_new ( _("X (easting) scale (mpp): ")); + ylabel = gtk_label_new ( _("Y (northing) scale (mpp): ")); - xspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 5 ), 1, 8 ); - yspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 5 ), 1, 8 ); + xspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 0 ), 1, 8 ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(xspin), _("the scale of the map in the X direction (meters per pixel)") ); + yspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 0 ), 1, 8 ); + gtk_widget_set_tooltip_text ( GTK_WIDGET(yspin), _("the scale of the map in the Y direction (meters per pixel)") ); - imagelabel = gtk_label_new ( "Map Image:" ); - imageentry = vik_file_entry_new (); + imagelabel = gtk_label_new ( _("Map Image:") ); + imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, VF_FILTER_IMAGE); if (*vgl) { @@ -435,13 +597,16 @@ static gboolean georef_layer_dialog ( VikGeorefLayer **vgl, gpointer vp, GtkWind pass_along[3] = cn_spin; g_signal_connect_swapped ( G_OBJECT(wfp_button), "clicked", G_CALLBACK(georef_layer_dialog_load), pass_along ); + if ( response_w ) + gtk_widget_grab_focus ( response_w ); + gtk_widget_show_all ( table ); if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) { if (! *vgl) { - *vgl = georef_layer_new (); + *vgl = georef_layer_new ( VIK_VIEWPORT(vp) ); vik_layer_rename ( VIK_LAYER(*vgl), vik_georef_layer_interface.name ); } (*vgl)->corner.easting = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(ce_spin) ); @@ -451,7 +616,7 @@ static gboolean georef_layer_dialog ( VikGeorefLayer **vgl, gpointer vp, GtkWind if ( (!(*vgl)->image) || strcmp( (*vgl)->image, vik_file_entry_get_filename(VIK_FILE_ENTRY(imageentry)) ) != 0 ) { georef_layer_set_image ( *vgl, vik_file_entry_get_filename(VIK_FILE_ENTRY(imageentry)) ); - georef_layer_load_image ( *vgl ); + georef_layer_load_image ( *vgl, VIK_VIEWPORT(vp), FALSE ); } gtk_widget_destroy ( GTK_WIDGET(dialog) ); @@ -481,7 +646,7 @@ static void georef_layer_goto_center ( gpointer vgl_vlp[2] ) utm.northing = vgl->corner.northing - (vgl->height * vgl->mpp_northing / 2); vik_coord_load_from_utm ( &coord, vik_viewport_get_coord_mode ( vp ), &utm ); - vik_viewport_set_center_coord ( vp, &coord ); + vik_viewport_set_center_coord ( vp, &coord, TRUE ); vik_layers_panel_emit_update ( VIK_LAYERS_PANEL(vgl_vlp[1]) ); } @@ -497,17 +662,21 @@ static void georef_layer_add_menu_items ( VikGeorefLayer *vgl, GtkMenu *menu, gp gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item ); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( "Zoom to Fit Map" ); + /* Now with icons */ + item = gtk_image_menu_item_new_with_mnemonic ( _("_Zoom to Fit Map") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_ZOOM_FIT, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(georef_layer_zoom_to_fit), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( "Goto Map Center" ); + item = gtk_image_menu_item_new_with_mnemonic ( _("_Goto Map Center") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(georef_layer_goto_center), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( "Export to World File" ); + item = gtk_image_menu_item_new_with_mnemonic ( _("_Export to World File") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_HARDDISK, GTK_ICON_SIZE_MENU) ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(georef_layer_export_params), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item );