/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: Vladimir Nadvornik
*
#include "bar_histogram.h"
#include "histogram.h"
#include "rcfile.h"
+#include "bar_gps.h"
typedef struct _KnownPanes KnownPanes;
struct _KnownPanes
const gchar *config;
};
-static const gchar default_config_histogram[] =
+static const gchar default_config_histogram[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" </layout>"
"</gq>";
-static const gchar default_config_title[] =
+static const gchar default_config_title[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" </layout>"
"</gq>";
-static const gchar default_config_keywords[] =
+static const gchar default_config_keywords[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" </layout>"
"</gq>";
-static const gchar default_config_comment[] =
+static const gchar default_config_comment[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" </layout>"
"</gq>";
-static const gchar default_config_exif[] =
+static const gchar default_config_exif[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" <entry key = 'formatted.ColorProfile' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.SubjectDistance' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.Resolution' if_set = 'true' editable = 'false' />"
-" <entry key = 'Exif.Image.Orientation' if_set = 'true' editable = 'false' />"
+" <entry key = '" ORIENTATION_KEY "' if_set = 'true' editable = 'false' />"
" </pane_exif>"
" </bar>"
" </layout>"
"</gq>";
-static const gchar default_config_file_info[] =
+static const gchar default_config_file_info[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" </layout>"
"</gq>";
-static const gchar default_config_location[] =
+static const gchar default_config_location[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" </layout>"
"</gq>";
-static const gchar default_config_copyright[] =
+static const gchar default_config_copyright[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
" </layout>"
"</gq>";
+#ifdef HAVE_LIBCHAMPLAIN
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+static const gchar default_config_gps[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_gps id = 'gps' expanded = 'true'"
+" map-id = 'osm::mapnik'"
+" zoom-level = '8'"
+" latitude = '50116666'"
+" longitude = '8683333' />"
+" </bar>"
+" </layout>"
+"</gq>";
+#endif
+#endif
+
static const KnownPanes known_panes[] = {
/* default sidebar */
{PANE_HISTOGRAM, "histogram", N_("Histogram"), default_config_histogram},
{PANE_EXIF, "exif", N_("Exif"), default_config_exif},
/* other pre-configured panes */
{PANE_EXIF, "file_info", N_("File info"), default_config_file_info},
- {PANE_EXIF, "location", N_("Location"), default_config_location},
+ {PANE_EXIF, "location", N_("Location and GPS"), default_config_location},
{PANE_EXIF, "copyright", N_("Copyright"), default_config_copyright},
-
+#ifdef HAVE_LIBCHAMPLAIN
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+ {PANE_GPS, "gps", N_("GPS Map"), default_config_gps},
+#endif
+#endif
{PANE_UNDEF, NULL, NULL, NULL}
};
BarData *bd;
bd = g_object_get_data(G_OBJECT(widget), "bar_data");
- if (bd)
+ if (bd)
{
expander = NULL;
- bar = widget;
+ bar = widget;
}
else
{
expander = widget;
- bar = widget->parent;
+ bar = gtk_widget_get_parent(widget);
while (bar && !g_object_get_data(G_OBJECT(bar), "bar_data"))
- bar = bar->parent;
+ bar = gtk_widget_get_parent(bar);
if (!bar) return;
}
menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN, G_CALLBACK(bar_expander_move_down_cb), expander);
menu_item_add_stock(menu, _("Move to _bottom"), GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(bar_expander_move_bottom_cb), expander);
menu_item_add_divider(menu);
- menu_item_add_stock(menu, _("Delete"), GTK_STOCK_DELETE, G_CALLBACK(bar_expander_delete_cb), expander);
+ menu_item_add_stock(menu, _("Remove"), GTK_STOCK_DELETE, G_CALLBACK(bar_expander_delete_cb), expander);
menu_item_add_divider(menu);
}
}
-static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
-{
+static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
bar_menu_popup(widget);
return TRUE;
}
return FALSE;
-}
+}
-void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
+static void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
{
GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
}
+static void bar_pane_notify_selection_cb(GtkWidget *expander, gpointer data)
+{
+ GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
+ PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+ if (!pd) return;
+ if (pd->pane_notify_selection) pd->pane_notify_selection(widget, GPOINTER_TO_INT(data));
+}
+
+void bar_notify_selection(GtkWidget *bar, gint count)
+{
+ BarData *bd;
+ bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+ if (!bd) return;
+
+ gtk_container_foreach(GTK_CONTAINER(bd->vbox), bar_pane_notify_selection_cb, GINT_TO_POINTER(count));
+}
+
gboolean bar_event(GtkWidget *bar, GdkEvent *event)
{
BarData *bd;
if (!bd) return;
WRITE_NL(); WRITE_STRING("<bar ");
- write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar));
+ write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
write_uint_option(outstr, indent, "width", bd->width);
WRITE_STRING(">");
indent++;
WRITE_NL(); WRITE_STRING("<clear/>");
- list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
+ list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
work = list;
while (work)
{
if (!pd) return;
- expander = pane->parent;
+ expander = gtk_widget_get_parent(pane);
gtk_expander_set_expanded(GTK_EXPANDER(expander), pd->expanded);
}
gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0);
- g_signal_connect(expander, "button_press_event", G_CALLBACK(bar_menu_cb), bd);
+ g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd);
gtk_container_add(GTK_CONTAINER(expander), pane);
g_free(bd);
}
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+/*
+ FIXME: this is an ugly hack that works around this bug:
+ https://bugzilla.gnome.org/show_bug.cgi?id=590692
+ http://bugzilla.openedhand.com/show_bug.cgi?id=1751
+ it should be removed as soon as a better solution exists
+*/
+
+static void bar_unrealize_clutter_fix_cb(GtkWidget *widget, gpointer data)
+{
+ GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget));
+ if (child) gtk_widget_unrealize(child);
+}
+#endif
+
GtkWidget *bar_new(LayoutWindow *lw)
{
BarData *bd;
g_signal_connect(G_OBJECT(bd->widget), "size-allocate",
G_CALLBACK(bar_size_allocate), bd);
- g_signal_connect(G_OBJECT(bd->widget), "button_press_event", G_CALLBACK(bar_menu_cb), bd);
+ g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd);
bd->width = SIDEBAR_DEFAULT_WIDTH;
gtk_widget_set_size_request(bd->widget, bd->width, -1);
bd->vbox = gtk_vbox_new(FALSE, 0);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), bd->vbox);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))), GTK_SHADOW_NONE);
-
+
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+ g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL);
+#endif
+
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
gtk_widget_show(bd->vbox);
return bd->widget;
}
gtk_widget_set_size_request(bar, width, -1);
- if (enabled)
+ if (enabled)
{
gtk_widget_show(bar);
}
projects / geeqie.git / blobdiff