* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "layout.h"
+#include <unistd.h>
+
+#include <cstring>
+#include <utility>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#ifdef GDK_WINDOWING_X11
+# include <gdk/gdkx.h>
+#endif
+#include <glib-object.h>
+#include <pango/pango.h>
+
+#include "bar-sort.h"
+#include "bar.h"
+#include "compat.h"
+#include "debug.h"
#include "filedata.h"
+#include "histogram.h"
#include "history-list.h"
-#include "image.h"
#include "image-overlay.h"
+#include "image.h"
+#include "intl.h"
#include "layout-config.h"
#include "layout-image.h"
#include "layout-util.h"
#include "logwindow.h"
+#include "main-defines.h"
+#include "main.h"
#include "menu.h"
+#include "metadata.h"
+#include "misc.h"
#include "pixbuf-util.h"
-#include "utilops.h"
-#include "view-dir.h"
-#include "view-file.h"
+#include "preferences.h"
+#include "rcfile.h"
+#include "shortcuts.h"
#include "ui-fileops.h"
#include "ui-menu.h"
#include "ui-misc.h"
#include "ui-tabcomp.h"
+#include "ui-utildlg.h"
+#include "view-dir.h"
+#include "view-file.h"
#include "window.h"
-#include "metadata.h"
-#include "rcfile.h"
-#include "bar.h"
-#include "bar-sort.h"
-#include "preferences.h"
-#include "shortcuts.h"
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-#define MAINWINDOW_DEF_WIDTH 700
-#define MAINWINDOW_DEF_HEIGHT 500
+namespace
+{
+
+constexpr gint MAINWINDOW_DEF_WIDTH = 700;
+constexpr gint MAINWINDOW_DEF_HEIGHT = 500;
+
+constexpr gint MAIN_WINDOW_DIV_HPOS = MAINWINDOW_DEF_WIDTH / 2;
+constexpr gint MAIN_WINDOW_DIV_VPOS = MAINWINDOW_DEF_HEIGHT / 2;
+
+constexpr gint TOOLWINDOW_DEF_WIDTH = 260;
+constexpr gint TOOLWINDOW_DEF_HEIGHT = 450;
-#define MAIN_WINDOW_DIV_HPOS (MAINWINDOW_DEF_WIDTH / 2)
-#define MAIN_WINDOW_DIV_VPOS (MAINWINDOW_DEF_HEIGHT / 2)
+constexpr gint PROGRESS_WIDTH = 150;
-#define TOOLWINDOW_DEF_WIDTH 260
-#define TOOLWINDOW_DEF_HEIGHT 450
+constexpr gint ZOOM_LABEL_WIDTH = 120;
-#define PROGRESS_WIDTH 150
-#define ZOOM_LABEL_WIDTH 120
+constexpr gint CONFIG_WINDOW_DEF_WIDTH = 600;
+constexpr gint CONFIG_WINDOW_DEF_HEIGHT = 400;
-#define PANE_DIVIDER_SIZE 10
+struct LayoutConfig
+{
+ LayoutWindow *lw;
+
+ GtkWidget *configwindow;
+ GtkWidget *home_path_entry;
+ GtkWidget *layout_widget;
+ LayoutOptions options;
+};
-GList *layout_window_list = NULL;
-LayoutWindow *current_lw = NULL;
+} // namespace
+
+GList *layout_window_list = nullptr;
+LayoutWindow *current_lw = nullptr;
static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *needle);
gboolean layout_valid(LayoutWindow **lw)
{
- if (*lw == NULL)
+ if (*lw == nullptr)
{
if (current_lw) *lw = current_lw;
- else if (layout_window_list) *lw = layout_window_list->data;
- return (*lw != NULL);
+ else if (layout_window_list) *lw = static_cast<LayoutWindow *>(layout_window_list->data);
+ return (*lw != nullptr);
}
- return (g_list_find(layout_window_list, *lw) != NULL);
+ return (g_list_find(layout_window_list, *lw) != nullptr);
}
LayoutWindow *layout_find_by_image(ImageWindow *imd)
work = layout_window_list;
while (work)
{
- LayoutWindow *lw = work->data;
+ auto lw = static_cast<LayoutWindow *>(work->data);
work = work->next;
if (lw->image == imd) return lw;
}
- return NULL;
+ return nullptr;
}
LayoutWindow *layout_find_by_image_fd(ImageWindow *imd)
work = layout_window_list;
while (work)
{
- LayoutWindow *lw = work->data;
+ auto lw = static_cast<LayoutWindow *>(work->data);
work = work->next;
if (lw->image->image_fd == imd->image_fd)
return lw;
}
- return NULL;
+ return nullptr;
}
LayoutWindow *layout_find_by_layout_id(const gchar *id)
{
GList *work;
- if (!id || !id[0]) return NULL;
+ if (!id || !id[0]) return nullptr;
if (strcmp(id, LAYOUT_ID_CURRENT) == 0)
{
if (current_lw) return current_lw;
- if (layout_window_list) return layout_window_list->data;
- return NULL;
+ if (layout_window_list) return static_cast<LayoutWindow *>(layout_window_list->data);
+ return nullptr;
}
work = layout_window_list;
while (work)
{
- LayoutWindow *lw = work->data;
+ auto lw = static_cast<LayoutWindow *>(work->data);
work = work->next;
if (lw->options.id && strcmp(id, lw->options.id) == 0)
return lw;
}
- return NULL;
+ return nullptr;
}
gchar *layout_get_unique_id()
if (lw->options.id && lw->options.id[0]) return; /* id is already set */
g_free(lw->options.id);
- lw->options.id = NULL;
+ lw->options.id = nullptr;
i = 1;
while (TRUE)
}
}
-static gboolean layout_set_current_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUSED(event), gpointer data)
+static gboolean layout_set_current_cb(GtkWidget *, GdkEventFocus *, gpointer data)
{
- LayoutWindow *lw = 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;
work = layout_window_list;
while (work)
{
- lw = work->data;
+ lw = static_cast<LayoutWindow *>(work->data);
lw->options.folder_window.vdivider_pos = gtk_paned_get_position(GTK_PANED(widget));
work = work->next;
}
static void layout_path_entry_changed_cb(GtkWidget *widget, gpointer data)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
gchar *buf;
if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
- buf = g_strdup(gtk_entry_get_text(GTK_ENTRY(lw->path_entry)));
+ buf = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(lw->path_entry)));
if (!lw->dir_fd || strcmp(buf, lw->dir_fd->path) != 0)
{
layout_set_path(lw, buf);
static void layout_path_entry_tab_cb(const gchar *path, gpointer data)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
gchar *buf;
buf = g_strdup(path);
/* put the G_DIR_SEPARATOR back, if we are in tab completion for a dir and result was path change */
gtk_editable_insert_text(GTK_EDITABLE(lw->path_entry), G_DIR_SEPARATOR_S, -1, &pos);
gtk_editable_set_position(GTK_EDITABLE(lw->path_entry),
- strlen(gtk_entry_get_text(GTK_ENTRY(lw->path_entry))));
+ strlen(gq_gtk_entry_get_text(GTK_ENTRY(lw->path_entry))));
}
}
else if (lw->dir_fd)
static void layout_path_entry_cb(const gchar *path, gpointer data)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
gchar *buf;
buf = g_strdup(path);
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)
{
- LayoutWindow *lw = 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)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
if (!lw || !lw->back_button) return;
if (!layout_valid(&lw)) return;
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;
gchar *current_path;
box_child_list = gtk_container_get_children(GTK_CONTAINER(widget));
- path_entry = box_child_list->data;
+ path_entry = static_cast<GtkComboBox *>(box_child_list->data);
current_path = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(path_entry));
gtk_widget_set_tooltip_text(GTK_WIDGET(widget), current_path);
{
GtkWidget *box;
GtkWidget *box_folders;
- GtkWidget *scd;
+ GtkWidget *box_menu_tabcomp;
+ GtkWidget *menu_bar;
GtkWidget *menu_tool_bar;
+ GtkWidget *menu_toolbar_box;
+ GtkWidget *open_menu;
+ GtkWidget *scd;
+ GtkWidget *scroll_window;
GtkWidget *tabcomp;
- GtkWidget *menu_bar;
GtkWidget *toolbar;
- GtkWidget *scroll_window;
box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
if (!options->expand_menu_toolbar)
{
- menu_bar = layout_actions_menu_bar(lw);
+ menu_toolbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ scroll_window = gq_gtk_scrolled_window_new(nullptr, nullptr);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+
+ if (!options->hamburger_menu)
+ {
+ menu_bar = layout_actions_menu_bar(lw);
+ gq_gtk_box_pack_start(GTK_BOX(menu_toolbar_box), menu_bar, FALSE, FALSE, 0);
+ }
toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
- scroll_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window), GTK_POLICY_AUTOMATIC,GTK_POLICY_NEVER);
- gtk_container_add(GTK_CONTAINER(scroll_window), menu_bar);
- gtk_widget_show(scroll_window);
- gtk_widget_show(menu_bar);
- if (lw->options.toolbar_hidden) gtk_widget_hide(toolbar);
+ gq_gtk_box_pack_start(GTK_BOX(menu_toolbar_box), toolbar, FALSE, FALSE, 0);
+ gq_gtk_container_add(GTK_WIDGET(scroll_window), menu_toolbar_box);
+ gq_gtk_box_pack_start(GTK_BOX(box), scroll_window, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(box), scroll_window, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0);
+ gtk_widget_show_all(scroll_window);
}
else
{
menu_tool_bar = layout_actions_menu_tool_bar(lw);
DEBUG_NAME(menu_tool_bar);
gtk_widget_show(menu_tool_bar);
- gtk_box_pack_start(GTK_BOX(lw->main_box), lw->menu_tool_bar, FALSE, FALSE, 0);
- if (lw->options.toolbar_hidden) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
+ gq_gtk_box_pack_start(GTK_BOX(lw->main_box), lw->menu_tool_bar, FALSE, FALSE, 0);
}
- tabcomp = tab_completion_new_with_history(&lw->path_entry, NULL, "path_list", -1,
- layout_path_entry_cb, lw);
+ tabcomp = tab_completion_new_with_history(&lw->path_entry, nullptr, "path_list", -1, layout_path_entry_cb, lw);
DEBUG_NAME(tabcomp);
tab_completion_add_tab_func(lw->path_entry, layout_path_entry_tab_cb, lw);
tab_completion_add_append_func(lw->path_entry, layout_path_entry_tab_append_cb, lw);
- gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
+
+ if (options->hamburger_menu)
+ {
+ box_menu_tabcomp = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_widget_show(box_menu_tabcomp);
+
+ open_menu = layout_actions_menu_bar(lw);
+ gtk_widget_set_tooltip_text(open_menu, _("Open application menu"));
+ gq_gtk_box_pack_start(GTK_BOX(box_menu_tabcomp), open_menu, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box_menu_tabcomp), tabcomp, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), box_menu_tabcomp, FALSE, FALSE, 0);
+ }
+ else
+ {
+ gq_gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
+ }
+
gtk_widget_show(tabcomp);
gtk_widget_set_has_tooltip(GTK_WIDGET(tabcomp), TRUE);
g_signal_connect(G_OBJECT(tabcomp), "query_tooltip", G_CALLBACK(path_entry_tooltip_cb), lw);
- 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);
+ 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);
+ gq_gtk_box_pack_start(GTK_BOX(box), box_folders, TRUE, TRUE, 0);
lw->vd = vd_new(lw);
gtk_widget_show(box_folders);
- g_signal_connect(G_OBJECT(box_folders), "notify::position",
- G_CALLBACK(layout_box_folders_changed_cb), lw);
+ g_signal_connect(G_OBJECT(box_folders), "notify::position", G_CALLBACK(layout_box_folders_changed_cb), lw);
gtk_widget_show(box);
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
- lw = submenu_item_get_data(widget);
+ lw = static_cast<LayoutWindow *>(submenu_item_get_data(widget));
if (!lw) return;
- type = (SortType)GPOINTER_TO_INT(data);
+ type = static_cast<SortType>GPOINTER_TO_INT(data);
if (type == SORT_EXIFTIME || type == SORT_EXIFTIMEDIGITIZED || type == SORT_RATING)
{
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 *, 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_ascend_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void layout_sort_menu_case_cb(GtkWidget *, gpointer data)
{
- LayoutWindow *lw = 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_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)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
GtkWidget *menu;
- menu = submenu_add_sort(NULL, 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_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
}
static GtkWidget *layout_sort_button(LayoutWindow *lw, GtkWidget *box)
GtkWidget *frame;
GtkWidget *image;
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
- gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+ gq_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);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_button_set_image_position(GTK_BUTTON(button), GTK_POS_RIGHT);
- gtk_container_add(GTK_CONTAINER(frame), button);
+ gq_gtk_container_add(GTK_WIDGET(frame), button);
+
gtk_widget_show(button);
return button;
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
- mode = (ZoomMode)GPOINTER_TO_INT(data);
+ mode = static_cast<ZoomMode>GPOINTER_TO_INT(data);
options->image.zoom_mode = mode;
}
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)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
GtkWidget *menu;
- menu = submenu_add_zoom(NULL, G_CALLBACK(layout_zoom_menu_cb),
+ menu = submenu_add_zoom(nullptr, G_CALLBACK(layout_zoom_menu_cb),
lw, FALSE, FALSE, TRUE, options->image.zoom_mode);
/* take ownership of menu */
g_signal_connect(G_OBJECT(menu), "selection_done",
G_CALLBACK(layout_zoom_menu_hide_cb), NULL);
- gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ 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;
GtkWidget *image;
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
if (size) gtk_widget_set_size_request(frame, size, -1);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
- gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
+ gq_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);
+ 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",
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_button_set_image_position(GTK_BUTTON(button), GTK_POS_RIGHT);
- gtk_container_add(GTK_CONTAINER(frame), button);
+ gq_gtk_container_add(GTK_WIDGET(frame), button);
gtk_widget_show(button);
return button;
void layout_status_update_info(LayoutWindow *lw, const gchar *text)
{
- gchar *buf = NULL;
+ gchar *buf = nullptr;
gint hrs;
gint min;
gdouble sec;
}
hrs = options->slideshow.delay / (36000);
min = (options->slideshow.delay -(36000 * hrs))/600;
- sec = (gdouble)(options->slideshow.delay -(36000 * hrs)-(min * 600)) / 10;
+ sec = static_cast<gdouble>(options->slideshow.delay -(36000 * hrs)-(min * 600)) / 10;
if (hrs > 0)
{
}
g_string_append_printf(delay, "%.1fs]", sec);
- ss = g_strdup(delay->str);
-
- g_string_free(delay, TRUE);
+ ss = g_string_free(delay, FALSE);
}
else
{
void layout_status_update_image(LayoutWindow *lw)
{
- guint64 n;
FileData *fd;
gint page_total;
gint page_num;
if (!layout_valid(&lw) || !lw->image) return;
if (!lw->info_zoom || !lw->info_details) return; /*called from layout_style_set */
- n = layout_list_count(lw, NULL);
-
- if (!n)
+ if (!lw->image->image_fd)
{
gtk_button_set_label(GTK_BUTTON(lw->info_zoom), "");
gtk_label_set_text(GTK_LABEL(lw->info_details), "");
}
else
{
- gint width, height;
+ gint width;
+ gint height;
fd = image_get_fd(lw->image);
page_total = fd->page_total;
page_num = fd->page_num + 1;
void layout_status_update_all(LayoutWindow *lw)
{
- layout_status_update_progress(lw, 0.0, NULL);
- layout_status_update_info(lw, NULL);
+ layout_status_update_progress(lw, 0.0, nullptr);
+ layout_status_update_info(lw, nullptr);
layout_status_update_image(lw);
layout_util_status_update_write(lw);
}
-static GtkWidget *layout_status_label(gchar *text, GtkWidget *box, gboolean start, gint size, gboolean expand)
+static GtkWidget *layout_status_label(const gchar *text, GtkWidget *box, gboolean start, gint size, gboolean expand)
{
GtkWidget *label;
GtkWidget *frame;
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
if (size) gtk_widget_set_size_request(frame, size, -1);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
if (start)
{
- gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
}
else
{
- gtk_box_pack_end(GTK_BOX(box), frame, expand, expand, 0);
+ gq_gtk_box_pack_end(GTK_BOX(box), frame, expand, expand, 0);
}
gtk_widget_show(frame);
label = gtk_label_new(text ? text : "");
gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
- gtk_container_add(GTK_CONTAINER(frame), label);
+ gq_gtk_container_add(GTK_WIDGET(frame), label);
gtk_widget_show(label);
return label;
lw->info_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(lw->info_box);
}
- gtk_box_pack_end(GTK_BOX(box), lw->info_box, FALSE, FALSE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(box), lw->info_box, FALSE, FALSE, 0);
gtk_widget_show(lw->info_box);
if (small_format)
{
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(hbox);
- gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
}
else
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(lw->info_progress_bar), TRUE);
- gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
gtk_widget_show(lw->info_progress_bar);
lw->info_sort = layout_sort_button(lw, hbox);
gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_sort), _("Select sort order"));
gtk_widget_show(lw->info_sort);
- lw->info_status = layout_status_label(NULL, lw->info_box, TRUE, 0, (!small_format));
+ lw->info_status = layout_status_label(nullptr, lw->info_box, TRUE, 0, (!small_format));
DEBUG_NAME(lw->info_status);
gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_status), _("Folder contents (files selected)\nSlideshow [time interval]"));
{
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(hbox);
- gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
}
- lw->info_details = layout_status_label(NULL, hbox, TRUE, 0, TRUE);
+ lw->info_details = layout_status_label(nullptr, hbox, TRUE, 0, TRUE);
DEBUG_NAME(lw->info_details);
gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_details), _("(Image dimensions) Image size [page n of m]"));
toolbar = layout_actions_toolbar(lw, TOOLBAR_STATUS);
- toolbar_frame = gtk_frame_new(NULL);
+ toolbar_frame = gtk_frame_new(nullptr);
DEBUG_NAME(toolbar_frame);
- gtk_frame_set_shadow_type(GTK_FRAME(toolbar_frame), GTK_SHADOW_IN);
- gtk_container_add(GTK_CONTAINER(toolbar_frame), toolbar);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(toolbar_frame), GTK_SHADOW_IN);
+ gq_gtk_container_add(GTK_WIDGET(toolbar_frame), toolbar);
gtk_widget_show(toolbar_frame);
gtk_widget_show(toolbar);
- gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
lw->info_zoom = layout_zoom_button(lw, hbox, ZOOM_LABEL_WIDTH, TRUE);
gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Select zoom and scroll mode"));
gtk_widget_show(lw->info_zoom);
{
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(hbox);
- gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
}
- lw->info_pixel = layout_status_label(NULL, hbox, FALSE, 0, small_format); /* expand only in small format */
+ lw->info_pixel = layout_status_label(nullptr, hbox, FALSE, 0, small_format); /* expand only in small format */
DEBUG_NAME(lw->info_pixel);
gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_pixel), _("[Pixel x,y coord]: (Pixel R,G,B value)"));
if (!lw->options.show_info_pixel) gtk_widget_hide(gtk_widget_get_parent(lw->info_pixel));
return lw->dir_view;
}
-static void layout_list_status_cb(ViewFile *UNUSED(vf), gpointer data)
+static void layout_list_status_cb(ViewFile *, gpointer data)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
- layout_status_update_info(lw, NULL);
+ 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)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
layout_status_update_progress(lw, val, text);
}
static GtkWidget *layout_list_new(LayoutWindow *lw)
{
- lw->vf = vf_new(lw->options.file_view_type, NULL);
+ lw->vf = vf_new(lw->options.file_view_type, nullptr);
vf_set_layout(lw->vf, lw);
vf_set_status_func(lw->vf, layout_list_status_cb, lw);
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;
}
GList *layout_list(LayoutWindow *lw)
{
- if (!layout_valid(&lw)) return NULL;
+ if (!layout_valid(&lw)) return nullptr;
if (lw->vf) return vf_get_list(lw->vf);
- return NULL;
+ return nullptr;
}
guint layout_list_count(LayoutWindow *lw, gint64 *bytes)
FileData *layout_list_get_fd(LayoutWindow *lw, gint index)
{
- if (!layout_valid(&lw)) return NULL;
+ if (!layout_valid(&lw)) return nullptr;
if (lw->vf) return vf_index_get_data(lw->vf, index);
- return NULL;
+ return nullptr;
}
gint layout_list_get_index(LayoutWindow *lw, FileData *fd)
{
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 (!layout_valid(&lw)) return NULL;
+ if (!layout_valid(&lw)) return nullptr;
- if (layout_image_get_collection(lw, NULL))
+ if (layout_image_get_collection(lw, nullptr))
{
FileData *fd;
fd = layout_image_get_fd(lw);
- if (fd) return g_list_append(NULL, file_data_ref(fd));
- return NULL;
+ if (fd) return g_list_append(nullptr, file_data_ref(fd));
+ return nullptr;
}
if (lw->vf) return vf_selection_get_list(lw->vf);
- return NULL;
+ return nullptr;
}
GList *layout_selection_list_by_index(LayoutWindow *lw)
{
- if (!layout_valid(&lw)) return NULL;
+ if (!layout_valid(&lw)) return nullptr;
if (lw->vf) return vf_selection_get_list_by_index(lw->vf);
- return NULL;
+ return nullptr;
}
guint layout_selection_count(LayoutWindow *lw, gint64 *bytes)
if (lw->vf) vf_selection_to_mark(lw->vf, mark, mode);
- layout_status_update_info(lw, NULL); /* osd in fullscreen mode */
+ layout_status_update_info(lw, nullptr); /* osd in fullscreen mode */
}
void layout_mark_filter_toggle(LayoutWindow *lw, gint mark)
if (lw->vf) vf_mark_filter_toggle(lw->vf, mark);
}
+guint layout_window_count()
+{
+ return g_list_length(layout_window_list);
+}
/*
*-----------------------------------------------------------------------------
const gchar *layout_get_path(LayoutWindow *lw)
{
- if (!layout_valid(&lw)) return NULL;
- return lw->dir_fd ? lw->dir_fd->path : NULL;
+ if (!layout_valid(&lw)) return nullptr;
+ return lw->dir_fd ? lw->dir_fd->path : nullptr;
}
static void layout_sync_path(LayoutWindow *lw)
{
if (!lw->dir_fd) return;
- if (lw->path_entry) gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
+ if (lw->path_entry) gq_gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
if (lw->vd) vd_set_fd(lw->vd, lw->dir_fd);
if (lw->vf) vf_set_fd(lw->vf, lw->dir_fd);
}
if (options->metadata.confirm_on_dir_change && dir_changed)
- metadata_write_queue_confirm(FALSE, NULL, NULL);
+ 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);
}
layout_list_sync_marks(lw);
}
-//gboolean layout_thumb_get(LayoutWindow *lw)
-//{
- //if (!layout_valid(&lw)) return FALSE;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+gboolean layout_thumb_get_unused(LayoutWindow *lw)
+{
+ if (!layout_valid(&lw)) return FALSE;
- //return lw->options.show_thumbnails;
-//}
+ return lw->options.show_thumbnails;
+}
-//gboolean layout_marks_get(LayoutWindow *lw)
-//{
- //if (!layout_valid(&lw)) return FALSE;
+gboolean layout_marks_get_unused(LayoutWindow *lw)
+{
+ if (!layout_valid(&lw)) return FALSE;
- //return lw->options.show_marks;
-//}
+ return lw->options.show_marks;
+}
+#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;
}
lw->options.dir_view_type = dir_view_type;
lw->options.file_view_type = file_view_type;
- layout_style_set(lw, -1, NULL);
+ 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, NULL);
+ layout_style_set(lw, -1, nullptr);
}
-//gboolean layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type)
-//{
- //if (!layout_valid(&lw)) return FALSE;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+gboolean layout_views_get_unused(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type)
+{
+ if (!layout_valid(&lw)) return FALSE;
- //*dir_view_type = lw->options.dir_view_type;
- //*file_view_type = lw->options.file_view_type;
+ *dir_view_type = lw->options.dir_view_type;
+ *file_view_type = lw->options.file_view_type;
- //return TRUE;
-//}
+ return TRUE;
+}
+#pragma GCC diagnostic pop
/*
*-----------------------------------------------------------------------------
{
LayoutLocation l;
- l = l1 & l2; /* get common compass direction */
- l = l1 - l; /* remove it */
+ l = static_cast<LayoutLocation>(l1 & l2); /* get common compass direction */
+ l = static_cast<LayoutLocation>(l1 - l); /* remove it */
if (layout_location_first(l))
{
return TRUE;
}
-gboolean layout_geometry_get_log_window(LayoutWindow *lw, gint *x, gint *y,
- gint *w, gint *h)
+static gboolean layout_geometry_get_log_window(LayoutWindow *lw, GdkRectangle &log_window)
{
GdkWindow *window;
}
window = gtk_widget_get_window(lw->log_window);
- gdk_window_get_root_origin(window, x, y);
- *w = gdk_window_get_width(window);
- *h = gdk_window_get_height(window);
+ gdk_window_get_root_origin(window, &log_window.x, &log_window.y);
+ log_window.width = gdk_window_get_width(window);
+ log_window.height = gdk_window_get_height(window);
return TRUE;
}
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)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
layout_tools_float_toggle(lw);
static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *files)
{
GtkWidget *vbox;
- GtkWidget *w1, *w2;
+ GtkWidget *w1;
+ GtkWidget *w2;
gboolean vertical;
gboolean new_window = FALSE;
GdkGeometry geometry;
GdkWindowHints hints;
- lw->tools = window_new(GTK_WINDOW_TOPLEVEL, "tools", PIXBUF_INLINE_ICON_TOOLS, NULL, _("Tools"));
+ lw->tools = window_new("tools", PIXBUF_INLINE_ICON_TOOLS, nullptr, _("Tools"));
DEBUG_NAME(lw->tools);
g_signal_connect(G_OBJECT(lw->tools), "delete_event",
G_CALLBACK(layout_tools_delete_cb), lw);
}
else
{
- hints = 0;
+ hints = static_cast<GdkWindowHints>(0);
}
geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.base_width = TOOLWINDOW_DEF_WIDTH;
geometry.base_height = TOOLWINDOW_DEF_HEIGHT;
- gtk_window_set_geometry_hints(GTK_WINDOW(lw->tools), NULL, &geometry,
- GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | hints);
+ gtk_window_set_geometry_hints(GTK_WINDOW(lw->tools), nullptr, &geometry,
+ static_cast<GdkWindowHints>(GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | hints));
gtk_window_set_resizable(GTK_WINDOW(lw->tools), TRUE);
{
layout_tools_geometry_sync(lw);
/* dump the contents */
- gtk_widget_destroy(gtk_bin_get_child(GTK_BIN(lw->tools)));
+ gq_gtk_widget_destroy(gtk_bin_get_child(GTK_BIN(lw->tools)));
}
layout_actions_add_window(lw, lw->tools);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(vbox);
- gtk_container_add(GTK_CONTAINER(lw->tools), vbox);
- if (options->expand_menu_toolbar) gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(lw->menu_tool_bar), FALSE, FALSE, 0);
+ gq_gtk_container_add(GTK_WIDGET(lw->tools), vbox);
+ if (options->expand_menu_toolbar) gq_gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(lw->menu_tool_bar), FALSE, FALSE, 0);
gtk_widget_show(vbox);
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);
- }
- gtk_box_pack_start(GTK_BOX(vbox), lw->tools_pane, TRUE, TRUE, 0);
+ lw->tools_pane = gtk_paned_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
+ DEBUG_NAME(lw->tools_pane);
+ gq_gtk_box_pack_start(GTK_BOX(vbox), lw->tools_pane, TRUE, TRUE, 0);
gtk_widget_show(lw->tools_pane);
gtk_paned_pack1(GTK_PANED(lw->tools_pane), w1, FALSE, TRUE);
if (options->save_window_positions)
{
gtk_window_set_default_size(GTK_WINDOW(lw->tools), lw->options.float_window.w, lw->options.float_window.h);
- gtk_window_move(GTK_WINDOW(lw->tools), lw->options.float_window.x, lw->options.float_window.y);
+ gq_gtk_window_move(GTK_WINDOW(lw->tools), lw->options.float_window.x, lw->options.float_window.y);
}
else
{
gint priority_location;
GtkWidget *h;
GtkWidget *v;
- GtkWidget *w1, *w2, *w3;
+ GtkWidget *w1;
+ GtkWidget *w2;
+ GtkWidget *w3;
GtkWidget *image_sb; /* image together with sidebars in utility box */
GtkWidget *tools;
GtkWidget *files;
layout_actions_setup(lw);
+ create_toolbars(lw);
lw->group_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(lw->group_box);
if (options->expand_menu_toolbar)
{
- gtk_box_pack_end(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
}
else
{
- gtk_box_pack_start(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
}
gtk_widget_show(lw->group_box);
if (lw->options.tools_float || lw->options.tools_hidden)
{
- gtk_box_pack_start(GTK_BOX(lw->group_box), image_sb, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lw->group_box), image_sb, TRUE, TRUE, 0);
gtk_widget_show(image_sb);
layout_tools_setup(lw, tools, files);
return;
}
- else if (lw->tools)
+
+ if (lw->tools)
{
layout_tools_geometry_sync(lw);
- gtk_widget_destroy(lw->tools);
- lw->tools = NULL;
- lw->tools_pane = NULL;
+ gq_gtk_widget_destroy(lw->tools);
+ lw->tools = nullptr;
+ lw->tools_pane = nullptr;
}
layout_status_setup(lw, lw->group_box, FALSE);
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(priority_location))
+ if (!layout_location_vertical(static_cast<LayoutLocation>(priority_location)))
{
- GtkWidget *tmp;
-
- tmp = v;
- v = h;
- h = tmp;
+ std::swap(v, h);
}
- gtk_box_pack_start(GTK_BOX(lw->group_box), v, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lw->group_box), v, TRUE, TRUE, 0);
- if (!layout_location_first(priority_location))
+ if (!layout_location_first(static_cast<LayoutLocation>(priority_location)))
{
gtk_paned_pack1(GTK_PANED(v), h, FALSE, TRUE);
gtk_paned_pack2(GTK_PANED(v), w3, TRUE, TRUE);
/* fix to have image pane visible when it is left and priority widget */
if (lw->options.main_window.hdivider_pos == -1 &&
w1 == image_sb &&
- !layout_location_vertical(priority_location) &&
- layout_location_first(priority_location))
+ !layout_location_vertical(static_cast<LayoutLocation>(priority_location)) &&
+ layout_location_first(static_cast<LayoutLocation>(priority_location)))
{
gtk_widget_set_size_request(image_sb, 200, -1);
}
if (style != -1)
{
- LayoutLocation d, f, i;
+ LayoutLocation d;
+ LayoutLocation f;
+ LayoutLocation i;
layout_config_parse(style, order, &d, &f, &i);
dir_fd = lw->dir_fd;
if (dir_fd) file_data_unregister_real_time_monitor(dir_fd);
- lw->dir_fd = NULL;
+ lw->dir_fd = nullptr;
layout_geometry_get_dividers(lw, &lw->options.main_window.hdivider_pos, &lw->options.main_window.vdivider_pos);
{
if (lw->menu_bar) gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->menu_bar)), lw->menu_bar);
for (i = 0; i < TOOLBAR_COUNT; i++)
- if (lw->toolbar[i]) gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->toolbar[i])), lw->toolbar[i]);
+ if (lw->toolbar[i]) gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->toolbar[i])), lw->toolbar[i]);
}
/* clear it all */
- lw->h_pane = NULL;
- lw->v_pane = NULL;
+ lw->h_pane = nullptr;
+ lw->v_pane = nullptr;
- lw->path_entry = NULL;
- lw->dir_view = NULL;
- lw->vd = NULL;
+ lw->path_entry = nullptr;
+ lw->dir_view = nullptr;
+ lw->vd = nullptr;
- lw->file_view = NULL;
- lw->vf = NULL;
+ lw->file_view = nullptr;
+ lw->vf = nullptr;
- lw->info_box = NULL;
- lw->info_progress_bar = NULL;
- lw->info_sort = NULL;
- lw->info_status = NULL;
- lw->info_details = NULL;
- lw->info_pixel = NULL;
- lw->info_zoom = NULL;
-
-/*
- if (lw->ui_manager) g_object_unref(lw->ui_manager);
- lw->ui_manager = NULL;
- lw->action_group = NULL;
- lw->action_group_editors = NULL;
-*/
+ lw->info_box = nullptr;
+ lw->info_progress_bar = nullptr;
+ lw->info_sort = nullptr;
+ lw->info_status = nullptr;
+ lw->info_details = nullptr;
+ lw->info_pixel = nullptr;
+ lw->info_zoom = nullptr;
gtk_container_remove(GTK_CONTAINER(lw->main_box), lw->group_box);
- lw->group_box = NULL;
+ lw->group_box = nullptr;
/* re-fill */
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))
file_data_unref(dir_fd);
}
-void layout_colors_update(void)
+void layout_colors_update()
{
GList *work;
while (work)
{
gint i;
- LayoutWindow *lw = work->data;
+ auto lw = static_cast<LayoutWindow *>(work->data);
work = work->next;
if (!lw->image) continue;
lw->options.tools_float = popped;
lw->options.tools_hidden = hidden;
- layout_style_set(lw, -1, NULL);
+ layout_style_set(lw, -1, nullptr);
}
gboolean layout_tools_float_get(LayoutWindow *lw, gboolean *popped, gboolean *hidden)
return TRUE;
}
-void layout_toolbar_toggle(LayoutWindow *lw)
+void layout_selectable_toolbars_toggle(LayoutWindow *)
{
- if (!layout_valid(&lw)) return;
- if (!lw->toolbar[TOOLBAR_MAIN]) return;
+ if (!layout_valid(¤t_lw)) return;
+ if (!current_lw->toolbar[TOOLBAR_MAIN]) return;
+ if (!current_lw->menu_bar) return;
+ if (!current_lw->info_box) return;
+
+ current_lw->options.selectable_toolbars_hidden = !current_lw->options.selectable_toolbars_hidden;
+
+ if (options->selectable_bars.tool_bar)
+ {
+ if (current_lw->options.selectable_toolbars_hidden)
+ {
+ if (gtk_widget_get_visible(current_lw->toolbar[TOOLBAR_MAIN]))
+ {
+ gtk_widget_hide(current_lw->toolbar[TOOLBAR_MAIN]);
+ }
+ }
+ else
+ {
+ if (!gtk_widget_get_visible(current_lw->toolbar[TOOLBAR_MAIN]))
+ {
+ gtk_widget_show(current_lw->toolbar[TOOLBAR_MAIN]);
+ }
+ }
+ }
+ else
+ {
+ gtk_widget_show(current_lw->toolbar[TOOLBAR_MAIN]);
+ }
- lw->options.toolbar_hidden = !lw->options.toolbar_hidden;
+ if (options->selectable_bars.menu_bar)
+ {
+ if (current_lw->options.selectable_toolbars_hidden)
+ {
+ if (gtk_widget_get_visible(current_lw->menu_bar))
+ {
+ gtk_widget_hide(current_lw->menu_bar);
+ }
+ }
+ else
+ {
+ if (!gtk_widget_get_visible(current_lw->menu_bar))
+ {
+ gtk_widget_show(current_lw->menu_bar);
+ }
+ }
+ }
+ else
+ {
+ gtk_widget_show(current_lw->menu_bar);
+ }
- if (lw->options.toolbar_hidden)
+ if (options->selectable_bars.status_bar)
{
- if (gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
+ if (current_lw->options.selectable_toolbars_hidden)
+ {
+ if (gtk_widget_get_visible(current_lw->info_box))
+ {
+ gtk_widget_hide(current_lw->info_box);
+ }
+ }
+ else
+ {
+ if (!gtk_widget_get_visible(current_lw->info_box))
+ {
+ gtk_widget_show(current_lw->info_box);
+ }
+ }
}
else
{
- if (!gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
+ gtk_widget_show(current_lw->info_box);
}
}
*-----------------------------------------------------------------------------
*/
-#define CONFIG_WINDOW_DEF_WIDTH 600
-#define CONFIG_WINDOW_DEF_HEIGHT 400
-
-typedef struct _LayoutConfig LayoutConfig;
-struct _LayoutConfig
-{
- LayoutWindow *lw;
-
- GtkWidget *configwindow;
- GtkWidget *home_path_entry;
- GtkWidget *layout_widget;
-
- LayoutOptions options;
-};
-
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)
{
- LayoutConfig *lc = data;
+ auto lc = static_cast<LayoutConfig *>(data);
- gtk_widget_destroy(lc->configwindow);
+ gq_gtk_widget_destroy(lc->configwindow);
free_layout_options_content(&lc->options);
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)
{
- LayoutConfig *lc = data;
+ auto lc = static_cast<LayoutConfig *>(data);
g_free(lc->options.order);
lc->options.order = layout_config_get(lc->layout_widget, &lc->options.style);
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");
}
static void layout_config_ok_cb(GtkWidget *widget, gpointer data)
{
- LayoutConfig *lc = data;
+ auto lc = static_cast<LayoutConfig *>(data);
layout_config_apply_cb(widget, lc);
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)
{
- LayoutConfig *lc = data;
- gtk_entry_set_text(GTK_ENTRY(lc->home_path_entry), layout_get_path(lc->lw));
+ auto lc = static_cast<LayoutConfig *>(data);
+ gq_gtk_entry_set_text(GTK_ENTRY(lc->home_path_entry), layout_get_path(lc->lw));
}
static void startup_path_set_current_cb(GtkWidget *widget, gpointer data)
{
- LayoutConfig *lc = data;
+ auto lc = static_cast<LayoutConfig *>(data);
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
return;
static void startup_path_set_last_cb(GtkWidget *widget, gpointer data)
{
- LayoutConfig *lc = data;
+ auto lc = static_cast<LayoutConfig *>(data);
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
return;
static void startup_path_set_home_cb(GtkWidget *widget, gpointer data)
{
- LayoutConfig *lc = data;
+ auto lc = static_cast<LayoutConfig *>(data);
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
return;
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)
{
layout_sync_options_with_current_state(lw);
copy_layout_options(&lc->options, &lw->options);
- lc->configwindow = window_new(GTK_WINDOW_TOPLEVEL, "Layout", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Window options and layout"));
+ lc->configwindow = window_new("Layout", PIXBUF_INLINE_ICON_CONFIG, nullptr, _("Window options and layout"));
DEBUG_NAME(lc->configwindow);
gtk_window_set_type_hint(GTK_WINDOW(lc->configwindow), GDK_WINDOW_TYPE_HINT_DIALOG);
win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
DEBUG_NAME(win_vbox);
- gtk_container_add(GTK_CONTAINER(lc->configwindow), win_vbox);
+ gq_gtk_container_add(GTK_WIDGET(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);
+ gq_gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
- button = pref_button_new(NULL, GTK_STOCK_OK, NULL, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_OK, "OK",
G_CALLBACK(layout_config_ok_cb), lc);
- gtk_container_add(GTK_CONTAINER(hbox), button);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_grab_default(button);
gtk_widget_show(button);
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);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_show(button);
*/
- button = pref_button_new(NULL, GTK_STOCK_HELP, NULL, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
G_CALLBACK(layout_config_help_cb), lc);
- gtk_container_add(GTK_CONTAINER(hbox), button);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_show(button);
- button = pref_button_new(NULL, GTK_STOCK_APPLY, NULL, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_APPLY, _("Apply"),
G_CALLBACK(layout_config_apply_cb), lc);
- gtk_container_add(GTK_CONTAINER(hbox), button);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_show(button);
- button = pref_button_new(NULL, GTK_STOCK_CANCEL, NULL, FALSE,
+ button = pref_button_new(nullptr, GQ_ICON_CANCEL, _("Cancel"),
G_CALLBACK(layout_config_close_cb), lc);
- gtk_container_add(GTK_CONTAINER(hbox), button);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_show(button);
gtk_box_reorder_child(GTK_BOX(hbox), ct_button, -1);
}
- frame = pref_frame_new(win_vbox, TRUE, NULL, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
+ frame = pref_frame_new(win_vbox, TRUE, nullptr, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
DEBUG_NAME(frame);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
DEBUG_NAME(vbox);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
+ gq_gtk_container_add(GTK_WIDGET(frame), vbox);
gtk_widget_show(vbox);
pref_label_new(group, _("Home path (empty to use your home directory)"));
hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- tabcomp = tab_completion_new(&lc->home_path_entry, lc->options.home_path, NULL, NULL, NULL, NULL);
- tab_completion_add_select_button(lc->home_path_entry, NULL, TRUE);
- gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
+ tabcomp = tab_completion_new(&lc->home_path_entry, lc->options.home_path, nullptr, nullptr, nullptr, nullptr);
+ tab_completion_add_select_button(lc->home_path_entry, nullptr, TRUE);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
gtk_widget_show(tabcomp);
- button = pref_button_new(hbox, NULL, _("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"),
group = pref_group_new(vbox, FALSE, _("Start-up directory:"), GTK_ORIENTATION_VERTICAL);
- button = pref_radiobutton_new(group, NULL, _("No change"),
+ button = pref_radiobutton_new(group, nullptr, _("No change"),
(lc->options.startup_path == STARTUP_PATH_CURRENT),
G_CALLBACK(startup_path_set_current_cb), lc);
button = pref_radiobutton_new(group, button, _("Restore last path"),
lc->layout_widget = layout_config_new();
DEBUG_NAME(lc->layout_widget);
layout_config_set(lc->layout_widget, lw->options.style, lw->options.order);
- gtk_box_pack_start(GTK_BOX(group), lc->layout_widget, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(group), lc->layout_widget, TRUE, TRUE, 0);
gtk_widget_show(lc->layout_widget);
gtk_widget_show(lc->configwindow);
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->options.last_path);
lw->options.last_path = g_strdup(layout_get_path(lw));
- layout_geometry_get_log_window(lw, &lw->options.log_window.x, &lw->options.log_window.y,
- &lw->options.log_window.w, &lw->options.log_window.h);
+ layout_geometry_get_log_window(lw, lw->options.log_window);
#ifdef GDK_WINDOWING_X11
GdkDisplay *display;
}
}
#endif
- return;
}
void layout_apply_options(LayoutWindow *lw, LayoutOptions *lop)
if (!lw) return;
layout_window_list = g_list_remove(layout_window_list, lw);
- if (current_lw == lw) current_lw = NULL;
+ if (current_lw == lw) current_lw = nullptr;
- if (lw->exif_window) g_signal_handlers_disconnect_matched(G_OBJECT(lw->exif_window), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, lw);
+ if (lw->exif_window) g_signal_handlers_disconnect_matched(G_OBJECT(lw->exif_window), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, lw);
layout_bars_close(lw);
if (lw->toolbar[i]) g_object_unref(lw->toolbar[i]);
}
- gtk_widget_destroy(lw->window);
+ gq_gtk_widget_destroy(lw->window);
if (lw->split_image_sizegroup) g_object_unref(lw->split_image_sizegroup);
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)
{
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
layout_close(lw);
return TRUE;
LayoutWindow *layout_new(FileData *dir_fd, LayoutOptions *lop)
{
- return layout_new_with_geometry(dir_fd, lop, NULL);
-}
-
-gboolean release_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
- return defined_mouse_buttons(widget, event, data);
+ return layout_new_with_geometry(dir_fd, lop, nullptr);
}
static gboolean move_window_to_workspace_cb(gpointer data)
{
#ifdef GDK_WINDOWING_X11
- LayoutWindow *lw = data;
+ auto lw = static_cast<LayoutWindow *>(data);
GdkWindow *window;
GdkDisplay *display;
}
}
#endif
- return FALSE;
+ return G_SOURCE_REMOVE;
}
LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
else
init_layout_options(&lw->options);
- lw->sort_method = SORT_NAME;
- lw->sort_ascend = 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 */
layout_config_parse(lw->options.style, lw->options.order,
&lw->dir_location, &lw->file_location, &lw->image_location);
- if (lw->options.dir_view_type > DIRVIEW_LAST) lw->options.dir_view_type = 0;
- if (lw->options.file_view_type > FILEVIEW_LAST) lw->options.file_view_type = 0;
-
+ if (lw->options.dir_view_type > DIRVIEW_LAST) lw->options.dir_view_type = DIRVIEW_LIST;
+ if (lw->options.file_view_type > FILEVIEW_LAST) lw->options.file_view_type = FILEVIEW_LIST;
/* divider positions */
default_path = g_build_filename(get_rc_dir(), DEFAULT_WINDOW_LAYOUT, NULL);
/* window */
- lw->window = window_new(GTK_WINDOW_TOPLEVEL, GQ_APPNAME_LC, NULL, NULL, NULL);
+ lw->window = window_new(GQ_APPNAME_LC, nullptr, nullptr, nullptr);
DEBUG_NAME(lw->window);
gtk_window_set_resizable(GTK_WINDOW(lw->window), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(lw->window), 0);
- g_signal_connect(G_OBJECT(lw->window), "button_release_event", G_CALLBACK(release_cb), lw);
-
if (options->save_window_positions)
{
hint_mask = GDK_HINT_USER_POS;
}
else
{
- hint_mask = 0;
+ hint_mask = static_cast<GdkWindowHints>(0);
}
hint.min_width = 32;
hint.min_height = 32;
hint.base_width = 0;
hint.base_height = 0;
- gtk_window_set_geometry_hints(GTK_WINDOW(lw->window), NULL, &hint,
- GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | hint_mask);
+ gtk_window_set_geometry_hints(GTK_WINDOW(lw->window), nullptr, &hint,
+ static_cast<GdkWindowHints>(GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | hint_mask));
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);
+ gq_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);
}
lw->main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(lw->main_box);
- gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box);
+ gq_gtk_container_add(GTK_WIDGET(lw->window), lw->main_box);
gtk_widget_show(lw->main_box);
layout_grid_setup(lw);
pixbuf = pixbuf_inline(PIXBUF_INLINE_LOGO);
/** @FIXME the zoom value set here is the value, which is then copied again and again
- in "Leave Zoom at previous setting" mode. This is not ideal. */
+ in 'Leave Zoom at previous setting' mode. This is not ideal. */
image_change_pixbuf(lw->image, pixbuf, 0.0, FALSE);
g_object_unref(pixbuf);
}
gtk_widget_show(lw->window);
layout_tools_hide(lw, lw->options.tools_hidden);
- image_osd_set(lw->image, lw->options.image_overlay.state);
+ image_osd_set(lw->image, static_cast<OsdShowFlags>(lw->options.image_overlay.state));
histogram = image_osd_get_histogram(lw->image);
histogram->histogram_channel = lw->options.image_overlay.histogram_channel;
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);
WRITE_NL(); WRITE_BOOL(*layout, tools_hidden);
WRITE_SEPARATOR();
- WRITE_NL(); WRITE_BOOL(*layout, toolbar_hidden);
WRITE_NL(); WRITE_BOOL(*layout, show_info_pixel);
WRITE_NL(); WRITE_BOOL(*layout, ignore_alpha);
WRITE_SEPARATOR();
WRITE_NL(); WRITE_INT(*layout, log_window.x);
WRITE_NL(); WRITE_INT(*layout, log_window.y);
- WRITE_NL(); WRITE_INT(*layout, log_window.w);
- WRITE_NL(); WRITE_INT(*layout, log_window.h);
+ WRITE_NL(); WRITE_INT(*layout, log_window.width);
+ WRITE_NL(); WRITE_INT(*layout, log_window.height);
WRITE_NL(); WRITE_INT(*layout, preferences_window.x);
WRITE_NL(); WRITE_INT(*layout, preferences_window.y);
void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names, const gchar **attribute_values)
{
- gchar *id = NULL;
+ gchar *id = nullptr;
while (*attribute_names)
{
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;
if (READ_BOOL(*layout, tools_float)) continue;
if (READ_BOOL(*layout, tools_hidden)) continue;
- if (READ_BOOL(*layout, toolbar_hidden)) continue;
if (READ_BOOL(*layout, show_info_pixel)) continue;
if (READ_BOOL(*layout, ignore_alpha)) continue;
if (READ_INT(*layout, log_window.x)) continue;
if (READ_INT(*layout, log_window.y)) continue;
- if (READ_INT(*layout, log_window.w)) continue;
- if (READ_INT(*layout, log_window.h)) continue;
+ if (READ_INT(*layout, log_window.width)) continue;
+ if (READ_INT(*layout, log_window.height)) continue;
if (READ_INT(*layout, preferences_window.x)) continue;
if (READ_INT(*layout, preferences_window.y)) continue;
if (command_line->startup_blank)
{
- *path = NULL;
+ *path = nullptr;
}
else if (command_line->file)
{
{
LayoutOptions lop;
LayoutWindow *lw;
- gchar *path = NULL;
+ gchar *path = nullptr;
init_layout_options(&lop);
layout_config_startup_path(&lop, &path);
}
- lw = layout_new_with_geometry(NULL, &lop, use_commandline ? command_line->geometry : NULL);
- layout_sort_set(lw, options->file_sort.method, options->file_sort.ascending);
+ lw = layout_new_with_geometry(nullptr, &lop, use_commandline ? command_line->geometry : nullptr);
+ 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);
if (success)
{
work = g_list_last(layout_window_list);
- lw = work->data;
- g_free(lw->options.id);
- lw->options.id = g_strdup(layout_get_unique_id());
+ lw = static_cast<LayoutWindow *>(work->data);
}
else
{
- lw = layout_new_from_config(NULL, NULL, TRUE);
+ lw = layout_new_from_config(nullptr, nullptr, TRUE);
}
+
+ g_free(lw->options.id);
+ lw->options.id = g_strdup(layout_get_unique_id());
+
return lw;
}
-
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff