/*
* Geeqie
* (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
ThumbLoader *thumb_loader;
gboolean thumb_enable;
FileData *thumb_fd;
-
- /* file list for edit menu */
- GList *editmenu_fd_list;
-
};
typedef struct _MatchFileData MatchFileData;
static void search_result_edit_selected(SearchData *sd, const gchar *key)
{
- GList *list;
-
- list = search_result_selection_list(sd);
- file_util_start_editor_from_filelist(key, list, NULL, sd->window);
- 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)
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);
static void search_result_menu_destroy_cb(GtkWidget *widget, gpointer data)
{
- SearchData *sd = data;
+ GList *editmenu_fd_list = data;
- filelist_free(sd->editmenu_fd_list);
- sd->editmenu_fd_list = NULL;
+ 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();
- g_signal_connect(G_OBJECT(menu), "destroy",
- G_CALLBACK(search_result_menu_destroy_cb), sd);
menu_item_add_sensitive(menu, _("_View"), on_row,
G_CALLBACK(sr_menu_view_cb), sd);
G_CALLBACK(sr_menu_select_none_cb), sd);
menu_item_add_divider(menu);
- sd->editmenu_fd_list = search_result_selection_list(sd);
- submenu_add_edit(menu, &item, G_CALLBACK(sr_menu_edit_cb), sd, sd->editmenu_fd_list);
+ 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, _("Add to new collection"), GTK_STOCK_INDEX, on_row,
G_CALLBACK(sr_menu_collection_cb), sd);
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);
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 0
- if (edit_val >= 0)
- {
- search_result_edit_selected(sd, edit_val);
- }
-#endif
}
else
{
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Return: case GDK_KP_Enter:
+ 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;
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)
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
-
}
/*
path = fd->path + strlen(sd->search_dir_fd->path);
if (path != fd->path)
{
- FileData *dir_fd = file_data_new_simple(path);
+ FileData *dir_fd = file_data_new_dir(path);
success = filelist_read(dir_fd, &list, NULL);
file_data_unref(dir_fd);
}
sd->search_similarity_cd = cache_sim_data_new();
}
- sd->img_loader = image_loader_new(file_data_new_simple(sd->search_similarity_path));
+ 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))
if (isdir(path))
{
file_data_unref(sd->search_dir_fd);
- sd->search_dir_fd = file_data_new_simple(path);
+ sd->search_dir_fd = file_data_new_dir(path);
tab_completion_append_to_history(sd->path_entry, sd->search_dir_fd->path);
{
/* search metadata */
file_data_unref(sd->search_dir_fd);
- sd->search_dir_fd = file_data_new_simple(get_metadata_cache_dir());
+ sd->search_dir_fd = file_data_new_dir(get_metadata_cache_dir());
search_start(sd);
}
else if (sd->search_type == SEARCH_MATCH_CONTAINS)
{
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);
}
}
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);
projects / geeqie.git / blobdiff