/*
* Geeqie
* (C) 2005 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
*/
-#include "gqview.h"
+#include "main.h"
#include "search.h"
-#include "bar_info.h"
#include "cache.h"
#include "collect.h"
#include "collect-table.h"
#include "dnd.h"
#include "dupe.h"
-#include "image-load.h"
-#include "info.h"
#include "editors.h"
+#include "filedata.h"
+#include "image-load.h"
#include "img-view.h"
-#include "filelist.h"
-#include "layout_image.h"
+#include "layout.h"
#include "menu.h"
+#include "metadata.h"
+#include "misc.h"
#include "print.h"
#include "thumb.h"
-#include "utilops.h"
#include "ui_bookmark.h"
#include "ui_fileops.h"
#include "ui_menu.h"
#include "ui_spinner.h"
#include "ui_tabcomp.h"
#include "ui_tree_edit.h"
+#include "uri_utils.h"
+#include "utilops.h"
+#include "window.h"
+#include "bar_keywords.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
GtkWidget *menu_keywords;
GtkWidget *entry_keywords;
- gchar *search_path;
- gint search_path_recurse;
+ GtkWidget *check_comment;
+ GtkWidget *menu_comment;
+ GtkWidget *entry_comment;
+
+ FileData *search_dir_fd;
+ gboolean search_path_recurse;
gchar *search_name;
- gint search_name_match_case;
+ gboolean search_name_match_case;
gint64 search_size;
gint64 search_size_end;
gint search_date_y;
gchar *search_similarity_path;
CacheData *search_similarity_cd;
GList *search_keyword_list;
+ gchar *search_comment;
+ gboolean search_comment_match_case;
MatchType search_type;
MatchType match_date;
MatchType match_dimensions;
MatchType match_keywords;
+ MatchType match_comment;
gboolean match_name_enable;
gboolean match_size_enable;
gboolean match_dimensions_enable;
gboolean match_similarity_enable;
gboolean match_keywords_enable;
+ gboolean match_comment_enable;
GList *search_folder_list;
GList *search_done_list;
gint search_total;
gint search_buffer_count;
- gint search_idle_id;
- gint update_idle_id;
+ guint search_idle_id; /* event source id */
+ guint update_idle_id; /* event source id */
ImageLoader *img_loader;
CacheData *img_cd;
FileData *click_fd;
ThumbLoader *thumb_loader;
- gint thumb_enable;
+ gboolean thumb_enable;
FileData *thumb_fd;
};
{ N_("exclude"), SEARCH_MATCH_NONE }
};
+static const MatchList text_search_menu_comment[] = {
+ { N_("contains"), SEARCH_MATCH_CONTAINS },
+ { N_("miss"), SEARCH_MATCH_NONE }
+};
+
static GList *search_window_list = NULL;
static void search_window_close(SearchData *sd);
+static void search_notify_cb(FileData *fd, NotifyType type, gpointer data);
/*
*-------------------------------------------------------------------
gint64 t_bytes;
gint64 s_bytes;
gchar *tt;
- gchar *ts;
t = search_result_count(sd, &t_bytes);
s = search_result_selection_count(sd, &s_bytes);
+
+ tt = text_from_size_abrev(t_bytes);
if (s > 0)
{
- tt = text_from_size_abrev(t_bytes);
- ts = text_from_size_abrev(s_bytes);
+ gchar *ts = text_from_size_abrev(s_bytes);
buf = g_strdup_printf(_("%s, %d files (%s, %d)"), tt, t, ts, s);
- g_free(tt);
g_free(ts);
}
else
{
- tt = text_from_size_abrev(t_bytes);
buf = g_strdup_printf(_("%s, %d files"), tt, t);
- g_free(tt);
}
+ g_free(tt);
+
gtk_label_set_text(GTK_LABEL(sd->label_status), buf);
g_free(buf);
}
-static void search_progress_update(SearchData *sd, gint search, gdouble thumbs)
+static void search_progress_update(SearchData *sd, gboolean search, gdouble thumbs)
{
if (search || thumbs >= 0.0)
static gint search_result_find_row(SearchData *sd, FileData *fd, GtkTreeIter *iter)
{
GtkTreeModel *store;
- gint valid;
+ gboolean valid;
gint n = 0;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
return -1;
}
-static gint search_result_row_selected(SearchData *sd, FileData *fd)
+static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
{
GtkTreeModel *store;
GtkTreeSelection *selection;
GList *slist;
GList *work;
- gint found = FALSE;
+ gboolean found = FALSE;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
slist = gtk_tree_selection_get_selected_rows(selection, &store);
if (list) plist = g_list_prepend(plist, file_data_ref(mfd->fd));
}
-
+
work = work->next;
}
g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
gint n = 0;
gint64 total = 0;
GList *plist = NULL;
gtk_list_store_set(store, &iter,
SEARCH_COLUMN_POINTER, mfd,
SEARCH_COLUMN_RANK, mfd->rank,
- SEARCH_COLUMN_THUMB, fd->pixbuf,
+ SEARCH_COLUMN_THUMB, fd->thumb_pixbuf,
SEARCH_COLUMN_NAME, fd->name,
SEARCH_COLUMN_SIZE, text_size,
SEARCH_COLUMN_DATE, text_from_time(fd->date),
GList *list = NULL;
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
valid = gtk_tree_model_get_iter_first(store, &iter);
search_status_update(sd);
}
-static void search_result_edit_selected(SearchData *sd, gint n)
+static void search_result_edit_selected(SearchData *sd, const gchar *key)
{
- GList *list;
-
- list = search_result_selection_list(sd);
- start_editor_from_filelist(n, list);
- filelist_free(list);
+ file_util_start_editor_from_filelist(key, search_result_selection_list(sd), NULL, sd->window);
}
static void search_result_collection_from_selection(SearchData *sd)
filelist_free(list);
}
-static gint search_result_update_idle_cb(gpointer data)
+static gboolean search_result_update_idle_cb(gpointer data)
{
SearchData *sd = data;
search_status_update(sd);
- sd->update_idle_id = -1;
+ sd->update_idle_id = 0;
return FALSE;
}
static void search_result_update_idle_cancel(SearchData *sd)
{
- if (sd->update_idle_id != -1) g_source_remove(sd->update_idle_id);
- sd->update_idle_id = -1;
+ if (sd->update_idle_id)
+ {
+ g_source_remove(sd->update_idle_id);
+ sd->update_idle_id = 0;
+ }
}
static gboolean search_result_select_cb(GtkTreeSelection *selection, GtkTreeModel *store,
{
SearchData *sd = data;
- if (sd->update_idle_id == -1)
+ if (!sd->update_idle_id)
{
sd->update_idle_id = g_idle_add(search_result_update_idle_cb, sd);
}
if (search_result_find_row(sd, fd, &iter_n) >= 0) iter = &iter_n;
}
- if (iter) gtk_list_store_set(store, iter, SEARCH_COLUMN_THUMB, fd->pixbuf, -1);
+ if (iter) gtk_list_store_set(store, iter, SEARCH_COLUMN_THUMB, fd->thumb_pixbuf, -1);
}
static void search_result_thumb_do(SearchData *sd)
if (!sd->thumb_loader || !sd->thumb_fd) return;
fd = sd->thumb_fd;
- if (fd->pixbuf) g_object_unref(fd->pixbuf);
- fd->pixbuf = thumb_loader_get_pixbuf(sd->thumb_loader, TRUE);
-
search_result_thumb_set(sd, fd, NULL);
}
GtkTreeModel *store;
GtkTreeIter iter;
MatchFileData *mfd = NULL;
- gint valid;
+ gboolean valid;
gint row = 0;
gint length = 0;
- if (!sd->thumb_enable) return;
-
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
-
valid = gtk_tree_model_get_iter_first(store, &iter);
+ if (!sd->thumb_enable)
+ {
+ while (valid)
+ {
+ gtk_list_store_set(GTK_LIST_STORE(store), &iter, SEARCH_COLUMN_THUMB, NULL, -1);
+ valid = gtk_tree_model_iter_next(store, &iter);
+ }
+ return;
+ }
+
while (!mfd && valid)
{
GdkPixbuf *pixbuf;
length++;
gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, SEARCH_COLUMN_THUMB, &pixbuf, -1);
- if (pixbuf || mfd->fd->pixbuf)
+ if (pixbuf || mfd->fd->thumb_pixbuf)
{
- if (!pixbuf) gtk_list_store_set(GTK_LIST_STORE(store), &iter, SEARCH_COLUMN_THUMB, mfd->fd->pixbuf, -1);
+ if (!pixbuf) gtk_list_store_set(GTK_LIST_STORE(store), &iter, SEARCH_COLUMN_THUMB, mfd->fd->thumb_pixbuf, -1);
row++;
mfd = NULL;
}
sd->thumb_fd = mfd->fd;
thumb_loader_free(sd->thumb_loader);
- sd->thumb_loader = thumb_loader_new(thumb_max_width, thumb_max_height);
+ sd->thumb_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
thumb_loader_set_callbacks(sd->thumb_loader,
search_result_thumb_done_cb,
search_result_thumb_done_cb,
NULL,
sd);
- if (!thumb_loader_start(sd->thumb_loader, mfd->fd->path))
+ if (!thumb_loader_start(sd->thumb_loader, mfd->fd))
{
search_result_thumb_do(sd);
search_result_thumb_step(sd);
column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_THUMB - 1);
if (!column) return;
- gtk_tree_view_column_set_fixed_width(column, (sd->thumb_enable) ? thumb_max_width : 4);
+ gtk_tree_view_column_set_fixed_width(column, (sd->thumb_enable) ? options->thumbnails.max_width : 4);
- list = gtk_tree_view_column_get_cell_renderers(column);
+ list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
if (!list) return;
cell = list->data;
g_list_free(list);
- g_object_set(G_OBJECT(cell), "height", (sd->thumb_enable) ? thumb_max_height : -1, NULL);
+ g_object_set(G_OBJECT(cell), "height", (sd->thumb_enable) ? options->thumbnails.max_height : -1, NULL);
gtk_tree_view_columns_autosize(GTK_TREE_VIEW(sd->result_view));
}
-static void search_result_thumb_enable(SearchData *sd, gint enable)
+static void search_result_thumb_enable(SearchData *sd, gboolean enable)
{
if (sd->thumb_enable == enable) return;
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
thumb_loader_free(sd->thumb_loader);
sd->thumb_loader = NULL;
{
SearchData *sd = data;
- if (sd->click_fd) layout_image_set_fd(NULL, sd->click_fd);
+ if (sd->click_fd) layout_set_fd(NULL, sd->click_fd);
}
static void sr_menu_viewnew_cb(GtkWidget *widget, gpointer data)
static void sr_menu_edit_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd;
- gint n;
+ const gchar *key = data;
sd = submenu_item_get_data(widget);
- n = GPOINTER_TO_INT(data);
if (!sd) return;
- search_result_edit_selected(sd, n);
-}
-
-static void sr_menu_info_cb(GtkWidget *widget, gpointer data)
-{
- SearchData *sd = data;
-
- info_window_new(NULL, search_result_selection_list(sd));
+ search_result_edit_selected(sd, key);
}
static void sr_menu_collection_cb(GtkWidget *widget, gpointer data)
static void sr_menu_print_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd = data;
-
+
print_window_new(sd->click_fd, search_result_selection_list(sd),
search_result_get_filelist(sd), sd->window);
}
file_util_delete(NULL, search_result_selection_list(sd), sd->window);
}
+static void sr_menu_copy_path_cb(GtkWidget *widget, gpointer data)
+{
+ SearchData *sd = data;
+
+ file_util_copy_path_list_to_clipboard(search_result_selection_list(sd));
+}
+
static void sr_menu_remove_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd = data;
search_result_clear(sd);
}
-static GtkWidget *search_result_menu(SearchData *sd, gint on_row, gint empty)
+static void search_result_menu_destroy_cb(GtkWidget *widget, gpointer data)
+{
+ GList *editmenu_fd_list = data;
+
+ filelist_free(editmenu_fd_list);
+}
+
+static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean empty)
{
GtkWidget *menu;
GtkWidget *item;
+ GList *editmenu_fd_list;
menu = popup_menu_short_lived();
+
menu_item_add_sensitive(menu, _("_View"), on_row,
G_CALLBACK(sr_menu_view_cb), sd);
menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row,
menu_item_add_sensitive(menu, _("Select none"), !empty,
G_CALLBACK(sr_menu_select_none_cb), sd);
menu_item_add_divider(menu);
- submenu_add_edit(menu, &item, G_CALLBACK(sr_menu_edit_cb), sd);
+
+ editmenu_fd_list = search_result_selection_list(sd);
+ g_signal_connect(G_OBJECT(menu), "destroy",
+ G_CALLBACK(search_result_menu_destroy_cb), editmenu_fd_list);
+ submenu_add_edit(menu, &item, G_CALLBACK(sr_menu_edit_cb), sd, editmenu_fd_list);
if (!on_row) gtk_widget_set_sensitive(item, FALSE);
- menu_item_add_stock_sensitive(menu, _("_Properties"), GTK_STOCK_PROPERTIES, on_row,
- G_CALLBACK(sr_menu_info_cb), sd);
menu_item_add_stock_sensitive(menu, _("Add to new collection"), GTK_STOCK_INDEX, on_row,
G_CALLBACK(sr_menu_collection_cb), sd);
menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, on_row,
G_CALLBACK(sr_menu_rename_cb), sd);
menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
G_CALLBACK(sr_menu_delete_cb), sd);
+ menu_item_add_sensitive(menu, _("_Copy path"), on_row,
+ G_CALLBACK(sr_menu_copy_path_cb), sd);
menu_item_add_divider(menu);
menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
G_CALLBACK(sr_menu_remove_cb), sd);
*-------------------------------------------------------------------
*/
-static gint search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
SearchData *sd = data;
GtkTreeModel *store;
sd->click_fd = mfd ? mfd->fd : NULL;
- if (bevent->button == 3)
+ if (bevent->button == MOUSE_BUTTON_RIGHT)
{
GtkWidget *menu;
if (!mfd) return FALSE;
- if (bevent->button == 1 && bevent->type == GDK_2BUTTON_PRESS)
+ if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_2BUTTON_PRESS)
{
- layout_image_set_fd(NULL, mfd->fd);
+ layout_set_fd(NULL, mfd->fd);
}
- if (bevent->button == 2) return TRUE;
+ if (bevent->button == MOUSE_BUTTON_MIDDLE) return TRUE;
- if (bevent->button == 3)
+ if (bevent->button == MOUSE_BUTTON_RIGHT)
{
if (!search_result_row_selected(sd, mfd->fd))
{
return TRUE;
}
- if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS &&
+ if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_BUTTON_PRESS &&
!(bevent->state & GDK_SHIFT_MASK ) &&
!(bevent->state & GDK_CONTROL_MASK ) &&
search_result_row_selected(sd, mfd->fd))
return FALSE;
}
-static gint search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
SearchData *sd = data;
GtkTreeModel *store;
MatchFileData *mfd = NULL;
- if (bevent->button != 1 && bevent->button != 2) return TRUE;
+ if (bevent->button != MOUSE_BUTTON_LEFT && bevent->button != MOUSE_BUTTON_MIDDLE) return TRUE;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
gtk_tree_path_free(tpath);
}
- if (bevent->button == 2)
+ if (bevent->button == MOUSE_BUTTON_MIDDLE)
{
if (mfd && sd->click_fd == mfd->fd)
{
return FALSE;
}
-static gint search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
SearchData *sd = data;
- gint stop_signal = FALSE;
+ gboolean stop_signal = FALSE;
GtkTreeModel *store;
GtkTreeSelection *selection;
GList *slist;
if (event->state & GDK_CONTROL_MASK)
{
- gint edit_val = -1;
-
stop_signal = TRUE;
switch (event->keyval)
{
case '1':
- edit_val = 0;
- break;
case '2':
- edit_val = 1;
- break;
case '3':
- edit_val = 2;
- break;
case '4':
- edit_val = 3;
- break;
case '5':
- edit_val = 4;
- break;
case '6':
- edit_val = 5;
- break;
case '7':
- edit_val = 6;
- break;
case '8':
- edit_val = 7;
- break;
case '9':
- edit_val = 8;
- break;
case '0':
- edit_val = 9;
break;
case 'C': case 'c':
file_util_copy(NULL, search_result_selection_list(sd), NULL, widget);
case 'D': case 'd':
file_util_delete(NULL, search_result_selection_list(sd), widget);
break;
- case 'P': case 'p':
- info_window_new(NULL, search_result_selection_list(sd));
- break;
case 'A': case 'a':
if (event->state & GDK_SHIFT_MASK)
{
gtk_tree_selection_select_all(selection);
}
break;
- case GDK_Delete: case GDK_KP_Delete:
+ case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
search_result_clear(sd);
break;
default:
stop_signal = FALSE;
break;
}
-
- if (edit_val >= 0)
- {
- search_result_edit_selected(sd, edit_val);
- }
}
else
{
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Return: case GDK_KP_Enter:
- if (mfd) layout_image_set_fd(NULL, mfd->fd);
+ case GDK_KEY_Return: case GDK_KEY_KP_Enter:
+ if (mfd) layout_set_fd(NULL, mfd->fd);
break;
case 'V': case 'v':
{
filelist_free(list);
}
break;
- case GDK_Delete: case GDK_KP_Delete:
+ case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
search_result_remove_selection(sd);
break;
case 'C': case 'c':
search_result_collection_from_selection(sd);
break;
- case GDK_Menu:
- case GDK_F10:
+ case GDK_KEY_Menu:
+ case GDK_KEY_F10:
{
GtkWidget *menu;
break;
}
}
-
+
return stop_signal;
}
-static gint search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
SearchData *sd = data;
- gint stop_signal = FALSE;
+ gboolean stop_signal = FALSE;
if (event->state & GDK_CONTROL_MASK)
{
guint time, gpointer data)
{
SearchData *sd = data;
- gchar *uri_text;
- gint length;
GList *list;
- switch (info)
- {
- case TARGET_URI_LIST:
- case TARGET_TEXT_PLAIN:
- list = search_result_selection_list(sd);
- if (!list) return;
- uri_text = uri_text_from_filelist(list, &length, (info == TARGET_TEXT_PLAIN));
- filelist_free(list);
- break;
- default:
- uri_text = NULL;
- break;
- }
+ list = search_result_selection_list(sd);
+ if (!list) return;
- if (uri_text) gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uri_text, length);
- g_free(uri_text);
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
+ filelist_free(list);
}
static void search_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
}
if (sd->thumb_enable &&
- sd->click_fd && sd->click_fd->pixbuf)
+ sd->click_fd && sd->click_fd->thumb_pixbuf)
{
- dnd_set_drag_icon(widget, context, sd->click_fd->pixbuf, search_result_selection_count(sd, NULL));
+ dnd_set_drag_icon(widget, context, sd->click_fd->thumb_pixbuf, search_result_selection_count(sd, NULL));
}
}
G_CALLBACK(search_dnd_data_set), sd);
g_signal_connect(G_OBJECT(sd->result_view), "drag_begin",
G_CALLBACK(search_dnd_begin), sd);
-#if 0
- g_signal_connect(G_OBJECT(sd->result_view), "drag_end",
- G_CALLBACK(search_dnd_end), sd);
-#endif
-
}
/*
#define MATCH_IS_BETWEEN(val, a, b) (b > a ? (val >= a && val <= b) : (val >= b && val <= a))
-static gint search_step_cb(gpointer data);
+static gboolean search_step_cb(gpointer data);
static void search_buffer_flush(SearchData *sd)
static void search_stop(SearchData *sd)
{
- if (sd->search_idle_id != -1)
+ if (sd->search_idle_id)
{
g_source_remove(sd->search_idle_id);
- sd->search_idle_id = -1;
+ sd->search_idle_id = 0;
}
image_loader_free(sd->img_loader);
image_sim_free(sim);
}
- if (enable_thumb_caching &&
- sd->img_loader && sd->img_loader->fd)
+ if (options->thumbnails.enable_caching &&
+ sd->img_loader && image_loader_get_fd(sd->img_loader))
{
gchar *base;
const gchar *path;
mode_t mode = 0755;
- path = sd->img_loader->fd->path;
+ path = image_loader_get_fd(sd->img_loader)->path;
base = cache_get_location(CACHE_TYPE_SIM, path, FALSE, &mode);
- if (cache_ensure_dir_exists(base, mode))
+ if (recursive_mkdir_if_not_exists(base, mode))
{
g_free(cd->path);
cd->path = cache_get_location(CACHE_TYPE_SIM, path, TRUE, NULL);
if (cache_sim_data_save(cd))
{
- filetime_set(cd->path, filetime(sd->img_loader->fd->path));
+ filetime_set(cd->path, filetime(image_loader_get_fd(sd->img_loader)->path));
}
}
g_free(base);
static void search_file_load_done_cb(ImageLoader *il, gpointer data)
{
- SearchData *sd = data;
+ SearchData *sd = data;
search_file_load_process(sd, sd->img_cd);
}
-static gint search_file_do_extra(SearchData *sd, FileData *fd, gint *match,
- gint *width, gint *height, gint *simval)
+static gboolean search_file_do_extra(SearchData *sd, FileData *fd, gint *match,
+ gint *width, gint *height, gint *simval)
{
- gint new_data = FALSE;
- gint tmatch = TRUE;
- gint tested = FALSE;
+ gboolean new_data = FALSE;
+ gboolean tmatch = TRUE;
+ gboolean tested = FALSE;
if (!sd->img_cd)
{
(sd->match_similarity_enable && !sd->img_cd->similarity))
{
sd->img_loader = image_loader_new(fd);
- image_loader_set_error_func(sd->img_loader, search_file_load_done_cb, sd);
- if (image_loader_start(sd->img_loader, search_file_load_done_cb, sd))
+ g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd);
+ g_signal_connect(G_OBJECT(sd->img_loader), "done", (GCallback)search_file_load_done_cb, sd);
+ if (image_loader_start(sd->img_loader))
{
return TRUE;
}
value = (gint)result;
}
}
-
+
if (simval) *simval = value;
}
return FALSE;
}
-static gint search_file_next(SearchData *sd)
+static gboolean search_file_next(SearchData *sd)
{
FileData *fd;
- gint match = TRUE;
- gint tested = FALSE;
- gint extra_only = FALSE;
+ gboolean match = TRUE;
+ gboolean tested = FALSE;
+ gboolean extra_only = FALSE;
gint width = 0;
gint height = 0;
gint sim = 0;
}
else
{
- match = (strcasecmp(fd->name, sd->search_name) == 0);
+ match = (g_ascii_strcasecmp(fd->name, sd->search_name) == 0);
}
}
else if (sd->match_name == SEARCH_MATCH_CONTAINS)
tested = TRUE;
match = FALSE;
- if (comment_read(fd, &list, NULL))
+ list = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
+
+ if (list)
{
GList *needle;
GList *haystack;
if (sd->match_keywords == SEARCH_MATCH_ALL)
{
- gint found = TRUE;
+ gboolean found = TRUE;
needle = sd->search_keyword_list;
while (needle && found)
haystack = list;
while (haystack && !found)
{
- found = (strcasecmp((gchar *)needle->data,
+ found = (g_ascii_strcasecmp((gchar *)needle->data,
(gchar *)haystack->data) == 0);
haystack = haystack->next;
}
}
else if (sd->match_keywords == SEARCH_MATCH_ANY)
{
- gint found = FALSE;
+ gboolean found = FALSE;
needle = sd->search_keyword_list;
while (needle && !found)
haystack = list;
while (haystack && !found)
{
- found = (strcasecmp((gchar *)needle->data,
+ found = (g_ascii_strcasecmp((gchar *)needle->data,
(gchar *)haystack->data) == 0);
haystack = haystack->next;
}
}
else if (sd->match_keywords == SEARCH_MATCH_NONE)
{
- gint found = FALSE;
+ gboolean found = FALSE;
needle = sd->search_keyword_list;
while (needle && !found)
haystack = list;
while (haystack && !found)
{
- found = (strcasecmp((gchar *)needle->data,
+ found = (g_ascii_strcasecmp((gchar *)needle->data,
(gchar *)haystack->data) == 0);
haystack = haystack->next;
}
}
}
+ if (match && sd->match_comment_enable && sd->search_comment && strlen(sd->search_comment))
+ {
+ gchar *comment;
+
+ tested = TRUE;
+ match = FALSE;
+
+ comment = metadata_read_string(fd, COMMENT_KEY, METADATA_PLAIN);
+
+ if (comment)
+ {
+ if (!sd->search_comment_match_case)
+ {
+ gchar *tmp = g_utf8_strdown(comment, -1);
+ g_free(comment);
+ comment = tmp;
+ }
+
+ if (sd->match_comment == SEARCH_MATCH_CONTAINS)
+ {
+ match = (strstr(comment, sd->search_comment) != NULL);
+ }
+ else if (sd->match_comment == SEARCH_MATCH_NONE)
+ {
+ match = (strstr(comment, sd->search_comment) == NULL);
+ }
+ g_free(comment);
+ }
+ else
+ {
+ match = (sd->match_comment == SEARCH_MATCH_NONE);
+ }
+ }
+
if ((match || extra_only) &&
(sd->match_dimensions_enable || sd->match_similarity_enable))
{
return FALSE;
}
-static gint search_step_cb(gpointer data)
+static gboolean search_step_cb(gpointer data)
{
SearchData *sd = data;
FileData *fd;
{
if (search_file_next(sd))
{
- sd->search_idle_id = -1;
+ sd->search_idle_id = 0;
return FALSE;
}
return TRUE;
if (!sd->search_file_list && !sd->search_folder_list)
{
- sd->search_idle_id = -1;
+ sd->search_idle_id = 0;
search_stop(sd);
search_result_thumb_step(sd);
{
GList *list = NULL;
GList *dlist = NULL;
- gint success = FALSE;
+ gboolean success = FALSE;
sd->search_done_list = g_list_prepend(sd->search_done_list, fd);
if (sd->search_type == SEARCH_MATCH_NONE)
{
- success = filelist_read(fd->path, &list, &dlist);
+ success = filelist_read(fd, &list, &dlist);
}
else if (sd->search_type == SEARCH_MATCH_ALL &&
- sd->search_path &&
- strlen(fd->path) >= strlen(sd->search_path))
+ sd->search_dir_fd &&
+ strlen(fd->path) >= strlen(sd->search_dir_fd->path))
{
const gchar *path;
- path = fd->path + strlen(sd->search_path);
- if (path != fd->path) success = filelist_read(path, &list, NULL);
- success |= filelist_read(fd->path, NULL, &dlist);
+ path = fd->path + strlen(sd->search_dir_fd->path);
+ if (path != fd->path)
+ {
+ FileData *dir_fd = file_data_new_dir(path);
+ success = filelist_read(dir_fd, &list, NULL);
+ file_data_unref(dir_fd);
+ }
+ success |= filelist_read(fd, NULL, &dlist);
if (success)
{
GList *work;
search_stop(sd);
search_result_clear(sd);
- if (sd->search_path)
+ if (sd->search_dir_fd)
{
- sd->search_folder_list = g_list_prepend(sd->search_folder_list,
- file_data_new_simple(sd->search_path));
+ sd->search_folder_list = g_list_prepend(sd->search_folder_list, file_data_ref(sd->search_dir_fd));
}
if (!sd->search_name_match_case)
sd->search_name = tmp;
}
+ if (!sd->search_comment_match_case)
+ {
+ /* convert to lowercase here, so that this is only done once per search */
+ gchar *tmp = g_utf8_strdown(sd->search_comment, -1);
+ g_free(sd->search_comment);
+ sd->search_comment = tmp;
+ }
+
sd->search_count = 0;
sd->search_total = 0;
sd->search_similarity_cd = cache_sim_data_new();
}
- sd->img_loader = image_loader_new(file_data_new_simple(sd->search_similarity_path));
- image_loader_set_error_func(sd->img_loader, search_similarity_load_done_cb, sd);
- if (image_loader_start(sd->img_loader, search_similarity_load_done_cb, sd))
+ sd->img_loader = image_loader_new(file_data_new_group(sd->search_similarity_path));
+ g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_similarity_load_done_cb, sd);
+ g_signal_connect(G_OBJECT(sd->img_loader), "done", (GCallback)search_similarity_load_done_cb, sd);
+ if (image_loader_start(sd->img_loader))
{
return;
}
image_loader_free(sd->img_loader);
sd->img_loader = NULL;
}
-
+
}
sd->search_idle_id = g_idle_add(search_step_cb, sd);
g_free(sd->search_name);
sd->search_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->entry_name)));
+ /* XXX */
+ g_free(sd->search_comment);
+ sd->search_comment = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->entry_comment)));
+
g_free(sd->search_similarity_path);
sd->search_similarity_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->entry_similarity)));
if (sd->match_similarity_enable)
date_selection_get(sd->date_sel, &sd->search_date_d, &sd->search_date_m, &sd->search_date_y);
date_selection_get(sd->date_sel_end, &sd->search_date_end_d, &sd->search_date_end_m, &sd->search_date_end_y);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_DIMENSIONS - 1);
+ gtk_tree_view_column_set_visible(column, sd->match_dimensions_enable);
+
column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_RANK - 1);
gtk_tree_view_column_set_visible(column, sd->match_similarity_enable);
if (!sd->match_similarity_enable)
path = remove_trailing_slash(gtk_entry_get_text(GTK_ENTRY(sd->path_entry)));
if (isdir(path))
{
- g_free(sd->search_path);
- sd->search_path = path;
- path = NULL;
+ file_data_unref(sd->search_dir_fd);
+ sd->search_dir_fd = file_data_new_dir(path);
- tab_completion_append_to_history(sd->path_entry, sd->search_path);
+ tab_completion_append_to_history(sd->path_entry, sd->search_dir_fd->path);
search_start(sd);
}
else if (sd->search_type == SEARCH_MATCH_ALL)
{
/* search metadata */
-
- g_free(sd->search_path);
- sd->search_path = g_strconcat(homedir(), "/", GQVIEW_CACHE_RC_METADATA, NULL);
-
+ file_data_unref(sd->search_dir_fd);
+ sd->search_dir_fd = file_data_new_dir(get_metadata_cache_dir());
search_start(sd);
}
else if (sd->search_type == SEARCH_MATCH_CONTAINS)
list = search_result_refine_list(sd);
- g_free(sd->search_path);
- sd->search_path = NULL;
+ file_data_unref(sd->search_dir_fd);
+ sd->search_dir_fd = NULL;
search_start(sd);
return 0;
break;
case SEARCH_COLUMN_NAME:
- return CASE_SORT(fda->fd->name, fdb->fd->name);
+ if (options->file_sort.case_sensitive)
+ return strcmp(fda->fd->collate_key_name, fdb->fd->collate_key_name);
+ else
+ return strcmp(fda->fd->collate_key_name_nocase, fdb->fd->collate_key_name_nocase);
break;
case SEARCH_COLUMN_SIZE:
if (fda->fd->size > fdb->fd->size) return 1;
return sort_matchdata_dimensions(fda, fdb);
break;
case SEARCH_COLUMN_PATH:
- return CASE_SORT(fda->fd->path, fdb->fd->path);
+ return utf8_compare(fda->fd->path, fdb->fd->path, options->file_sort.case_sensitive);
break;
default:
break;
return 0;
}
-static void search_result_add_column(SearchData * sd, gint n, const gchar *title, gint image, gint right_justify)
+static void search_result_add_column(SearchData * sd, gint n, const gchar *title, gboolean image, gboolean right_justify)
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
gtk_tree_view_append_column(GTK_TREE_VIEW(sd->result_view), column);
}
-static void menu_choice_set_visible(GtkWidget *widget, gint visible)
+static void menu_choice_set_visible(GtkWidget *widget, gboolean visible)
{
if (visible)
{
- if (!GTK_WIDGET_VISIBLE(widget)) gtk_widget_show(widget);
+ if (!gtk_widget_get_visible(widget)) gtk_widget_show(widget);
}
else
{
- if (GTK_WIDGET_VISIBLE(widget)) gtk_widget_hide(widget);
+ if (gtk_widget_get_visible(widget)) gtk_widget_hide(widget);
}
}
-static void menu_choice_path_cb(GtkWidget *combo, gpointer data)
+static gboolean menu_choice_get_match_type(GtkWidget *combo, MatchType *type)
{
- SearchData *sd = data;
GtkTreeModel *store;
GtkTreeIter iter;
store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
- if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return;
- gtk_tree_model_get(store, &iter, MENU_CHOICE_COLUMN_VALUE, &sd->search_type, -1);
+ if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return FALSE;
+ gtk_tree_model_get(store, &iter, MENU_CHOICE_COLUMN_VALUE, type, -1);
+ return TRUE;
+}
+
+static void menu_choice_path_cb(GtkWidget *combo, gpointer data)
+{
+ SearchData *sd = data;
+
+ if (!menu_choice_get_match_type(combo, &sd->search_type)) return;
menu_choice_set_visible(gtk_widget_get_parent(sd->check_recurse),
(sd->search_type == SEARCH_MATCH_NONE));
static void menu_choice_name_cb(GtkWidget *combo, gpointer data)
{
SearchData *sd = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
- if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return;
- gtk_tree_model_get(store, &iter, MENU_CHOICE_COLUMN_VALUE, &sd->match_name, -1);
+ if (!menu_choice_get_match_type(combo, &sd->match_name)) return;
}
static void menu_choice_size_cb(GtkWidget *combo, gpointer data)
{
SearchData *sd = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
- if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return;
- gtk_tree_model_get(store, &iter, MENU_CHOICE_COLUMN_VALUE, &sd->match_size, -1);
+ if (!menu_choice_get_match_type(combo, &sd->match_size)) return;
menu_choice_set_visible(gtk_widget_get_parent(sd->spin_size_end),
(sd->match_size == SEARCH_MATCH_BETWEEN));
static void menu_choice_date_cb(GtkWidget *combo, gpointer data)
{
SearchData *sd = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
- if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return;
- gtk_tree_model_get(store, &iter, MENU_CHOICE_COLUMN_VALUE, &sd->match_date, -1);
+ if (!menu_choice_get_match_type(combo, &sd->match_date)) return;
menu_choice_set_visible(gtk_widget_get_parent(sd->date_sel_end),
(sd->match_date == SEARCH_MATCH_BETWEEN));
static void menu_choice_dimensions_cb(GtkWidget *combo, gpointer data)
{
SearchData *sd = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
- if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return;
- gtk_tree_model_get(store, &iter, MENU_CHOICE_COLUMN_VALUE, &sd->match_dimensions, -1);
+ if (!menu_choice_get_match_type(combo, &sd->match_dimensions)) return;
menu_choice_set_visible(gtk_widget_get_parent(sd->spin_width_end),
(sd->match_dimensions == SEARCH_MATCH_BETWEEN));
static void menu_choice_keyword_cb(GtkWidget *combo, gpointer data)
{
SearchData *sd = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
- if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return;
- gtk_tree_model_get(store, &iter, MENU_CHOICE_COLUMN_VALUE, &sd->match_keywords, -1);
+ if (!menu_choice_get_match_type(combo, &sd->match_keywords)) return;
+}
+
+static void menu_choice_comment_cb(GtkWidget *combo, gpointer data)
+{
+ SearchData *sd = data;
+
+ if (!menu_choice_get_match_type(combo, &sd->match_comment)) return;
}
static void menu_choice_spin_cb(GtkAdjustment *adjustment, gpointer data)
gtk_widget_destroy(sd->window);
}
-static gint search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
{
SearchData *sd = data;
search_stop(sd);
search_result_clear(sd);
- g_free(sd->search_path);
+ file_data_unref(sd->search_dir_fd);
+
g_free(sd->search_name);
+ g_free(sd->search_comment);
g_free(sd->search_similarity_path);
string_list_free(sd->search_keyword_list);
+ file_data_unregister_notify_func(search_notify_cb, sd);
+
g_free(sd);
}
-void search_new(const gchar *path, const gchar *example_file)
+void search_new(FileData *dir_fd, FileData *example_file)
{
SearchData *sd;
GtkWidget *vbox;
sd = g_new0(SearchData, 1);
- sd->search_path = g_strdup(path);
+ sd->search_dir_fd = file_data_ref(dir_fd);
sd->search_path_recurse = TRUE;
sd->search_size = 0;
sd->search_width = 640;
sd->search_height = 480;
sd->search_width_end = 1024;
sd->search_height_end = 768;
- sd->search_name = NULL;
- sd->search_name_match_case = FALSE;
sd->search_type = SEARCH_MATCH_NONE;
sd->match_date = SEARCH_MATCH_EQUAL;
sd->match_dimensions = SEARCH_MATCH_EQUAL;
sd->match_keywords = SEARCH_MATCH_ALL;
+ sd->match_comment = SEARCH_MATCH_CONTAINS;
sd->match_name_enable = TRUE;
- sd->match_size_enable = FALSE;
- sd->match_date_enable = FALSE;
- sd->match_dimensions_enable = FALSE;
- sd->match_similarity_enable = FALSE;
- sd->match_keywords_enable = FALSE;
sd->search_similarity = 95;
- sd->search_similarity_path = g_strdup(example_file);
- sd->search_similarity_cd = NULL;
-
- sd->search_idle_id = -1;
- sd->update_idle_id = -1;
+
+ if (example_file)
+ {
+ sd->search_similarity_path = g_strdup(example_file->path);
+ }
- sd->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- window_set_icon(sd->window, NULL, NULL);
+ sd->window = window_new(GTK_WINDOW_TOPLEVEL, "search", NULL, NULL, _("Image search"));
gtk_window_set_resizable(GTK_WINDOW(sd->window), TRUE);
- gtk_window_set_title(GTK_WINDOW(sd->window), _("Image search - Geeqie"));
- gtk_window_set_wmclass(GTK_WINDOW(sd->window), "search", "Geeqie");
- geometry.min_width = 32;
- geometry.min_height = 32;
+ geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
+ geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.base_width = DEF_SEARCH_WIDTH;
geometry.base_height = DEF_SEARCH_HEIGHT;
gtk_window_set_geometry_hints(GTK_WINDOW(sd->window), NULL, &geometry,
gtk_widget_show(sd->menu_path);
hbox2 = pref_box_new(hbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- combo = tab_completion_new_with_history(&sd->path_entry, sd->search_path,
+ combo = tab_completion_new_with_history(&sd->path_entry, sd->search_dir_fd->path,
"search_path", -1,
NULL, NULL);
tab_completion_add_select_button(sd->path_entry, NULL, TRUE);
sd->check_recurse = pref_checkbox_new_int(hbox2, _("Recurse"),
sd->search_path_recurse, &sd->search_path_recurse);
+ /* Search for file name */
hbox = menu_choice(sd->box_search, &sd->check_name, &sd->menu_name,
_("File name"), &sd->match_name_enable,
text_search_menu_name, sizeof(text_search_menu_name) / sizeof(MatchList),
pref_checkbox_new_int(hbox, _("Match case"),
sd->search_name_match_case, &sd->search_name_match_case);
+ /* Search for file size */
hbox = menu_choice(sd->box_search, &sd->check_size, &sd->menu_size,
_("File size is"), &sd->match_size_enable,
text_search_menu_size, sizeof(text_search_menu_size) / sizeof(MatchList),
sd->spin_size_end = menu_spin(hbox2, 0, 1024*1024*1024, sd->search_size_end,
G_CALLBACK(menu_choice_spin_cb), &sd->search_size_end);
+ /* Search for file date */
hbox = menu_choice(sd->box_search, &sd->check_date, &sd->menu_date,
_("File date is"), &sd->match_date_enable,
text_search_menu_date, sizeof(text_search_menu_date) / sizeof(MatchList),
gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
gtk_widget_show(sd->date_sel_end);
+ /* Search for image dimensions */
hbox = menu_choice(sd->box_search, &sd->check_dimensions, &sd->menu_dimensions,
_("Image dimensions are"), &sd->match_dimensions_enable,
text_search_menu_size, sizeof(text_search_menu_size) / sizeof(MatchList),
sd->spin_height_end = menu_spin(hbox2, 0, 1000000, sd->search_height_end,
G_CALLBACK(menu_choice_spin_cb), &sd->search_height_end);
+ /* Search for image similarity */
hbox = menu_choice(sd->box_search, &sd->check_similarity, NULL,
_("Image content is"), &sd->match_similarity_enable,
NULL, 0, NULL, sd);
gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
gtk_widget_show(combo);
+ /* Search for image keywords */
hbox = menu_choice(sd->box_search, &sd->check_keywords, &sd->menu_keywords,
_("Keywords"), &sd->match_keywords_enable,
text_search_menu_keyword, sizeof(text_search_menu_keyword) / sizeof(MatchList),
G_CALLBACK(menu_choice_check_cb), sd->entry_keywords);
gtk_widget_show(sd->entry_keywords);
+ /* Search for image comment */
+ hbox = menu_choice(sd->box_search, &sd->check_comment, &sd->menu_comment,
+ _("Comment"), &sd->match_comment_enable,
+ text_search_menu_comment, sizeof(text_search_menu_comment) / sizeof(MatchList),
+ G_CALLBACK(menu_choice_comment_cb), sd);
+ sd->entry_comment = gtk_entry_new();
+ gtk_box_pack_start(GTK_BOX(hbox), sd->entry_comment, TRUE, TRUE, 0);
+ gtk_widget_set_sensitive(sd->entry_comment, sd->match_comment_enable);
+ g_signal_connect(G_OBJECT(sd->check_comment), "toggled",
+ G_CALLBACK(menu_choice_check_cb), sd->entry_comment);
+ gtk_widget_show(sd->entry_comment);
+ pref_checkbox_new_int(hbox, _("Match case"),
+ sd->search_comment_match_case, &sd->search_comment_match_case);
+
+ /* Done the types of searches */
+
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(sd->result_view), TRUE);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(sd->result_view), FALSE);
-#if 0
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_NAME);
-#endif
-
search_result_add_column(sd, SEARCH_COLUMN_RANK, _("Rank"), FALSE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_THUMB, "", TRUE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_NAME, _("Name"), FALSE, FALSE);
search_window_list = g_list_append(search_window_list, sd);
+ file_data_register_notify_func(search_notify_cb, sd, NOTIFY_PRIORITY_MEDIUM);
+
gtk_widget_show(sd->window);
}
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
valid = gtk_tree_model_get_iter_first(store, &iter);
}
}
-void search_maint_renamed(FileData *fd)
+static void search_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
- GList *work;
+ SearchData *sd = data;
- work = search_window_list;
- while (work)
- {
- SearchData *sd = work->data;
- work = work->next;
+ if (!(type & NOTIFY_CHANGE) || !fd->change) return;
- search_result_change_path(sd, fd);
+ DEBUG_1("Notify search: %s %04x", fd->path, type);
+
+ switch (fd->change->type)
+ {
+ case FILEDATA_CHANGE_MOVE:
+ case FILEDATA_CHANGE_RENAME:
+ case FILEDATA_CHANGE_DELETE:
+ search_result_change_path(sd, fd);
+ break;
+ case FILEDATA_CHANGE_COPY:
+ case FILEDATA_CHANGE_UNSPECIFIED:
+ case FILEDATA_CHANGE_WRITE_METADATA:
+ break;
}
}
-
-void search_maint_removed(FileData *fd)
-{
- search_maint_renamed(fd);
-}
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff