X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flayout.c;h=37fe728afb7cc62c9bebdc806d3f500e5f145b1a;hb=aaf1420aa54c31f2d7f4acb4b38fa018196e2c63;hp=64d514ffc8ee17c6b840640f16994b2fa0f8eb89;hpb=ba645d1fe84bb87385f0121613a85a08c14a676d;p=geeqie.git

diff --git a/src/layout.c b/src/layout.c
index 64d514ff..37fe728a 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -1,13 +1,22 @@
 /*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "main.h"
@@ -16,11 +25,13 @@
 #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"
@@ -37,10 +48,15 @@
 #include "bar.h"
 #include "bar_sort.h"
 #include "preferences.h"
-
+#include "shortcuts.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
@@ -52,7 +68,7 @@
 #define TOOLWINDOW_DEF_HEIGHT 450
 
 #define PROGRESS_WIDTH 150
-#define ZOOM_LABEL_WIDTH 64
+#define ZOOM_LABEL_WIDTH 120
 
 #define PANE_DIVIDER_SIZE 10
 
@@ -118,7 +134,7 @@ LayoutWindow *layout_find_by_layout_id(const gchar *id)
 	GList *work;
 
 	if (!id || !id[0]) return NULL;
-	
+
 	if (strcmp(id, LAYOUT_ID_CURRENT) == 0)
 		{
 		if (current_lw) return current_lw;
@@ -139,21 +155,32 @@ LayoutWindow *layout_find_by_layout_id(const gchar *id)
 	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];
 	gint i;
 	if (lw->options.id && lw->options.id[0]) return; /* id is already set */
-	
+
 	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)
 		{
@@ -174,6 +201,21 @@ static gboolean layout_set_current_cb(GtkWidget *widget, GdkEventFocus *event, g
 	return FALSE;
 }
 
+static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer data)
+{
+	LayoutWindow *lw;
+	GList *work;
+
+/** @FIXME this is probably not the correct way to implement this */
+	work = layout_window_list;
+	while (work)
+		{
+		lw = work->data;
+		lw->options.folder_window.vdivider_pos = gtk_paned_get_position(GTK_PANED(widget));
+		work = work->next;
+		}
+}
+
 /*
  *-----------------------------------------------------------------------------
  * menu, toolbar, and dir view
@@ -203,11 +245,12 @@ static void layout_path_entry_tab_cb(const gchar *path, gpointer data)
 
 	buf = g_strdup(path);
 	parse_out_relatives(buf);
-	
+
 	if (isdir(buf))
 		{
 		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);
@@ -225,7 +268,7 @@ static void layout_path_entry_tab_cb(const gchar *path, gpointer data)
 			}
 		g_free(base);
 		}
-		
+
 	g_free(buf);
 }
 
@@ -235,9 +278,13 @@ static void layout_path_entry_cb(const gchar *path, gpointer data)
 	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);
 }
@@ -260,42 +307,119 @@ static void layout_path_entry_tab_append_cb(const gchar *path, gpointer data, gi
 	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 *menu_bar;
+	GtkWidget *box_folders;
+	GtkWidget *scd;
+	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);
-	gtk_widget_show(menu_bar);
+	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);
+
+		gtk_widget_show(scroll_window);
+		gtk_widget_show(menu_bar);
+		if (lw->options.toolbar_hidden) gtk_widget_hide(toolbar);
 
-	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_show(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);
 
-	g_signal_connect(G_OBJECT(lw->path_entry->parent), "changed",
+#if GTK_CHECK_VERSION(3,20,0)
+	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);
+#else
+	g_signal_connect(G_OBJECT(gtk_widget_get_parent(lw->path_entry)), "changed",
 			 G_CALLBACK(layout_path_entry_changed_cb), lw);
+#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);
 
-	lw->vd = vd_new(lw->options.dir_view_type, lw->dir_fd);
-	vd_set_layout(lw->vd, lw);
 	vd_set_select_func(lw->vd, layout_vd_select_cb, lw);
 
 	lw->dir_view = lw->vd->widget;
-
-	gtk_box_pack_start(GTK_BOX(box), lw->dir_view, TRUE, TRUE, 0);
+	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);
+
+	gtk_widget_show(box_folders);
+
+	g_signal_connect(G_OBJECT(box_folders), "notify::position",
+			 G_CALLBACK(layout_box_folders_changed_cb), lw);
+
 	gtk_widget_show(box);
 
 	return box;
@@ -319,6 +443,10 @@ static void layout_sort_menu_cb(GtkWidget *widget, gpointer data)
 
 	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);
 }
 
@@ -332,11 +460,7 @@ static void layout_sort_menu_ascend_cb(GtkWidget *widget, gpointer data)
 static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer data)
 {
 	/* destroy the menu */
-#if GTK_CHECK_VERSION(2,12,0)
 	g_object_unref(widget);
-#else
-	gtk_widget_unref(GTK_WIDGET(widget));
-#endif
 }
 
 static void layout_sort_button_press_cb(GtkWidget *widget, gpointer data)
@@ -384,6 +508,7 @@ static GtkWidget *layout_sort_button(LayoutWindow *lw)
 	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);
@@ -391,6 +516,114 @@ static GtkWidget *layout_sort_button(LayoutWindow *lw)
 	return button;
 }
 
+static void layout_zoom_menu_cb(GtkWidget *widget, gpointer data)
+{
+	ZoomMode mode;
+
+	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
+
+	mode = (ZoomMode)GPOINTER_TO_INT(data);
+	options->image.zoom_mode = mode;
+}
+
+static void layout_scroll_menu_cb(GtkWidget *widget, gpointer data)
+{
+	guint scroll_type;
+
+	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
+
+	scroll_type = GPOINTER_TO_UINT(data);
+	options->image.scroll_reset_method = scroll_type;
+	image_options_sync();
+}
+
+static void layout_zoom_menu_hide_cb(GtkWidget *widget, gpointer data)
+{
+	/* destroy the menu */
+	g_object_unref(widget);
+}
+
+static void layout_zoom_button_press_cb(GtkWidget *widget, gpointer data)
+{
+	LayoutWindow *lw = data;
+	GtkWidget *menu;
+	GdkEvent *event;
+	guint32 etime;
+
+	menu = submenu_add_zoom(NULL, G_CALLBACK(layout_zoom_menu_cb),
+			lw, FALSE, FALSE, TRUE, options->image.zoom_mode);
+
+	/* take ownership of menu */
+#ifdef GTK_OBJECT_FLOATING
+	/* GTK+ < 2.10 */
+	g_object_ref(G_OBJECT(menu));
+	gtk_object_sink(GTK_OBJECT(menu));
+#else
+	/* GTK+ >= 2.10 */
+	g_object_ref_sink(G_OBJECT(menu));
+#endif
+
+	menu_item_add_divider(menu);
+
+	menu_item_add_radio(menu, _("Scroll to top left corner"),
+			GUINT_TO_POINTER(SCROLL_RESET_TOPLEFT),
+			options->image.scroll_reset_method == SCROLL_RESET_TOPLEFT,
+			G_CALLBACK(layout_scroll_menu_cb),
+			GUINT_TO_POINTER(SCROLL_RESET_TOPLEFT));
+	menu_item_add_radio(menu, _("Scroll to image center"),
+			GUINT_TO_POINTER(SCROLL_RESET_CENTER),
+			options->image.scroll_reset_method == SCROLL_RESET_CENTER,
+			G_CALLBACK(layout_scroll_menu_cb),
+			GUINT_TO_POINTER(SCROLL_RESET_CENTER));
+	menu_item_add_radio(menu, _("Keep the region from previous image"),
+			GUINT_TO_POINTER(SCROLL_RESET_NOCHANGE),
+			options->image.scroll_reset_method == SCROLL_RESET_NOCHANGE,
+			G_CALLBACK(layout_scroll_menu_cb),
+			GUINT_TO_POINTER(SCROLL_RESET_NOCHANGE));
+
+	g_signal_connect(G_OBJECT(menu), "selection_done",
+			 G_CALLBACK(layout_zoom_menu_hide_cb), NULL);
+
+	event = gtk_get_current_event();
+	if (event)
+		{
+		etime = gdk_event_get_time(event);
+		gdk_event_free(event);
+		}
+	else
+		{
+		etime = 0;
+		}
+
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, etime);
+}
+
+static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size, gboolean expand)
+{
+	GtkWidget *button;
+	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);
+
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
+
+	gtk_widget_show(frame);
+
+	button = gtk_button_new_with_label("1:1");
+	g_signal_connect(G_OBJECT(button), "clicked",
+			 G_CALLBACK(layout_zoom_button_press_cb), lw);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+	gtk_container_add(GTK_CONTAINER(frame), button);
+	gtk_widget_show(button);
+
+	return button;
+}
+
 /*
  *-----------------------------------------------------------------------------
  * status bar
@@ -400,16 +633,37 @@ static GtkWidget *layout_sort_button(LayoutWindow *lw)
 
 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;
 
@@ -417,35 +671,53 @@ void layout_status_update_info(LayoutWindow *lw, const gchar *text)
 		{
 		guint n;
 		gint64 n_bytes = 0;
-	
+
 		n = layout_list_count(lw, &n_bytes);
-		
+
 		if (n)
 			{
 			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);
-	
+
 			layout_bars_new_selection(lw, s);
-	
+
 			if (s > 0)
 				{
 				gchar *b = text_from_size_abrev(n_bytes);
@@ -453,20 +725,23 @@ void layout_status_update_info(LayoutWindow *lw, const gchar *text)
 				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;
-	
+
 			image_osd_update(lw->image);
 			}
 		else
@@ -474,7 +749,7 @@ void layout_status_update_info(LayoutWindow *lw, const gchar *text)
 			text = "";
 			}
 	}
-	
+
 	if (lw->info_status) gtk_label_set_text(GTK_LABEL(lw->info_status), text);
 	g_free(buf);
 }
@@ -482,14 +757,18 @@ void layout_status_update_info(LayoutWindow *lw, const gchar *text)
 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)
 		{
-		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
@@ -498,7 +777,7 @@ void layout_status_update_image(LayoutWindow *lw)
 		gchar *b;
 
 		text = image_zoom_get_as_text(lw->image);
-		gtk_label_set_text(GTK_LABEL(lw->info_zoom), text);
+		gtk_button_set_label(GTK_BUTTON(lw->info_zoom), text);
 		g_free(text);
 
 		b = image_get_fd(lw->image) ? text_from_size(image_get_fd(lw->image)->size) : g_strdup("0");
@@ -517,16 +796,25 @@ void layout_status_update_image(LayoutWindow *lw)
 		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");
-		
+
 		g_free(b);
-		
+
 		gtk_label_set_text(GTK_LABEL(lw->info_details), text);
 		g_free(text);
 		}
@@ -547,6 +835,7 @@ static GtkWidget *layout_status_label(gchar *text, GtkWidget *box, gboolean star
 	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)
@@ -577,10 +866,12 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
 	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);
@@ -588,6 +879,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
 	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);
 		}
@@ -596,39 +888,57 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
 		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_progress_bar_set_show_text(GTK_PROGRESS_BAR(lw->info_progress_bar), TRUE);
+#endif
 	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);
+	gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_sort), _("Select sort order"));
 	gtk_box_pack_start(GTK_BOX(hbox), lw->info_sort, FALSE, FALSE, 0);
 	gtk_widget_show(lw->info_sort);
 
 	lw->info_status = layout_status_label(NULL, 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]"));
 
 	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);
+	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_status_label(NULL, hbox, FALSE, ZOOM_LABEL_WIDTH, FALSE);
+	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);
+
 	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));
 }
 
@@ -663,6 +973,11 @@ static void layout_list_sync_thumb(LayoutWindow *lw)
 	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);
@@ -672,8 +987,9 @@ static GtkWidget *layout_list_new(LayoutWindow *lw)
 	vf_set_thumb_status_func(lw->vf, layout_list_thumb_cb, lw);
 
 	vf_marks_set(lw->vf, lw->options.show_marks);
-	
+
 	layout_list_sync_thumb(lw);
+	layout_list_sync_file_filter(lw);
 
 	return lw->vf->widget;
 }
@@ -686,9 +1002,6 @@ static void layout_list_sync_marks(LayoutWindow *lw)
 static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *needle)
 {
 	if (!lw) return;
-#if 0
-	if (lw->vf) vf_scroll_to_subpart(lw->vf, needle);
-#endif
 }
 
 GList *layout_list(LayoutWindow *lw)
@@ -798,6 +1111,16 @@ void layout_select_invert(LayoutWindow *lw)
 	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;
@@ -850,7 +1173,7 @@ gboolean layout_set_path(LayoutWindow *lw, const gchar *path)
 	gboolean ret;
 
 	if (!path) return FALSE;
-	
+
 	fd = file_data_new_group(path);
 	ret = layout_set_fd(lw, fd);
 	file_data_unref(fd);
@@ -910,10 +1233,14 @@ gboolean layout_set_fd(LayoutWindow *lw, FileData *fd)
 		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 (have_file)
 		{
 		gint row;
@@ -936,6 +1263,11 @@ gboolean layout_set_fd(LayoutWindow *lw, FileData *fd)
 	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;
 }
 
@@ -973,6 +1305,18 @@ void layout_thumb_set(LayoutWindow *lw, gboolean enable)
 	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;
@@ -981,7 +1325,7 @@ void layout_marks_set(LayoutWindow *lw, gboolean enable)
 
 	lw->options.show_marks = enable;
 
-//	layout_util_sync_marks(lw);
+	layout_util_sync_marks(lw);
 	layout_list_sync_marks(lw);
 }
 
@@ -1007,7 +1351,7 @@ void layout_sort_set(LayoutWindow *lw, SortType type, gboolean ascend)
 	lw->sort_method = type;
 	lw->sort_ascend = ascend;
 
-	if (lw->info_sort) gtk_label_set_text(GTK_LABEL(GTK_BIN(lw->info_sort)->child),
+	if (lw->info_sort) gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(lw->info_sort))),
 					      sort_type_get_text(type));
 	layout_list_sync_sort(lw);
 }
@@ -1024,30 +1368,48 @@ gboolean layout_sort_get(LayoutWindow *lw, SortType *type, gboolean *ascend)
 
 gboolean layout_geometry_get(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h)
 {
+	GdkWindow *window;
 	if (!layout_valid(&lw)) return FALSE;
 
-	gdk_window_get_root_origin(lw->window->window, x, y);
-	gdk_drawable_get_size(lw->window->window, w, h);
+	window = gtk_widget_get_window(lw->window);
+	gdk_window_get_root_origin(window, x, y);
+	*w = gdk_window_get_width(window);
+	*h = gdk_window_get_height(window);
 
 	return TRUE;
 }
 
 gboolean layout_geometry_get_dividers(LayoutWindow *lw, gint *h, gint *v)
 {
+	GtkAllocation h_allocation;
+	GtkAllocation v_allocation;
+
 	if (!layout_valid(&lw)) return FALSE;
 
-	if (lw->h_pane && GTK_PANED(lw->h_pane)->child1->allocation.x >= 0)
+	if (lw->h_pane)
+		{
+		GtkWidget *child = gtk_paned_get_child1(GTK_PANED(lw->h_pane));
+		gtk_widget_get_allocation(child, &h_allocation);
+		}
+
+	if (lw->v_pane)
 		{
-		*h = GTK_PANED(lw->h_pane)->child1->allocation.width;
+		GtkWidget *child = gtk_paned_get_child1(GTK_PANED(lw->v_pane));
+		gtk_widget_get_allocation(child, &v_allocation);
+		}
+
+	if (lw->h_pane && h_allocation.x >= 0)
+		{
+		*h = h_allocation.width;
 		}
 	else if (h != &lw->options.main_window.hdivider_pos)
 		{
 		*h = lw->options.main_window.hdivider_pos;
 		}
 
-	if (lw->v_pane && GTK_PANED(lw->v_pane)->child1->allocation.x >= 0)
+	if (lw->v_pane && v_allocation.x >= 0)
 		{
-		*v = GTK_PANED(lw->v_pane)->child1->allocation.height;
+		*v = v_allocation.height;
 		}
 	else if (v != &lw->options.main_window.vdivider_pos)
 		{
@@ -1069,6 +1431,18 @@ void layout_views_set(LayoutWindow *lw, DirViewType dir_view_type, FileViewType
 	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;
@@ -1141,13 +1515,11 @@ static void layout_location_compute(LayoutLocation l1, LayoutLocation l2,
 
 gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos)
 {
+	GdkWindow *window;
+	GtkAllocation allocation;
 	if (!layout_valid(&lw)) return FALSE;
 
-#if GTK_CHECK_VERSION(2,20,0)
 	if (!lw->tools || !gtk_widget_get_visible(lw->tools))
-#else
-	if (!lw->tools || !GTK_WIDGET_VISIBLE(lw->tools))
-#endif
 		{
 		/* use the stored values (sort of breaks success return value) */
 
@@ -1156,24 +1528,47 @@ gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w,
 		return FALSE;
 		}
 
-	gdk_window_get_root_origin(lw->tools->window, x, y);
-	gdk_drawable_get_size(lw->tools->window, w, h);
+	window = gtk_widget_get_window(lw->tools);
+	gdk_window_get_root_origin(window, x, y);
+	*w = gdk_window_get_width(window);
+	*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 = GTK_PANED(lw->tools_pane)->child1->allocation.height;
+		*divider_pos = allocation.height;
 		}
 	else
 		{
-		*divider_pos = GTK_PANED(lw->tools_pane)->child1->allocation.width;
+		*divider_pos = allocation.width;
+		}
+
+	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.x,
+	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);
 }
 
@@ -1183,11 +1578,7 @@ static void layout_tools_hide(LayoutWindow *lw, gboolean hide)
 
 	if (hide)
 		{
-#if GTK_CHECK_VERSION(2,20,0)
 		if (gtk_widget_get_visible(lw->tools))
-#else
-		if (GTK_WIDGET_VISIBLE(lw->tools))
-#endif
 			{
 			layout_tools_geometry_sync(lw);
 			gtk_widget_hide(lw->tools);
@@ -1195,11 +1586,7 @@ static void layout_tools_hide(LayoutWindow *lw, gboolean hide)
 		}
 	else
 		{
-#if GTK_CHECK_VERSION(2,20,0)
 		if (!gtk_widget_get_visible(lw->tools))
-#else
-		if (!GTK_WIDGET_VISIBLE(lw->tools))
-#endif
 			{
 			gtk_widget_show(lw->tools);
 			if (lw->vf) vf_refresh(lw->vf);
@@ -1227,10 +1614,6 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 
 	vertical = (layout_location_single(lw->image_location) && !layout_location_vertical(lw->image_location)) ||
 		   (!layout_location_single(lw->image_location) && layout_location_vertical(layout_grid_compass(lw)));
-#if 0
-	layout_location_compute(lw->dir_location, lw->file_location,
-				tools, files, &w1, &w2);
-#endif
 	/* for now, tools/dir are always first in order */
 	w1 = tools;
 	w2 = files;
@@ -1241,6 +1624,7 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 		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);
@@ -1264,6 +1648,7 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 
 		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;
 		}
@@ -1271,13 +1656,15 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 		{
 		layout_tools_geometry_sync(lw);
 		/* dump the contents */
-		gtk_widget_destroy(GTK_BIN(lw->tools)->child);
+		gtk_widget_destroy(gtk_bin_get_child(GTK_BIN(lw->tools)));
 		}
 
 	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);
@@ -1285,10 +1672,12 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 	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);
@@ -1400,8 +1789,8 @@ void layout_split_change(LayoutWindow *lw, ImageSplitMode mode)
 		if (lw->split_images[i])
 			{
 			gtk_widget_hide(lw->split_images[i]->widget);
-			if (lw->split_images[i]->widget->parent != lw->utility_paned)
-				gtk_container_remove(GTK_CONTAINER(lw->split_images[i]->widget->parent), lw->split_images[i]->widget);
+			if (gtk_widget_get_parent(lw->split_images[i]->widget) != lw->utility_paned)
+				gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->split_images[i]->widget)), lw->split_images[i]->widget);
 			}
 		}
 	gtk_container_remove(GTK_CONTAINER(lw->utility_paned), lw->split_image_widget);
@@ -1427,7 +1816,15 @@ static void layout_grid_setup(LayoutWindow *lw)
 	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);
@@ -1436,16 +1833,20 @@ static void layout_grid_setup(LayoutWindow *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)
@@ -1472,8 +1873,10 @@ static void layout_grid_setup(LayoutWindow *lw)
 	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))
 		{
@@ -1549,7 +1952,7 @@ void layout_style_set(LayoutWindow *lw, gint style, const gchar *order)
 
 	/* remember state */
 
-	/* layout_image_slideshow_stop(lw); slideshow should survive */ 
+	/* layout_image_slideshow_stop(lw); slideshow should survive */
 	layout_image_full_screen_stop(lw);
 
 	dir_fd = lw->dir_fd;
@@ -1560,10 +1963,20 @@ void layout_style_set(LayoutWindow *lw, gint style, const gchar *order)
 
 	/* 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(lw->utility_box->parent), lw->utility_box);
-	if (lw->menu_bar) gtk_container_remove(GTK_CONTAINER(lw->menu_bar->parent), lw->menu_bar);
-	for (i = 0; i < TOOLBAR_COUNT; i++)
-		if (lw->toolbar[i]) gtk_container_remove(GTK_CONTAINER(lw->toolbar[i]->parent), lw->toolbar[i]);
+	if (lw->utility_box) gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(lw->utility_box)), lw->utility_box);
+
+	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 */
 
@@ -1633,7 +2046,7 @@ void layout_colors_update(void)
 		gint i;
 		LayoutWindow *lw = work->data;
 		work = work->next;
-		
+
 		if (!lw->image) continue;
 
 		for (i = 0; i < MAX_SPLIT_IMAGES; i++)
@@ -1641,7 +2054,7 @@ void layout_colors_update(void)
 			if (!lw->split_images[i]) continue;
 			image_background_set_color_from_options(lw->split_images[i], !!lw->full_screen);
 			}
-		
+
 		image_background_set_color_from_options(lw->image, !!lw->full_screen);
 		}
 }
@@ -1719,32 +2132,24 @@ gboolean layout_tools_float_get(LayoutWindow *lw, gboolean *popped, gboolean *hi
 void layout_toolbar_toggle(LayoutWindow *lw)
 {
 	if (!layout_valid(&lw)) return;
-	if (!lw->toolbar) return;
+	if (!lw->toolbar[TOOLBAR_MAIN]) return;
 
 	lw->options.toolbar_hidden = !lw->options.toolbar_hidden;
 
 	if (lw->options.toolbar_hidden)
 		{
-#if GTK_CHECK_VERSION(2,20,0)
 		if (gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
-#else
-		if (GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
-#endif
 		}
 	else
 		{
-#if GTK_CHECK_VERSION(2,20,0)
 		if (!gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
-#else
-		if (!GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
-#endif
 		}
 }
 
 void layout_info_pixel_set(LayoutWindow *lw, gboolean show)
 {
 	GtkWidget *frame;
-	
+
 	if (!layout_valid(&lw)) return;
 	if (!lw->info_pixel) return;
 
@@ -1759,7 +2164,7 @@ void layout_info_pixel_set(LayoutWindow *lw, gboolean show)
 		{
 		gtk_widget_show(frame);
 		}
-	
+
 	g_signal_emit_by_name (lw->image->pr, "update-pixel");
 }
 
@@ -1780,7 +2185,7 @@ struct _LayoutConfig
 	GtkWidget *configwindow;
 	GtkWidget *home_path_entry;
 	GtkWidget *layout_widget;
-	
+
 	LayoutOptions options;
 };
 
@@ -1789,7 +2194,7 @@ static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer d
 static void layout_config_close_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutConfig *lc = data;
-	
+
 	gtk_widget_destroy(lc->configwindow);
 	free_layout_options_content(&lc->options);
 	g_free(lc);
@@ -1804,7 +2209,7 @@ static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer d
 static void layout_config_apply_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutConfig *lc = data;
-	
+
 	g_free(lc->options.order);
 	lc->options.order = layout_config_get(lc->layout_widget, &lc->options.style);
 
@@ -1813,6 +2218,11 @@ static void layout_config_apply_cb(GtkWidget *widget, gpointer data)
 	layout_apply_options(lc->lw, &lc->options);
 }
 
+static void layout_config_help_cb(GtkWidget *widget, gpointer data)
+{
+	help_window_show("GuideOptionsLayout.html");
+}
+
 static void layout_config_ok_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutConfig *lc = data;
@@ -1829,18 +2239,30 @@ static void home_path_set_current_cb(GtkWidget *widget, gpointer data)
 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;
 }
 
@@ -1871,6 +2293,7 @@ void layout_show_config_window(LayoutWindow *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"));
+	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",
@@ -1881,6 +2304,7 @@ void layout_show_config_window(LayoutWindow *lw)
 	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);
 
@@ -1893,7 +2317,7 @@ void layout_show_config_window(LayoutWindow *lw)
 	button = pref_button_new(NULL, GTK_STOCK_OK, NULL, FALSE,
 				 G_CALLBACK(layout_config_ok_cb), lc);
 	gtk_container_add(GTK_CONTAINER(hbox), button);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default(button, TRUE);
 	gtk_widget_grab_default(button);
 	gtk_widget_show(button);
 
@@ -1904,17 +2328,23 @@ void layout_show_config_window(LayoutWindow *lw)
 	gtk_container_add(GTK_CONTAINER(hbox), button);
 	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 	gtk_widget_show(button);
-*/	
+*/
+	button = pref_button_new(NULL, GTK_STOCK_HELP, NULL, FALSE,
+				 G_CALLBACK(layout_config_help_cb), lc);
+	gtk_container_add(GTK_CONTAINER(hbox), button);
+	gtk_widget_set_can_default(button, TRUE);
+	gtk_widget_show(button);
+
 	button = pref_button_new(NULL, GTK_STOCK_APPLY, NULL, FALSE,
 				 G_CALLBACK(layout_config_apply_cb), lc);
 	gtk_container_add(GTK_CONTAINER(hbox), button);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default(button, TRUE);
 	gtk_widget_show(button);
 
 	button = pref_button_new(NULL, GTK_STOCK_CANCEL, NULL, FALSE,
 				 G_CALLBACK(layout_config_close_cb), lc);
 	gtk_container_add(GTK_CONTAINER(hbox), button);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default(button, TRUE);
 	gtk_widget_show(button);
 
 	if (!generic_dialog_get_alternative_button_order(lc->configwindow))
@@ -1923,8 +2353,10 @@ void layout_show_config_window(LayoutWindow *lw)
 		}
 
 	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);
 
