Use util_clip_triangle() in pan_item_tri_new()
[geeqie.git] / src / bar_sort.c
diff --git a/src/bar_sort.c b/src/bar_sort.c
deleted file mode 100644 (file)
index d912634..0000000
+++ /dev/null
@@ -1,826 +0,0 @@
-/*
- * Copyright (C) 2004 John Ellis
- * Copyright (C) 2008 - 2016 The Geeqie Team
- *
- * Author: John Ellis
- *
- * 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 "bar_sort.h"
-
-#include "collect.h"
-#include "collect-io.h"
-#include "filedata.h"
-#include "history_list.h"
-#include "layout.h"
-#include "layout_image.h"
-#include "utilops.h"
-#include "editors.h"
-#include "ui_bookmark.h"
-#include "ui_fileops.h"
-#include "ui_menu.h"
-#include "ui_misc.h"
-#include "rcfile.h"
-#include "window.h"
-
-
-/*
-  *-------------------------------------------------------------------
-  * sort bar
-  *-------------------------------------------------------------------
-  */
-
-typedef struct _SortData SortData;
-struct _SortData
-{
-       GtkWidget *vbox;
-       GtkWidget *bookmarks;
-       LayoutWindow *lw;
-
-       FileDialog *dialog;
-       GtkWidget *dialog_name_entry;
-
-       SortModeType mode;
-       SortActionType action;
-       gchar *filter_key;
-
-       SortSelectionType selection;
-
-       GtkWidget *folder_group;
-       GtkWidget *collection_group;
-
-       GtkWidget *add_button;
-       GtkWidget *undo_button;
-       SortActionType undo_action;
-       GList *undo_src_list;
-       GList *undo_dest_list;
-       gchar *undo_collection;
-};
-
-
-#define SORT_KEY_FOLDERS     "sort_manager"
-#define SORT_KEY_COLLECTIONS "sort_manager_collections"
-
-
-static void bar_sort_undo_set(SortData *sd, GList *src_list, const gchar *dest);
-static void bar_sort_add_close(SortData *sd);
-
-
-static void bar_sort_collection_list_build(GtkWidget *bookmarks)
-{
-       FileData *dir_fd;
-       GList *list;
-       GList *work;
-
-       history_list_free_key(SORT_KEY_COLLECTIONS);
-       bookmark_list_set_key(bookmarks, SORT_KEY_COLLECTIONS);
-
-       dir_fd = file_data_new_dir(get_collections_dir());
-       filelist_read(dir_fd, &list, NULL);
-       file_data_unref(dir_fd);
-
-       list = filelist_sort_path(list);
-
-       work = list;
-       while (work)
-               {
-               FileData *fd;
-               gchar *name;
-
-               fd = work->data;
-               work = work->next;
-
-               if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
-                       {
-                       name = remove_extension_from_path(fd->name);
-                       }
-               else
-                       {
-                       name = g_strdup(fd->name);
-                       }
-               bookmark_list_add(bookmarks, name, fd->path);
-               g_free(name);
-               }
-
-       filelist_free(list);
-}
-
-static void bar_sort_mode_sync(SortData *sd, SortModeType mode)
-{
-       gboolean folder_mode;
-
-       if (sd->mode == mode) return;
-       sd->mode = mode;
-
-       folder_mode = (sd->mode == BAR_SORT_MODE_FOLDER);
-
-       bookmark_list_set_no_defaults(sd->bookmarks, !folder_mode);
-       bookmark_list_set_editable(sd->bookmarks, folder_mode);
-       bookmark_list_set_only_directories(sd->bookmarks, folder_mode);
-
-       if (folder_mode)
-               {
-               gtk_widget_hide(sd->collection_group);
-               gtk_widget_show(sd->folder_group);
-               bookmark_list_set_key(sd->bookmarks, SORT_KEY_FOLDERS);
-               }
-       else
-               {
-               gtk_widget_hide(sd->folder_group);
-               gtk_widget_show(sd->collection_group);
-               bar_sort_collection_list_build(sd->bookmarks);
-               }
-
-       bar_sort_add_close(sd);
-
-       bar_sort_undo_set(sd, NULL, NULL);
-}
-
-static void bar_sort_mode_cb(GtkWidget *combo, gpointer data)
-{
-       SortData *sd = data;
-
-       if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == BAR_SORT_MODE_FOLDER)
-               {
-               bar_sort_mode_sync(sd, BAR_SORT_MODE_FOLDER);
-               }
-       else
-               {
-               bar_sort_mode_sync(sd, BAR_SORT_MODE_COLLECTION);
-               }
-}
-
-/* this takes control of src_list */
-static void bar_sort_undo_set(SortData *sd, GList *src_list, const gchar *dest)
-{
-       string_list_free(sd->undo_src_list);
-       sd->undo_src_list = filelist_to_path_list(src_list);
-
-       if (src_list)
-               {
-               /* we should create the undo_dest_list to use it later... */
-               string_list_free(sd->undo_dest_list);
-               sd->undo_dest_list=NULL;
-
-               GList *work = sd->undo_src_list;
-               while(work)
-                       {
-                       gchar *filename =  g_strdup(filename_from_path(work->data));
-                       gchar *dest_path = g_build_filename(g_strdup(dest), filename, NULL);
-                       sd->undo_dest_list = g_list_prepend(sd->undo_dest_list, g_strdup(dest_path));
-                       work = work->next;
-                       }
-               sd->undo_dest_list = g_list_reverse(sd->undo_dest_list);
-               }
-
-       sd->undo_action = sd->action;
-
-       if (sd->undo_button)
-               {
-               gtk_widget_set_sensitive(sd->undo_button,
-                                       ((sd->undo_src_list ) && sd->undo_dest_list));
-               }
-}
-
-static void bar_sort_undo_folder(SortData *sd, GtkWidget *button)
-{
-       gchar *origin;
-
-       if (!(sd->undo_src_list && sd->undo_dest_list)) return;
-
-       switch (sd->undo_action)
-               {
-               case BAR_SORT_MOVE:
-                       {
-                       GList *list;
-                       gchar *src_dir;
-                       gchar *src_path;
-
-                       if (sd->undo_src_list)
-                               {
-                               GList *work = NULL;
-
-                               src_path = g_strdup(sd->undo_src_list->data);
-                               src_dir = remove_level_from_path(src_path);
-                               list = sd->undo_dest_list;
-                               while (list)
-                                       {
-                                       work = g_list_prepend(work, file_data_new_group(list->data));
-                                       list=list->next;
-                                       }
-                               file_util_move_simple(work, src_dir, sd->lw->window);
-                               g_free(src_dir);
-                               g_free(src_path);
-                               }
-                       }
-                       break;
-
-               case BAR_SORT_COPY:
-               case BAR_SORT_FILTER:
-                       if (sd->undo_src_list)
-                               {
-                               GList *delete_list;
-                               GList *work = NULL;
-
-                               delete_list = sd->undo_dest_list;
-                               while (delete_list)
-                                       {
-                                       work = g_list_append(work, file_data_new_group(delete_list->data));
-                                       delete_list = delete_list->next;
-                                       }
-                               options->file_ops.safe_delete_enable = TRUE;
-                               file_util_delete(NULL, work, button);
-                               }
-                       break;
-
-               default:
-                       break;
-               }
-
-       layout_refresh(sd->lw);
-       origin = (sd->undo_src_list)->data;
-
-       if (isfile(origin))
-               {
-               layout_image_set_fd(sd->lw, file_data_new_group(origin));
-               }
-
-       bar_sort_undo_set(sd, NULL, NULL);
-}
-
-static void bar_sort_undo_collection(SortData *sd)
-{
-       GList *work;
-
-       work = sd->undo_src_list;
-       while (work)
-               {
-               gchar *source;
-               source = work->data;
-               work = work->next;
-               collect_manager_remove(file_data_new_group(source), sd->undo_collection);
-               }
-
-       bar_sort_undo_set(sd, NULL,  NULL);
-}
-
-static void bar_sort_undo_cb(GtkWidget *button, gpointer data)
-{
-       SortData *sd = data;
-
-       if (sd->mode == BAR_SORT_MODE_FOLDER)
-               {
-               bar_sort_undo_folder(sd, button);
-               }
-       else
-               {
-               bar_sort_undo_collection(sd);
-               }
-}
-
-static void bar_sort_bookmark_select_folder(SortData *sd, FileData *UNUSED(source), const gchar *path)
-{
-       GList *orig_list;
-       GList *action_list;
-       GList *undo_src_list;
-
-       if (!isdir(path)) return;
-
-       orig_list = layout_selection_list(sd->lw);
-       action_list = orig_list;
-       undo_src_list = orig_list;
-       orig_list = NULL;
-
-       bar_sort_undo_set(sd, undo_src_list, path);
-
-       switch (sd->action)
-               {
-               case BAR_SORT_COPY:
-                       file_util_copy_simple(action_list, path, sd->lw->window);
-                       action_list = NULL;
-                       layout_image_next(sd->lw);
-                       break;
-
-               case BAR_SORT_MOVE:
-                       file_util_move_simple(action_list, path, sd->lw->window);
-                       action_list = NULL;
-                       break;
-
-               case BAR_SORT_FILTER:
-                       file_util_start_filter_from_filelist(sd->filter_key, action_list, path, sd->lw->window);
-                       layout_image_next(sd->lw);
-                       break;
-
-               default:
-                       break;
-               }
-}
-
-static void bar_sort_bookmark_select_collection(SortData *sd, FileData *source, const gchar *path)
-{
-       GList *list = NULL;
-
-       switch (sd->selection)
-               {
-               case BAR_SORT_SELECTION_IMAGE:
-                       list = g_list_append(NULL, file_data_ref(source));
-                       break;
-               case BAR_SORT_SELECTION_SELECTED:
-                       list = layout_selection_list(sd->lw);
-                       break;
-               default:
-                       break;
-               }
-
-       if (!list)
-               {
-               bar_sort_undo_set(sd, NULL, NULL);
-               return;
-               }
-
-       bar_sort_undo_set(sd, list, path);
-       sd->undo_collection = g_strdup(path);
-
-       while (list)
-               {
-               FileData *image_fd;
-
-               image_fd = list->data;
-               list = list->next;
-               collect_manager_add(image_fd, path);
-               }
-}
-
-static void bar_sort_bookmark_select(const gchar *path, gpointer data)
-{
-       SortData *sd = data;
-       FileData *source;
-
-       source = layout_image_get_fd(sd->lw);
-       if (!path || !source) return;
-
-       if (sd->mode == BAR_SORT_MODE_FOLDER)
-               {
-               bar_sort_bookmark_select_folder(sd, source, path);
-               }
-       else
-               {
-               bar_sort_bookmark_select_collection(sd, source, path);
-               }
-}
-
-static void bar_sort_set_action(SortData *sd, SortActionType action, const gchar *filter_key)
-{
-       sd->action = action;
-       if (action == BAR_SORT_FILTER)
-               {
-               if (!filter_key) filter_key = "";
-               sd->filter_key = g_strdup(filter_key);
-               }
-       else
-               {
-               sd->filter_key = NULL;
-               }
-}
-
-static void bar_sort_set_copy_cb(GtkWidget *button, gpointer data)
-{
-       SortData *sd = data;
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
-       bar_sort_set_action(sd, BAR_SORT_COPY, NULL);
-}
-
-static void bar_sort_set_move_cb(GtkWidget *button, gpointer data)
-{
-       SortData *sd = data;
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
-       bar_sort_set_action(sd, BAR_SORT_MOVE, NULL);
-}
-
-static void bar_sort_set_filter_cb(GtkWidget *button, gpointer data)
-{
-       SortData *sd = data;
-       const gchar *key;
-
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
-       key = g_object_get_data(G_OBJECT(button), "filter_key");
-       bar_sort_set_action(sd, BAR_SORT_FILTER, key);
-}
-
-static void bar_filter_help_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
-{
-       help_window_show("GuidePluginsConfig.html#Geeqieextensions");
-}
-
-static gboolean bar_filter_message_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer UNUSED(data))
-{
-       GenericDialog *gd;
-
-       if (event->button != MOUSE_BUTTON_RIGHT) return FALSE;
-
-       gd = generic_dialog_new(_("Sort Manager Operations"),
-                               "sort_manager_operations", NULL, TRUE, NULL, NULL);
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
-                               "Sort Manager Operations", _("Additional operations utilising plugins\nmay be included by setting:\n\nX-Geeqie-Filter=true\n\nin the plugin file."), TRUE);
-       generic_dialog_add_button(gd, GTK_STOCK_HELP, NULL, bar_filter_help_cb, TRUE);
-       generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
-
-       gtk_widget_show(gd->dialog);
-
-       return TRUE;
-}
-
-static void bar_sort_set_selection(SortData *sd, SortSelectionType selection)
-{
-       sd->selection = selection;
-}
-
-static void bar_sort_set_selection_image_cb(GtkWidget *button, gpointer data)
-{
-       SortData *sd = data;
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
-       bar_sort_set_selection(sd, BAR_SORT_SELECTION_IMAGE);
-}
-
-static void bar_sort_set_selection_selected_cb(GtkWidget *button, gpointer data)
-{
-       SortData *sd = data;
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
-       bar_sort_set_selection(sd, BAR_SORT_SELECTION_SELECTED);
-}
-
-static void bar_sort_add_close(SortData *sd)
-{
-       if (sd->dialog) file_dialog_close(sd->dialog);
-       sd->dialog_name_entry = NULL;
-       sd->dialog = NULL;
-}
-
-static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
-{
-       SortData *sd = data;
-       const gchar *name = gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
-       gboolean empty_name = (name[0] == '\0');
-
-       name = gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
-       if (sd->mode == BAR_SORT_MODE_FOLDER)
-               {
-               if (empty_name)
-                       {
-                       name = filename_from_path(fd->dest_path);
-                       }
-
-               bookmark_list_add(sd->bookmarks, name, fd->dest_path);
-               }
-       else
-               {
-               gchar *path;
-               gboolean has_extension;
-               gchar *filename = (gchar *) name;
-
-               if (empty_name) return;
-
-               has_extension = file_extension_match(name, GQ_COLLECTION_EXT);
-               if (!has_extension)
-                       {
-                       filename = g_strconcat(name, GQ_COLLECTION_EXT, NULL);
-                       }
-
-               path = g_build_filename(get_collections_dir(), filename, NULL);
-               if (isfile(path))
-                       {
-                       gchar *text = g_strdup_printf(_("The collection:\n%s\nalready exists."), filename);
-                       file_util_warning_dialog(_("Collection exists"), text, GTK_STOCK_DIALOG_INFO, NULL);
-                       g_free(text);
-                       }
-               else
-                       {
-                       CollectionData *cd;
-
-                       cd = collection_new(path);
-                       if (collection_save(cd, path))
-                               {
-                               bar_sort_collection_list_build(sd->bookmarks);
-                               }
-                       else
-                               {
-                               gchar *text = g_strdup_printf(_("Failed to save the collection:\n%s"), path);
-                               file_util_warning_dialog(_("Save Failed"), text,
-                                                        GTK_STOCK_DIALOG_ERROR, GENERIC_DIALOG(fd)->dialog);
-                               g_free(text);
-                               }
-                       collection_unref(cd);
-                       }
-
-               if (!has_extension) g_free(filename);
-               g_free(path);
-               }
-
-       bar_sort_add_close(sd);
-}
-
-static void bar_sort_add_cancel_cb(FileDialog *UNUSED(fd), gpointer data)
-{
-       SortData *sd = data;
-
-       bar_sort_add_close(sd);
-}
-
-static void bar_sort_add_cb(GtkWidget *button, gpointer data)
-{
-       SortData *sd = data;
-       GtkWidget *hbox;
-       const gchar *title;
-
-       if (sd->dialog)
-               {
-               gtk_window_present(GTK_WINDOW(GENERIC_DIALOG(sd->dialog)->dialog));
-               return;
-               }
-
-       if (sd->mode == BAR_SORT_MODE_FOLDER)
-               {
-               title = _("Add Bookmark");
-               }
-       else
-               {
-               title = _("Add Collection");
-               }
-
-       sd->dialog = file_util_file_dlg(title,
-                                      "add_bookmark", button,
-                                      bar_sort_add_cancel_cb, sd);
-       file_dialog_add_button(sd->dialog, GTK_STOCK_OK, NULL, bar_sort_add_ok_cb, TRUE);
-
-       generic_dialog_add_message(GENERIC_DIALOG(sd->dialog), NULL, title, NULL, FALSE);
-
-       if (sd->mode == BAR_SORT_MODE_FOLDER)
-               {
-               file_dialog_add_path_widgets(sd->dialog, NULL, NULL, "add_bookmark", NULL, NULL);
-               }
-
-       hbox = pref_box_new(GENERIC_DIALOG(sd->dialog)->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-
-       pref_label_new(hbox, _("Name:"));
-
-       sd->dialog_name_entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), sd->dialog_name_entry, TRUE, TRUE, 0);
-       generic_dialog_attach_default(GENERIC_DIALOG(sd->dialog), sd->dialog_name_entry);
-       gtk_widget_show(sd->dialog_name_entry);
-
-       if (sd->mode == BAR_SORT_MODE_COLLECTION)
-               {
-               gtk_widget_grab_focus(sd->dialog_name_entry);
-               }
-
-       gtk_widget_show(GENERIC_DIALOG(sd->dialog)->dialog);
-}
-
-void bar_sort_close(GtkWidget *bar)
-{
-       SortData *sd;
-
-       sd = g_object_get_data(G_OBJECT(bar), "bar_sort_data");
-       if (!sd) return;
-
-       gtk_widget_destroy(sd->vbox);
-}
-
-static void bar_sort_destroy(GtkWidget *UNUSED(widget), gpointer data)
-{
-       SortData *sd = data;
-
-       bar_sort_add_close(sd);
-
-       g_free(sd->filter_key);
-       string_list_free(sd->undo_src_list);
-       string_list_free(sd->undo_dest_list);
-       g_free(sd->undo_collection);
-       g_free(sd);
-}
-
-static void bar_sort_edit_button_free(gpointer data)
-{
-       g_free(data);
-}
-
-static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action,
-                              SortModeType mode, SortSelectionType selection,
-                              const gchar *filter_key)
-{
-       SortData *sd;
-       GtkWidget *buttongrp;
-       GtkWidget *label;
-       GtkWidget *tbar;
-       GtkWidget *combo;
-       GList *editors_list, *work;
-       gboolean have_filter;
-       GtkWidget *button;
-
-       if (!lw) return NULL;
-
-       sd = g_new0(SortData, 1);
-
-       sd->lw = lw;
-
-       sd->action = action;
-
-       if (sd->action == BAR_SORT_FILTER && (!filter_key || !filter_key[0]))
-               {
-               sd->action = BAR_SORT_COPY;
-               }
-
-       sd->selection = selection;
-       sd->undo_src_list = NULL;
-       sd->undo_dest_list = NULL;
-       sd->undo_collection = NULL;
-
-       sd->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
-       DEBUG_NAME(sd->vbox);
-       g_object_set_data(G_OBJECT(sd->vbox), "bar_sort_data", sd);
-       g_signal_connect(G_OBJECT(sd->vbox), "destroy",
-                        G_CALLBACK(bar_sort_destroy), sd);
-
-       label = gtk_label_new(_("Sort Manager"));
-       pref_label_bold(label, TRUE, FALSE);
-       gtk_box_pack_start(GTK_BOX(sd->vbox), label, FALSE, FALSE, 0);
-       gtk_widget_show(label);
-
-       combo = gtk_combo_box_text_new();
-       gtk_box_pack_start(GTK_BOX(sd->vbox), combo, FALSE, FALSE, 0);
-       gtk_widget_show(combo);
-
-       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Folders"));
-       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Collections"));
-
-       g_signal_connect(G_OBJECT(combo), "changed",
-                        G_CALLBACK(bar_sort_mode_cb), sd);
-
-       sd->folder_group = pref_box_new(sd->vbox, FALSE, GTK_ORIENTATION_VERTICAL, 0);
-       DEBUG_NAME(sd->folder_group);
-
-       buttongrp = pref_radiobutton_new(sd->folder_group, NULL,
-                                        _("Copy"), (sd->action == BAR_SORT_COPY),
-                                        G_CALLBACK(bar_sort_set_copy_cb), sd);
-       g_signal_connect(G_OBJECT(buttongrp), "button_press_event", G_CALLBACK(bar_filter_message_cb), NULL);
-       button = pref_radiobutton_new(sd->folder_group, buttongrp,
-                            _("Move"), (sd->action == BAR_SORT_MOVE),
-                            G_CALLBACK(bar_sort_set_move_cb), sd);
-       g_signal_connect(G_OBJECT(button), "button_press_event", G_CALLBACK(bar_filter_message_cb), NULL);
-
-
-       have_filter = FALSE;
-       editors_list = editor_list_get();
-       work = editors_list;
-       while (work)
-               {
-               GtkWidget *button;
-               EditorDescription *editor = work->data;
-               gchar *key;
-               gboolean select = FALSE;
-
-               work = work->next;
-
-               if (!editor_is_filter(editor->key)) continue;
-
-               key = g_strdup(editor->key);
-               if (sd->action == BAR_SORT_FILTER && strcmp(key, filter_key) == 0)
-                       {
-                       bar_sort_set_action(sd, sd->action, key);
-                       select = TRUE;
-                       have_filter = TRUE;
-                       }
-
-               button = pref_radiobutton_new(sd->folder_group, buttongrp,
-                                             editor->name, select,
-                                             G_CALLBACK(bar_sort_set_filter_cb), sd);
-               g_signal_connect(G_OBJECT(button), "button_press_event", G_CALLBACK(bar_filter_message_cb), NULL);
-
-               g_object_set_data_full(G_OBJECT(button), "filter_key", key, bar_sort_edit_button_free);
-               }
-       g_list_free(editors_list);
-
-       if (sd->action == BAR_SORT_FILTER && !have_filter) sd->action = BAR_SORT_COPY;
-
-       sd->collection_group = pref_box_new(sd->vbox, FALSE, GTK_ORIENTATION_VERTICAL, 0);
-
-       buttongrp = pref_radiobutton_new(sd->collection_group, NULL,
-                                        _("Add image"), (sd->selection == BAR_SORT_SELECTION_IMAGE),
-                                        G_CALLBACK(bar_sort_set_selection_image_cb), sd);
-       pref_radiobutton_new(sd->collection_group, buttongrp,
-                            _("Add selection"), (sd->selection == BAR_SORT_SELECTION_SELECTED),
-                            G_CALLBACK(bar_sort_set_selection_selected_cb), sd);
-
-       sd->bookmarks = bookmark_list_new(SORT_KEY_FOLDERS, bar_sort_bookmark_select, sd);
-       DEBUG_NAME(sd->bookmarks);
-       gtk_box_pack_start(GTK_BOX(sd->vbox), sd->bookmarks, TRUE, TRUE, 0);
-       gtk_widget_show(sd->bookmarks);
-
-       tbar = pref_toolbar_new(sd->vbox, GTK_TOOLBAR_ICONS);
-       DEBUG_NAME(tbar);
-
-       sd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, NULL, FALSE,
-                                            _("Add Bookmark"),
-                                            G_CALLBACK(bar_sort_add_cb), sd);
-       sd->undo_button = pref_toolbar_button(tbar, GTK_STOCK_UNDO, NULL, FALSE,
-                                             _("Undo last image"),
-                                             G_CALLBACK(bar_sort_undo_cb), sd);
-
-       sd->mode = -1;
-       bar_sort_mode_sync(sd, mode);
-       gtk_combo_box_set_active(GTK_COMBO_BOX(combo), sd->mode);
-
-       return sd->vbox;
-}
-
-GtkWidget *bar_sort_new_from_config(LayoutWindow *lw, const gchar **UNUSED(attribute_names), const gchar **UNUSED(attribute_values))
-{
-       GtkWidget *bar;
-
-       bar = bar_sort_new(lw, lw->options.action, lw->options.mode, lw->options.selection, lw->options.filter_key);
-
-       if (lw->bar_sort_enabled) gtk_widget_show(bar);
-       return bar;
-}
-
-/**
- * @brief Sets the bar_sort_enabled flag
- * @param lw 
- * @param attribute_names 
- * @param attribute_values 
- * 
- * Called from rcfile when processing geeqierc.xml on start-up.
- * It is necessary to set the bar_sort_enabled flag because
- * the sort manager and desktop files are set up in the idle loop, and
- * setup is not yet completed during initialisation.
- * The flag is checked in layout_editors_reload_idle_cb.
- */
-void bar_sort_cold_start(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values)
-{
-       gboolean enabled = TRUE;
-       gint action = 0;
-       gint mode = 0;
-       gint selection = 0;
-       gchar *filter_key = NULL;
-
-       while (attribute_names && *attribute_names)
-               {
-               const gchar *option = *attribute_names++;
-               const gchar *value = *attribute_values++;
-
-               if (READ_BOOL_FULL("enabled", enabled)) continue;
-               if (READ_INT_CLAMP_FULL("action", action, 0, BAR_SORT_ACTION_COUNT - 1)) continue;
-               if (READ_INT_CLAMP_FULL("mode", mode, 0, BAR_SORT_MODE_COUNT - 1)) continue;
-               if (READ_INT_CLAMP_FULL("selection", selection, 0, BAR_SORT_SELECTION_COUNT - 1)) continue;
-               if (READ_CHAR_FULL("filter_key", filter_key)) continue;
-
-               log_printf("unknown attribute %s = %s\n", option, value);
-               }
-
-       lw->options.action = action;
-       lw->options.mode = mode;
-       lw->options.selection = selection;
-       lw->options.filter_key = g_strdup(filter_key);
-       lw->bar_sort_enabled = enabled;
-
-       g_free(filter_key);
-}
-
-GtkWidget *bar_sort_new_default(LayoutWindow *lw)
-{
-       return bar_sort_new_from_config(lw, NULL, NULL);
-}
-
-void bar_sort_write_config(GtkWidget *bar, GString *outstr, gint indent)
-{
-       SortData *sd;
-
-       if (!bar) return;
-       sd = g_object_get_data(G_OBJECT(bar), "bar_sort_data");
-       if (!sd) return;
-
-       WRITE_NL(); WRITE_STRING("<bar_sort ");
-       write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
-       WRITE_INT(*sd, mode);
-       WRITE_INT(*sd, action);
-       WRITE_INT(*sd, selection);
-       WRITE_CHAR(*sd, filter_key);
-       WRITE_STRING("/>");
-}
-
-
-/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */