/*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: Colin Clark
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "main.h"
#include "layout.h"
#include "metadata.h"
#include "menu.h"
+#include "misc.h"
#include "rcfile.h"
#include "thumb.h"
#include "ui_menu.h"
+#include "uri_utils.h"
+#include "ui_utildlg.h"
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
#include <champlain/champlain.h>
#include <champlain-gtk/champlain-gtk.h>
#define THUMB_COLOUR 0xff, 0xff, 0xff, 0xff
#define THUMB_SIZE 100
+#define DIRECTION_SIZE 300
+
/*
*-------------------------------------------------------------------
* GPS Map utils
{
PaneData pane;
GtkWidget *widget;
- FileData *fd;
gchar *map_source;
gint height;
+ FileData *fd;
ClutterActor *gps_view;
- ChamplainLayer *icon_layer;
+ ChamplainMarkerLayer *icon_layer;
GList *selection_list;
- GPtrArray *marker_list;
+ GList *not_added;
+ ChamplainBoundingBox *bbox;
+ guint num_added;
guint create_markers_id;
GtkWidget *progress;
GtkWidget *slider;
gint selection_count;
gboolean centre_map_checked;
gboolean enable_markers_checked;
+ gdouble dest_latitude;
+ gdouble dest_longitude;
+ GList *geocode_list;
};
+/*
+ *-------------------------------------------------------------------
+ * drag-and-drop
+ *-------------------------------------------------------------------
+ */
+enum {
+ TARGET_APP_COLLECTION_MEMBER,
+ TARGET_APP_EXIF_ENTRY,
+ TARGET_APP_KEYWORD_PATH,
+ TARGET_URI_LIST,
+ TARGET_TEXT_PLAIN
+};
+
+static GtkTargetEntry bar_pane_gps_drop_types[] = {
+ { "text/uri-list", 0, TARGET_URI_LIST },
+ { "text/plain", 0, TARGET_TEXT_PLAIN }
+};
+static gint n_gps_entry_drop_types = 2;
+
+static void bar_pane_gps_close_cancel_cb(GenericDialog *gd, gpointer data)
+{
+ PaneGPSData *pgd = data;
+
+ g_list_free(pgd->geocode_list);
+}
+
+static void bar_pane_gps_close_save_cb(GenericDialog *gd, gpointer data)
+{
+ PaneGPSData *pgd = data;
+ FileData *fd;
+ GList *work;
+
+ work = g_list_first(pgd->geocode_list);
+ while (work)
+ {
+ fd = work->data;
+ if (fd->name && !fd->parent)
+ {
+ work = work->next;
+ metadata_write_GPS_coord(fd, "Xmp.exif.GPSLatitude", pgd->dest_latitude);
+ metadata_write_GPS_coord(fd, "Xmp.exif.GPSLongitude", pgd->dest_longitude);
+ }
+ }
+ g_list_free(work);
+ g_list_free(pgd->geocode_list);
+}
+
+ static void bar_pane_gps_dnd_receive(GtkWidget *pane, GdkDragContext *context,
+ gint x, gint y,
+ GtkSelectionData *selection_data, guint info,
+ guint time, gpointer data)
+{
+ PaneGPSData *pgd;
+ GenericDialog *gd;
+ FileData *fd, *fd_found;
+ GList *work, *list;
+ gint count, geocoded_count;
+ gdouble latitude, longitude;
+ GString *message;
+ gchar *location;
+ gchar **latlong;
+
+ pgd = g_object_get_data(G_OBJECT(pane), "pane_data");
+ if (!pgd) return;
+
+ if (info == TARGET_URI_LIST)
+ {
+ pgd->dest_longitude = champlain_view_x_to_longitude(CHAMPLAIN_VIEW(pgd->gps_view), x);
+ pgd->dest_latitude = champlain_view_y_to_latitude(CHAMPLAIN_VIEW(pgd->gps_view), y);
+
+ count = 0;
+ geocoded_count = 0;
+ pgd->geocode_list = NULL;
+
+ list = uri_filelist_from_gtk_selection_data(selection_data);
+
+ if (list)
+ {
+ work = list;
+ while (work)
+ {
+ fd = work->data;
+ work = work->next;
+ if (fd->name && !fd->parent)
+ {
+ count++;
+ pgd->geocode_list = g_list_append(pgd->geocode_list, fd);
+ latitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLatitude", 1000);
+ longitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLongitude", 1000);
+ if (latitude != 1000 && longitude != 1000)
+ {
+ geocoded_count++;
+ }
+ }
+ }
+ g_list_free(work);
+
+ if(count)
+ {
+ message = g_string_new("");
+ if (count == 1)
+ {
+ fd_found = g_list_first(pgd->geocode_list)->data;
+ g_string_append_printf(message,
+ _("\nDo you want to geocode image %s?"), fd_found->name);
+ }
+ else
+ {
+ g_string_append_printf(message,
+ _("\nDo you want to geocode %i images?"), count);
+ }
+ if (geocoded_count == 1 && count == 1)
+ {
+ g_string_append_printf(message,
+ _("\nThis image is already geocoded!"));
+ }
+ else if (geocoded_count == 1 && count > 1)
+ {
+ g_string_append_printf(message,
+ _("\nOne image is already geocoded!"));
+ }
+ else if (geocoded_count > 1 && count > 1)
+ {
+ g_string_append_printf(message,
+ _("\n%i Images are already geocoded!"), geocoded_count);
+ }
+
+ location = g_strdup_printf("%lf %lf", pgd->dest_latitude,
+ pgd->dest_longitude);
+ g_string_append_printf(message, _("\n\nPosition: %s \n"), location);
+
+ gd = generic_dialog_new(_("Geocode images"),
+ "geocode_images", NULL, TRUE,
+ bar_pane_gps_close_cancel_cb, pgd);
+ generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
+ _("Write lat/long to meta-data?"),
+ message->str);
+
+ generic_dialog_add_button(gd, GTK_STOCK_SAVE, NULL,
+ bar_pane_gps_close_save_cb, TRUE);
+
+ gtk_widget_show(gd->dialog);
+ g_free(location);
+ g_string_free(message, TRUE);
+ }
+ }
+ }
+
+ if (info == TARGET_TEXT_PLAIN)
+ {
+ location = decode_geo_parameters((gchar *)gtk_selection_data_get_data(selection_data));
+ if (!(g_strstr_len(location,-1,"Error")))
+ {
+ latlong = g_strsplit(location, " ", 2);
+ champlain_view_center_on(CHAMPLAIN_VIEW(pgd->gps_view),
+ g_ascii_strtod(latlong[0],NULL),
+ g_ascii_strtod(latlong[1],NULL));
+ g_strfreev(latlong);
+ }
+ g_free(location);
+ }
+
+ return;
+}
+
+static void bar_pane_gps_dnd_init(gpointer data)
+{
+ PaneGPSData *pgd = data;
+
+ gtk_drag_dest_set(pgd->widget,
+ GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
+ bar_pane_gps_drop_types, n_gps_entry_drop_types,
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ g_signal_connect(G_OBJECT(pgd->widget), "drag_data_received",
+ G_CALLBACK(bar_pane_gps_dnd_receive), NULL);
+
+}
+
+static gboolean bar_gps_draw_direction (ClutterCanvas *canvas,
+ cairo_t *cr, gpointer data)
+{
+ cairo_set_source_rgb(cr, 255, 0, 0);
+
+ cairo_set_line_width(cr, 2);
+ cairo_move_to(cr, 0, 1);
+ cairo_line_to(cr, DIRECTION_SIZE, 1);
+
+ cairo_stroke(cr);
+
+ return TRUE;
+}
+
static void bar_pane_gps_thumb_done_cb(ThumbLoader *tl, gpointer data)
{
FileData *fd;
fd = g_object_get_data(G_OBJECT(marker), "file_fd");
if (fd->thumb_pixbuf != NULL)
{
- actor = clutter_texture_new();
- gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor), fd->thumb_pixbuf);
- champlain_marker_set_image(CHAMPLAIN_MARKER(marker), actor);
+ actor = gtk_clutter_texture_new();
+ gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor), fd->thumb_pixbuf, NULL);
+ champlain_label_set_image(CHAMPLAIN_LABEL(marker), actor);
}
thumb_loader_free(tl);
}
{
//PaneGPSData *pgd = data;
FileData *fd;
- ClutterActor *marker;
+ ClutterActor *label_marker, *parent_marker;
ClutterColor marker_colour = { MARKER_COLOUR };
ClutterColor text_colour = { TEXT_COLOUR };
ClutterColor thumb_colour = { THUMB_COLOUR };
gchar *current_text;
- ClutterActor *actor;
+ ClutterActor *actor, *direction;
ClutterActor *current_image;
GString *text;
gint height, width, rotate;
if (bevent->button == MOUSE_BUTTON_LEFT)
{
- marker = CLUTTER_ACTOR(widget);
- fd = g_object_get_data(G_OBJECT(marker), "file_fd");
+ label_marker = CLUTTER_ACTOR(widget);
+ fd = g_object_get_data(G_OBJECT(label_marker), "file_fd");
/* If the marker is showing a thumbnail, delete it
*/
- current_image = champlain_marker_get_image(CHAMPLAIN_MARKER(marker));
+ current_image = champlain_label_get_image(CHAMPLAIN_LABEL(label_marker));
if (current_image != NULL)
{
clutter_actor_destroy(CLUTTER_ACTOR(current_image));
- champlain_marker_set_image(CHAMPLAIN_MARKER(marker), NULL);
+ champlain_label_set_image(CHAMPLAIN_LABEL(label_marker), NULL);
}
-
- current_text = g_strdup(champlain_marker_get_text(CHAMPLAIN_MARKER(marker)));
+
+ current_text = g_strdup(champlain_label_get_text(CHAMPLAIN_LABEL(label_marker)));
/* If the marker is showing only the text character, replace it with a
* thumbnail and date and altitude
*/
if (fd->thumb_pixbuf != NULL)
{
- actor = clutter_texture_new();
- gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor), fd->thumb_pixbuf);
- champlain_marker_set_image(CHAMPLAIN_MARKER(marker), actor);
+ actor = gtk_clutter_texture_new();
+ gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor), fd->thumb_pixbuf, NULL);
+ champlain_label_set_image(CHAMPLAIN_LABEL(label_marker), actor);
}
else if (fd->pixbuf != NULL)
{
- actor = clutter_texture_new();
+ actor = gtk_clutter_texture_new();
width = gdk_pixbuf_get_width (fd->pixbuf);
height = gdk_pixbuf_get_height (fd->pixbuf);
switch (fd->exif_orientation)
default:
rotate = GDK_PIXBUF_ROTATE_NONE;
}
-
- gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor),
+
+ gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor),
gdk_pixbuf_rotate_simple(gdk_pixbuf_scale_simple(fd->pixbuf, THUMB_SIZE, height * THUMB_SIZE / width,
- GDK_INTERP_NEAREST), rotate));
- champlain_marker_set_image(CHAMPLAIN_MARKER(marker), actor);
+ GDK_INTERP_NEAREST), rotate), NULL);
+ champlain_label_set_image(CHAMPLAIN_LABEL(label_marker), actor);
}
else
{
bar_pane_gps_thumb_done_cb,
bar_pane_gps_thumb_error_cb,
NULL,
- marker);
+ label_marker);
thumb_loader_start(tl, fd);
}
-
+
text = g_string_new(fd->name);
g_string_append(text, "\n");
g_string_append(text, text_from_time(fd->date));
g_string_append(text, altitude);
}
- champlain_marker_set_text(CHAMPLAIN_MARKER(marker), text->str);
- champlain_marker_set_color(CHAMPLAIN_MARKER(marker), &thumb_colour);
- champlain_marker_set_text_color(CHAMPLAIN_MARKER(marker), &text_colour);
- champlain_marker_set_font_name(CHAMPLAIN_MARKER(marker), "sans 8");
+ champlain_label_set_text(CHAMPLAIN_LABEL(label_marker), text->str);
+ champlain_label_set_font_name(CHAMPLAIN_LABEL(label_marker), "sans 8");
+ champlain_marker_set_selection_color(&thumb_colour);
+ champlain_marker_set_selection_text_color(&text_colour);
g_free(altitude);
g_string_free(text, TRUE);
+
+ parent_marker = clutter_actor_get_parent(label_marker);
+ direction = clutter_actor_get_child_at_index(parent_marker, 0);
+ clutter_actor_set_opacity(direction, 255);
}
/* otherwise, revert to the hidden text marker
*/
else
{
- champlain_marker_set_text(CHAMPLAIN_MARKER(marker), "i");
- champlain_marker_set_color(CHAMPLAIN_MARKER(marker), &marker_colour);
- champlain_marker_set_text_color(CHAMPLAIN_MARKER(marker), &marker_colour);
- champlain_marker_set_font_name(CHAMPLAIN_MARKER(marker), "courier 5");
+ champlain_label_set_text(CHAMPLAIN_LABEL(label_marker), "i");
+ champlain_label_set_font_name(CHAMPLAIN_LABEL(label_marker), "courier 5");
+ champlain_marker_set_selection_color(&marker_colour);
+ champlain_marker_set_selection_text_color(&marker_colour);
+
+ parent_marker = clutter_actor_get_parent(label_marker);
+ direction = clutter_actor_get_child_at_index(parent_marker, 0);
+ clutter_actor_set_opacity(direction, 0);
}
g_free(current_text);
-
+
return TRUE;
}
return TRUE;
PaneGPSData *pgd = data;
gdouble latitude;
gdouble longitude;
- GList *work;
- ClutterActor *marker;
+ gdouble compass;
FileData *fd;
+ ClutterActor *parent_marker, *label_marker;
+ ClutterActor *direction;
ClutterColor marker_colour = { MARKER_COLOUR };
+ ClutterColor thumb_colour = { THUMB_COLOUR };
GString *message;
+ ClutterContent *canvas;
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgd->progress),
- (gdouble)(pgd->selection_count - g_list_length(pgd->selection_list)) /
+ (gdouble)(pgd->selection_count - g_list_length(pgd->not_added)) /
(gdouble)pgd->selection_count);
-
+
message = g_string_new("");
- g_string_printf(message, "%i/%i", (pgd->selection_count - g_list_length(pgd->selection_list)),
+ g_string_printf(message, "%i/%i", (pgd->selection_count - g_list_length(pgd->not_added)),
pgd->selection_count);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pgd->progress), message->str);
g_string_free(message, TRUE);
-
- work = pgd->selection_list;
- while (work)
+
+ if(pgd->not_added)
{
- fd = work->data;
- pgd->selection_list = g_list_remove(pgd->selection_list, work->data);
- if (fd != NULL)
+ fd = pgd->not_added->data;
+ pgd->not_added = pgd->not_added->next;
+
+ latitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLatitude", 0);
+ longitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLongitude", 0);
+ compass = metadata_read_GPS_direction(fd, "Xmp.exif.GPSImgDirection", 1000);
+
+ if (!(latitude == 0 && longitude == 0))
{
- latitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLatitude", 1000);
- longitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLongitude", 1000);
+ pgd->num_added++;
+
+ parent_marker = champlain_marker_new();
+ clutter_actor_set_reactive(parent_marker, FALSE);
+ label_marker = champlain_label_new_with_text("i","courier 5", &marker_colour, &marker_colour);
+ clutter_actor_set_reactive(label_marker, TRUE);
+ champlain_marker_set_selection_color(&thumb_colour);
- if ((latitude != 1000) && (longitude != 1000))
+ if (compass != 1000)
{
- marker = champlain_marker_new_with_text("i","courier 5", &marker_colour, &marker_colour);
+ canvas = clutter_canvas_new();
+ clutter_canvas_set_size(CLUTTER_CANVAS (canvas), DIRECTION_SIZE, 3);
+ g_signal_connect(canvas, "draw", G_CALLBACK(bar_gps_draw_direction), NULL);
+ direction = clutter_actor_new();
+ clutter_actor_set_size(direction, DIRECTION_SIZE, 3);
+ clutter_actor_set_position(direction, 0, 0);
+ clutter_actor_set_rotation_angle(direction, CLUTTER_Z_AXIS, compass -90.00);
+ clutter_actor_set_content(direction, canvas);
+ clutter_content_invalidate(canvas);
+ g_object_unref(canvas);
+
+ clutter_actor_add_child(parent_marker, direction);
+ clutter_actor_set_opacity(direction, 0);
+ }
- champlain_base_marker_set_position(CHAMPLAIN_BASE_MARKER(marker), latitude, longitude);
- clutter_container_add(CLUTTER_CONTAINER(pgd->icon_layer), marker, NULL);
- clutter_actor_set_reactive(marker, TRUE);
+ clutter_actor_add_child(parent_marker, label_marker);
- g_signal_connect(G_OBJECT(marker), "button_press_event",
- G_CALLBACK(bar_pane_gps_marker_keypress_cb), pgd);
+ champlain_location_set_location(CHAMPLAIN_LOCATION(parent_marker), latitude, longitude);
+ champlain_marker_layer_add_marker(pgd->icon_layer, CHAMPLAIN_MARKER(parent_marker));
- g_object_set_data(G_OBJECT(marker), "file_fd", fd);
+ g_signal_connect(G_OBJECT(label_marker), "button_release_event",
+ G_CALLBACK(bar_pane_gps_marker_keypress_cb), pgd);
+
+ g_object_set_data(G_OBJECT(label_marker), "file_fd", fd);
+
+ champlain_bounding_box_extend(pgd->bbox, latitude, longitude);
- g_ptr_array_add(pgd->marker_list, marker);
- if (pgd->centre_map_checked)
- {
- g_ptr_array_add(pgd->marker_list, NULL);
- champlain_view_ensure_markers_visible(CHAMPLAIN_VIEW(pgd->gps_view),
- (void *)pgd->marker_list->pdata, FALSE);
- g_ptr_array_remove(pgd->marker_list, NULL);
- }
- }
}
return TRUE;
}
-
- if (pgd->marker_list->len >= 1)
- {
- g_ptr_array_add(pgd->marker_list, NULL);
- if (pgd->centre_map_checked)
+ if (pgd->centre_map_checked)
+ {
+ if (pgd->num_added == 1)
{
- champlain_view_ensure_markers_visible(CHAMPLAIN_VIEW(pgd->gps_view), (void *)pgd->marker_list->pdata, FALSE);
+ champlain_bounding_box_get_center(pgd->bbox, &latitude, &longitude);
+ champlain_view_go_to(CHAMPLAIN_VIEW(pgd->gps_view), latitude, longitude);
+ }
+ else if (pgd->num_added > 1)
+ {
+ champlain_view_ensure_visible(CHAMPLAIN_VIEW(pgd->gps_view), pgd->bbox, TRUE);
}
}
-
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgd->progress), 0);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pgd->progress), NULL);
- g_list_free(pgd->selection_list);
- g_ptr_array_free(pgd->marker_list, TRUE);
pgd->create_markers_id = 0;
return FALSE;
static void bar_pane_gps_update(PaneGPSData *pgd)
{
GList *list;
- GList *work;
/* The widget does not have a parent during bar_pane_gps_new, so calling gtk_widget_show_all there gives a
* "Gtk-CRITICAL **: gtk_widget_realize: assertion `GTK_WIDGET_ANCHORED (widget) || GTK_IS_INVISIBLE (widget)' failed"
else
{
return;
- }
+ }
}
/* Delete any markers currently displayed
*/
- work = clutter_container_get_children(CLUTTER_CONTAINER(pgd->icon_layer));
- while (work)
- {
- clutter_container_remove(CLUTTER_CONTAINER(pgd->icon_layer), work->data, NULL);
- work = work->next;
- }
- g_list_free(work);
+
+ champlain_marker_layer_remove_all(pgd->icon_layer);
if (!pgd->enable_markers_checked)
{
* a single, small text character the same colour as the marker background.
* Use a background process in case the user selects a large number of files.
*/
+ filelist_free(pgd->selection_list);
+ if (pgd->bbox) champlain_bounding_box_free(pgd->bbox);
+
list = layout_selection_list(pgd->pane.lw);
+ list = file_data_process_groups_in_selection(list, FALSE, NULL);
- if (list != NULL)
- {
- pgd->selection_list = g_list_copy(list);
- pgd->marker_list = g_ptr_array_new();
- pgd->selection_count = g_list_length(pgd->selection_list);
- pgd->create_markers_id = g_idle_add(bar_pane_gps_create_markers_cb, pgd);
- }
+ pgd->selection_list = list;
+ pgd->not_added = list;
- g_list_free(list);
- g_list_free(work);
+ pgd->bbox = champlain_bounding_box_new();
+ pgd->selection_count = g_list_length(pgd->selection_list);
+ pgd->create_markers_id = g_idle_add(bar_pane_gps_create_markers_cb, pgd);
+ pgd->num_added = 0;
}
void bar_pane_gps_set_map_source(PaneGPSData *pgd, const gchar *map_id)
ChamplainMapSource *map_source;
ChamplainMapSourceFactory *map_factory;
- map_factory = champlain_map_source_factory_get_default();
+ map_factory = champlain_map_source_factory_dup_default();
map_source = champlain_map_source_factory_create(map_factory, map_id);
if (map_source != NULL)
{
g_object_set(G_OBJECT(pgd->gps_view), "map-source", map_source, NULL);
- g_object_unref(map_factory);
}
- g_object_unref(map_source);
+ g_object_unref(map_factory);
}
void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *menu_widget, gpointer data)
pgd = g_object_get_data(G_OBJECT(bar), "pane_data");
if (!pgd) return FALSE;
- if (GTK_WIDGET_HAS_FOCUS(pgd->widget)) return gtk_widget_event(GTK_WIDGET(pgd->widget), event);
+ if (gtk_widget_has_focus(pgd->widget)) return gtk_widget_event(GTK_WIDGET(pgd->widget), event);
return FALSE;
}
}
static void bar_pane_gps_slider_changed_cb(GtkScaleButton *slider,
- gdouble zoom,
- gpointer data)
+ gdouble zoom,
+ gpointer data)
{
PaneGPSData *pgd = data;
GString *message;
}
static void bar_pane_gps_view_state_changed_cb(ChamplainView *view,
- GParamSpec *gobject,
- gpointer data)
+ GParamSpec *gobject,
+ gpointer data)
{
PaneGPSData *pgd = data;
ChamplainState status;
{
gtk_label_set_text(GTK_LABEL(pgd->state), message->str);
}
-
+
gtk_widget_set_tooltip_text(GTK_WIDGET(pgd->slider), message->str);
gtk_scale_button_set_value(GTK_SCALE_BUTTON(pgd->slider), (gdouble)zoom);
static void bar_pane_gps_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
PaneGPSData *pgd = data;
-
- if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pgd->fd)
+
+ if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) &&
+ g_list_find(pgd->selection_list, fd))
{
bar_pane_gps_update(pgd);
}
{
GtkWidget *menu;
GtkWidget *map_centre;
- GtkWidget *parent;
ChamplainMapSourceFactory *map_factory;
GSList *map_list;
ChamplainMapSourceDesc *map_desc;
menu = popup_menu_short_lived();
- map_factory = champlain_map_source_factory_get_default();
- map_list = champlain_map_source_factory_get_list(map_factory);
+ map_factory = champlain_map_source_factory_dup_default();
+ map_list = champlain_map_source_factory_get_registered(map_factory);
current = bar_pane_gps_get_map_id(pgd);
while (map_list)
{
map_desc = (ChamplainMapSourceDesc *)(map_list->data);
-
- menu_item_add_radio(menu, map_desc->name, map_desc->id, strcmp(map_desc->id, current) == 0, G_CALLBACK(bar_pane_gps_change_map_cb), pgd);
-
+
+ menu_item_add_radio(menu,
+ champlain_map_source_desc_get_name(map_desc),
+ (gpointer)champlain_map_source_desc_get_id(map_desc),
+ strcmp(champlain_map_source_desc_get_id(map_desc), current) == 0,
+ G_CALLBACK(bar_pane_gps_change_map_cb), pgd);
+
map_list = g_slist_next(map_list);
}
-
+
menu_item_add_divider(menu);
menu_item_add_check(menu, _("Enable markers"), pgd->enable_markers_checked,
- G_CALLBACK(bar_pane_gps_enable_markers_checked_toggle_cb), pgd);
+ G_CALLBACK(bar_pane_gps_enable_markers_checked_toggle_cb), pgd);
map_centre = menu_item_add_check(menu, _("Centre map on marker"), pgd->centre_map_checked,
- G_CALLBACK(bar_pane_gps_centre_map_checked_toggle_cb), pgd);
+ G_CALLBACK(bar_pane_gps_centre_map_checked_toggle_cb), pgd);
if (!pgd->enable_markers_checked)
{
gtk_widget_set_sensitive(map_centre, FALSE);
g_slist_free(map_list);
g_object_unref(map_factory);
- //g_object_unref(map_centre);
return menu;
}
*/
void bar_pane_gps_map_centreing(PaneGPSData *pgd)
{
- GtkWidget *dialog;
+ GenericDialog *gd;
GString *message = g_string_new("");
if (pgd->centre_map_checked)
message = g_string_append(message, _("Move map centre to marker\n is enabled"));
pgd->centre_map_checked = TRUE;
}
-
- dialog = gtk_message_dialog_new(NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_CLOSE,
- "%s", message->str);
- gtk_window_set_title(GTK_WINDOW(dialog), _("Map Centreing"));
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
- gtk_dialog_run(GTK_DIALOG(dialog));
-
- gtk_widget_destroy(dialog);
+
+ gd = generic_dialog_new(_("Map centering"),
+ "map_centering", NULL, TRUE, NULL, pgd);
+ generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
+ "Map Centering", message->str);
+ generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
+
+ gtk_widget_show(gd->dialog);
+
g_string_free(message, TRUE);
}
{
PaneGPSData *pgd = data;
GtkWidget *menu;
+ GtkClipboard *clipboard;
+ gchar *geo_coords;
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
}
else if (bevent->button == MOUSE_BUTTON_LEFT)
{
- return FALSE;
+ clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ geo_coords = g_strdup_printf("%lf %lf",
+ champlain_view_y_to_latitude(
+ CHAMPLAIN_VIEW(pgd->gps_view),bevent->y),
+ champlain_view_x_to_longitude(
+ CHAMPLAIN_VIEW(pgd->gps_view),bevent->x));
+ gtk_clipboard_set_text(clipboard, geo_coords, -1);
+
+ g_free(geo_coords);
+
+ return TRUE;
}
else
{
file_data_unregister_notify_func(bar_pane_gps_notify_cb, pgd);
+ g_idle_remove_by_data(pgd);
+
+ filelist_free(pgd->selection_list);
+ if (pgd->bbox) champlain_bounding_box_free(pgd->bbox);
+
file_data_unref(pgd->fd);
g_free(pgd->map_source);
g_free(pgd->pane.id);
gboolean expanded, gint height)
{
PaneGPSData *pgd;
- GtkWidget *vbox, *scrolled;
- GtkWidget *gpswidget, *viewport;
+ GtkWidget *vbox, *frame;
+ GtkWidget *gpswidget;
GtkWidget *status, *state, *progress, *slider;
- ChamplainLayer *layer;
- ClutterActor *view;
- const gchar *slider_list[] = {GTK_STOCK_ZOOM_IN, GTK_STOCK_ZOOM_OUT, NULL};
+ ChamplainMarkerLayer *layer;
+ ChamplainView *view;
+ const gchar *slider_list[] = {"zoom-in", "zoom-out", NULL};
const gchar **slider_icons = slider_list;
pgd = g_new0(PaneGPSData, 1);
pgd->pane.expanded = expanded;
pgd->height = height;
- scrolled = gtk_scrolled_window_new(NULL, NULL);
- vbox = gtk_vbox_new(FALSE, 0);
+ frame = gtk_frame_new(NULL);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gpswidget = gtk_champlain_embed_new ();
- view = gtk_champlain_embed_get_view (GTK_CHAMPLAIN_EMBED (gpswidget));
+ gpswidget = gtk_champlain_embed_new();
+ view = gtk_champlain_embed_get_view(GTK_CHAMPLAIN_EMBED(gpswidget));
- viewport = gtk_viewport_new(NULL, NULL);
-
- gtk_container_add(GTK_CONTAINER(viewport), gpswidget);
- gtk_box_pack_start(GTK_BOX(vbox),viewport, TRUE, TRUE, 0);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), vbox);
+ gtk_box_pack_start(GTK_BOX(vbox), gpswidget, TRUE, TRUE, 0);
+ gtk_container_add(GTK_CONTAINER(frame), vbox);
- status = gtk_hbox_new(FALSE,0);
+ status = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
slider = gtk_scale_button_new(GTK_ICON_SIZE_SMALL_TOOLBAR, 1, 17, 1, slider_icons);
gtk_widget_set_tooltip_text(slider, "Zoom");
gtk_scale_button_set_value(GTK_SCALE_BUTTON(slider), (gdouble)zoom);
progress = gtk_progress_bar_new();
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "");
+ gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(progress), TRUE);
+#endif
state = gtk_label_new("");
gtk_label_set_justify(GTK_LABEL(state), GTK_JUSTIFY_CENTER);
-
+
gtk_box_pack_start(GTK_BOX(status), GTK_WIDGET(slider), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(status), GTK_WIDGET(state), FALSE, FALSE, 5);
gtk_box_pack_end(GTK_BOX(status), GTK_WIDGET(progress), FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(vbox),GTK_WIDGET(status), FALSE, FALSE, 0);
-
- layer = champlain_layer_new();
- champlain_view_add_layer(CHAMPLAIN_VIEW(view), layer);
+
+ layer = champlain_marker_layer_new();
+ champlain_view_add_layer(view, CHAMPLAIN_LAYER(layer));
pgd->icon_layer = layer;
- pgd->gps_view = view;
- pgd->widget = scrolled;
+ pgd->gps_view = CLUTTER_ACTOR(view);
+ pgd->widget = frame;
pgd->progress = progress;
pgd->slider = slider;
pgd->state = state;
bar_pane_gps_set_map_source(pgd, map_id);
-
- g_object_set(G_OBJECT(CHAMPLAIN_VIEW(view)), "scroll-mode", CHAMPLAIN_SCROLL_MODE_KINETIC,
- "zoom-level", zoom,
- "keep-center-on-resize", TRUE,
- "decel-rate", 1.0,
- "show-license", TRUE,
- "zoom-on-double-click", FALSE,
- "max-zoom-level", 17,
- "min-zoom-level", 1,
- NULL);
- champlain_view_center_on(CHAMPLAIN_VIEW(view), latitude, longitude);
+
+ g_object_set(G_OBJECT(view), "kinetic-mode", TRUE,
+ "zoom-level", zoom,
+ "keep-center-on-resize", TRUE,
+ "deceleration", 1.1,
+ "zoom-on-double-click", FALSE,
+ "max-zoom-level", 17,
+ "min-zoom-level", 1,
+ NULL);
+ champlain_view_center_on(view, latitude, longitude);
pgd->centre_map_checked = TRUE;
g_object_set_data(G_OBJECT(pgd->widget), "pane_data", pgd);
g_signal_connect(G_OBJECT(pgd->widget), "destroy", G_CALLBACK(bar_pane_gps_destroy), pgd);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_widget_set_size_request(pgd->widget, -1, height);
- clutter_set_motion_events_enabled(TRUE);
- g_signal_connect(G_OBJECT(vbox), "button_press_event", G_CALLBACK(bar_pane_gps_map_keypress_cb), pgd);
+ g_signal_connect(G_OBJECT(gpswidget), "button_press_event", G_CALLBACK(bar_pane_gps_map_keypress_cb), pgd);
g_signal_connect(pgd->gps_view, "notify::state", G_CALLBACK(bar_pane_gps_view_state_changed_cb), pgd);
g_signal_connect(pgd->gps_view, "notify::zoom-level", G_CALLBACK(bar_pane_gps_view_state_changed_cb), pgd);
g_signal_connect(G_OBJECT(slider), "value-changed", G_CALLBACK(bar_pane_gps_slider_changed_cb), pgd);
+ bar_pane_gps_dnd_init(pgd);
+
file_data_register_notify_func(bar_pane_gps_notify_cb, pgd, NOTIFY_PRIORITY_LOW);
pgd->create_markers_id = 0;
pgd->enable_markers_checked = TRUE;
pgd->centre_map_checked = TRUE;
-
+
return pgd->widget;
}
continue;
if (READ_CHAR_FULL("map-id", map_id))
continue;
- /* There is a bug in the libchamplain libraries which prevents correct
- * initialisation if the zoom level starts higher than 8
- */
- if (READ_INT_CLAMP_FULL("zoom-level", zoom, 1, 8))
+ if (READ_INT_CLAMP_FULL("zoom-level", zoom, 1, 20))
continue;
if (READ_INT_CLAMP_FULL("latitude", int_latitude, -90000000, +90000000))
continue;
projects / geeqie.git / blobdiff