@@ -1934,7 +2366,7 @@ void layout_show_config_window(LayoutWindow *lw)
 	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);
@@ -1945,9 +2377,6 @@ void layout_show_config_window(LayoutWindow *lw)
 	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"),
@@ -1963,6 +2392,7 @@ void layout_show_config_window(LayoutWindow *lw)
 	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);
 
@@ -1979,6 +2409,12 @@ void layout_show_config_window(LayoutWindow *lw)
 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);
@@ -1997,12 +2433,33 @@ void layout_sync_options_with_current_state(LayoutWindow *lw)
 
 	lw->options.image_overlay.state = image_osd_get(lw->image);
 	histogram = image_osd_get_histogram(lw->image);
-	
+
 	lw->options.image_overlay.histogram_channel = histogram->histogram_channel;
 	lw->options.image_overlay.histogram_mode = histogram->histogram_mode;
 
 	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)
@@ -2011,7 +2468,7 @@ 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);
@@ -2022,11 +2479,30 @@ void layout_apply_options(LayoutWindow *lw, LayoutOptions *lop)
 	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
@@ -2044,7 +2520,7 @@ void layout_free(LayoutWindow *lw)
 	if (current_lw == lw) current_lw = NULL;
 
 	if (lw->exif_window) g_signal_handlers_disconnect_matched(G_OBJECT(lw->exif_window), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, lw);
-		
+
 	layout_bars_close(lw);
 
 	g_object_unref(lw->menu_bar);
@@ -2053,11 +2529,10 @@ void layout_free(LayoutWindow *lw)
 	for (i = 0; i < TOOLBAR_COUNT; i++)
 		{
 		if (lw->toolbar[i]) g_object_unref(lw->toolbar[i]);
-		string_list_free(lw->toolbar_actions[i]);
 		}
-	
+
 	gtk_widget_destroy(lw->window);
-	
+
 	if (lw->split_image_sizegroup) g_object_unref(lw->split_image_sizegroup);
 
 	file_data_unregister_notify_func(layout_image_notify_cb, lw);
@@ -2085,6 +2560,37 @@ 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);
+}
+
+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)
 {
@@ -2114,8 +2620,8 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
 
 	layout_config_parse(lw->options.style, lw->options.order,
 			    &lw->dir_location,  &lw->file_location, &lw->image_location);
-	if (lw->options.dir_view_type >= VIEW_DIR_TYPES_COUNT) lw->options.dir_view_type = 0;
-	if (lw->options.file_view_type >= VIEW_FILE_TYPES_COUNT) lw->options.file_view_type = 0;
+	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;
 
 	/* divider positions */
 
@@ -2129,9 +2635,12 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
 	/* 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;
@@ -2156,6 +2665,8 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
 		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
 		{
@@ -2175,6 +2686,7 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
 #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);
 
@@ -2193,8 +2705,8 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
 		GdkPixbuf *pixbuf;
 
 		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);
@@ -2213,7 +2725,7 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
 
 	image_osd_set(lw->image, lw->options.image_overlay.state);
 	histogram = image_osd_get_histogram(lw->image);
-	
+
 	histogram->histogram_channel = lw->options.image_overlay.histogram_channel;
 	histogram->histogram_mode = lw->options.image_overlay.histogram_mode;
 
@@ -2234,13 +2746,14 @@ void layout_write_attributes(LayoutOptions *layout, GString *outstr, gint indent
 	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);
@@ -2250,6 +2763,10 @@ void layout_write_attributes(LayoutOptions *layout, GString *outstr, gint indent
 	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_SEPARATOR();
 
 	WRITE_NL(); WRITE_INT(*layout, float_window.x);
@@ -2269,10 +2786,43 @@ void layout_write_attributes(LayoutOptions *layout, GString *outstr, gint indent
 
 	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);
 }
 
 
@@ -2285,7 +2835,11 @@ void layout_write_config(LayoutWindow *lw, GString *outstr, gint indent)
 
 	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);
 
@@ -2295,7 +2849,7 @@ void layout_write_config(LayoutWindow *lw, GString *outstr, gint indent)
 void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names, const gchar **attribute_values)
 {
 	gchar *id = NULL;
-	
+
 	while (*attribute_names)
 		{
 		const gchar *option = *attribute_names++;
@@ -2306,16 +2860,17 @@ void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names
 
 		if (READ_INT(*layout, style)) continue;
 		if (READ_CHAR(*layout, order)) continue;
-		
+
 		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 */
 
@@ -2327,12 +2882,14 @@ void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names
 		if (READ_INT(*layout, main_window.hdivider_pos)) continue;
 		if (READ_INT(*layout, main_window.vdivider_pos)) continue;
 
+		if (READ_INT_CLAMP(*layout, folder_window.vdivider_pos, 1, 1000)) continue;
+
 		if (READ_INT(*layout, float_window.x)) continue;
 		if (READ_INT(*layout, float_window.y)) continue;
 		if (READ_INT(*layout, float_window.w)) continue;
 		if (READ_INT(*layout, float_window.h)) continue;
 		if (READ_INT(*layout, float_window.vdivider_pos)) continue;
-	
+
 		if (READ_INT(*layout, properties_window.w)) continue;
 		if (READ_INT(*layout, properties_window.h)) continue;
 
@@ -2340,11 +2897,42 @@ void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names
 		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);
 		}
 	if (id && strcmp(id, LAYOUT_ID_CURRENT) != 0)
@@ -2363,7 +2951,7 @@ static void layout_config_startup_path(LayoutOptions *lop, gchar **path)
 	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());
@@ -2372,7 +2960,7 @@ static void layout_config_startup_path(LayoutOptions *lop, gchar **path)
 			*path = get_current_dir();
 			break;
 		}
-}	
+}
 
 
 static void layout_config_commandline(LayoutOptions *lop, gchar **path)
@@ -2390,7 +2978,7 @@ static void layout_config_commandline(LayoutOptions *lop, gchar **path)
 		*path = g_strdup(command_line->path);
 		}
 	else layout_config_startup_path(lop, path);
-	
+
 	if (command_line->tools_show)
 		{
 		lop->tools_float = FALSE;
@@ -2402,21 +2990,27 @@ static void layout_config_commandline(LayoutOptions *lop, gchar **path)
 		}
 }
 
+static gboolean first_found = FALSE;
+
 LayoutWindow *layout_new_from_config(const gchar **attribute_names, const gchar **attribute_values, gboolean use_commandline)
 {
 	LayoutOptions lop;
 	LayoutWindow *lw;
 	gchar *path = NULL;
-	
+
 	init_layout_options(&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 
+	else
 		{
 		layout_config_startup_path(&lop, &path);
 		}
@@ -2427,7 +3021,7 @@ LayoutWindow *layout_new_from_config(const gchar **attribute_names, const gchar
 
 	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);
@@ -2437,13 +3031,13 @@ LayoutWindow *layout_new_from_config(const gchar **attribute_names, const gchar
 void layout_update_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values)
 {
 	LayoutOptions lop;
-	
+
 	init_layout_options(&lop);
 
 	if (attribute_names) layout_load_attributes(&lop, attribute_names, attribute_values);
 
 	layout_apply_options(lw, &lop);
-		
+
 	free_layout_options_content(&lop);
 }