diff src/preferences.c @ 2623:f5886b8e1968

Fix #444: User-definable toolbar https://github.com/BestImageViewer/geeqie/issues/444 Set via an additional tab on the Preferences dialogue
author Colin Clark <colin.clark@cclark.uk>
date Tue, 10 Oct 2017 10:53:31 +0100
parents 3966a69e854d
children 3685b630d2e4
line wrap: on
line diff
--- a/src/preferences.c	Sun Oct 08 13:30:05 2017 +0100
+++ b/src/preferences.c	Tue Oct 10 10:53:31 2017 +0100
@@ -38,6 +38,7 @@
 #include "layout_util.h"
 #include "pixbuf_util.h"
 #include "slideshow.h"
+#include "toolbar.h"
 #include "trash.h"
 #include "utilops.h"
 #include "ui_fileops.h"
@@ -426,6 +427,8 @@
 		}
 
 	if (accel_store) gtk_tree_model_foreach(GTK_TREE_MODEL(accel_store), accel_apply_cb, NULL);
+
+	toolbar_apply();
 }
 
 /*
@@ -2404,6 +2407,22 @@
 	gtk_widget_show(button);
 }
 
+/* toolbar tab */
+static void config_tab_toolbar(GtkWidget *notebook)
+{
+	GtkWidget *vbox;
+	GtkWidget *toolbardata;
+	LayoutWindow *lw;
+
+	lw = layout_window_list->data;
+
+	vbox = scrolled_notebook_page(notebook, _("Toolbar"));
+
+	toolbardata = toolbar_select_new(lw);
+	gtk_box_pack_start(GTK_BOX(vbox), toolbardata, TRUE, TRUE, 0);
+	gtk_widget_show(vbox);
+}
+
 /* stereo tab */
 static void config_tab_stereo(GtkWidget *notebook)
 {
@@ -2517,6 +2536,7 @@
 	config_tab_color(notebook);
 	config_tab_stereo(notebook);
 	config_tab_behavior(notebook);
+	config_tab_toolbar(notebook);
 
 	hbox = gtk_hbutton_box_new();
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);