/*
* Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: Laurent Monin
*
#include "filedata.h"
#include "layout_image.h"
#include "layout_util.h"
+#include "pixbuf_util.h"
#include "ui_fileops.h"
#include "ui_tree_edit.h"
#include "ui_menu.h"
#include "view_dir_list.h"
#include "view_dir_tree.h"
-static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data);
+/* Folders icons to be used in tree or list directory view */
+static PixmapFolders *folder_icons_new(GtkWidget *widget)
+{
+ PixmapFolders *pf = g_new0(PixmapFolders, 1);
+
+#if 1
+ GtkIconSize size = GTK_ICON_SIZE_MENU;
+
+ /* Attempt to use stock gtk icons */
+ pf->close = gtk_widget_render_icon(widget, GTK_STOCK_DIRECTORY, size, NULL);
+ pf->open = gtk_widget_render_icon(widget, GTK_STOCK_OPEN, size, NULL);
+ pf->deny = gtk_widget_render_icon(widget, GTK_STOCK_STOP, size, NULL);
+ pf->parent = gtk_widget_render_icon(widget, GTK_STOCK_GO_UP, size, NULL);
+#else
+ /* GQView legacy icons */
+ pf->close = pixbuf_inline(PIXBUF_INLINE_FOLDER_CLOSED);
+ pf->open = pixbuf_inline(PIXBUF_INLINE_FOLDER_OPEN);
+ pf->deny = pixbuf_inline(PIXBUF_INLINE_FOLDER_LOCKED);
+ pf->parent = pixbuf_inline(PIXBUF_INLINE_FOLDER_UP);
+#endif
+ return pf;
+}
-GtkRadioActionEntry menu_view_dir_radio_entries[] = {
- { "FolderList", NULL, N_("_List"), "<meta>L", NULL, DIRVIEW_LIST },
- { "FolderTree", NULL, N_("_Tree"), "<control>T", NULL, DIRVIEW_TREE },
-};
+static void folder_icons_free(PixmapFolders *pf)
+{
+ if (!pf) return;
+
+ g_object_unref(pf->close);
+ g_object_unref(pf->open);
+ g_object_unref(pf->deny);
+ g_object_unref(pf->parent);
+
+ g_free(pf);
+}
+
+
+
+static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data);
static void vd_destroy_cb(GtkWidget *widget, gpointer data)
{
ViewDir *vd_new(DirViewType type, FileData *dir_fd)
{
- g_assert(VIEW_DIR_TYPES_COUNT <= G_N_ELEMENTS(menu_view_dir_radio_entries));
-
ViewDir *vd = g_new0(ViewDir, 1);
- vd->drop_scroll_id = -1;
-
vd->widget = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vd->widget), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vd->widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
- vd->pf = folder_icons_new();
+ vd->pf = folder_icons_new(vd->widget);
switch (type)
{
g_signal_connect(G_OBJECT(vd->view), "button_release_event",
G_CALLBACK(vd_release_cb), vd);
- if (dir_fd) vd_set_fd(vd, dir_fd);
-
file_data_register_notify_func(vd_notify_cb, vd, NOTIFY_PRIORITY_HIGH);
+ /* vd_set_fd expects that vd_notify_cb is already registered */
+ if (dir_fd) vd_set_fd(vd, dir_fd);
+
gtk_widget_show(vd->view);
return vd;
}
void vd_set_select_func(ViewDir *vd,
- void (*func)(ViewDir *vd, const gchar *path, gpointer data), gpointer data)
+ void (*func)(ViewDir *vd, FileData *fd, gpointer data), gpointer data)
{
vd->select_func = func;
vd->select_data = data;
return ret;
}
+/* the calling stack is this:
+ vd_select_row -> select_func -> layout_set_fd -> vd_set_fd
+*/
void vd_select_row(ViewDir *vd, FileData *fd)
{
- switch (vd->type)
- {
- case DIRVIEW_LIST: vdlist_select_row(vd, fd); break;
- case DIRVIEW_TREE: vdtree_select_row(vd, fd); break;
- }
+ if (fd && vd->select_func)
+ {
+ vd->select_func(vd, fd, vd->select_data);
+ }
}
gboolean vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
return fd;
}
+static void vd_rename_finished_cb(gboolean success, const gchar *new_path, gpointer data)
+{
+ ViewDir *vd = data;
+ if (success)
+ {
+ FileData *fd = file_data_new_dir(new_path);
+ GtkTreeIter iter;
+
+ if (vd_find_row(vd, fd, &iter))
+ {
+ tree_view_row_make_visible(GTK_TREE_VIEW(vd->view), &iter, TRUE);
+ }
+
+ file_data_unref(fd);
+ }
+}
+
static gboolean vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
{
ViewDir *vd = data;
new_path = g_build_filename(base, new, NULL);
g_free(base);
- file_util_rename_dir(fd, new_path, vd->view);
+ file_util_rename_dir(fd, new_path, vd->view, vd_rename_finished_cb, vd);
g_free(new_path);
GtkTreePath *tpath;
GtkTreeIter iter;
- if (!fd || vd_find_row(vd, fd, &iter) < 0) return;
+ if (!fd || !vd_find_row(vd, fd, &iter)) return;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
tpath = gtk_tree_model_get_path(store, &iter);
GtkTreeModel *store;
GtkTreeIter iter;
- if (vd_find_row(vd, fd, &iter) < 0) return;
+ if (!vd_find_row(vd, fd, &iter)) return;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
switch (vd->type)
if (vd->select_func)
{
- vd->select_func(vd, path, vd->select_data);
+ FileData *fd = file_data_new_dir(path);
+ vd->select_func(vd, fd, vd->select_data);
+ file_data_unref(fd);
}
g_free(path);
file_util_copy_path_to_clipboard(vd->click_fd);
}
-#define VIEW_DIR_AS_SUBMENU_KEY "view_dir_as_submenu"
static void vd_pop_submenu_dir_view_as_cb(GtkWidget *widget, gpointer data)
{
ViewDir *vd = data;
- DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), VIEW_DIR_AS_SUBMENU_KEY));
+ DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
layout_views_set(vd->layout, new_type, vd->layout->options.file_view_type);
}
break;
case DIRVIEW_TREE:
{
- FileData *new_fd = file_data_new_simple(new_path);
+ FileData *new_fd = file_data_new_dir(new_path);
fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
file_data_unref(new_fd);
}
GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
{
GtkWidget *menu;
- GtkWidget *submenu;
- GtkWidget *item;
gboolean active;
gboolean rename_delete_active = FALSE;
gboolean new_folder_active = FALSE;
- gint i;
active = (fd != NULL);
switch (vd->type)
menu_item_add_divider(menu);
- item = menu_item_add(menu, _("_View as"), NULL, NULL);
- submenu = gtk_menu_new();
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
- for (i = 0; i < VIEW_DIR_TYPES_COUNT; i++)
- {
- item = menu_item_add_check(submenu, _(menu_view_dir_radio_entries[i].label),
- ((gint) vd->type == menu_view_dir_radio_entries[i].value),
- G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
- g_object_set_data(G_OBJECT(item), VIEW_DIR_AS_SUBMENU_KEY, GINT_TO_POINTER(menu_view_dir_radio_entries[i].value));
- }
+ menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(DIRVIEW_LIST), vd->type == DIRVIEW_LIST,
+ G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
+
+ menu_item_add_radio(menu, _("View as _Tree"), GINT_TO_POINTER(DIRVIEW_TREE), vd->type == DIRVIEW_TREE,
+ G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
+
+ menu_item_add_divider(menu);
menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_hidden_files,
G_CALLBACK(vd_toggle_show_hidden_files_cb), vd);
return menu;
}
+void vd_new_folder(ViewDir *vd, FileData *dir_fd)
+{
+ file_util_create_dir(dir_fd, vd->widget, vd_pop_menu_new_rename_cb, vd);
+}
+
/*
*-----------------------------------------------------------------------------
* dnd
{
ViewDir *vd = data;
GList *list;
- gchar *uritext = NULL;
- gint length = 0;
if (!vd->click_fd) return;
case TARGET_URI_LIST:
case TARGET_TEXT_PLAIN:
list = g_list_prepend(NULL, vd->click_fd);
- uritext = uri_text_from_filelist(list, &length, (info == TARGET_TEXT_PLAIN));
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
g_list_free(list);
break;
}
- if (uritext)
- {
- gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uritext, length);
- g_free(uritext);
- }
}
static void vd_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
vd_color_set(vd, vd->click_fd, FALSE);
- if (vd->type == DIRVIEW_LIST && context->action == GDK_ACTION_MOVE)
+ if (vd->type == DIRVIEW_LIST && gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
{
vd_refresh(vd);
}
gint active;
gboolean done = FALSE;
- list = uri_filelist_from_text((gchar *)selection_data->data, TRUE);
+ list = uri_filelist_from_gtk_selection_data(selection_data);
if (!list) return;
active = access_file(fd->path, W_OK | X_OK);
if (active)
{
- if (context->actions == GDK_ACTION_COPY)
+ if (gdk_drag_context_get_actions(context) == GDK_ACTION_COPY)
{
file_util_copy_simple(list, fd->path, vd->widget);
done = TRUE;
+ list = NULL;
}
- else if (context->actions == GDK_ACTION_MOVE)
+ else if (gdk_drag_context_get_actions(context) == GDK_ACTION_MOVE)
{
file_util_move_simple(list, fd->path, vd->widget);
done = TRUE;
+ list = NULL;
}
}
void vd_dnd_drop_scroll_cancel(ViewDir *vd)
{
- if (vd->drop_scroll_id != -1) g_source_remove(vd->drop_scroll_id);
- vd->drop_scroll_id = -1;
+ if (vd->drop_scroll_id)
+ {
+ g_source_remove(vd->drop_scroll_id);
+ vd->drop_scroll_id = 0;
+ }
}
static gboolean vd_auto_scroll_idle_cb(gpointer data)
gint x, y;
gint w, h;
- window = vd->view->window;
+ window = gtk_widget_get_window(vd->view);
gdk_window_get_pointer(window, &x, &y, NULL);
- gdk_drawable_get_size(window, &w, &h);
+ w = gdk_window_get_width(window);
+ h = gdk_window_get_height(window);
if (x >= 0 && x < w && y >= 0 && y < h)
{
vd_dnd_drop_update(vd, x, y);
}
}
- vd->drop_scroll_id = -1;
+ vd->drop_scroll_id = 0;
return FALSE;
}
if (!vd->drop_fd || vd->drop_list) return FALSE;
- if (vd->drop_scroll_id == -1) vd->drop_scroll_id = g_idle_add(vd_auto_scroll_idle_cb, vd);
+ if (!vd->drop_scroll_id) vd->drop_scroll_id = g_idle_add(vd_auto_scroll_idle_cb, vd);
return TRUE;
}
}
else
{
- gdk_drag_status(context, context->suggested_action, time);
+ gdk_drag_status(context, gdk_drag_context_get_suggested_action(context), time);
}
vd_dnd_drop_update(vd, x, y);
GtkTreePath *tpath;
gint cw, ch;
- if (vd_find_row(vd, vd->click_fd, &iter) < 0) return;
+ if (!vd_find_row(vd, vd->click_fd, &iter)) return;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
tpath = gtk_tree_model_get_path(store, &iter);
tree_view_get_cell_clamped(GTK_TREE_VIEW(vd->view), tpath, 0, TRUE, x, y, &cw, &ch);
if (fd && vd->click_fd == fd)
{
- vdlist_select_row(vd, vd->click_fd);
+ vd_select_row(vd, vd->click_fd);
}
return FALSE;
if (vd->type == DIRVIEW_TREE)
{
GtkTreeIter iter;
- FileData *base_fd = file_data_new_simple(base);
+ FileData *base_fd = file_data_new_dir(base);
if (vd_find_row(vd, base_fd, &iter))
{