* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "view-file.h"
+#include <config.h>
+
+#include "compat.h"
+#include "debug.h"
#include "dupe.h"
#include "history-list.h"
+#include "intl.h"
#include "layout.h"
+#include "main-defines.h"
+#include "main.h"
#include "menu.h"
#include "misc.h"
#include "pixbuf-util.h"
#include "thumb.h"
-#include "ui-menu.h"
#include "ui-fileops.h"
+#include "ui-menu.h"
#include "ui-misc.h"
#include "utilops.h"
-#include "view-file/view-file-list.h"
#include "view-file/view-file-icon.h"
+#include "view-file/view-file-list.h"
#include "window.h"
/*
*-----------------------------------------------------------------------------
*/
-void vf_sort_set(ViewFile *vf, SortType type, gboolean ascend)
+void vf_sort_set(ViewFile *vf, SortType type, gboolean ascend, gboolean case_sensitive)
{
switch (vf->type)
{
- case FILEVIEW_LIST: vflist_sort_set(vf, type, ascend); break;
- case FILEVIEW_ICON: vficon_sort_set(vf, type, ascend); break;
+ case FILEVIEW_LIST: vflist_sort_set(vf, type, ascend, case_sensitive); break;
+ case FILEVIEW_ICON: vficon_sort_set(vf, type, ascend, case_sensitive); break;
}
}
GList *vf_get_list(ViewFile *vf)
{
- GList *list = nullptr;
- GList *work;
- for (work = vf->list; work; work = work->next)
- {
- auto fd = static_cast<FileData *>(work->data);
- list = g_list_prepend(list, file_data_ref(fd));
- }
-
- return g_list_reverse(list);
+ return filelist_copy(vf->list);
}
/*
if (vf->layout)
{
- layout_sort_set(vf->layout, type, vf->sort_ascend);
+ layout_sort_set_files(vf->layout, type, vf->sort_ascend, vf->sort_case);
}
else
{
- vf_sort_set(vf, type, vf->sort_ascend);
+ vf_sort_set(vf, type, vf->sort_ascend, vf->sort_case);
}
}
if (vf->layout)
{
- layout_sort_set(vf->layout, vf->sort_method, !vf->sort_ascend);
+ layout_sort_set_files(vf->layout, vf->sort_method, !vf->sort_ascend, vf->sort_case);
}
else
{
- vf_sort_set(vf, vf->sort_method, !vf->sort_ascend);
+ vf_sort_set(vf, vf->sort_method, !vf->sort_ascend, vf->sort_case);
+ }
+}
+
+static void vf_pop_menu_sort_case_cb(GtkWidget *, gpointer data)
+{
+ auto vf = static_cast<ViewFile *>(data);
+
+ if (vf->layout)
+ {
+ layout_sort_set_files(vf->layout, vf->sort_method, vf->sort_ascend, !vf->sort_case);
+ }
+ else
+ {
+ vf_sort_set(vf, vf->sort_method, vf->sort_ascend, !vf->sort_case);
}
}
menu_item_add_divider(submenu);
menu_item_add_check(submenu, _("Ascending"), vf->sort_ascend,
G_CALLBACK(vf_pop_menu_sort_ascend_cb), vf);
+ menu_item_add_check(submenu, _("Case"), vf->sort_ascend,
+ G_CALLBACK(vf_pop_menu_sort_case_cb), vf);
item = menu_item_add(menu, _("_Sort"), nullptr, nullptr);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
{
g_signal_handlers_disconnect_matched(G_OBJECT(vf->popup), G_SIGNAL_MATCH_DATA,
0, 0, nullptr, nullptr, vf);
- gtk_widget_destroy(vf->popup);
+ g_object_unref(vf->popup);
}
if (vf->read_metadata_in_idle_id)
auto mte = static_cast<MarksTextEntry *>(data);
g_free(options->marks_tooltips[mte->mark_no]);
- options->marks_tooltips[mte->mark_no] = g_strdup(gtk_entry_get_text(GTK_ENTRY(mte->edit_widget)));
+ options->marks_tooltips[mte->mark_no] = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(mte->edit_widget)));
gtk_widget_set_tooltip_text(mte->parent, options->marks_tooltips[mte->mark_no]);
g_free(mte->text_entry);
mte->text_entry = g_strdup("");
- gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), "");
+ gq_gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), "");
}
static void vf_marks_tooltip_help_cb(GenericDialog *, gpointer)
vf_marks_tooltip_help_cb, FALSE);
table = pref_table_new(mte->gd->vbox, 3, 1, FALSE, TRUE);
- pref_table_label(table, 0, 0, g_strdup_printf("%s%d", _("Mark "), mte->mark_no + 1), 1.0);
+ pref_table_label(table, 0, 0, g_strdup_printf("%s%d", _("Mark "), mte->mark_no + 1), GTK_ALIGN_END);
mte->edit_widget = gtk_entry_new();
gtk_widget_set_size_request(mte->edit_widget, 300, -1);
if (mte->text_entry)
{
- gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), mte->text_entry);
+ gq_gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), mte->text_entry);
}
- gtk_table_attach_defaults(GTK_TABLE(table), mte->edit_widget, 1, 2, 0, 1);
+ gq_gtk_grid_attach_default(GTK_GRID(table), mte->edit_widget, 1, 2, 0, 1);
generic_dialog_attach_default(mte->gd, mte->edit_widget);
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(mte->edit_widget),
gboolean text_found = FALSE;
gint i;
- entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo)))));
+ entry_text = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo)))));
if (entry_text[0] == '\0' && vf->file_filter.last_selected >= 0)
{
gtk_combo_box_set_active(GTK_COMBO_BOX(vf->file_filter.combo), -1);
vf->file_filter.last_selected = - 1;
- gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo))), "");
+ gq_gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo))), "");
vf->file_filter.count--;
}
else
for (i = 0; i < FILEDATA_MARKS_SIZE ; i++)
{
GtkWidget *check = gtk_check_button_new();
- gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(check), "toggled",
G_CALLBACK(vf_marks_filter_toggle_cb), vf);
g_signal_connect(G_OBJECT(check), "button_press_event",
gtk_widget_show(check);
vf->filter_check[i] = check;
}
- gtk_container_add(GTK_CONTAINER(frame), hbox);
+ gq_gtk_container_add(GTK_WIDGET(frame), hbox);
gtk_widget_show(hbox);
return frame;
}
{
if (pos == GTK_ENTRY_ICON_SECONDARY)
{
- gtk_entry_set_text(GTK_ENTRY(userdata), "");
+ gq_gtk_entry_set_text(GTK_ENTRY(userdata), "");
gtk_widget_grab_focus(GTK_WIDGET(userdata));
}
}
g_signal_connect(G_OBJECT(combo_entry), "button_press_event",
G_CALLBACK(vf_file_filter_press_cb), vf);
- gtk_box_pack_start(GTK_BOX(hbox), vf->file_filter.combo, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), vf->file_filter.combo, FALSE, FALSE, 0);
gtk_widget_show(vf->file_filter.combo);
- gtk_container_add(GTK_CONTAINER(frame), hbox);
+ gq_gtk_container_add(GTK_WIDGET(frame), hbox);
gtk_widget_show(hbox);
case_sensitive = gtk_check_button_new_with_label(_("Case"));
- gtk_box_pack_start(GTK_BOX(hbox), case_sensitive, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), case_sensitive, FALSE, FALSE, 0);
gtk_widget_set_tooltip_text(GTK_WIDGET(case_sensitive), _("Case sensitive"));
g_signal_connect(G_OBJECT(case_sensitive), "clicked", G_CALLBACK(case_sensitive_cb), vf);
gtk_widget_show(case_sensitive);
menubar = gtk_menu_bar_new();
- gtk_box_pack_start(GTK_BOX(hbox), menubar, FALSE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), menubar, FALSE, TRUE, 0);
gtk_widget_show(menubar);
box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
icon = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_MENU);
label = gtk_label_new(_("Class"));
- gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
- gtk_box_pack_end(GTK_BOX(box), icon, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(box), icon, FALSE, FALSE, 0);
menuitem = gtk_menu_item_new();
gtk_widget_set_tooltip_text(GTK_WIDGET(menuitem), _("Select Class filter"));
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), class_filter_menu(vf));
gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
- gtk_container_add(GTK_CONTAINER(menuitem), box);
- gtk_widget_show_all(menuitem);
+ gq_gtk_container_add(GTK_WIDGET(menuitem), box);
+ gq_gtk_widget_show_all(menuitem);
return frame;
}
vf->sort_ascend = TRUE;
vf->read_metadata_in_idle_id = 0;
- vf->scrolled = gtk_scrolled_window_new(nullptr, nullptr);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vf->scrolled), GTK_SHADOW_IN);
+ vf->scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+ gq_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->file_filter.frame = vf_file_filter_init(vf);
vf->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start(GTK_BOX(vf->widget), vf->filter, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vf->widget), vf->file_filter.frame, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vf->widget), vf->scrolled, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(vf->widget), vf->filter, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(vf->widget), vf->file_filter.frame, FALSE, FALSE, 0);
+ gq_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_signal_connect(G_OBJECT(vf->listview), "button_release_event",
G_CALLBACK(vf_release_cb), vf);
- gtk_container_add(GTK_CONTAINER(vf->scrolled), vf->listview);
+ gq_gtk_container_add(GTK_WIDGET(vf->scrolled), vf->listview);
gtk_widget_show(vf->listview);
if (dir_fd) vf_set_fd(vf, dir_fd);
{
return G_SOURCE_CONTINUE;
}
- else
- {
- vf->stars_filedata = nullptr;
- vf->stars_id = 0;
- return G_SOURCE_REMOVE;
- }
+
+ vf->stars_filedata = nullptr;
+ vf->stars_id = 0;
+ return G_SOURCE_REMOVE;
}
return G_SOURCE_REMOVE;
projects / geeqie.git / blobdiff