#include "image-load.h"
#include "img-view.h"
#include "layout.h"
+#include "layout_util.h"
#include "math.h"
#include "menu.h"
#include "metadata.h"
#include "misc.h"
+#include "pixbuf_util.h"
#include "print.h"
#include "thumb.h"
#include "ui_bookmark.h"
#define DEF_SEARCH_WIDTH 700
-#define DEF_SEARCH_HEIGHT 450
+#define DEF_SEARCH_HEIGHT 650
#define SEARCH_BUFFER_MATCH_LOAD 20
#define SEARCH_BUFFER_MATCH_HIT 5
#define SEARCH_BUFFER_MATCH_MISS 1
#define SEARCH_BUFFER_FLUSH_SIZE 99
+#define FORMAT_CLASS_BROKEN FILE_FORMAT_CLASSES + 1
+
typedef enum {
SEARCH_MATCH_NONE,
SEARCH_MATCH_EQUAL,
SEARCH_MATCH_CONTAINS,
+ SEARCH_MATCH_NAME_EQUAL,
+ SEARCH_MATCH_NAME_CONTAINS,
+ SEARCH_MATCH_PATH_CONTAINS,
SEARCH_MATCH_UNDER,
SEARCH_MATCH_OVER,
SEARCH_MATCH_BETWEEN,
SEARCH_MATCH_ALL,
- SEARCH_MATCH_ANY
+ SEARCH_MATCH_ANY,
+ SEARCH_MATCH_COLLECTION
} MatchType;
enum {
GtkWidget *label_progress;
GtkWidget *button_start;
GtkWidget *button_stop;
+ GtkWidget *button_close;
+ GtkWidget *button_help;
GtkWidget *spinner;
+ GtkWidget *collection;
+ GtkWidget *fd_button;
+ GtkWidget *collection_entry;
+
GtkWidget *box_search;
GtkWidget *menu_path;
GtkWidget *menu_date;
GtkWidget *date_sel;
GtkWidget *date_sel_end;
+ GtkWidget *date_type;
GtkWidget *check_dimensions;
GtkWidget *menu_dimensions;
GtkWidget *spin_rating;
GtkWidget *spin_rating_end;
+ GtkWidget *check_class;
+ GtkWidget *menu_class;
+ GtkWidget *class_type;
+ GtkWidget *marks_type;
+ GtkWidget *menu_marks;
+
FileData *search_dir_fd;
gboolean search_path_recurse;
gchar *search_name;
+ GRegex *search_name_regex;
gboolean search_name_match_case;
gint64 search_size;
gint64 search_size_end;
CacheData *search_similarity_cd;
GList *search_keyword_list;
gchar *search_comment;
+ GRegex *search_comment_regex;
gint search_rating;
gint search_rating_end;
gboolean search_comment_match_case;
- gboolean search_date_exif;
MatchType search_type;
MatchType match_comment;
MatchType match_rating;
MatchType match_gps;
+ MatchType match_class;
+ MatchType match_marks;
gboolean match_name_enable;
gboolean match_size_enable;
gboolean match_keywords_enable;
gboolean match_comment_enable;
gboolean match_rating_enable;
+ gboolean match_class_enable;
+ gboolean match_marks_enable;
+ gboolean match_broken_enable;
GList *search_folder_list;
GList *search_done_list;
static const MatchList text_search_menu_path[] = {
{ N_("folder"), SEARCH_MATCH_NONE },
{ N_("comments"), SEARCH_MATCH_ALL },
- { N_("results"), SEARCH_MATCH_CONTAINS }
+ { N_("results"), SEARCH_MATCH_CONTAINS },
+ { N_("collection"), SEARCH_MATCH_COLLECTION }
};
static const MatchList text_search_menu_name[] = {
- { N_("contains"), SEARCH_MATCH_CONTAINS },
- { N_("is"), SEARCH_MATCH_EQUAL }
+ { N_("name contains"), SEARCH_MATCH_NAME_CONTAINS },
+ { N_("name is"), SEARCH_MATCH_NAME_EQUAL },
+ { N_("path contains"), SEARCH_MATCH_PATH_CONTAINS }
};
static const MatchList text_search_menu_size[] = {
{ N_("greater than"), SEARCH_MATCH_OVER }
};
+static const MatchList text_search_menu_class[] = {
+ { N_("is"), SEARCH_MATCH_EQUAL },
+ { N_("is not"), SEARCH_MATCH_NONE }
+};
+
+static const MatchList text_search_menu_marks[] = {
+ { N_("is"), SEARCH_MATCH_EQUAL },
+ { N_("is not"), 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);
+static void search_start_cb(GtkWidget *widget, gpointer data);
+void mfd_list_free(GList *list);
/*
*-------------------------------------------------------------------
return -1;
}
+
static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
{
GtkTreeModel *store;
if (mfd_n->fd == fd) found = TRUE;
work = work->next;
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
g_list_free(slist);
return found;
work = work->next;
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
g_list_free(slist);
if (bytes) *bytes = total;
flist = g_list_prepend(flist, mfd->fd);
work = work->next;
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
g_list_free(slist);
work = flist;
static void search_result_thumb_enable(SearchData *sd, gboolean enable)
{
+ GtkTreeViewColumn *column;
+
if (sd->thumb_enable == enable) return;
if (sd->thumb_enable)
search_progress_update(sd, TRUE, -1.0);
}
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_THUMB - 1);
+ if (column)
+ {
+ gtk_tree_view_column_set_visible(column, enable);
+ }
+
sd->thumb_enable = enable;
search_result_thumb_height(sd);
search_result_edit_selected(sd, key);
}
-static void sr_menu_collection_cb(GtkWidget *widget, gpointer data)
-{
- SearchData *sd = data;
-
- search_result_collection_from_selection(sd);
-}
-
static void sr_menu_print_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd = data;
{
SearchData *sd = data;
+ options->file_ops.safe_delete_enable = FALSE;
+ file_util_delete(NULL, search_result_selection_list(sd), sd->window);
+}
+
+static void sr_menu_move_to_trash_cb(GtkWidget *widget, gpointer data)
+{
+ SearchData *sd = data;
+
+ options->file_ops.safe_delete_enable = TRUE;
file_util_delete(NULL, search_result_selection_list(sd), sd->window);
}
{
SearchData *sd = data;
- file_util_copy_path_list_to_clipboard(search_result_selection_list(sd));
+ file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), TRUE);
}
-static void sr_menu_remove_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd = data;
- search_result_remove_selection(sd);
+ file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), FALSE);
}
-static void sr_menu_clear_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_play_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd = data;
- search_result_clear(sd);
+ start_editor_from_file(options->image_l_click_video_editor, sd->click_fd);
}
static void search_result_menu_destroy_cb(GtkWidget *widget, gpointer data)
GtkWidget *menu;
GtkWidget *item;
GList *editmenu_fd_list;
- GtkWidget *submenu;
+ gboolean video;
menu = popup_menu_short_lived();
+ video = (on_row && sd->click_fd && sd->click_fd->format_class == FORMAT_CLASS_VIDEO);
+ menu_item_add_stock_sensitive(menu, _("_Play"), GTK_STOCK_MEDIA_PLAY, video,
+ G_CALLBACK(sr_menu_play_cb), sd);
+ menu_item_add_divider(menu);
+
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,
submenu_add_edit(menu, &item, G_CALLBACK(sr_menu_edit_cb), sd, editmenu_fd_list);
if (!on_row) gtk_widget_set_sensitive(item, FALSE);
- submenu = submenu_add_collections(menu, &item,
+ submenu_add_collections(menu, &item,
G_CALLBACK(search_pop_menu_collections_cb), sd);
gtk_widget_set_sensitive(item, on_row);
G_CALLBACK(sr_menu_rename_cb), sd);
menu_item_add_sensitive(menu, _("_Copy path"), on_row,
G_CALLBACK(sr_menu_copy_path_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 unquoted"), on_row,
+ G_CALLBACK(sr_menu_copy_path_unquoted_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);
- menu_item_add_stock_sensitive(menu, _("C_lear"), GTK_STOCK_CLEAR, !empty,
- G_CALLBACK(sr_menu_clear_cb), sd);
+ menu_item_add_stock_sensitive(menu,
+ options->file_ops.confirm_move_to_trash ? _("Move to Trash...") :
+ _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, on_row,
+ G_CALLBACK(sr_menu_move_to_trash_cb), sd);
+ menu_item_add_stock_sensitive(menu,
+ options->file_ops.confirm_delete ? _("_Delete...") :
+ _("_Delete"), GTK_STOCK_DELETE, on_row,
+ G_CALLBACK(sr_menu_delete_cb), sd);
return menu;
}
return FALSE;
}
+
static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
SearchData *sd = data;
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, -1);
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
g_list_free(slist);
if (event->state & GDK_CONTROL_MASK)
file_util_rename(NULL, search_result_selection_list(sd), widget);
break;
case 'D': case 'd':
+ options->file_ops.safe_delete_enable = TRUE;
file_util_delete(NULL, search_result_selection_list(sd), widget);
break;
case 'A': case 'a':
search_result_menu_pos_cb, sd, 0, GDK_CURRENT_TIME);
}
break;
- case GDK_KEY_F1:
- help_window_show("GuideReferenceKeyboardShortcuts.html#SearchKeyboardShortcuts");
- break;
default:
stop_signal = FALSE;
break;
case 'W': case 'w':
search_window_close(sd);
break;
+ case GDK_KEY_Return: case GDK_KEY_KP_Enter:
+ search_start_cb(NULL, sd);
+ break;
default:
stop_signal = FALSE;
break;
}
}
+ if (!stop_signal && is_help_key(event))
+ {
+ help_window_show("GuideImageSearchSearch.html");
+ stop_signal = TRUE;
+ }
return stop_signal;
}
}
}
+static void search_path_entry_dnd_received_cb(GtkWidget *pane, GdkDragContext *context,
+ gint x, gint y,
+ GtkSelectionData *selection_data, guint info,
+ guint time, gpointer data)
+{
+ SearchData *sd = data;
+ GList *list;
+ FileData *fd;
+
+ if (info == TARGET_URI_LIST)
+ {
+ list = uri_filelist_from_gtk_selection_data(selection_data);
+ /* If more than one file, use only the first file in a list.
+ */
+ if (list != NULL)
+ {
+ fd = list->data;
+ gtk_entry_set_text(GTK_ENTRY(sd->path_entry),
+ g_strdup_printf("%s", fd->path));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(sd->path_entry),g_strdup_printf("%s", fd->path));
+ }
+ }
+
+ if (info == TARGET_TEXT_PLAIN)
+ {
+ gtk_entry_set_text(GTK_ENTRY(sd->path_entry),"");
+ }
+}
+
+static void search_image_content_dnd_received_cb(GtkWidget *pane, GdkDragContext *context,
+ gint x, gint y,
+ GtkSelectionData *selection_data, guint info,
+ guint time, gpointer data)
+{
+ SearchData *sd = data;
+ GList *list;
+ FileData *fd;
+
+ if (info == TARGET_URI_LIST)
+ {
+ list = uri_filelist_from_gtk_selection_data(selection_data);
+ /* If more than one file, use only the first file in a list.
+ */
+ if (list != NULL)
+ {
+ fd = list->data;
+ gtk_entry_set_text(GTK_ENTRY(sd->entry_similarity),
+ g_strdup_printf("%s", fd->path));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(sd->entry_similarity),g_strdup_printf("%s", fd->path));
+ }
+ }
+
+ if (info == TARGET_TEXT_PLAIN)
+ {
+ gtk_entry_set_text(GTK_ENTRY(sd->entry_similarity),"");
+ }
+}
+
static void search_dnd_init(SearchData *sd)
{
gtk_drag_source_set(sd->result_view, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
g_signal_connect(G_OBJECT(sd->entry_gps_coord), "drag_data_received",
G_CALLBACK(search_gps_dnd_received_cb), sd);
+
+ gtk_drag_dest_set(GTK_WIDGET(sd->path_entry),
+ GTK_DEST_DEFAULT_ALL,
+ result_drop_types, n_result_drop_types,
+ GDK_ACTION_COPY);
+
+ g_signal_connect(G_OBJECT(sd->path_entry), "drag_data_received",
+ G_CALLBACK(search_path_entry_dnd_received_cb), sd);
+
+ gtk_drag_dest_set(GTK_WIDGET(sd->entry_similarity),
+ GTK_DEST_DEFAULT_ALL,
+ result_drop_types, n_result_drop_types,
+ GDK_ACTION_COPY);
+
+ g_signal_connect(G_OBJECT(sd->entry_similarity), "drag_data_received",
+ G_CALLBACK(search_image_content_dnd_received_cb), sd);
}
/*
filelist_free(sd->search_file_list);
sd->search_file_list = NULL;
+ sd->match_broken_enable = FALSE;
+
gtk_widget_set_sensitive(sd->box_search, TRUE);
spinner_set_interval(sd->spinner, -1);
gtk_widget_set_sensitive(sd->button_start, TRUE);
pixbuf = image_loader_get_pixbuf(sd->img_loader);
- if (cd && pixbuf)
+ /* Used to determine if image is broken
+ */
+ if (cd && !pixbuf)
+ {
+ if (!cd->dimensions)
+ {
+ cache_sim_data_set_dimensions(cd, -1, -1);
+ }
+ }
+ else if (cd && pixbuf)
{
if (!cd->dimensions)
{
if (new_data)
{
- if ((sd->match_dimensions_enable && !sd->img_cd->dimensions) ||
- (sd->match_similarity_enable && !sd->img_cd->similarity))
+ if ((sd->match_dimensions_enable && !sd->img_cd->dimensions) || (sd->match_similarity_enable && !sd->img_cd->similarity) || sd->match_broken_enable)
{
sd->img_loader = image_loader_new(fd);
g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd);
}
}
+ if (sd->match_broken_enable)
+ {
+ tested = TRUE;
+ tmatch = FALSE;
+ if (sd->match_class == SEARCH_MATCH_EQUAL && sd->img_cd->width == -1)
+ {
+ tmatch = TRUE;
+ }
+ else if (sd->match_class == SEARCH_MATCH_NONE && sd->img_cd->width != -1)
+ {
+ tmatch = TRUE;
+ }
+ }
+
if (tmatch && sd->match_dimensions_enable && sd->img_cd->dimensions)
{
CacheData *cd = sd->img_cd;
tmatch = FALSE;
tested = TRUE;
- /* fixme: implement similarity checking */
+ /** @FIXME implement similarity checking */
if (sd->search_similarity_cd && sd->search_similarity_cd->similarity)
{
gdouble result;
tested = TRUE;
match = FALSE;
- if (sd->match_name == SEARCH_MATCH_EQUAL)
+ if (sd->match_name == SEARCH_MATCH_NAME_EQUAL)
{
if (sd->search_name_match_case)
{
match = (g_ascii_strcasecmp(fd->name, sd->search_name) == 0);
}
}
- else if (sd->match_name == SEARCH_MATCH_CONTAINS)
+ else if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS || sd->match_name == SEARCH_MATCH_PATH_CONTAINS)
{
+ const gchar *fd_name_or_path;
+ if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS)
+ {
+ fd_name_or_path = fd->name;
+ }
+ else
+ {
+ fd_name_or_path = fd->path;
+ }
if (sd->search_name_match_case)
{
- match = (strstr(fd->name, sd->search_name) != NULL);
+ match = g_regex_match(sd->search_name_regex, fd_name_or_path, 0, NULL);
}
else
{
/* sd->search_name is converted in search_start() */
- gchar *haystack = g_utf8_strdown(fd->name, -1);
- match = (strstr(haystack, sd->search_name) != NULL);
+ gchar *haystack = g_utf8_strdown(fd_name_or_path, -1);
+ match = g_regex_match(sd->search_name_regex, haystack, 0, NULL);
g_free(haystack);
}
}
tested = TRUE;
match = FALSE;
- if (sd->search_date_exif)
+ if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->date_type)), _("Changed")) == 0)
+ {
+ file_date = fd->cdate;
+ }
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->date_type)), _("Original")) == 0)
{
read_exif_time_data(fd);
file_date = fd->exifdate;
}
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->date_type)), _("Digitized")) == 0)
+ {
+ read_exif_time_digitized_data(fd);
+ file_date = fd->exifdate_digitized;
+ }
else
{
file_date = fd->date;
if (sd->match_comment == SEARCH_MATCH_CONTAINS)
{
- match = (strstr(comment, sd->search_comment) != NULL);
+ match = g_regex_match(sd->search_comment_regex, comment, 0, NULL);
}
else if (sd->match_comment == SEARCH_MATCH_NONE)
{
- match = (strstr(comment, sd->search_comment) == NULL);
+ match = !g_regex_match(sd->search_comment_regex, comment, 0, NULL);
}
g_free(comment);
}
}
}
+ if (match && sd->match_class_enable)
+ {
+ tested = TRUE;
+ match = FALSE;
+ gint class;
+ FileFormatClass search_class;
+
+ if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->class_type)), _("Image")) == 0)
+ {
+ search_class = FORMAT_CLASS_IMAGE;
+ }
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->class_type)), _("Raw Image")) == 0)
+ {
+ search_class = FORMAT_CLASS_RAWIMAGE;
+ }
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->class_type)), _("Video")) == 0)
+ {
+ search_class = FORMAT_CLASS_VIDEO;
+ }
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->class_type)), _("Document")) == 0)
+ {
+ search_class = FORMAT_CLASS_DOCUMENT;
+ }
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->class_type)), _("Metadata")) == 0)
+ {
+ search_class = FORMAT_CLASS_META;
+ }
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->class_type)), _("Unknown")) == 0)
+ {
+ search_class = FORMAT_CLASS_UNKNOWN;
+ }
+ else
+ {
+ search_class = FORMAT_CLASS_BROKEN;
+ }
+
+ if (search_class != FORMAT_CLASS_BROKEN)
+ {
+ class = fd->format_class;
+ if (sd->match_class == SEARCH_MATCH_EQUAL)
+ {
+ match = (class == search_class);
+ }
+ else if (sd->match_class == SEARCH_MATCH_NONE)
+ {
+ match = (class != search_class);
+ }
+ }
+ else
+ {
+ if (fd->format_class == FORMAT_CLASS_IMAGE || fd->format_class == FORMAT_CLASS_RAWIMAGE || fd->format_class == FORMAT_CLASS_VIDEO || fd->format_class == FORMAT_CLASS_DOCUMENT)
+ {
+ sd->match_broken_enable = TRUE;
+ match = TRUE;
+ }
+ else
+ {
+ sd->match_broken_enable = FALSE;
+ }
+ }
+ }
+
+ if (match && sd->match_marks_enable)
+ {
+ tested = TRUE;
+ match = FALSE;
+ gint search_marks;
+ gint i;
+ gchar *marks_string;
+
+ if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->marks_type)), _("Any mark")) == 0)
+ {
+ search_marks = -1;
+ }
+ else
+ {
+ for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+ {
+ marks_string = g_strdup_printf("%s%d", _("Mark "), i + 1);
+ if (g_strcmp0(marks_string, options->marks_tooltips[i]) != 0)
+ {
+ g_free(marks_string);
+ marks_string = g_strdup_printf("%s%d %s", _("Mark "), i + 1,
+ options->marks_tooltips[i]);
+ }
+
+ if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->marks_type)),
+ marks_string) == 0)
+ {
+ search_marks = 1 << i;
+ }
+ g_free(marks_string);
+ }
+ }
+
+ if (sd->match_marks == SEARCH_MATCH_EQUAL)
+ {
+ match = (fd->marks & search_marks);
+ }
+ else
+ {
+ if (search_marks == -1)
+ {
+ match = fd->marks ? FALSE : TRUE;
+ }
+ else
+ {
+ match = (fd->marks & search_marks) ? FALSE : TRUE;
+ }
+ }
+ }
+
if (match && sd->match_gps_enable)
{
/* Calculate the distance the image is from the specified origin.
}
}
- if ((match || extra_only) && (sd->match_dimensions_enable ||
- sd ->match_similarity_enable))
+ if ((match || extra_only) && (sd->match_dimensions_enable || sd->match_similarity_enable || sd->match_broken_enable))
{
tested = TRUE;
static void search_start(SearchData *sd)
{
+ GError *error = NULL;
+
search_stop(sd);
search_result_clear(sd);
sd->search_name = tmp;
}
+ if(sd->search_name_regex)
+ {
+ g_regex_unref(sd->search_name_regex);
+ }
+
+ sd->search_name_regex = g_regex_new(sd->search_name, 0, 0, &error);
+ if (error)
+ {
+ log_printf("Error: could not compile regular expression %s\n%s\n", sd->search_name, error->message);
+ g_error_free(error);
+ error = NULL;
+ sd->search_name_regex = g_regex_new("", 0, 0, NULL);
+ }
+
if (!sd->search_comment_match_case)
{
/* convert to lowercase here, so that this is only done once per search */
sd->search_comment = tmp;
}
+ if(sd->search_comment_regex)
+ {
+ g_regex_unref(sd->search_comment_regex);
+ }
+
+ sd->search_comment_regex = g_regex_new(sd->search_comment, 0, 0, &error);
+ if (error)
+ {
+ log_printf("Error: could not compile regular expression %s\n%s\n", sd->search_comment, error->message);
+ g_error_free(error);
+ error = NULL;
+ sd->search_comment_regex = g_regex_new("", 0, 0, NULL);
+ }
+
sd->search_count = 0;
sd->search_total = 0;
GtkTreeViewColumn *column;
gchar *path;
gchar *entry_text;
+ gchar *collection;
if (sd->search_folder_list)
{
sd->search_file_list = g_list_concat(sd->search_file_list, list);
}
+ else if (sd->search_type == SEARCH_MATCH_COLLECTION)
+ {
+ collection = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->collection_entry)));
+
+ if (is_collection(collection))
+ {
+ GList *list = NULL;
+
+ list = collection_contents_fd(collection);
+
+ file_data_unref(sd->search_dir_fd);
+ sd->search_dir_fd = NULL;
+
+ search_start(sd);
+
+ sd->search_file_list = g_list_concat(sd->search_file_list, list);
+ }
+ else
+ {
+ file_util_warning_dialog(_("Collection not found"), _("Please enter an existing collection name."), GTK_STOCK_DIALOG_WARNING, sd->window);
+ }
+ g_free(collection);
+ }
}
/*
menu_choice_set_visible(gtk_widget_get_parent(sd->check_recurse),
(sd->search_type == SEARCH_MATCH_NONE));
+ menu_choice_set_visible(sd->collection, (sd->search_type == SEARCH_MATCH_COLLECTION));
}
static void menu_choice_name_cb(GtkWidget *combo, gpointer data)
(sd->match_rating == SEARCH_MATCH_BETWEEN));
}
+static void menu_choice_class_cb(GtkWidget *combo, gpointer data)
+{
+ SearchData *sd = data;
+
+ if (!menu_choice_get_match_type(combo, &sd->match_class)) return;
+}
+
+static void menu_choice_marks_cb(GtkWidget *combo, gpointer data)
+{
+ SearchData *sd = data;
+
+ if (!menu_choice_get_match_type(combo, &sd->match_marks)) return;
+}
+
static void menu_choice_date_cb(GtkWidget *combo, gpointer data)
{
SearchData *sd = data;
return hbox;
}
+static void search_window_get_geometry(SearchData *sd)
+{
+ GdkWindow *window;
+ LayoutWindow *lw = NULL;
+
+ layout_valid(&lw);
+
+ if (!sd || !lw) return;
+
+ window = gtk_widget_get_window(sd->window);
+ gdk_window_get_position(window, &lw->options.search_window.x, &lw->options.search_window.y);
+ lw->options.search_window.w = gdk_window_get_width(window);
+ lw->options.search_window.h = gdk_window_get_height(window);
+}
+
static void search_window_close(SearchData *sd)
{
+
+ search_window_get_geometry(sd);
+
gtk_widget_destroy(sd->window);
}
+static void search_window_close_cb(GtkWidget *widget, gpointer data)
+{
+ SearchData *sd = data;
+
+ search_window_close(sd);
+}
+
+static void search_window_help_cb(GtkWidget *widget, gpointer data)
+{
+ help_window_show("GuideImageSearchSearch.html");
+}
+
static gboolean search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
{
SearchData *sd = data;
search_result_update_idle_cancel(sd);
- filelist_free(sd->search_buffer_list);
+ mfd_list_free(sd->search_buffer_list);
sd->search_buffer_list = NULL;
search_stop(sd);
file_data_unref(sd->search_dir_fd);
g_free(sd->search_name);
+ if(sd->search_name_regex)
+ {
+ g_regex_unref(sd->search_name_regex);
+ }
g_free(sd->search_comment);
+ if(sd->search_comment_regex)
+ {
+ g_regex_unref(sd->search_comment_regex);
+ }
g_free(sd->search_similarity_path);
string_list_free(sd->search_keyword_list);
g_free(sd);
}
+static void select_collection_dialog_close_cb(FileDialog *fdlg, gpointer data)
+{
+ file_dialog_close(fdlg);
+}
+
+static void select_collection_dialog_ok_cb(FileDialog *fdlg, gpointer data)
+{
+ SearchData *sd = data;
+ gchar *path;
+ gchar *path_noext;
+ gchar *collection;
+
+ path = g_strdup(gtk_entry_get_text(GTK_ENTRY(fdlg->entry)));
+ path_noext = remove_extension_from_path(path);
+ collection = g_path_get_basename(path_noext);
+
+ gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), collection);
+ file_dialog_close(fdlg);
+
+ g_free(path);
+ g_free(path_noext);
+ g_free(collection);
+}
+
+static void select_collection_clicked_cb(GtkWidget *widget, gpointer data)
+{
+ SearchData *sd = data;
+ FileDialog *fdlg;
+ const gchar *title;
+ const gchar *btntext;
+ gpointer btnfunc;
+ const gchar *stock_id;
+
+ title = _("Select collection");
+ btntext = NULL;
+ btnfunc = select_collection_dialog_ok_cb;
+ stock_id = GTK_STOCK_OK;
+
+ fdlg = file_util_file_dlg(title, "dlg_collection", sd->window, select_collection_dialog_close_cb, sd);
+
+ generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, title, NULL, FALSE);
+ file_dialog_add_button(fdlg, stock_id, btntext, btnfunc, TRUE);
+
+ file_dialog_add_path_widgets(fdlg, get_collections_dir(), NULL, "search_collection", GQ_COLLECTION_EXT, _("Collection Files"));
+
+ gtk_widget_show(GENERIC_DIALOG(fdlg)->dialog);
+}
+
void search_new(FileData *dir_fd, FileData *example_file)
{
SearchData *sd;
GtkListStore *store;
GtkTreeSortable *sortable;
GtkTreeSelection *selection;
+ GtkTreeViewColumn *column;
GtkWidget *combo;
GdkGeometry geometry;
+ gint i;
+ gchar *marks_string;
+ LayoutWindow *lw = NULL;
+
+ layout_valid(&lw);
sd = g_new0(SearchData, 1);
sd->search_type = SEARCH_MATCH_NONE;
- sd->match_name = SEARCH_MATCH_CONTAINS;
+ sd->match_name = SEARCH_MATCH_NAME_CONTAINS;
sd->match_size = SEARCH_MATCH_EQUAL;
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_rating = SEARCH_MATCH_EQUAL;
+ sd->match_class = SEARCH_MATCH_EQUAL;
+ sd->match_marks = SEARCH_MATCH_EQUAL;
sd->match_name_enable = TRUE;
}
sd->window = window_new(GTK_WINDOW_TOPLEVEL, "search", NULL, NULL, _("Image search"));
+ DEBUG_NAME(sd->window);
gtk_window_set_resizable(GTK_WINDOW(sd->window), TRUE);
gtk_window_set_geometry_hints(GTK_WINDOW(sd->window), NULL, &geometry,
GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE);
- gtk_window_set_default_size(GTK_WINDOW(sd->window), DEF_SEARCH_WIDTH, DEF_SEARCH_HEIGHT);
+ if (lw && options->save_window_positions)
+ {
+ gtk_window_set_default_size(GTK_WINDOW(sd->window), lw->options.search_window.w, lw->options.search_window.h);
+ gtk_window_move(GTK_WINDOW(sd->window), lw->options.search_window.x, lw->options.search_window.y);
+ }
+ else
+ {
+ gtk_window_set_default_size(GTK_WINDOW(sd->window), DEF_SEARCH_WIDTH, DEF_SEARCH_HEIGHT);
+ }
g_signal_connect(G_OBJECT(sd->window), "delete_event",
G_CALLBACK(search_window_delete_cb), sd);
sd->check_recurse = pref_checkbox_new_int(hbox2, _("Recurse"),
sd->search_path_recurse, &sd->search_path_recurse);
+ sd->collection = pref_box_new(hbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+ sd->collection_entry = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), "");
+ gtk_box_pack_start(GTK_BOX(sd->collection), sd->collection_entry, TRUE, TRUE, 0);
+ gtk_widget_show(sd->collection_entry);
+
+ sd->fd_button = gtk_button_new_with_label("...");
+ g_signal_connect(G_OBJECT(sd->fd_button), "clicked", G_CALLBACK(select_collection_clicked_cb), sd);
+ gtk_box_pack_start(GTK_BOX(sd->collection), sd->fd_button, FALSE, FALSE, 0);
+ gtk_widget_show(sd->fd_button);
+
+ gtk_widget_hide(sd->collection);
+
/* Search for file name */
hbox = menu_choice(sd->box_search, &sd->check_name, &sd->menu_name,
- _("File name"), &sd->match_name_enable,
+ _("File"), &sd->match_name_enable,
text_search_menu_name, sizeof(text_search_menu_name) / sizeof(MatchList),
G_CALLBACK(menu_choice_name_cb), sd);
combo = history_combo_new(&sd->entry_name, "", "search_name", -1);
gtk_widget_show(combo);
pref_checkbox_new_int(hbox, _("Match case"),
sd->search_name_match_case, &sd->search_name_match_case);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(combo), "When set to \"contains\" or \"path contains\", this field uses Perl Compatible Regular Expressions.\ne.g. use \n.*\\.jpg\n and not \n*.jpg\n\nSee the Help file.");
/* Search for file size */
hbox = menu_choice(sd->box_search, &sd->check_size, &sd->menu_size,
_("File date is"), &sd->match_date_enable,
text_search_menu_date, sizeof(text_search_menu_date) / sizeof(MatchList),
G_CALLBACK(menu_choice_date_cb), sd);
+
sd->date_sel = date_selection_new();
date_selection_time_set(sd->date_sel, time(NULL));
gtk_box_pack_start(GTK_BOX(hbox), sd->date_sel, FALSE, FALSE, 0);
date_selection_time_set(sd->date_sel_end, time(NULL));
gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
gtk_widget_show(sd->date_sel_end);
- pref_checkbox_new_int(hbox, _("Exif date"),
- sd->search_date_exif, &sd->search_date_exif);
+
+ sd->date_type = gtk_combo_box_text_new();
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Modified"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Status Changed"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Original"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Digitized"));
+ gtk_box_pack_start(GTK_BOX(hbox), sd->date_type, FALSE, FALSE, 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(sd->date_type), 0);
+ gtk_widget_set_tooltip_text(sd->date_type, "Modified (mtime)\nStatus Changed (ctime)\nOriginal (Exif.Photo.DateTimeOriginal)\nDigitized (Exif.Photo.DateTimeDigitized)");
+ gtk_widget_show(sd->date_type);
/* Search for image dimensions */
hbox = menu_choice(sd->box_search, &sd->check_dimensions, &sd->menu_dimensions,
gtk_widget_show(sd->entry_comment);
pref_checkbox_new_int(hbox, _("Match case"),
sd->search_comment_match_case, &sd->search_comment_match_case);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(sd->entry_comment), "This field uses Perl Compatible Regular Expressions.\ne.g. use \nabc.*ghk\n and not \nabc*ghk\n\nSee the Help file.");
/* Search for image rating */
hbox = menu_choice(sd->box_search, &sd->check_rating, &sd->menu_rating,
gtk_widget_show(sd->entry_gps_coord);
+ /* Search for image class */
+ hbox = menu_choice(sd->box_search, &sd->check_class, &sd->menu_class,
+ _("Image class"), &sd->match_class_enable,
+ text_search_menu_class, sizeof(text_search_menu_class) / sizeof(MatchList),
+ G_CALLBACK(menu_choice_class_cb), sd);
+
+ sd->class_type = gtk_combo_box_text_new();
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Image"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Raw Image"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Video"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Document"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Metadata"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Unknown"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Broken"));
+ gtk_box_pack_start(GTK_BOX(hbox), sd->class_type, FALSE, FALSE, 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(sd->class_type), 0);
+ gtk_widget_show(sd->class_type);
+
+ /* Search for image marks */
+ hbox = menu_choice(sd->box_search, &sd->check_class, &sd->menu_marks,
+ _("Marks"), &sd->match_marks_enable,
+ text_search_menu_marks, sizeof(text_search_menu_marks) / sizeof(MatchList),
+ G_CALLBACK(menu_choice_marks_cb), sd);
+
+ sd->marks_type = gtk_combo_box_text_new();
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->marks_type), _("Any mark"));
+ for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+ {
+ marks_string = g_strdup_printf("%s%d", _("Mark "), i + 1);
+ if (g_strcmp0(marks_string, options->marks_tooltips[i]) != 0)
+ {
+ g_free(marks_string);
+ marks_string = g_strdup_printf("%s%d %s", _("Mark "), i + 1,
+ options->marks_tooltips[i]);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->marks_type), marks_string);
+ }
+ else
+ {
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->marks_type), marks_string);
+ }
+ g_free(marks_string);
+ }
+ gtk_box_pack_start(GTK_BOX(hbox), sd->marks_type, FALSE, FALSE, 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(sd->marks_type), 0);
+ gtk_widget_show(sd->marks_type);
+
/* Done the types of searches */
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(sd->result_view), FALSE);
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_THUMB, _("Thumb"), TRUE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_NAME, _("Name"), FALSE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_SIZE, _("Size"), FALSE, TRUE);
search_result_add_column(sd, SEARCH_COLUMN_DATE, _("Date"), FALSE, TRUE);
G_CALLBACK(search_thumb_toggle_cb), sd);
frame = gtk_frame_new(NULL);
+ DEBUG_NAME(frame);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, PREF_PAD_SPACE);
gtk_widget_show(frame);
gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0);
gtk_widget_show(sd->spinner);
+ sd->button_help = pref_button_new(hbox, GTK_STOCK_HELP, NULL, FALSE, G_CALLBACK(search_window_help_cb), sd);
+ gtk_widget_set_sensitive(sd->button_help, TRUE);
+ pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
sd->button_start = pref_button_new(hbox, GTK_STOCK_FIND, NULL, FALSE,
G_CALLBACK(search_start_cb), sd);
pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
sd->button_stop = pref_button_new(hbox, GTK_STOCK_STOP, NULL, FALSE,
G_CALLBACK(search_start_cb), sd);
gtk_widget_set_sensitive(sd->button_stop, FALSE);
+ pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
+ sd->button_close = pref_button_new(hbox, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(search_window_close_cb), sd);
+ gtk_widget_set_sensitive(sd->button_close, TRUE);
+
+ search_result_thumb_enable(sd, TRUE);
+ search_result_thumb_enable(sd, FALSE);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_RANK - 1);
+ gtk_tree_view_column_set_visible(column, FALSE);
search_status_update(sd);
search_progress_update(sd, FALSE, -1.0);
break;
}
}
+
+void mfd_list_free(GList *list)
+{
+ GList *work;
+
+ work = list;
+ while (work)
+ {
+ MatchFileData *mfd = work->data;
+ file_data_unref((FileData *)mfd->fd);
+ work = work->next;
+ }
+
+ g_list_free(list);
+}
+
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff