}
}
-static gboolean layout_set_current_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUSED(event), gpointer data)
+static gboolean layout_set_current_cb(GtkWidget *, GdkEventFocus *, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
current_lw = lw;
return FALSE;
}
-static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer UNUSED(data))
+static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer)
{
LayoutWindow *lw;
GList *work;
g_free(buf);
}
-static void layout_vd_select_cb(ViewDir *UNUSED(vd), FileData *fd, gpointer data)
+static void layout_vd_select_cb(ViewDir *, FileData *fd, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
layout_set_fd(lw, fd);
}
-static void layout_path_entry_tab_append_cb(const gchar *UNUSED(path), gpointer data, gint n)
+static void layout_path_entry_tab_append_cb(const gchar *, gpointer data, gint n)
{
auto lw = static_cast<LayoutWindow *>(data);
gtk_widget_set_sensitive(lw->back_button, (n > 1));
}
-static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer UNUSED(data))
+static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer)
{
GList *box_child_list;
GtkComboBox *path_entry;
g_signal_connect(G_OBJECT(gtk_widget_get_parent(gtk_widget_get_parent(lw->path_entry))), "changed",
G_CALLBACK(layout_path_entry_changed_cb), lw);
- box_folders = GTK_WIDGET(gtk_hpaned_new());
+ box_folders = GTK_WIDGET(gtk_paned_new(GTK_ORIENTATION_HORIZONTAL));
DEBUG_NAME(box_folders);
gtk_box_pack_start(GTK_BOX(box), box_folders, TRUE, TRUE, 0);
{
vf_read_metadata_in_idle(lw->vf);
}
- layout_sort_set(lw, type, lw->sort_ascend);
+ layout_sort_set_files(lw, type, lw->options.file_view_list_sort.ascend, lw->options.file_view_list_sort.case_sensitive);
}
-static void layout_sort_menu_ascend_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void layout_sort_menu_ascend_cb(GtkWidget *, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
- layout_sort_set(lw, lw->sort_method, !lw->sort_ascend);
+ layout_sort_set_files(lw, lw->options.file_view_list_sort.method, !lw->options.file_view_list_sort.ascend, lw->options.file_view_list_sort.case_sensitive);
}
-static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer UNUSED(data))
+static void layout_sort_menu_case_cb(GtkWidget *, gpointer data)
+{
+ auto lw = static_cast<LayoutWindow *>(data);
+
+ layout_sort_set_files(lw, lw->options.file_view_list_sort.method, lw->options.file_view_list_sort.ascend, !lw->options.file_view_list_sort.case_sensitive);
+}
+
+static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer)
{
/* destroy the menu */
g_object_unref(widget);
}
-static void layout_sort_button_press_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void layout_sort_button_press_cb(GtkWidget *, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
GtkWidget *menu;
- menu = submenu_add_sort(nullptr, G_CALLBACK(layout_sort_menu_cb), lw, FALSE, FALSE, TRUE, lw->sort_method);
+ menu = submenu_add_sort(nullptr, G_CALLBACK(layout_sort_menu_cb), lw, FALSE, FALSE, TRUE, lw->options.file_view_list_sort.method);
/* take ownership of menu */
#ifdef GTK_OBJECT_FLOATING
/* ascending option */
menu_item_add_divider(menu);
- menu_item_add_check(menu, _("Ascending"), lw->sort_ascend, G_CALLBACK(layout_sort_menu_ascend_cb), lw);
+ menu_item_add_check(menu, _("Ascending"), lw->options.file_view_list_sort.ascend, G_CALLBACK(layout_sort_menu_ascend_cb), lw);
+ menu_item_add_check(menu, _("Case"), lw->options.file_view_list_sort.case_sensitive, G_CALLBACK(layout_sort_menu_case_cb), lw);
g_signal_connect(G_OBJECT(menu), "selection_done",
G_CALLBACK(layout_sort_menu_hide_cb), NULL);
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
gtk_widget_show(frame);
- image = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_BUTTON);
- button = gtk_button_new_with_label(sort_type_get_text(lw->sort_method));
+ image = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
+ button = gtk_button_new_with_label(sort_type_get_text(lw->options.file_view_list_sort.method));
gtk_button_set_image(GTK_BUTTON(button), image);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(layout_sort_button_press_cb), lw);
image_options_sync();
}
-static void layout_zoom_menu_hide_cb(GtkWidget *widget, gpointer UNUSED(data))
+static void layout_zoom_menu_hide_cb(GtkWidget *widget, gpointer)
{
/* destroy the menu */
g_object_unref(widget);
}
-static void layout_zoom_button_press_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void layout_zoom_button_press_cb(GtkWidget *, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
GtkWidget *menu;
gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
}
-static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size, gboolean UNUSED(expand))
+static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size, gboolean)
{
GtkWidget *button;
GtkWidget *frame;
gtk_widget_show(frame);
- image = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
button = gtk_button_new_with_label("1:1");
gtk_button_set_image(GTK_BUTTON(button), image);
g_signal_connect(G_OBJECT(button), "clicked",
return lw->dir_view;
}
-static void layout_list_status_cb(ViewFile *UNUSED(vf), gpointer data)
+static void layout_list_status_cb(ViewFile *, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
layout_status_update_info(lw, nullptr);
}
-static void layout_list_thumb_cb(ViewFile *UNUSED(vf), gdouble val, const gchar *text, gpointer data)
+static void layout_list_thumb_cb(ViewFile *, gdouble val, const gchar *text, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
if (lw->vf) vf_marks_set(lw->vf, lw->options.show_marks);
}
-static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *UNUSED(needle))
+static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *)
{
if (!lw) return;
}
{
if (!layout_valid(&lw)) return;
- if (lw->vf) vf_sort_set(lw->vf, lw->sort_method, lw->sort_ascend);
+ if (lw->vf) vf_sort_set(lw->vf, lw->options.file_view_list_sort.method, lw->options.file_view_list_sort.ascend, lw->options.file_view_list_sort.case_sensitive);
}
GList *layout_selection_list(LayoutWindow *lw)
if (options->metadata.confirm_on_dir_change && dir_changed)
metadata_write_queue_confirm(FALSE, nullptr, nullptr);
- if (lw->vf && (options->read_metadata_in_idle || (lw->sort_method == SORT_EXIFTIME || lw->sort_method == SORT_EXIFTIMEDIGITIZED || lw->sort_method == SORT_RATING)))
+ if (lw->vf && (options->read_metadata_in_idle || (lw->options.file_view_list_sort.method == SORT_EXIFTIME || lw->options.file_view_list_sort.method == SORT_EXIFTIMEDIGITIZED || lw->options.file_view_list_sort.method == SORT_RATING)))
{
vf_read_metadata_in_idle(lw->vf);
}
}
#pragma GCC diagnostic pop
-void layout_sort_set(LayoutWindow *lw, SortType type, gboolean ascend)
+void layout_sort_set_files(LayoutWindow *lw, SortType type, gboolean ascend, gboolean case_sensitive)
{
if (!layout_valid(&lw)) return;
- if (lw->sort_method == type && lw->sort_ascend == ascend) return;
+ if (lw->options.file_view_list_sort.method == type && lw->options.file_view_list_sort.ascend == ascend && lw->options.file_view_list_sort.case_sensitive == case_sensitive) return;
- lw->sort_method = type;
- lw->sort_ascend = ascend;
+ lw->options.file_view_list_sort.method = type; //??
+ lw->options.file_view_list_sort.ascend = ascend;
+ lw->options.file_view_list_sort.case_sensitive = case_sensitive;
if (lw->info_sort) gtk_button_set_label(GTK_BUTTON(lw->info_sort), sort_type_get_text(type));
layout_list_sync_sort(lw);
}
-gboolean layout_sort_get(LayoutWindow *lw, SortType *type, gboolean *ascend)
+gboolean layout_sort_get(LayoutWindow *lw, SortType *type, gboolean *ascend, gboolean *case_sensitive)
{
if (!layout_valid(&lw)) return FALSE;
- if (type) *type = lw->sort_method;
- if (ascend) *ascend = lw->sort_ascend;
+ if (type) *type = lw->options.file_view_list_sort.method;
+ if (ascend) *ascend = lw->options.file_view_list_sort.ascend;
+ if (case_sensitive) *case_sensitive = lw->options.file_view_list_sort.case_sensitive;
return TRUE;
}
layout_style_set(lw, -1, nullptr);
}
-void layout_views_set_sort(LayoutWindow *lw, SortType method, gboolean ascend)
+void layout_views_set_sort_dir(LayoutWindow *lw, SortType method, gboolean ascend, gboolean case_sensitive)
{
if (!layout_valid(&lw)) return;
- if (lw->options.dir_view_list_sort.method == method && lw->options.dir_view_list_sort.ascend == ascend) return;
+ if (lw->options.dir_view_list_sort.method == method && lw->options.dir_view_list_sort.ascend == ascend && lw->options.dir_view_list_sort.case_sensitive == case_sensitive) return;
lw->options.dir_view_list_sort.method = method;
lw->options.dir_view_list_sort.ascend = ascend;
+ lw->options.dir_view_list_sort.case_sensitive = case_sensitive;
layout_style_set(lw, -1, nullptr);
}
lw->options.tools_hidden = hide;
}
-static gboolean layout_tools_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
+static gboolean layout_tools_delete_cb(GtkWidget *, GdkEventAny *, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
layout_status_setup(lw, vbox, TRUE);
- if (vertical)
- {
- lw->tools_pane = gtk_vpaned_new();
- DEBUG_NAME(lw->tools_pane);
- }
- else
- {
- lw->tools_pane = gtk_hpaned_new();
- DEBUG_NAME(lw->tools_pane);
- }
+ lw->tools_pane = gtk_paned_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
+ DEBUG_NAME(lw->tools_pane);
gtk_box_pack_start(GTK_BOX(vbox), lw->tools_pane, TRUE, TRUE, 0);
gtk_widget_show(lw->tools_pane);
layout_grid_compute(lw, image_sb, tools, files, &w1, &w2, &w3);
- v = lw->v_pane = gtk_vpaned_new();
+ v = lw->v_pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
DEBUG_NAME(v);
- h = lw->h_pane = gtk_hpaned_new();
+ h = lw->h_pane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
DEBUG_NAME(h);
if (!layout_location_vertical(static_cast<LayoutLocation>(priority_location)))
lw->info_pixel = nullptr;
lw->info_zoom = nullptr;
-/*
- if (lw->ui_manager) g_object_unref(lw->ui_manager);
- lw->ui_manager = NULL;
- lw->action_group = NULL;
- lw->action_group_editors = NULL;
-*/
-
gtk_container_remove(GTK_CONTAINER(lw->main_box), lw->group_box);
lw->group_box = nullptr;
layout_util_sync(lw);
layout_status_update_all(lw);
-
- // printf("%d %d %d \n", G_OBJECT(lw->utility_box)->ref_count, G_OBJECT(lw->menu_bar)->ref_count, G_OBJECT(lw->toolbar)->ref_count);
-
/* sync */
if (image_get_fd(lw->image))
static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data);
-static void layout_config_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void layout_config_close_cb(GtkWidget *, gpointer data)
{
auto lc = static_cast<LayoutConfig *>(data);
g_free(lc);
}
-static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *UNUSED(event), gpointer data)
+static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *, gpointer data)
{
layout_config_close_cb(w, data);
return TRUE;
}
-static void layout_config_apply_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void layout_config_apply_cb(GtkWidget *, gpointer data)
{
auto lc = static_cast<LayoutConfig *>(data);
layout_apply_options(lc->lw, &lc->options);
}
-static void layout_config_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
+static void layout_config_help_cb(GtkWidget *, gpointer)
{
help_window_show("GuideOptionsLayout.html");
}
layout_config_close_cb(widget, lc);
}
-static void home_path_set_current_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void home_path_set_current_cb(GtkWidget *, gpointer data)
{
auto lc = static_cast<LayoutConfig *>(data);
gtk_entry_set_text(GTK_ENTRY(lc->home_path_entry), layout_get_path(lc->lw));
lc->options.startup_path = STARTUP_PATH_HOME;
}
-
-/*
-static void layout_config_save_cb(GtkWidget *widget, gpointer data)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static void layout_config_save_cb_unused(GtkWidget *, gpointer)
{
- layout_config_apply();
+ //layout_config_apply();
save_options(options);
}
-*/
+#pragma GCC diagnostic pop
void layout_show_config_window(LayoutWindow *lw)
{
gtk_container_add(GTK_CONTAINER(lc->configwindow), win_vbox);
gtk_widget_show(win_vbox);
- hbox = gtk_hbutton_box_new();
+ hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_BUTTON_GAP);
gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
- button = pref_button_new(nullptr, GTK_STOCK_OK, nullptr, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_OK, "OK",
G_CALLBACK(layout_config_ok_cb), lc);
gtk_container_add(GTK_CONTAINER(hbox), button);
gtk_widget_set_can_default(button, TRUE);
ct_button = button;
/*
- button = pref_button_new(NULL, GTK_STOCK_SAVE, NULL, FALSE,
+ button = pref_button_new(NULL, GQ_ICON_SAVE, _("Save"), FALSE,
G_CALLBACK(layout_config_save_cb), NULL);
gtk_container_add(GTK_CONTAINER(hbox), button);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_show(button);
*/
- button = pref_button_new(nullptr, GTK_STOCK_HELP, nullptr, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
G_CALLBACK(layout_config_help_cb), lc);
gtk_container_add(GTK_CONTAINER(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_show(button);
- button = pref_button_new(nullptr, GTK_STOCK_APPLY, nullptr, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_APPLY, _("Apply"),
G_CALLBACK(layout_config_apply_cb), lc);
gtk_container_add(GTK_CONTAINER(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_show(button);
- button = pref_button_new(nullptr, GTK_STOCK_CANCEL, nullptr, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_CANCEL, _("Cancel"),
G_CALLBACK(layout_config_close_cb), lc);
gtk_container_add(GTK_CONTAINER(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
gtk_widget_show(tabcomp);
- button = pref_button_new(hbox, nullptr, _("Use current"), FALSE,
+ button = pref_button_new(hbox, nullptr, _("Use current"),
G_CALLBACK(home_path_set_current_cb), lc);
pref_checkbox_new_int(group, _("Show date in directories list view"),
layout_geometry_get_dividers(lw, &lw->options.main_window.hdivider_pos, &lw->options.main_window.vdivider_pos);
-// layout_sort_get(NULL, &options->file_sort.method, &options->file_sort.ascending);
-
layout_geometry_get_tools(lw, &lw->options.float_window.x, &lw->options.float_window.y,
&lw->options.float_window.w, &lw->options.float_window.h, &lw->options.float_window.vdivider_pos);
g_free(lw);
}
-static gboolean layout_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
+static gboolean layout_delete_cb(GtkWidget *, GdkEventAny *, gpointer data)
{
auto lw = static_cast<LayoutWindow *>(data);
else
init_layout_options(&lw->options);
- lw->sort_method = SORT_NAME;
- lw->sort_ascend = TRUE;
+ lw->options.file_view_list_sort.method = SORT_NAME;
+ lw->options.file_view_list_sort.ascend = TRUE;
+ lw->options.file_view_list_sort.case_sensitive = TRUE;
layout_set_unique_id(lw);
-// lw->options.tools_float = popped;
-// lw->options.tools_hidden = hidden;
-// lw->bar_sort_enabled = options->panels.sort.enabled;
-// lw->bar_enabled = options->panels.info.enabled;
/* default layout */
if (options->save_window_positions || isfile(default_path))
{
gtk_window_set_default_size(GTK_WINDOW(lw->window), lw->options.main_window.w, lw->options.main_window.h);
-// if (!layout_window_list)
-// {
gtk_window_move(GTK_WINDOW(lw->window), lw->options.main_window.x, lw->options.main_window.y);
if (lw->options.main_window.maximized) gtk_window_maximize(GTK_WINDOW(lw->window));
-// }
g_idle_add(move_window_to_workspace_cb, lw);
}
WRITE_NL(); WRITE_CHAR(*layout, order);
WRITE_NL(); WRITE_UINT(*layout, dir_view_type);
WRITE_NL(); WRITE_UINT(*layout, file_view_type);
+
+ WRITE_NL(); WRITE_UINT(*layout, file_view_list_sort.method);
+ WRITE_NL(); WRITE_BOOL(*layout, file_view_list_sort.ascend);
+ WRITE_NL(); WRITE_BOOL(*layout, file_view_list_sort.case_sensitive);
+
WRITE_NL(); WRITE_UINT(*layout, dir_view_list_sort.method);
WRITE_NL(); WRITE_BOOL(*layout, dir_view_list_sort.ascend);
+ WRITE_NL(); WRITE_BOOL(*layout, dir_view_list_sort.case_sensitive);
WRITE_NL(); WRITE_BOOL(*layout, show_marks);
WRITE_NL(); WRITE_BOOL(*layout, show_file_filter);
WRITE_NL(); WRITE_BOOL(*layout, show_thumbnails);
if (READ_UINT_ENUM(*layout, dir_view_type)) continue;
if (READ_UINT_ENUM(*layout, file_view_type)) continue;
+ if (READ_UINT_ENUM(*layout, file_view_list_sort.method)) continue;
+ if (READ_BOOL(*layout, file_view_list_sort.ascend)) continue;
+ if (READ_BOOL(*layout, file_view_list_sort.case_sensitive)) continue;
if (READ_UINT_ENUM(*layout, dir_view_list_sort.method)) continue;
if (READ_BOOL(*layout, dir_view_list_sort.ascend)) continue;
+ if (READ_BOOL(*layout, dir_view_list_sort.case_sensitive)) continue;
if (READ_BOOL(*layout, show_marks)) continue;
if (READ_BOOL(*layout, show_file_filter)) continue;
if (READ_BOOL(*layout, show_thumbnails)) continue;
}
lw = layout_new_with_geometry(nullptr, &lop, use_commandline ? command_line->geometry : nullptr);
- layout_sort_set(lw, options->file_sort.method, options->file_sort.ascending);
+ layout_sort_set_files(lw, lw->options.file_view_list_sort.method, lw->options.file_view_list_sort.ascend, lw->options.file_view_list_sort.case_sensitive);
+
+
layout_set_path(lw, path);
if (use_commandline && command_line->startup_full_screen) layout_image_full_screen_start(lw);
projects / geeqie.git / blobdiff