#include "color-man.h"
#include "filedata.h"
#include "histogram.h"
+#include "history_list.h"
#include "image.h"
#include "image-overlay.h"
#include "layout_config.h"
#include "layout_image.h"
#include "layout_util.h"
+#include "logwindow.h"
#include "menu.h"
#include "pixbuf-renderer.h"
#include "pixbuf_util.h"
#ifdef HAVE_LIRC
#include "lirc.h"
#endif
+#ifdef GDK_WINDOWING_X11
+#if GTK_CHECK_VERSION(3,10,0)
+#include <gdk/gdkx.h>
+#endif
+#endif
#define MAINWINDOW_DEF_WIDTH 700
#define MAINWINDOW_DEF_HEIGHT 500
#define TOOLWINDOW_DEF_HEIGHT 450
#define PROGRESS_WIDTH 150
-#define ZOOM_LABEL_WIDTH 64
+#define ZOOM_LABEL_WIDTH 120
#define PANE_DIVIDER_SIZE 10
return NULL;
}
+gchar *layout_get_unique_id()
+{
+ char id[10];
+ gint i;
+
+ i = 1;
+ while (TRUE)
+ {
+ g_snprintf(id, sizeof(id), "lw%d", i);
+ if (!layout_find_by_layout_id(id))
+ {
+ return g_strdup(id);
+ }
+ i++;
+ }
+}
+
static void layout_set_unique_id(LayoutWindow *lw)
{
char id[10];
g_free(lw->options.id);
lw->options.id = NULL;
- if (!layout_find_by_layout_id("main"))
- {
- lw->options.id = g_strdup("main");
- return;
- }
-
i = 1;
while (TRUE)
{
LayoutWindow *lw;
GList *work;
-/* FIXME: this is probably not the correct way to implement this */
+/** @FIXME this is probably not the correct way to implement this */
work = layout_window_list;
while (work)
{
{
if ((!lw->dir_fd || strcmp(lw->dir_fd->path, buf) != 0) && layout_set_path(lw, buf))
{
+ gtk_widget_grab_focus(GTK_WIDGET(lw->path_entry));
gint pos = -1;
/* 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);
gchar *buf;
buf = g_strdup(path);
- parse_out_relatives(buf);
- layout_set_path(lw, buf);
+ if (!download_web_file(buf, FALSE, lw))
+ {
+ parse_out_relatives(buf);
+
+ layout_set_path(lw, buf);
+ }
g_free(buf);
}
gtk_widget_set_sensitive(lw->back_button, (n > 1));
}
+static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer data)
+{
+ 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;
+ 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);
+
+ g_free(current_path);
+ g_list_free(box_child_list);
+
+ return FALSE;
+}
+
+void show_menu_scrollbar_cb(GtkWidget *widget, GdkRectangle *allocation, gpointer data)
+{
+ GtkRequisition requisition;
+
+ gtk_widget_size_request(widget, &requisition);
+
+ if (allocation->width <= requisition.width)
+ {
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(data), GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
+ }
+ else
+ {
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(data), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+ }
+}
+
static GtkWidget *layout_tool_setup(LayoutWindow *lw)
{
GtkWidget *box;
GtkWidget *box_folders;
GtkWidget *scd;
- GtkWidget *menu_bar;
+ GtkWidget *menu_tool_bar;
GtkWidget *tabcomp;
+ GtkWidget *menu_bar;
GtkWidget *toolbar;
+ GtkWidget *scroll_window;
box = gtk_vbox_new(FALSE, 0);
- menu_bar = layout_actions_menu_bar(lw);
- gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, FALSE, 0);
+ if (!options->expand_menu_toolbar)
+ {
+ menu_bar = layout_actions_menu_bar(lw);
+
+ 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_AUTOMATIC);
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll_window), menu_bar);
+ g_signal_connect(G_OBJECT(menu_bar), "size-allocate", G_CALLBACK(show_menu_scrollbar_cb), scroll_window);
- toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
- gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0);
- if (lw->options.toolbar_hidden) gtk_widget_hide(toolbar);
+ gtk_widget_show(scroll_window);
+ gtk_widget_show(menu_bar);
+ if (lw->options.toolbar_hidden) gtk_widget_hide(toolbar);
+
+ gtk_box_pack_start(GTK_BOX(box), scroll_window, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0);
+ }
+ 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]);
+ }
tabcomp = tab_completion_new_with_history(&lw->path_entry, NULL, "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);
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);
#if GTK_CHECK_VERSION(3,20,0)
g_signal_connect(G_OBJECT(gtk_widget_get_parent(gtk_widget_get_parent(lw->path_entry))), "changed",
#endif
box_folders = GTK_WIDGET(gtk_hpaned_new());
+ DEBUG_NAME(box_folders);
gtk_box_pack_start(GTK_BOX(box), box_folders, TRUE, TRUE, 0);
- lw->vd = vd_new(lw->options.dir_view_type, lw->dir_fd);
- vd_set_layout(lw->vd, lw);
+ lw->vd = vd_new(lw);
+
vd_set_select_func(lw->vd, layout_vd_select_cb, lw);
lw->dir_view = lw->vd->widget;
+ DEBUG_NAME(lw->dir_view);
gtk_paned_add2(GTK_PANED(box_folders), lw->dir_view);
gtk_widget_show(lw->dir_view);
scd = shortcuts_new_default(lw);
+ DEBUG_NAME(scd);
gtk_paned_add1(GTK_PANED(box_folders), scd);
gtk_paned_set_position(GTK_PANED(box_folders), lw->options.folder_window.vdivider_pos);
type = (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);
}
GtkWidget *button;
button = gtk_button_new_with_label(sort_type_get_text(lw->sort_method));
+ DEBUG_NAME(button);
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);
frame = gtk_frame_new(NULL);
+ DEBUG_NAME(frame);
if (size) gtk_widget_set_size_request(frame, size, -1);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *text)
{
+ static gdouble meta = 0;
+
if (!layout_valid(&lw)) return;
if (!lw->info_progress_bar) return;
+ /* Give priority to the loading meta data message
+ */
+ if(!g_strcmp0(text, "Loading thumbs..."))
+ {
+ if (meta)
+ {
+ return;
+ }
+ }
+ else
+ {
+ meta = val;
+ }
+
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(lw->info_progress_bar), val);
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), (text) ? text : " ");
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar),
+ val ? ((text) ? text : " ") : " ");
}
void layout_status_update_info(LayoutWindow *lw, const gchar *text)
{
gchar *buf = NULL;
+ gint hrs;
+ gint min;
+ gdouble sec;
+ GString *delay;
if (!layout_valid(&lw)) return;
{
guint s;
gint64 s_bytes = 0;
- const gchar *ss;
+ gchar *ss;
if (layout_image_slideshow_active(lw))
{
+
if (!layout_image_slideshow_paused(lw))
{
- ss = _(" Slideshow");
+ delay = g_string_new(_(" Slideshow ["));
}
else
{
- ss = _(" Paused");
+ delay = g_string_new(_(" Paused ["));
}
+ hrs = options->slideshow.delay / (36000);
+ min = (options->slideshow.delay -(36000 * hrs))/600;
+ sec = (gdouble)(options->slideshow.delay -(36000 * hrs)-(min * 600)) / 10;
+
+ if (hrs > 0)
+ {
+ g_string_append_printf(delay, "%dh ", hrs);
+ }
+ if (min > 0)
+ {
+ g_string_append_printf(delay, "%dm ", min);
+ }
+ g_string_append_printf(delay, "%.1fs]", sec);
+
+ ss = g_strdup(delay->str);
+
+ g_string_free(delay, TRUE);
}
else
{
- ss = "";
+ ss = g_strdup("");
}
s = layout_selection_count(lw, &s_bytes);
buf = g_strdup_printf(_("%s, %d files (%s, %d)%s"), b, n, sb, s, ss);
g_free(b);
g_free(sb);
+ g_free(ss);
}
else if (n > 0)
{
gchar *b = text_from_size_abrev(n_bytes);
buf = g_strdup_printf(_("%s, %d files%s"), b, n, ss);
g_free(b);
+ g_free(ss);
}
else
{
buf = g_strdup_printf(_("%d files%s"), n, ss);
+ g_free(ss);
}
text = buf;
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 */
if (!n)
{
- gtk_label_set_text(GTK_LABEL(lw->info_zoom), "");
+ gtk_button_set_label(GTK_BUTTON(lw->info_zoom), "");
gtk_label_set_text(GTK_LABEL(lw->info_details), "");
}
else
else
{
gint width, height;
-
+ fd = image_get_fd(lw->image);
+ page_total = fd->page_total;
+ page_num = fd->page_num + 1;
image_get_image_size(lw->image, &width, &height);
- text = g_strdup_printf(_("( %d x %d ) %s bytes"),
- width, height, b);
+
+ if (page_total > 1)
+ {
+ text = g_strdup_printf(_("( %d x %d ) %s bytes %s%d%s%d%s"), width, height, b, "[", page_num, "/", page_total, "]");
+ }
+ else
+ {
+ text = g_strdup_printf(_("( %d x %d ) %s bytes"), width, height, b);
+ }
}
g_signal_emit_by_name (lw->image->pr, "update-pixel");
GtkWidget *frame;
frame = gtk_frame_new(NULL);
+ DEBUG_NAME(frame);
if (size) gtk_widget_set_size_request(frame, size, -1);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
if (start)
if (small_format)
{
lw->info_box = gtk_vbox_new(FALSE, 0);
+ DEBUG_NAME(lw->info_box);
}
else
{
lw->info_box = gtk_hbox_new(FALSE, 0);
+ DEBUG_NAME(lw->info_box);
}
gtk_box_pack_end(GTK_BOX(box), lw->info_box, FALSE, FALSE, 0);
gtk_widget_show(lw->info_box);
if (small_format)
{
hbox = gtk_hbox_new(FALSE, 0);
+ DEBUG_NAME(hbox);
gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
}
hbox = lw->info_box;
}
lw->info_progress_bar = gtk_progress_bar_new();
+ DEBUG_NAME(lw->info_progress_bar);
gtk_widget_set_size_request(lw->info_progress_bar, PROGRESS_WIDTH, -1);
#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), "");
gtk_widget_show(lw->info_sort);
lw->info_status = layout_status_label(NULL, lw->info_box, TRUE, 0, (!small_format));
- gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_status), _("Folder contents (files selected)"));
+ DEBUG_NAME(lw->info_status);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_status), _("Folder contents (files selected)\nSlideshow [time interval]"));
if (small_format)
{
hbox = gtk_hbox_new(FALSE, 0);
+ DEBUG_NAME(hbox);
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);
- gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_details), _("(Image dimensions) Image size"));
+ 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);
+ DEBUG_NAME(toolbar_frame);
gtk_frame_set_shadow_type(GTK_FRAME(toolbar_frame), GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(toolbar_frame), toolbar);
gtk_widget_show(toolbar_frame);
gtk_widget_show(toolbar);
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 mode"));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Select zoom and scroll mode"));
gtk_widget_show(lw->info_zoom);
if (small_format)
{
hbox = gtk_hbox_new(FALSE, 0);
+ DEBUG_NAME(hbox);
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 */
+ 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));
}
if (lw->vf) vf_thumb_set(lw->vf, lw->options.show_thumbnails);
}
+static void layout_list_sync_file_filter(LayoutWindow *lw)
+{
+ if (lw->vf) vf_file_filter_set(lw->vf, lw->options.show_file_filter);
+}
+
static GtkWidget *layout_list_new(LayoutWindow *lw)
{
lw->vf = vf_new(lw->options.file_view_type, NULL);
vf_marks_set(lw->vf, lw->options.show_marks);
layout_list_sync_thumb(lw);
+ layout_list_sync_file_filter(lw);
return lw->vf->widget;
}
if (lw->vf) vf_select_invert(lw->vf);
}
+void layout_select_list(LayoutWindow *lw, GList *list)
+{
+ if (!layout_valid(&lw)) return;
+
+ if (lw->vf)
+ {
+ vf_select_list(lw->vf, list);
+ }
+}
+
void layout_mark_to_selection(LayoutWindow *lw, gint mark, MarkToSelectionMode mode)
{
if (!layout_valid(&lw)) return;
if (isfile(fd->path)) have_file = TRUE;
}
- if (lw->path_entry) tab_completion_append_to_history(lw->path_entry, lw->dir_fd->path);
+ if (lw->path_entry)
+ {
+ history_chain_append_end(lw->dir_fd->path);
+ tab_completion_append_to_history(lw->path_entry, lw->dir_fd->path);
+ }
layout_sync_path(lw);
layout_list_sync_sort(lw);
if (options->metadata.confirm_on_dir_change && dir_changed)
metadata_write_queue_confirm(FALSE, NULL, NULL);
+ if (lw->vf && (options->read_metadata_in_idle || (lw->sort_method == SORT_EXIFTIME || lw->sort_method == SORT_EXIFTIMEDIGITIZED || lw->sort_method == SORT_RATING)))
+ {
+ vf_read_metadata_in_idle(lw->vf);
+ }
+
return TRUE;
}
layout_list_sync_thumb(lw);
}
+void layout_file_filter_set(LayoutWindow *lw, gboolean enable)
+{
+ if (!layout_valid(&lw)) return;
+
+ if (lw->options.show_file_filter == enable) return;
+
+ lw->options.show_file_filter = enable;
+
+ layout_util_sync_file_filter(lw);
+ layout_list_sync_file_filter(lw);
+}
+
void layout_marks_set(LayoutWindow *lw, gboolean enable)
{
if (!layout_valid(&lw)) return;
lw->options.show_marks = enable;
-// layout_util_sync_marks(lw);
+ layout_util_sync_marks(lw);
layout_list_sync_marks(lw);
}
layout_style_set(lw, -1, NULL);
}
+void layout_views_set_sort(LayoutWindow *lw, SortType method, gboolean ascend)
+{
+ if (!layout_valid(&lw)) return;
+
+ if (lw->options.dir_view_list_sort.method == method && lw->options.dir_view_list_sort.ascend == ascend) return;
+
+ lw->options.dir_view_list_sort.method = method;
+ lw->options.dir_view_list_sort.ascend = ascend;
+
+ layout_style_set(lw, -1, NULL);
+}
+
gboolean layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type)
{
if (!layout_valid(&lw)) return FALSE;
*h = gdk_window_get_height(window);
gtk_widget_get_allocation(gtk_paned_get_child1(GTK_PANED(lw->tools_pane)), &allocation);
- if (GTK_IS_VPANED(lw->tools_pane))
+ if (gtk_orientable_get_orientation(GTK_ORIENTABLE(lw->tools_pane)) == GTK_ORIENTATION_VERTICAL)
{
*divider_pos = allocation.height;
}
return TRUE;
}
+gboolean layout_geometry_get_log_window(LayoutWindow *lw, gint *x, gint *y,
+ gint *w, gint *h)
+{
+ GdkWindow *window;
+
+ if (!layout_valid(&lw)) return FALSE;
+
+ if (!lw->log_window)
+ {
+ return FALSE;
+ }
+
+ 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);
+
+ return TRUE;
+}
+
static void layout_tools_geometry_sync(LayoutWindow *lw)
{
layout_geometry_get_tools(lw, &lw->options.float_window.x, &lw->options.float_window.y,
GdkWindowHints hints;
lw->tools = window_new(GTK_WINDOW_TOPLEVEL, "tools", PIXBUF_INLINE_ICON_TOOLS, NULL, _("Tools"));
+ DEBUG_NAME(lw->tools);
g_signal_connect(G_OBJECT(lw->tools), "delete_event",
G_CALLBACK(layout_tools_delete_cb), lw);
layout_keyboard_init(lw, lw->tools);
gtk_window_set_resizable(GTK_WINDOW(lw->tools), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(lw->tools), 0);
+ if (options->expand_menu_toolbar) gtk_container_remove(GTK_CONTAINER(lw->main_box), lw->menu_tool_bar);
new_window = TRUE;
}
layout_actions_add_window(lw, lw->tools);
vbox = gtk_vbox_new(FALSE, 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);
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);
gtk_widget_show(lw->tools_pane);
layout_actions_setup(lw);
lw->group_box = gtk_vbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 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);
+ }
+ else
+ {
+ gtk_box_pack_start(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
+ }
gtk_widget_show(lw->group_box);
priority_location = layout_grid_compass(lw);
{
layout_split_change(lw, lw->split_mode); /* this re-creates image frame for the new configuration */
image_sb = lw->utility_box;
+ DEBUG_NAME(image_sb);
}
else
{
GtkWidget *image; /* image or split images together */
image = layout_image_setup_split(lw, lw->split_mode);
image_sb = layout_bars_prepare(lw, image);
+ DEBUG_NAME(image_sb);
}
tools = layout_tools_new(lw);
+ DEBUG_NAME(tools);
files = layout_list_new(lw);
+ DEBUG_NAME(files);
if (lw->options.tools_float || lw->options.tools_hidden)
layout_grid_compute(lw, image_sb, tools, files, &w1, &w2, &w3);
v = lw->v_pane = gtk_vpaned_new();
+ DEBUG_NAME(v);
h = lw->h_pane = gtk_hpaned_new();
+ DEBUG_NAME(h);
if (!layout_location_vertical(priority_location))
{
/* preserve utility_box (image + sidebars), menu_bar and toolbars to be reused later in layout_grid_setup */
/* lw->image is preserved together with lw->utility_box */
if (lw->utility_box) gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->utility_box)), lw->utility_box);
- 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 (options->expand_menu_toolbar)
+ {
+ if (lw->toolbar[TOOLBAR_STATUS]) gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->toolbar[TOOLBAR_STATUS])), lw->toolbar[TOOLBAR_STATUS]);
+
+ if (lw->menu_tool_bar) gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->menu_tool_bar)), lw->menu_tool_bar);
+ }
+ else
+ {
+ 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]);
+ }
/* clear it all */
static void startup_path_set_current_cb(GtkWidget *widget, gpointer data)
{
LayoutConfig *lc = data;
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+ {
+ return;
+ }
lc->options.startup_path = STARTUP_PATH_CURRENT;
}
static void startup_path_set_last_cb(GtkWidget *widget, gpointer data)
{
LayoutConfig *lc = data;
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+ {
+ return;
+ }
lc->options.startup_path = STARTUP_PATH_LAST;
}
static void startup_path_set_home_cb(GtkWidget *widget, gpointer data)
{
LayoutConfig *lc = data;
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+ {
+ return;
+ }
lc->options.startup_path = STARTUP_PATH_HOME;
}
copy_layout_options(&lc->options, &lw->options);
lc->configwindow = window_new(GTK_WINDOW_TOPLEVEL, "Layout", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Window options and layout"));
+ DEBUG_NAME(lc->configwindow);
gtk_window_set_type_hint(GTK_WINDOW(lc->configwindow), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(lc->configwindow), "delete_event",
gtk_container_set_border_width(GTK_CONTAINER(lc->configwindow), PREF_PAD_BORDER);
win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ DEBUG_NAME(win_vbox);
gtk_container_add(GTK_CONTAINER(lc->configwindow), win_vbox);
gtk_widget_show(win_vbox);
}
frame = pref_frame_new(win_vbox, TRUE, NULL, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
+ DEBUG_NAME(frame);
vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ DEBUG_NAME(vbox);
gtk_container_add(GTK_CONTAINER(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);
+ 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);
gtk_widget_show(tabcomp);
pref_checkbox_new_int(group, _("Show date in directories list view"),
lc->options.show_directory_date, &lc->options.show_directory_date);
- pref_checkbox_new_int(group, _("Exit program when this window is closed"),
- lc->options.exit_on_close, &lc->options.exit_on_close);
-
group = pref_group_new(vbox, FALSE, _("Start-up directory:"), GTK_ORIENTATION_VERTICAL);
button = pref_radiobutton_new(group, NULL, _("No change"),
group = pref_group_new(vbox, FALSE, _("Layout"), GTK_ORIENTATION_VERTICAL);
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);
void layout_sync_options_with_current_state(LayoutWindow *lw)
{
Histogram *histogram;
+#ifdef GDK_WINDOWING_X11
+#if GTK_CHECK_VERSION(3,10,0)
+ GdkWindow *window;
+#endif
+#endif
+
if (!layout_valid(&lw)) return;
lw->options.main_window.maximized = window_maximized(lw->window);
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);
+
+#ifdef GDK_WINDOWING_X11
+#if GTK_CHECK_VERSION(3,10,0)
+ GdkDisplay *display;
+
+ if (options->save_window_workspace)
+ {
+ display = gdk_display_get_default();
+
+ if (GDK_IS_X11_DISPLAY(display))
+ {
+ window = gtk_widget_get_window(GTK_WIDGET(lw->window));
+ lw->options.workspace = gdk_x11_window_get_desktop(window);
+ }
+ }
+#endif
+#endif
+ return;
}
void layout_apply_options(LayoutWindow *lw, LayoutOptions *lop)
gboolean refresh_lists;
if (!layout_valid(&lw)) return;
-/* FIXME: add other options too */
+/** @FIXME add other options too */
refresh_style = (lop->style != lw->options.style || strcmp(lop->order, lw->options.order) != 0);
refresh_lists = (lop->show_directory_date != lw->options.show_directory_date);
if (refresh_lists) layout_refresh(lw);
}
+void save_layout(LayoutWindow *lw)
+{
+ gchar *path;
+ gchar *xml_name;
+
+ if (!g_str_has_prefix(lw->options.id, "lw"))
+ {
+ xml_name = g_strdup_printf("%s.xml", lw->options.id);
+ path = g_build_filename(get_window_layouts_dir(), xml_name, NULL);
+ save_config_to_file(path, options, lw);
+
+ g_free(xml_name);
+ g_free(path);
+ }
+}
void layout_close(LayoutWindow *lw)
{
- if (!lw->options.exit_on_close && layout_window_list && layout_window_list->next)
+ GList *list;
+ LayoutWindow *tmp_lw;
+
+ if (layout_window_list && layout_window_list->next)
{
+ save_layout(lw);
layout_free(lw);
}
else
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);
+}
+
+static gboolean move_window_to_workspace_cb(gpointer data)
+{
+#ifdef GDK_WINDOWING_X11
+#if GTK_CHECK_VERSION(3,10,0)
+ LayoutWindow *lw = data;
+ GdkWindow *window;
+ GdkDisplay *display;
+
+ if (options->save_window_workspace)
+ {
+ display = gdk_display_get_default();
+
+ if (GDK_IS_X11_DISPLAY(display))
+ {
+ if (lw->options.workspace != -1)
+ {
+ window = gtk_widget_get_window(GTK_WIDGET(lw->window));
+ gdk_x11_window_move_to_desktop(window, lw->options.workspace);
+ }
+ }
+ }
+#endif
+#endif
+ return FALSE;
+}
+
LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
const gchar *geometry)
{
/* window */
lw->window = window_new(GTK_WINDOW_TOPLEVEL, GQ_APPNAME_LC, NULL, NULL, NULL);
+ 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;
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);
}
else
{
#endif
lw->main_box = gtk_vbox_new(FALSE, 0);
+ DEBUG_NAME(lw->main_box);
gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box);
gtk_widget_show(lw->main_box);
pixbuf = pixbuf_inline(PIXBUF_INLINE_LOGO);
- /* FIXME: the zoom value set here is the value, which is then copied again and again
+ /** @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. */
image_change_pixbuf(lw->image, pixbuf, 0.0, FALSE);
g_object_unref(pixbuf);
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, dir_view_list_sort.method);
+ WRITE_NL(); WRITE_BOOL(*layout, dir_view_list_sort.ascend);
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, show_directory_date);
WRITE_NL(); WRITE_CHAR(*layout, home_path);
- WRITE_NL(); WRITE_CHAR(*layout, last_path);
WRITE_NL(); WRITE_UINT(*layout, startup_path);
- WRITE_NL(); WRITE_BOOL(*layout, exit_on_close);
WRITE_SEPARATOR();
WRITE_NL(); WRITE_INT(*layout, main_window.x);
WRITE_NL(); WRITE_BOOL(*layout, main_window.maximized);
WRITE_NL(); WRITE_INT(*layout, main_window.hdivider_pos);
WRITE_NL(); WRITE_INT(*layout, main_window.vdivider_pos);
+ WRITE_NL(); WRITE_INT(*layout, workspace);
WRITE_SEPARATOR();
WRITE_NL(); WRITE_INT(*layout, folder_window.vdivider_pos);
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_BOOL(*layout, bars_state.info);
+ WRITE_NL(); WRITE_BOOL(*layout, bars_state.sort);
+ WRITE_NL(); WRITE_BOOL(*layout, bars_state.tools_float);
+ WRITE_NL(); WRITE_BOOL(*layout, bars_state.tools_hidden);
+ WRITE_NL(); WRITE_BOOL(*layout, bars_state.hidden);
+ WRITE_SEPARATOR();
WRITE_NL(); WRITE_UINT(*layout, image_overlay.state);
WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_channel);
WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_mode);
+ 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, preferences_window.x);
+ WRITE_NL(); WRITE_INT(*layout, preferences_window.y);
+ WRITE_NL(); WRITE_INT(*layout, preferences_window.w);
+ WRITE_NL(); WRITE_INT(*layout, preferences_window.h);
+ WRITE_NL(); WRITE_INT(*layout, preferences_window.page_number);
+
+ WRITE_NL(); WRITE_INT(*layout, search_window.x);
+ WRITE_NL(); WRITE_INT(*layout, search_window.y);
+ WRITE_NL(); WRITE_INT(*layout, search_window.w);
+ WRITE_NL(); WRITE_INT(*layout, search_window.h);
+
+ WRITE_NL(); WRITE_INT(*layout, dupe_window.x);
+ WRITE_NL(); WRITE_INT(*layout, dupe_window.y);
+ WRITE_NL(); WRITE_INT(*layout, dupe_window.w);
+ WRITE_NL(); WRITE_INT(*layout, dupe_window.h);
+ WRITE_SEPARATOR();
+
WRITE_NL(); WRITE_BOOL(*layout, animate);
}
bar_sort_write_config(lw->bar_sort, outstr, indent + 1);
bar_write_config(lw->bar, outstr, indent + 1);
+ WRITE_SEPARATOR();
+ generic_dialog_windows_write_config(outstr, indent + 1);
+
+ WRITE_SEPARATOR();
+ layout_toolbar_write_config(lw, TOOLBAR_MAIN, outstr, indent + 1);
+ layout_toolbar_write_config(lw, TOOLBAR_STATUS, outstr, indent + 1);
+
WRITE_NL(); WRITE_STRING("</layout>");
}
if (READ_UINT(*layout, dir_view_type)) continue;
if (READ_UINT(*layout, file_view_type)) continue;
+ if (READ_UINT(*layout, dir_view_list_sort.method)) continue;
+ if (READ_BOOL(*layout, dir_view_list_sort.ascend)) 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, show_directory_date)) continue;
if (READ_CHAR(*layout, home_path)) continue;
- if (READ_CHAR(*layout, last_path)) continue;
if (READ_UINT_CLAMP(*layout, startup_path, 0, STARTUP_PATH_HOME)) continue;
- if (READ_BOOL(*layout, exit_on_close)) continue;
/* window positions */
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_BOOL(*layout, bars_state.info)) continue;
+ if (READ_BOOL(*layout, bars_state.sort)) continue;
+ if (READ_BOOL(*layout, bars_state.tools_float)) continue;
+ if (READ_BOOL(*layout, bars_state.tools_hidden)) continue;
+ if (READ_BOOL(*layout, bars_state.hidden)) continue;
if (READ_UINT(*layout, image_overlay.state)) continue;
if (READ_INT(*layout, image_overlay.histogram_channel)) continue;
if (READ_INT(*layout, image_overlay.histogram_mode)) 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, preferences_window.x)) continue;
+ if (READ_INT(*layout, preferences_window.y)) continue;
+ if (READ_INT(*layout, preferences_window.w)) continue;
+ if (READ_INT(*layout, preferences_window.h)) continue;
+ if (READ_INT(*layout, preferences_window.page_number)) continue;
+
+ if (READ_INT(*layout, search_window.x)) continue;
+ if (READ_INT(*layout, search_window.y)) continue;
+ if (READ_INT(*layout, search_window.w)) continue;
+ if (READ_INT(*layout, search_window.h)) continue;
+
+ if (READ_INT(*layout, dupe_window.x)) continue;
+ if (READ_INT(*layout, dupe_window.y)) continue;
+ if (READ_INT(*layout, dupe_window.w)) continue;
+ if (READ_INT(*layout, dupe_window.h)) continue;
+
if (READ_BOOL(*layout, animate)) continue;
+ if (READ_INT(*layout, workspace)) continue;
log_printf("unknown attribute %s = %s\n", option, value);
}
switch (lop->startup_path)
{
case STARTUP_PATH_LAST:
- *path = (lop->last_path && isdir(lop->last_path)) ? g_strdup(lop->last_path) : get_current_dir();
+ *path = (history_list_find_last_path_by_key("path_list") && isdir(history_list_find_last_path_by_key("path_list"))) ? g_strdup(history_list_find_last_path_by_key("path_list")) : get_current_dir();
break;
case STARTUP_PATH_HOME:
*path = (lop->home_path && isdir(lop->home_path)) ? g_strdup(lop->home_path) : g_strdup(homedir());
}
}
+static gboolean first_found = FALSE;
+
LayoutWindow *layout_new_from_config(const gchar **attribute_names, const gchar **attribute_values, gboolean use_commandline)
{
LayoutOptions lop;
if (attribute_names) layout_load_attributes(&lop, attribute_names, attribute_values);
- if (use_commandline)
+ /* If multiple windows are specified in the config. file,
+ * use the command line options only in the main window.
+ */
+ if (use_commandline && !first_found)
{
+ first_found = TRUE;
layout_config_commandline(&lop, &path);
}
else
if (use_commandline && command_line->startup_full_screen) layout_image_full_screen_start(lw);
if (use_commandline && command_line->startup_in_slideshow) layout_image_slideshow_start(lw);
-
+ if (use_commandline && command_line->log_window_show) log_window_new(lw);
g_free(path);
free_layout_options_content(&lop);
projects / geeqie.git / blobdiff