/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
GtkWidget *vbox;
GtkWidget *scrolled;
GtkWidget *listview;
+ GtkWidget *label_file_name;
FileData *fd;
};
EXIF_ADVCOL_COUNT
};
-static gint advanced_exif_row_enabled(const gchar *name)
+static gboolean advanced_exif_row_enabled(const gchar *name)
{
GList *list;
g_free(text);
elements = g_strdup_printf("%d", exif_item_get_elements(item));
description = exif_item_get_description(item);
- if (!description || *description == '\0')
+ if (!description || *description == '\0')
{
g_free(description);
description = g_strdup(tag_name);
file_data_unref(ew->fd);
ew->fd = file_data_ref(fd);
+ gtk_label_set_text(GTK_LABEL(ew->label_file_name), (ew->fd) ? ew->fd->path : "");
+
advanced_exif_clear(ew);
advanced_exif_update(ew);
}
-#if 0
-static void advanced_exif_row_toggled_cb(GtkCellRendererToggle *toggle, const gchar *path, gpointer data)
-{
- GtkWidget *listview = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- GtkTreePath *tpath;
- gchar *name = NULL;
- gboolean active;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview));
-
- tpath = gtk_tree_path_new_from_string(path);
- gtk_tree_model_get_iter(store, &iter, tpath);
- gtk_tree_path_free(tpath);
-
- gtk_tree_model_get(store, &iter, EXIF_ADVCOL_ENABLED, &active,
- EXIF_ADVCOL_NAME, &name, -1);
- active = (!active);
-
- if (active &&
- g_list_length(history_list_get_by_key("exif_extras")) >= EXIF_BAR_CUSTOM_COUNT)
- {
- active = FALSE;
- }
-
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, EXIF_ADVCOL_ENABLED, active, -1);
-
- if (active)
- {
- history_list_add_to_key("exif_extras", name, EXIF_BAR_CUSTOM_COUNT);
- }
- else
- {
- history_list_item_change("exif_extras", name, NULL);
- }
-
- g_free(name);
-}
-#endif
-
-#if 0
-static void advanced_exif_add_column_check(GtkWidget *listview, const gchar *title, gint n)
-{
- GtkTreeViewColumn *column;
- GtkCellRenderer *renderer;
-
- column = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(column, title);
- gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
- renderer = gtk_cell_renderer_toggle_new();
- gtk_tree_view_column_pack_start(column, renderer, TRUE);
- gtk_tree_view_column_add_attribute(column, renderer, "active", n);
- gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
-
- g_signal_connect(G_OBJECT(renderer), "toggled",
- G_CALLBACK(advanced_exif_row_toggled_cb), listview);
-}
-#endif
-
static GtkTargetEntry advanced_exif_drag_types[] = {
{ "text/plain", 0, TARGET_TEXT_PLAIN }
};
static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ GtkSelectionData *selection_data, guint info,
+ guint time, gpointer data)
{
- ExifWin *ew = data;
- GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
+ //ExifWin *ew = data;
+ GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
GtkTreeIter iter;
- if (gtk_tree_selection_get_selected(sel, NULL, &iter))
+ if (gtk_tree_selection_get_selected(sel, NULL, &iter))
{
GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview));
gchar *key;
gtk_tree_model_get(store, &iter, EXIF_ADVCOL_NAME, &key, -1);
gtk_selection_data_set_text(selection_data, key, -1);
- printf("%s\n",key);
+ //printf("%s\n",key);
g_free(key);
}
static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer data)
{
- ExifWin *ew = data;
- GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
+ //ExifWin *ew = data;
+ GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
GtkTreeIter iter;
- if (gtk_tree_selection_get_selected(sel, NULL, &iter))
+ if (gtk_tree_selection_get_selected(sel, NULL, &iter))
{
GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview));
gchar *key;
-static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gint n, gint sizable)
+static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gint n, gboolean sizable)
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
}
-void advanced_exif_close(GtkWidget *window)
+void advanced_exif_close(ExifWin *ew)
{
- ExifWin *ew;
-
- ew = g_object_get_data(G_OBJECT(window), "advanced_exif_data");
if (!ew) return;
- gtk_widget_destroy(ew->vbox);
+ gtk_widget_destroy(ew->window);
}
static void advanced_exif_destroy(GtkWidget *widget, gpointer data)
return ret;
}
+static gboolean advanced_exif_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ ExifWin *ew = data;
+ gboolean stop_signal = FALSE;
+
+ if (event->state & GDK_CONTROL_MASK)
+ {
+ switch (event->keyval)
+ {
+ case 'W': case 'w':
+ advanced_exif_close(ew);
+ stop_signal = TRUE;
+ break;
+ }
+ } // if (event->state & GDK_CONTROL...
+
+ return stop_signal;
+} // static gboolean advanced_exif_...
+
GtkWidget *advanced_exif_new(void)
{
ExifWin *ew;
GtkListStore *store;
GdkGeometry geometry;
GtkTreeSortable *sortable;
+ GtkWidget *box;
gint n;
ew = g_new0(ExifWin, 1);
gtk_container_add(GTK_CONTAINER(ew->window), ew->vbox);
gtk_widget_show(ew->vbox);
+ box = gtk_hbox_new(FALSE, 0);
+
+ ew->label_file_name = gtk_label_new("");
+ gtk_label_set_ellipsize(GTK_LABEL(ew->label_file_name), PANGO_ELLIPSIZE_START);
+ gtk_label_set_selectable(GTK_LABEL(ew->label_file_name), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(ew->label_file_name), 0.5, 0.5);
+ gtk_box_pack_start(GTK_BOX(box), ew->label_file_name, TRUE, TRUE, 0);
+ gtk_widget_show(ew->label_file_name);
+
+ gtk_box_pack_start(GTK_BOX(ew->vbox), box, FALSE, FALSE, 0);
+ gtk_widget_show(box);
+
store = gtk_list_store_new(7, G_TYPE_BOOLEAN,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
g_signal_connect(G_OBJECT(ew->listview), "drag_begin",
G_CALLBACK(advanced_exif_dnd_begin), ew);
+ g_signal_connect(G_OBJECT(ew->window), "key_press_event",
+ G_CALLBACK(advanced_exif_keypress), ew);
+
ew->scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ew->scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ew->scrolled),
projects / geeqie.git / blobdiff