* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "bar-sort.h"
-#include "collect.h"
+#include <config.h>
+
#include "collect-io.h"
+#include "collect.h"
+#include "compat.h"
+#include "debug.h"
+#include "editors.h"
#include "filedata.h"
#include "history-list.h"
-#include "layout.h"
+#include "intl.h"
#include "layout-image.h"
-#include "utilops.h"
-#include "editors.h"
+#include "layout.h"
+#include "main-defines.h"
+#include "misc.h"
+#include "rcfile.h"
#include "ui-bookmark.h"
#include "ui-fileops.h"
#include "ui-misc.h"
-#include "rcfile.h"
+#include "utilops.h"
#include "window.h"
*-------------------------------------------------------------------
*/
-typedef struct _SortData SortData;
-struct _SortData
+struct SortData
{
GtkWidget *vbox;
GtkWidget *bookmarks;
bookmark_list_set_key(bookmarks, SORT_KEY_COLLECTIONS);
dir_fd = file_data_new_dir(get_collections_dir());
- filelist_read(dir_fd, &list, NULL);
+ filelist_read(dir_fd, &list, nullptr);
file_data_unref(dir_fd);
list = filelist_sort_path(list);
bar_sort_add_close(sd);
- bar_sort_undo_set(sd, NULL, NULL);
+ bar_sort_undo_set(sd, nullptr, nullptr);
}
static void bar_sort_mode_cb(GtkWidget *combo, gpointer data)
/* 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);
+ g_list_free_full(sd->undo_src_list, g_free);
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;
+ g_list_free_full(sd->undo_dest_list, g_free);
+ sd->undo_dest_list=nullptr;
GList *work = sd->undo_src_list;
while(work)
if (sd->undo_src_list)
{
- GList *work = NULL;
+ GList *work = nullptr;
src_path = g_strdup(static_cast<const gchar *>(sd->undo_src_list->data));
src_dir = remove_level_from_path(src_path);
if (sd->undo_src_list)
{
GList *delete_list;
- GList *work = NULL;
+ GList *work = nullptr;
delete_list = sd->undo_dest_list;
while (delete_list)
delete_list = delete_list->next;
}
options->file_ops.safe_delete_enable = TRUE;
- file_util_delete(NULL, work, button);
+ file_util_delete(nullptr, work, button);
}
break;
layout_image_set_fd(sd->lw, file_data_new_group(origin));
}
- bar_sort_undo_set(sd, NULL, NULL);
+ bar_sort_undo_set(sd, nullptr, nullptr);
}
static void bar_sort_undo_collection(SortData *sd)
collect_manager_remove(file_data_new_group(source), sd->undo_collection);
}
- bar_sort_undo_set(sd, NULL, NULL);
+ bar_sort_undo_set(sd, nullptr, nullptr);
}
static void bar_sort_undo_cb(GtkWidget *button, gpointer data)
}
}
-static void bar_sort_bookmark_select_folder(SortData *sd, FileData *UNUSED(source), const gchar *path)
+static void bar_sort_bookmark_select_folder(SortData *sd, FileData *, const gchar *path)
{
GList *orig_list;
GList *action_list;
orig_list = layout_selection_list(sd->lw);
action_list = orig_list;
undo_src_list = orig_list;
- orig_list = NULL;
+ orig_list = nullptr;
bar_sort_undo_set(sd, undo_src_list, path);
{
case BAR_SORT_COPY:
file_util_copy_simple(action_list, path, sd->lw->window);
- action_list = NULL;
+ action_list = nullptr;
layout_image_next(sd->lw);
break;
case BAR_SORT_MOVE:
file_util_move_simple(action_list, path, sd->lw->window);
- action_list = NULL;
+ action_list = nullptr;
break;
case BAR_SORT_FILTER:
static void bar_sort_bookmark_select_collection(SortData *sd, FileData *source, const gchar *path)
{
- GList *list = NULL;
+ GList *list = nullptr;
switch (sd->selection)
{
case BAR_SORT_SELECTION_IMAGE:
- list = g_list_append(NULL, file_data_ref(source));
+ list = g_list_append(nullptr, file_data_ref(source));
break;
case BAR_SORT_SELECTION_SELECTED:
list = layout_selection_list(sd->lw);
if (!list)
{
- bar_sort_undo_set(sd, NULL, NULL);
+ bar_sort_undo_set(sd, nullptr, nullptr);
return;
}
}
else
{
- sd->filter_key = NULL;
+ sd->filter_key = nullptr;
}
}
{
auto sd = static_cast<SortData *>(data);
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
- bar_sort_set_action(sd, BAR_SORT_COPY, NULL);
+ bar_sort_set_action(sd, BAR_SORT_COPY, nullptr);
}
static void bar_sort_set_move_cb(GtkWidget *button, gpointer data)
{
auto sd = static_cast<SortData *>(data);
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
- bar_sort_set_action(sd, BAR_SORT_MOVE, NULL);
+ bar_sort_set_action(sd, BAR_SORT_MOVE, nullptr);
}
static void bar_sort_set_filter_cb(GtkWidget *button, gpointer data)
bar_sort_set_action(sd, BAR_SORT_FILTER, key);
}
-static void bar_filter_help_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
+static void bar_filter_help_cb(GenericDialog *, gpointer)
{
help_window_show("GuidePluginsConfig.html#Geeqieextensions");
}
GenericDialog *gd;
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", nullptr, TRUE, nullptr, nullptr);
+ generic_dialog_add_message(gd, GQ_ICON_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);
+ generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), bar_filter_help_cb, TRUE);
+ generic_dialog_add_button(gd, GQ_ICON_OK, "OK", nullptr, TRUE);
gtk_widget_show(gd->dialog);
}
-static gboolean bar_filter_message_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer UNUSED(data))
+static gboolean bar_filter_message_cb(GtkWidget *, GdkEventButton *event, gpointer)
{
if (event->button != MOUSE_BUTTON_RIGHT) return FALSE;
return TRUE;
}
-static void bar_sort_help_cb(gpointer UNUSED(data))
+static void bar_sort_help_cb(gpointer)
{
bar_filter_help_dialog();
}
static void bar_sort_add_close(SortData *sd)
{
if (sd->dialog) file_dialog_close(sd->dialog);
- sd->dialog_name_entry = NULL;
- sd->dialog = NULL;
+ sd->dialog_name_entry = nullptr;
+ sd->dialog = nullptr;
}
static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
{
auto sd = static_cast<SortData *>(data);
- const gchar *name = gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
+ const gchar *name = gq_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));
+ name = gq_gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
if (sd->mode == BAR_SORT_MODE_FOLDER)
{
if (empty_name)
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);
+ file_util_warning_dialog(_("Collection exists"), text, GQ_ICON_DIALOG_INFO, nullptr);
g_free(text);
}
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);
+ GQ_ICON_DIALOG_ERROR, GENERIC_DIALOG(fd)->dialog);
g_free(text);
}
collection_unref(cd);
bar_sort_add_close(sd);
}
-static void bar_sort_add_cancel_cb(FileDialog *UNUSED(fd), gpointer data)
+static void bar_sort_add_cancel_cb(FileDialog *, gpointer data)
{
auto sd = static_cast<SortData *>(data);
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);
+ file_dialog_add_button(sd->dialog, GQ_ICON_OK, "OK", bar_sort_add_ok_cb, TRUE);
- generic_dialog_add_message(GENERIC_DIALOG(sd->dialog), NULL, title, NULL, FALSE);
+ generic_dialog_add_message(GENERIC_DIALOG(sd->dialog), nullptr, title, nullptr, FALSE);
if (sd->mode == BAR_SORT_MODE_FOLDER)
{
- file_dialog_add_path_widgets(sd->dialog, NULL, NULL, "add_bookmark", NULL, NULL);
+ file_dialog_add_path_widgets(sd->dialog, nullptr, nullptr, "add_bookmark", nullptr, nullptr);
}
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);
+ gq_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);
sd = static_cast<SortData *>(g_object_get_data(G_OBJECT(bar), "bar_sort_data"));
if (!sd) return;
- gtk_widget_destroy(sd->vbox);
+ gq_gtk_widget_destroy(sd->vbox);
}
-static void bar_sort_destroy(GtkWidget *UNUSED(widget), gpointer data)
+static void bar_sort_destroy(GtkWidget *, gpointer data)
{
auto sd = static_cast<SortData *>(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_list_free_full(sd->undo_src_list, g_free);
+ g_list_free_full(sd->undo_dest_list, g_free);
g_free(sd->undo_collection);
g_free(sd);
}
GtkWidget *label;
GtkWidget *tbar;
GtkWidget *combo;
- GList *editors_list, *work;
+ GList *editors_list;
+ GList *work;
gboolean have_filter;
GtkWidget *button;
- if (!lw) return NULL;
+ if (!lw) return nullptr;
sd = g_new0(SortData, 1);
}
sd->selection = selection;
- sd->undo_src_list = NULL;
- sd->undo_dest_list = NULL;
- sd->undo_collection = NULL;
+ sd->undo_src_list = nullptr;
+ sd->undo_dest_list = nullptr;
+ sd->undo_collection = nullptr;
sd->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
DEBUG_NAME(sd->vbox);
label = gtk_label_new(_("Sort Manager"));
pref_label_bold(label, TRUE, FALSE);
- gtk_box_pack_start(GTK_BOX(sd->vbox), label, FALSE, FALSE, 0);
+ gq_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);
+ gq_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"));
DEBUG_NAME(sd->folder_group);
gtk_widget_set_tooltip_text(sd->folder_group, _("See the Help file for additional functions"));
- buttongrp = pref_radiobutton_new(sd->folder_group, NULL,
+ buttongrp = pref_radiobutton_new(sd->folder_group, nullptr,
_("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);
sd->collection_group = pref_box_new(sd->vbox, FALSE, GTK_ORIENTATION_VERTICAL, 0);
- buttongrp = pref_radiobutton_new(sd->collection_group, NULL,
+ buttongrp = pref_radiobutton_new(sd->collection_group, nullptr,
_("Add image"), (sd->selection == BAR_SORT_SELECTION_IMAGE),
G_CALLBACK(bar_sort_set_selection_image_cb), sd);
pref_radiobutton_new(sd->collection_group, buttongrp,
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);
+ gq_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);
+ tbar = pref_toolbar_new(sd->vbox);
DEBUG_NAME(tbar);
- sd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, NULL, FALSE,
+ sd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
_("Add Bookmark"),
G_CALLBACK(bar_sort_add_cb), sd);
- sd->undo_button = pref_toolbar_button(tbar, GTK_STOCK_UNDO, NULL, FALSE,
+ sd->undo_button = pref_toolbar_button(tbar, GQ_ICON_UNDO, _("Undo"), FALSE,
_("Undo last image"),
G_CALLBACK(bar_sort_undo_cb), sd);
- sd->help_button = pref_toolbar_button(tbar, GTK_STOCK_HELP, NULL, FALSE,
+ sd->help_button = pref_toolbar_button(tbar, GQ_ICON_HELP, _("Help"), FALSE,
_("Functions additional to Copy and Move"),
G_CALLBACK(bar_sort_help_cb), sd);
return sd->vbox;
}
-GtkWidget *bar_sort_new_from_config(LayoutWindow *lw, const gchar **UNUSED(attribute_names), const gchar **UNUSED(attribute_values))
+GtkWidget *bar_sort_new_from_config(LayoutWindow *lw, const gchar **, const gchar **)
{
GtkWidget *bar;
/**
* @brief Sets the bar_sort_enabled flag
- * @param lw
- * @param attribute_names
- * @param attribute_values
- *
+ * @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
gint action = BAR_SORT_COPY;
gint mode = BAR_SORT_MODE_FOLDER;
gint selection = BAR_SORT_SELECTION_IMAGE;
- gchar *filter_key = NULL;
+ gchar *filter_key = nullptr;
while (attribute_names && *attribute_names)
{
GtkWidget *bar_sort_new_default(LayoutWindow *lw)
{
- return bar_sort_new_from_config(lw, NULL, NULL);
+ return bar_sort_new_from_config(lw, nullptr, nullptr);
}
void bar_sort_write_config(GtkWidget *bar, GString *outstr, gint indent)
projects / geeqie.git / blobdiff