/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "dnd.h"
-static void bar_pane_keywords_keyword_update_all(void);
+//static void bar_pane_keywords_keyword_update_all(void);
static void bar_pane_keywords_changed(GtkTextBuffer *buffer, gpointer data);
/*
gboolean edit_existing;
};
-static GList *bar_list = NULL;
-
static void bar_pane_keywords_write(PaneKeywordsData *pkd)
{
if (pkd->collapse_unchecked) gtk_tree_model_foreach(model, bar_keyword_tree_collapse_if_unset_cb, pkd);
}
-static void bar_pane_keywords_keyword_update_all(void)
-{
- GList *work;
-
- work = bar_list;
- while (work)
- {
- PaneKeywordsData *pkd;
-// GList *keywords;
-
- pkd = work->data;
- work = work->next;
-
- bar_keyword_tree_sync(pkd);
- }
-}
-
static void bar_pane_keywords_update(PaneKeywordsData *pkd)
{
GList *keywords = NULL;
+ GList *orig_keywords = NULL;
+ GList *work1, *work2;
GtkTextBuffer *keyword_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pkd->keyword_view));
- g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
-
keywords = metadata_read_list(pkd->fd, KEYWORD_KEY, METADATA_PLAIN);
- keyword_list_push(pkd->keyword_view, keywords);
- bar_keyword_tree_sync(pkd);
- string_list_free(keywords);
-
- g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+ orig_keywords = keyword_list_pull(pkd->keyword_view);
+ /* compare the lists */
+ work1 = keywords;
+ work2 = orig_keywords;
+
+ while (work1 && work2)
+ {
+ if (strcmp(work1->data, work2->data) != 0) break;
+ work1 = work1->next;
+ work2 = work2->next;
+ }
+
+ if (work1 || work2) /* lists differs */
+ {
+ g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+ keyword_list_push(pkd->keyword_view, keywords);
+ bar_keyword_tree_sync(pkd);
+ g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+ }
+ string_list_free(keywords);
+ string_list_free(orig_keywords);
}
void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
pkd = g_object_get_data(G_OBJECT(bar), "pane_data");
if (!pkd) return FALSE;
- if (GTK_WIDGET_HAS_FOCUS(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event);
+ if (gtk_widget_has_focus(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event);
return FALSE;
}
/* call this just once in the end */
bar_pane_keywords_changed(keyword_buffer, pkd);
- /*
- bar_pane_keywords_change calls bar_keyword_tree_sync, no need to do it again
- bar_keyword_tree_sync(pkd);
- */
}
void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GValue *value, gint column, gpointer data)
keywords = keyword_list_pull(pkd->keyword_view);
list = layout_selection_list(pkd->pane.lw);
+ list = file_data_process_groups_in_selection(list, FALSE, NULL);
+
work = list;
while (work)
{
{
PaneKeywordsData *pkd = data;
- file_data_unregister_notify_func(bar_pane_keywords_notify_cb, pkd);
bar_pane_keywords_write(pkd);
bar_keyword_tree_sync(pkd);
- file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW);
pkd->idle_id = 0;
return FALSE;
}
case TARGET_APP_KEYWORD_PATH:
{
GList *path = keyword_tree_get_path(keyword_tree, &child_iter);
- gtk_selection_data_set(selection_data, selection_data->target,
+ gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
8, (gpointer) &path, sizeof(path));
break;
}
{
case TARGET_APP_KEYWORD_PATH:
{
- GList *path = *(gpointer *)selection_data->data;
+ GList *path = *(gpointer *)gtk_selection_data_get_data(selection_data);
src_valid = keyword_tree_get_iter(keyword_tree, &src_kw_iter, path);
string_list_free(path);
break;
}
default:
- new_keywords = string_to_keywords_list((gchar *)selection_data->data);
+ new_keywords = string_to_keywords_list((gchar *)gtk_selection_data_get_data(selection_data));
break;
}
else
{
GList *work = keywords;
+ gboolean append_to = FALSE;
while (work)
{
GtkTreeIter add;
- if (keyword_exists(keyword_tree, NULL, have_dest ? &kw_iter : NULL, work->data, FALSE, NULL))
+ if (keyword_exists(keyword_tree, NULL, (have_dest || append_to) ? &kw_iter : NULL, work->data, FALSE, NULL))
{
work = work->next;
continue;
}
if (have_dest)
+ {
+ gtk_tree_store_append(GTK_TREE_STORE(keyword_tree), &add, &kw_iter);
+ }
+ else if (append_to)
{
gtk_tree_store_insert_after(GTK_TREE_STORE(keyword_tree), &add, NULL, &kw_iter);
}
else
{
gtk_tree_store_append(GTK_TREE_STORE(keyword_tree), &add, NULL);
- have_dest = TRUE;
+ append_to = TRUE;
+ kw_iter = add;
}
- kw_iter = add;
- keyword_set(GTK_TREE_STORE(keyword_tree), &kw_iter, work->data, cdd->is_keyword);
+ keyword_set(GTK_TREE_STORE(keyword_tree), &add, work->data, cdd->is_keyword);
work = work->next;
}
}
cdd->pkd =pkd;
cdd->click_tpath = pkd->click_tpath;
pkd->click_tpath = NULL;
- cdd->is_keyword = is_keyword;
cdd->edit_existing = edit_existing;
cdd->gd = gd = generic_dialog_new(name ? _("Edit keyword") : _("Add keywords"), "keyword_edit",
group = pref_group_new(gd->vbox, FALSE, _("Keyword type:"), GTK_ORIENTATION_VERTICAL);
button = pref_radiobutton_new(group, NULL, _("Active keyword"),
- (cdd->is_keyword),
+ (is_keyword),
G_CALLBACK(bar_pane_keywords_conf_set_kw), cdd);
button = pref_radiobutton_new(group, button, _("Helper"),
- (!cdd->is_keyword),
+ (!is_keyword),
G_CALLBACK(bar_pane_keywords_conf_set_helper), cdd);
+
+ cdd->is_keyword = is_keyword;
+
g_free(name);
+ gtk_widget_grab_focus(cdd->edit_widget);
+
gtk_widget_show(gd->dialog);
}
gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &kw_iter, &iter);
- file_data_unregister_notify_func(bar_pane_keywords_notify_cb, pkd);
-
meta_data_connect_mark_with_keyword(keyword_tree, &kw_iter, mark);
-
- file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW);
-// bar_pane_keywords_update(pkd);
}
bar_keyword_tree_sync(pkd);
}
+/**
+ * \brief Callback for adding selected keyword to all selected images.
+ */
+static void bar_pane_keywords_add_to_selected_cb(GtkWidget *menu_widget, gpointer data)
+{
+ PaneKeywordsData *pkd = data;
+ GtkTreeIter iter; /* This is the iter which initial holds the current keyword */
+ GtkTreeIter child_iter;
+ GtkTreeModel *model;
+ GtkTreeModel *keyword_tree;
+ GList *list, *work;
+ GList *keywords = NULL;
+
+ GtkTextBuffer *keyword_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pkd->keyword_view));
+
+ /* Aquire selected keyword */
+ if (pkd->click_tpath)
+ {
+ gboolean is_keyword = TRUE;
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(pkd->keyword_treeview));
+ if (!gtk_tree_model_get_iter(model, &iter, pkd->click_tpath)) return;
+ gtk_tree_model_get(model, &iter, FILTER_KEYWORD_COLUMN_IS_KEYWORD, &is_keyword, -1);
+ if (!is_keyword) return;
+ }
+ else
+ return;
+
+ keyword_tree = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
+ gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &child_iter, &iter);
+
+ list = keyword_list_pull(pkd->keyword_view); /* Get the left keyword view */
+
+ /* Now set the current image */
+ keyword_tree_set(keyword_tree, &child_iter, &list);
+
+ keyword_list_push(pkd->keyword_view, list); /* Set the left keyword view */
+ string_list_free(list);
+
+ bar_pane_keywords_changed(keyword_buffer, pkd); /* Get list of all keywords in the hierarchy */
+
+ gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &child_iter, &iter);
+ keywords = keyword_tree_get(keyword_tree, &child_iter);
+
+ list = layout_selection_list(pkd->pane.lw);
+ work = list;
+ while (work)
+ {
+ FileData *fd = work->data;
+ work = work->next;
+ metadata_append_list(fd, KEYWORD_KEY, keywords);
+ }
+ filelist_free(list);
+ string_list_free(keywords);
+}
+
static void bar_pane_keywords_menu_popup(GtkWidget *widget, PaneKeywordsData *pkd, gint x, gint y)
{
GtkWidget *menu;
menu = popup_menu_short_lived();
+ menu_item_add_stock(menu, _("Add keyword"), GTK_STOCK_EDIT, G_CALLBACK(bar_pane_keywords_add_dialog_cb), pkd);
+
+ menu_item_add_divider(menu);
+
+ menu_item_add(menu, _("Add keyword to all selected images"), G_CALLBACK(bar_pane_keywords_add_to_selected_cb), pkd);
+
+ menu_item_add_divider(menu);
+
if (pkd->click_tpath)
{
/* for the entry */
text = g_strdup_printf(_("Edit \"%s\""), name);
menu_item_add_stock(menu, text, GTK_STOCK_EDIT, G_CALLBACK(bar_pane_keywords_edit_dialog_cb), pkd);
g_free(text);
- text = g_strdup_printf(_("Delete \"%s\""), name);
+ text = g_strdup_printf(_("Remove \"%s\""), name);
menu_item_add_stock(menu, text, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_keywords_delete_cb), pkd);
g_free(text);
menu_item_add_check(submenu, _("Collapse unchecked"), pkd->collapse_unchecked, G_CALLBACK(bar_pane_keywords_collapse_unchecked_toggle_cb), pkd);
menu_item_add_check(submenu, _("Hide unchecked"), pkd->hide_unchecked, G_CALLBACK(bar_pane_keywords_hide_unchecked_toggle_cb), pkd);
- menu_item_add_divider(menu);
-
- menu_item_add_stock(menu, _("Add keyword"), GTK_STOCK_EDIT, G_CALLBACK(bar_pane_keywords_add_dialog_cb), pkd);
-
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME);
}
GtkTreeModel *store;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
+ GtkTreeIter iter;
pkd = g_new0(PaneKeywordsData, 1);
gtk_widget_show(scrolled);
- if (!keyword_tree) keyword_tree_new_default();
+ if (!keyword_tree || !gtk_tree_model_get_iter_first(GTK_TREE_MODEL(keyword_tree), &iter))
+ {
+ /* keyword tree does not exist or is empty - fill with defaults */
+ keyword_tree_new_default();
+ }
store = gtk_tree_model_filter_new(GTK_TREE_MODEL(keyword_tree), NULL);
g_signal_connect(G_OBJECT(pkd->keyword_treeview), "drag_motion",
G_CALLBACK(bar_pane_keywords_dnd_motion), pkd);
- g_signal_connect(G_OBJECT(pkd->keyword_treeview), "button_press_event",
+ g_signal_connect(G_OBJECT(pkd->keyword_treeview), "button_release_event",
G_CALLBACK(bar_pane_keywords_menu_cb), pkd);
gtk_container_add(GTK_CONTAINER(scrolled), pkd->keyword_treeview);
projects / geeqie.git / blobdiff