/*
- * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: Laurent Monin
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "main.h"
#include "view_file.h"
+#include "dupe.h"
+#include "collect.h"
+#include "collect-table.h"
#include "editors.h"
#include "layout.h"
#include "menu.h"
#include "ui_menu.h"
#include "ui_fileops.h"
#include "utilops.h"
-#include "view_file_list.h"
-#include "view_file_icon.h"
+#include "view_file/view_file_list.h"
+#include "view_file/view_file_icon.h"
/*
*-----------------------------------------------------------------------------
return ret;
}
+GList *vf_selection_get_one(ViewFile *vf, FileData *fd)
+{
+ GList *ret = NULL;
+
+ switch (vf->type)
+ {
+ case FILEVIEW_LIST: ret = vflist_selection_get_one(vf, fd); break;
+ case FILEVIEW_ICON: ret = vficon_selection_get_one(vf, fd); break;
+ }
+
+ return ret;
+}
+
static void vf_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf;
const gchar *key = data;
- GList *list;
vf = submenu_item_get_data(widget);
if (!vf) return;
- list = vf_pop_menu_file_list(vf);
- file_util_start_editor_from_filelist(key, list, vf->listview);
- filelist_free(list);
+ file_util_start_editor_from_filelist(key, vf_pop_menu_file_list(vf), vf->dir_fd->path, vf->listview);
}
static void vf_pop_menu_view_cb(GtkWidget *widget, gpointer data)
file_data_disable_grouping_list(vf_pop_menu_file_list(vf), FALSE);
}
+static void vf_pop_menu_duplicates_cb(GtkWidget *widget, gpointer data)
+{
+ ViewFile *vf = data;
+ DupeWindow *dw;
+
+ dw = dupe_window_new();
+ dupe_window_add_files(dw, vf_pop_menu_file_list(vf), FALSE);
+}
+
+static void vf_pop_menu_add_collection_cb(GtkWidget *widget, gpointer data)
+{
+ ViewFile *vf = data;
+ CollectWindow *w;
+
+ w = collection_window_new(NULL);
+ collection_table_add_filelist(w->table, vf_pop_menu_file_list(vf));
+}
+
static void vf_pop_menu_disable_grouping_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
static void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
-
+ FileViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
if (!vf->layout) return;
- switch (vf->type)
- {
- case FILEVIEW_LIST:
- layout_views_set(vf->layout, vf->layout->options.dir_view_type, FILEVIEW_ICON);
- break;
- case FILEVIEW_ICON:
- layout_views_set(vf->layout, vf->layout->options.dir_view_type, FILEVIEW_LIST);
- break;
- }
+ layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type);
}
static void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
g_free(str_sel_mark_minus);
}
- vf->editmenu_fd_list = vf_selection_get_list(vf);
+ vf->editmenu_fd_list = vf_pop_menu_file_list(vf);
submenu_add_edit(menu, &item, G_CALLBACK(vf_pop_menu_edit_cb), vf, vf->editmenu_fd_list);
gtk_widget_set_sensitive(item, active);
G_CALLBACK(vf_pop_menu_disable_grouping_cb), vf);
menu_item_add_divider(menu);
+ menu_item_add_stock_sensitive(menu, _("_Find duplicates..."), GTK_STOCK_FIND, active,
+ G_CALLBACK(vf_pop_menu_duplicates_cb), vf);
+ menu_item_add_divider(menu);
+ menu_item_add_stock_sensitive(menu, _("Add to new collection"), GTK_STOCK_INDEX, active,
+ G_CALLBACK(vf_pop_menu_add_collection_cb), vf);
+ menu_item_add_divider(menu);
submenu = submenu_add_sort(NULL, G_CALLBACK(vf_pop_menu_sort_cb), vf,
FALSE, FALSE, TRUE, vf->sort_method);
item = menu_item_add(menu, _("_Sort"), NULL, NULL);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
- menu_item_add_check(menu, _("View as _icons"), (vf->type == FILEVIEW_ICON),
- G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
+ item = menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(FILEVIEW_LIST), vf->type == FILEVIEW_LIST,
+ G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
+
+ item = menu_item_add_radio(menu, _("View as _Icons"), GINT_TO_POINTER(FILEVIEW_ICON), vf->type == FILEVIEW_ICON,
+ G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
switch (vf->type)
{
G_CALLBACK(vficon_pop_menu_show_names_cb), vf);
break;
}
-
+
menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vf_pop_menu_refresh_cb), vf);
return menu;
case FILEVIEW_LIST: ret = vflist_set_fd(vf, dir_fd); break;
case FILEVIEW_ICON: ret = vficon_set_fd(vf, dir_fd); break;
}
-
+
return ret;
}
{
GtkWidget *frame = gtk_frame_new(NULL);
GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
-
+
gint i;
-
+
for (i = 0; i < FILEDATA_MARKS_SIZE ; i++)
{
GtkWidget *check = gtk_check_button_new();
ViewFile *vf;
vf = g_new0(ViewFile, 1);
-
+
vf->type = type;
vf->sort_method = SORT_NAME;
vf->sort_ascend = TRUE;
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vf->scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vf->scrolled),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
+
vf->filter = vf_marks_filter_init(vf);
vf->widget = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vf->widget), vf->filter, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vf->widget), vf->scrolled, TRUE, TRUE, 0);
gtk_widget_show(vf->scrolled);
-
+
g_signal_connect(G_OBJECT(vf->widget), "destroy",
G_CALLBACK(vf_destroy_cb), vf);
{
gint count = 0;
gint done = 0;
-
+
switch (vf->type)
{
case FILEVIEW_LIST: vflist_thumb_progress_count(vf->list, &count, &done); break;
case FILEVIEW_ICON: vficon_thumb_progress_count(vf->list, &count, &done); break;
}
-
+
DEBUG_1("thumb progress: %d of %d", done, count);
return (gdouble)done / count;
}
static void vf_set_thumb_fd(ViewFile *vf, FileData *fd)
-{
+{
switch (vf->type)
{
case FILEVIEW_LIST: vflist_set_thumb_fd(vf, fd); break;
{
FileData *fd = NULL;
- if (!GTK_WIDGET_REALIZED(vf->listview))
+ if (!gtk_widget_get_realized(vf->listview))
{
vf_thumb_status(vf, 0.0, NULL);
return FALSE;
void vf_thumb_update(ViewFile *vf)
{
vf_thumb_stop(vf);
-
+
if (vf->type == FILEVIEW_LIST && !VFLIST(vf)->thumbs_enabled) return;
vf_thumb_status(vf, 0.0, _("Loading thumbs..."));
guint ret = 0;
gint i;
if (!vf->marks_enabled) return 0;
-
+
for (i = 0; i < FILEDATA_MARKS_SIZE ; i++)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vf->filter_check[i])))
{
if (!vf->refresh_idle_id)
{
- vf->refresh_idle_id = g_idle_add(vf_refresh_idle_cb, vf);
+ vf->time_refresh_set = time(NULL);
+ /* file operations run with G_PRIORITY_DEFAULT_IDLE */
+ vf->refresh_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE + 50, vf_refresh_idle_cb, vf, NULL);
+ }
+ else if (time(NULL) - vf->time_refresh_set > 1)
+ {
+ /* more than 1 sec since last update - increase priority */
+ vf_refresh_idle_cancel(vf);
+ vf->time_refresh_set = time(NULL);
+ vf->refresh_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE - 50, vf_refresh_idle_cb, vf, NULL);
}
}
/* FIXME: NOTIFY_METADATA should be checked by the keyword-to-mark functions and converted to NOTIFY_MARKS only if there was a change */
if (!(type & interested) || vf->refresh_idle_id || !vf->dir_fd) return;
-
+
refresh = (fd == vf->dir_fd);
if (!refresh)
{
gchar *base = remove_level_from_path(fd->path);
- refresh = (strcmp(base, vf->dir_fd->path) == 0);
+ refresh = (g_strcmp0(base, vf->dir_fd->path) == 0);
g_free(base);
}
if (!refresh && fd->change->dest)
{
gchar *dest_base = remove_level_from_path(fd->change->dest);
- refresh = (strcmp(dest_base, vf->dir_fd->path) == 0);
+ refresh = (g_strcmp0(dest_base, vf->dir_fd->path) == 0);
g_free(dest_base);
}
if (!refresh && fd->change->source)
{
gchar *source_base = remove_level_from_path(fd->change->source);
- refresh = (strcmp(source_base, vf->dir_fd->path) == 0);
+ refresh = (g_strcmp0(source_base, vf->dir_fd->path) == 0);
g_free(source_base);
}
}
-
+
if (refresh)
{
DEBUG_1("Notify vf: %s %04x", fd->path, type);
projects / geeqie.git / blobdiff