Revision: 1654
http://geeqie.svn.sourceforge.net/geeqie/?rev=1654&view=rev
Author: nadvornik
Date: 2009-04-21 21:07:28 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
added possibility to show modifiied metadata before write
Modified Paths:
--------------
trunk/src/utilops.c
Modified: trunk/src/utilops.c
===================================================================
--- trunk/src/utilops.c 2009-04-20 21:34:16 UTC (rev 1653)
+++ trunk/src/utilops.c 2009-04-21 21:07:28 UTC (rev 1654)
@@ -32,6 +32,7 @@
#include "ui_tabcomp.h"
#include "editors.h"
#include "metadata.h"
+#include "exif.h"
static GdkPixbuf *file_util_get_error_icon(FileData *fd, GtkWidget *widget);
@@ -278,6 +279,8 @@
FileData *dir_fd;
GList *content_list;
GList *flist;
+
+ FileData *sel_fd;
GtkWidget *parent;
GenericDialog *gd;
@@ -315,6 +318,7 @@
gpointer resume_data;
FileUtilDoneFunc done_func;
+ void (*details_func)(FileData *fd, GtkWidget *parent);
gpointer done_data;
};
@@ -1252,6 +1256,8 @@
gtk_tree_model_get(store, &iter, UTILITY_COLUMN_FD, &fd, -1);
generic_dialog_image_set(ud->gd, fd);
+ ud->sel_fd = fd;
+
if (ud->type == UTILITY_TYPE_RENAME)
{
const gchar *name = filename_from_path(fd->change->dest);
@@ -1282,6 +1288,14 @@
gtk_widget_set_sensitive(label, FALSE);
}
+static void file_util_details_cb(GenericDialog *gd, gpointer data)
+{
+ UtilityData *ud = data;
+ if (ud->details_func && ud->sel_fd)
+ {
+ ud->details_func(ud->sel_fd, ud->gd->dialog);
+ }
+}
static void file_util_dialog_init_simple_list(UtilityData *ud)
{
@@ -1291,6 +1305,7 @@
const gchar *stock_id;
+ /* FIXME: use ud->stock_id */
if (ud->type == UTILITY_TYPE_DELETE ||
ud->type == UTILITY_TYPE_DELETE_LINK ||
ud->type == UTILITY_TYPE_DELETE_FOLDER)
@@ -1304,9 +1319,10 @@
ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
ud->parent, FALSE, file_util_cancel_cb, ud);
+ if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO,
_("File details"), file_util_details_cb, FALSE);
+
generic_dialog_add_button(ud->gd, stock_id, NULL, file_util_ok_cb,
TRUE);
-
if (ud->dir_fd)
{
dir_msg = g_strdup_printf("%s\n\n%s\n",
ud->messages.desc_source_fd, ud->dir_fd->path);
@@ -1414,6 +1430,9 @@
ud->parent, FALSE, file_util_cancel_cb, ud);
box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question,
NULL);
+
+ if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO,
_("File details"), file_util_details_cb, FALSE);
+
generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title,
file_util_ok_cb, TRUE);
box = pref_group_new(box, TRUE, ud->messages.desc_flist,
GTK_ORIENTATION_HORIZONTAL);
@@ -1656,6 +1675,75 @@
file_util_dialog_run(ud);
}
+static void file_util_write_metadata_details_dialog_ok_cb(GenericDialog *gd,
gpointer data)
+{
+ /* no op */
+}
+
+static void file_util_write_metadata_details_dialog(FileData *fd, GtkWidget
*parent)
+{
+ GenericDialog *gd;
+ GtkWidget *table;
+ GList *keys = NULL;
+ GList *work;
+ gchar *message = g_strdup_printf(_("This is a list of modified metadata
tags that will be written for file '%s'"), fd->name);
+ gint i;
+
+ if (fd && fd->modified_xmp)
+ {
+ keys = g_hash_table_get_keys(fd->modified_xmp);
+ }
+
+ g_assert(keys);
+
+
+ gd = file_util_gen_dlg(_("Overview of changed metadata"), "details",
parent, TRUE, NULL, NULL);
+ generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO, _("Overview of
changed metadata"), message);
+ generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
file_util_write_metadata_details_dialog_ok_cb, TRUE);
+
+ table = pref_table_new(gd->vbox, 2, g_list_length(keys), FALSE, TRUE);
+
+ work = keys;
+ i = 0;
+ while (work)
+ {
+ GtkWidget *label;
+ const gchar *key = work->data;
+ gchar *title = exif_get_description_by_key(key);
+ gchar *title_f = g_strdup_printf("%s:", title);
+ gchar *value = metadata_read_string(fd, key,
METADATA_FORMATTED);
+ work = work->next;
+
+
+ label = gtk_label_new(title_f);
+ gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0);
+ pref_label_bold(label, TRUE, FALSE);
+ gtk_table_attach(GTK_TABLE(table), label,
+ 0, 1, i, i + 1,
+ GTK_FILL, GTK_FILL,
+ 2, 2);
+ gtk_widget_show(label);
+
+ label = gtk_label_new(value);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
+ gtk_table_attach(GTK_TABLE(table), label,
+ 1, 2, i, i + 1,
+ GTK_FILL, GTK_FILL,
+ 2, 2);
+ gtk_widget_show(label);
+
+ g_free(title);
+ g_free(title_f);
+ g_free(value);
+ i++;
+ }
+
+ gtk_widget_show(gd->dialog);
+
+ g_list_free(keys);
+ g_free(message);
+}
+
static void file_util_write_metadata_full(FileData *source_fd, GList
*source_list, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc
done_func, gpointer done_data)
{
UtilityData *ud;
@@ -1687,6 +1775,8 @@
ud->done_func = done_func;
ud->done_data = done_data;
+ ud->details_func = file_util_write_metadata_details_dialog;
+
ud->messages.title = _("Write metadata");
ud->messages.question = _("Write metadata?");
ud->messages.desc_flist = _("This will write the changed metadata into
the following files");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
