Improved toolbar popup menu.

Added new preferences tab for toolbar settings, several toolbar buttons can be hidden.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@548 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2006-07-11  Enrico Tröger  <enrico.troeger@uvena.de>
+
+ * src/dialogs.c: Moved dialogs_show_prefs_dialog() to src/prefs.c.
+ * geany.glade, src/interface.c, src/vte.c, src/prefs.c, src/dialogs.c,
+   src/geany.h, src/main.c, src/callbacks.c, src/keybindings.c,
+   src/keyfile.c, src/utils.c:
+   Improved toolbar popup menu.
+   Added new preferences tab for toolbar settings, several toolbar
+   buttons can be hidden.
+
+
 2006-07-11  Nick Treleaven  <nick.treleaven@btinternet.com>
 
  * src/main.c: Prefix command-line opened files with the current

src/callbacks.c

@@ -68,6 +68,10 @@ static gboolean closing_all = FALSE;
 // represents the state at switching a notebook page, to update check menu items in document menu
 static gboolean switch_notebook_page = FALSE;
 
+// flag to indicate the explicit change of a toggle button of the toolbar menu and so the
+// toggled callback should ignore the change since it is not triggered by the user
+static gboolean ignore_toolbar_toggle = FALSE;
+
 // represents the state at switching a notebook page(in the left treeviews widget), to not emit
 // the selection-changed signal from tv.tree_openfiles
 //static gboolean switch_tv_notebook_page = FALSE;
@@ -522,6 +526,8 @@ void
 on_images_and_text2_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
+	if (ignore_toolbar_toggle) return;
+
 	gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), GTK_TOOLBAR_BOTH);
 	app->toolbar_icon_style = GTK_TOOLBAR_BOTH;
 }
@@ -531,6 +537,8 @@ void
 on_images_only2_activate               (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
+	if (ignore_toolbar_toggle) return;
+
 	gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), GTK_TOOLBAR_ICONS);
 	app->toolbar_icon_style = GTK_TOOLBAR_ICONS;
 }
@@ -540,6 +548,8 @@ void
 on_text_only2_activate                 (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
+	if (ignore_toolbar_toggle) return;
+
 	gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), GTK_TOOLBAR_TEXT);
 	app->toolbar_icon_style = GTK_TOOLBAR_TEXT;
 }
@@ -624,6 +634,8 @@ void
 on_toolbar_large_icons1_activate       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
+	if (ignore_toolbar_toggle) return;
+
 	app->toolbar_icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
 	utils_update_toolbar_icons(GTK_ICON_SIZE_LARGE_TOOLBAR);
 }
@@ -633,6 +645,8 @@ void
 on_toolbar_small_icons1_activate       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
+	if (ignore_toolbar_toggle) return;
+
 	app->toolbar_icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
 	utils_update_toolbar_icons(GTK_ICON_SIZE_SMALL_TOOLBAR);
 }
@@ -1106,6 +1120,28 @@ toolbar_popup_menu                     (GtkWidget *widget,
 {
 	if (event->button == 3)
 	{
+		GtkWidget *widget;
+
+		ignore_toolbar_toggle = TRUE;
+
+		switch (app->toolbar_icon_style)
+		{
+			case 0: widget = lookup_widget(app->toolbar_menu, "images_only2"); break;
+			case 1: widget = lookup_widget(app->toolbar_menu, "text_only2"); break;
+			default: widget = lookup_widget(app->toolbar_menu, "images_and_text2"); break;
+		}
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE);
+
+		switch (app->toolbar_icon_size)
+		{
+			case GTK_ICON_SIZE_LARGE_TOOLBAR:
+					widget = lookup_widget(app->toolbar_menu, "large_icons1"); break;
+			default: widget = lookup_widget(app->toolbar_menu, "small_icons1"); break;
+		}
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE);
+
+		ignore_toolbar_toggle = FALSE;
+
 		gtk_menu_popup(GTK_MENU(app->toolbar_menu), NULL, NULL, NULL, NULL, event->button, event->time);
 
 		return TRUE;
@@ -1199,15 +1235,8 @@ void
 on_show_toolbar1_toggled               (GtkCheckMenuItem *checkmenuitem,
                                         gpointer         user_data)
 {
-	if (app->toolbar_visible)
-	{
-		gtk_widget_hide(GTK_WIDGET(app->toolbar));
-	}
-	else
-	{
-		gtk_widget_show(GTK_WIDGET(app->toolbar));
-	}
 	app->toolbar_visible = (app->toolbar_visible) ? FALSE : TRUE;;
+	utils_widget_show_hide(GTK_WIDGET(app->toolbar), app->toolbar_visible);
 }
 
 
@@ -2509,3 +2538,4 @@ on_menu_select_all1_activate           (GtkMenuItem     *menuitem,
 	sci_select_all(doc_list[idx].sci);
 }
 
+

src/callbacks.h

@@ -590,3 +590,4 @@ on_print1_activate                     (GtkMenuItem     *menuitem,
 void
 on_menu_select_all1_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
+

src/dialogs.h

@@ -75,8 +75,6 @@ gboolean dialogs_show_mkcfgdir_error(gint error_nr);
 
 void dialogs_show_file_properties(gint idx);
 
-void dialogs_show_prefs_dialog(void);
-
 gboolean dialogs_show_question(const gchar *text, ...);
 
 void dialogs_show_keyboard_shortcuts(void);

src/geany.h

@@ -163,8 +163,12 @@ typedef struct MyApp
 	gboolean			 pref_main_load_session;
 	gboolean			 pref_main_save_winpos;
 	gboolean			 pref_main_confirm_exit;
-	gboolean			 pref_main_show_search;
-	gboolean			 pref_main_show_goto;
+	gboolean			 pref_toolbar_show_search;
+	gboolean			 pref_toolbar_show_goto;
+	gboolean			 pref_toolbar_show_undo;
+	gboolean			 pref_toolbar_show_compile;
+	gboolean			 pref_toolbar_show_zoom;
+	gboolean			 pref_toolbar_show_colour;
 	gint				 tab_pos_editor;
 	gint				 tab_pos_msgwin;
 	gint				 tab_pos_sidebar;
@@ -215,8 +219,8 @@ typedef struct MyApp
 	GtkWidget			*popup_goto_items[3];
 	GtkWidget			*popup_items[4];
 	GtkWidget			*menu_copy_items[4];
-	GtkWidget			*redo_items[2];
-	GtkWidget			*undo_items[2];
+	GtkWidget			*redo_items[3];
+	GtkWidget			*undo_items[3];
 	GtkWidget			*save_buttons[2];
 	GtkWidget			*sensitive_buttons[33];
 	GtkWidget			*open_colorsel;

src/keybindings.c

@@ -30,6 +30,7 @@
 #include "document.h"
 #include "callbacks.h"
 #include "dialogs.h"
+#include "prefs.h"
 #include "msgwindow.h"
 #include "sci_cb.h"
 #include "sciwrappers.h"

src/keyfile.c

@@ -66,9 +66,6 @@ void configuration_save(void)
 	scribble_text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
 
 	// store basic settings
-	g_key_file_set_boolean(config, PACKAGE, "toolbar_visible", app->toolbar_visible);
-	g_key_file_set_integer(config, PACKAGE, "toolbar_icon_style", app->toolbar_icon_style);
-	g_key_file_set_integer(config, PACKAGE, "toolbar_icon_size", app->toolbar_icon_size);
 	if (app->pref_main_save_winpos)
 	{
 		g_key_file_set_integer(config, PACKAGE, "treeview_position",
@@ -125,8 +122,15 @@ void configuration_save(void)
 	g_key_file_set_boolean(config, PACKAGE, "pref_main_confirm_exit", app->pref_main_confirm_exit);
 	g_key_file_set_boolean(config, PACKAGE, "pref_main_load_session", app->pref_main_load_session);
 	g_key_file_set_boolean(config, PACKAGE, "pref_main_save_winpos", app->pref_main_save_winpos);
-	g_key_file_set_boolean(config, PACKAGE, "pref_main_show_search", app->pref_main_show_search);
-	g_key_file_set_boolean(config, PACKAGE, "pref_main_show_goto", app->pref_main_show_goto);
+	g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show", app->toolbar_visible);
+	g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_search", app->pref_toolbar_show_search);
+	g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_goto", app->pref_toolbar_show_goto);
+	g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_zoom", app->pref_toolbar_show_zoom);
+	g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_undo", app->pref_toolbar_show_undo);
+	g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_compile", app->pref_toolbar_show_compile);
+	g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_colour", app->pref_toolbar_show_colour);
+	g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_style", app->toolbar_icon_style);
+	g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_size", app->toolbar_icon_size);
 	g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", app->pref_editor_new_line);
 	g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", app->pref_editor_replace_tabs);
 	g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", app->pref_editor_trail_space);
@@ -218,15 +222,15 @@ gboolean configuration_load(void)
 
 	config_exists = g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL);
 
-	app->toolbar_visible = utils_get_setting_boolean(config, PACKAGE, "toolbar_visible", TRUE);
+	app->toolbar_visible = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show", TRUE);
 	{
 		GtkIconSize tb_iconsize;
 		GtkToolbarStyle tb_style;
 		GEANY_GET_SETTING("gtk-toolbar-style", tb_style, GTK_TOOLBAR_ICONS);
 		GEANY_GET_SETTING("gtk-toolbar-icon-size", tb_iconsize,
 			GTK_ICON_SIZE_LARGE_TOOLBAR);
-		app->toolbar_icon_style = utils_get_setting_integer(config, PACKAGE, "toolbar_icon_style", tb_style);
-		app->toolbar_icon_size = utils_get_setting_integer(config, PACKAGE, "toolbar_icon_size", tb_iconsize);
+		app->toolbar_icon_style = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_style", tb_style);
+		app->toolbar_icon_size = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_size", tb_iconsize);
 	}
 	app->beep_on_errors = utils_get_setting_boolean(config, PACKAGE, "beep_on_errors", TRUE);
 	app->mru_length = utils_get_setting_integer(config, PACKAGE, "mru_length", GEANY_DEFAULT_MRU_LENGHTH);
@@ -287,8 +291,12 @@ gboolean configuration_load(void)
 	app->pref_main_confirm_exit = utils_get_setting_boolean(config, PACKAGE, "pref_main_confirm_exit", TRUE);
 	app->pref_main_load_session = utils_get_setting_boolean(config, PACKAGE, "pref_main_load_session", TRUE);
 	app->pref_main_save_winpos = utils_get_setting_boolean(config, PACKAGE, "pref_main_save_winpos", TRUE);
-	app->pref_main_show_search = utils_get_setting_boolean(config, PACKAGE, "pref_main_show_search", TRUE);
-	app->pref_main_show_goto = utils_get_setting_boolean(config, PACKAGE, "pref_main_show_goto", TRUE);
+	app->pref_toolbar_show_search = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_search", TRUE);
+	app->pref_toolbar_show_goto = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_goto", TRUE);
+	app->pref_toolbar_show_zoom = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_zoom", FALSE);
+	app->pref_toolbar_show_compile = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_compile", TRUE);
+	app->pref_toolbar_show_undo = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_undo", FALSE);
+	app->pref_toolbar_show_colour = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_colour", TRUE);
 #ifdef HAVE_VTE
 	app->load_vte = utils_get_setting_boolean(config, PACKAGE, "load_vte", TRUE);
 	app->terminal_settings = utils_get_setting_string(config, PACKAGE, "terminal_settings",	"");

src/main.c

@@ -176,20 +176,6 @@ static void apply_settings(void)
 		gtk_window_set_default_size(GTK_WINDOW(app->window), app->geometry[2], app->geometry[3]);
 	}
 
-	if (! app->pref_main_show_goto)
-	{
-		gtk_widget_hide(lookup_widget(app->window, "entry_goto_line"));
-		gtk_widget_hide(lookup_widget(app->window, "toolbutton25"));
-		gtk_widget_hide(lookup_widget(app->window, "separatortoolitem5"));
-	}
-
-	if (! app->pref_main_show_search)
-	{
-		gtk_widget_hide(lookup_widget(app->window, "entry1"));
-		gtk_widget_hide(lookup_widget(app->window, "toolbutton18"));
-		gtk_widget_hide(lookup_widget(app->window, "separatortoolitem4"));
-	}
-
 	g_object_set(G_OBJECT(lookup_widget(app->window, "menu_line_breaking1")), "active",
 				GINT_TO_POINTER(app->pref_editor_line_breaking), NULL);
 	g_object_set(G_OBJECT(lookup_widget(app->window, "menu_use_auto_indention1")), "active",
@@ -202,6 +188,8 @@ static void apply_settings(void)
 	gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->notebook), app->tab_pos_editor);
 	gtk_notebook_set_tab_pos(GTK_NOTEBOOK(msgwindow.notebook), app->tab_pos_msgwin);
 	gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->treeview_notebook), app->tab_pos_sidebar);
+
+	utils_update_toolbar_items();
 }
 
 
@@ -308,8 +296,10 @@ static void main_init(void)
 	app->sensitive_buttons[32] = lookup_widget(app->window, "print1");
 	app->redo_items[0] = lookup_widget(app->popup_menu, "redo1");
 	app->redo_items[1] = lookup_widget(app->window, "menu_redo2");
+	app->redo_items[2] = lookup_widget(app->window, "toolbutton_redo");
 	app->undo_items[0] = lookup_widget(app->popup_menu, "undo1");
 	app->undo_items[1] = lookup_widget(app->window, "menu_undo2");
+	app->undo_items[2] = lookup_widget(app->window, "toolbutton_undo");
 	msgwindow.tree_status = lookup_widget(app->window, "treeview3");
 	msgwindow.tree_msg = lookup_widget(app->window, "treeview4");
 	msgwindow.tree_compiler = lookup_widget(app->window, "treeview5");

src/prefs.h

@@ -33,4 +33,8 @@ void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data);
 
 void on_prefs_color_choosed(GtkColorButton *widget, gpointer user_data);
 
+void on_pref_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data);
+
+void dialogs_show_prefs_dialog(void);
+
 #endif

src/utils.c

@@ -171,9 +171,11 @@ void utils_update_popup_reundo_items(gint index)
 	// index 0 is the popup menu, 1 is the menubar
 	gtk_widget_set_sensitive(app->undo_items[0], enable_undo);
 	gtk_widget_set_sensitive(app->undo_items[1], enable_undo);
+	gtk_widget_set_sensitive(app->undo_items[2], enable_undo);
 
 	gtk_widget_set_sensitive(app->redo_items[0], enable_redo);
 	gtk_widget_set_sensitive(app->redo_items[1], enable_redo);
+	gtk_widget_set_sensitive(app->redo_items[2], enable_redo);
 }
 
 
@@ -2518,3 +2520,43 @@ TMTag *utils_find_tm_tag(const GPtrArray *tags, const gchar *tag_name)
 }
 
 
+void utils_update_toolbar_items(void)
+{
+	// show toolbar
+	GtkWidget *widget = lookup_widget(app->window, "menu_show_toolbar1");
+	if (app->toolbar_visible && ! gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))
+	{
+		app->toolbar_visible = ! app->toolbar_visible;	// will be changed by the toggled callback
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE);
+	}
+	else if (! app->toolbar_visible && gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))
+	{
+		app->toolbar_visible = ! app->toolbar_visible;	// will be changed by the toggled callback
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), FALSE);
+	}
+
+	// search
+	utils_widget_show_hide(lookup_widget(app->window, "entry1"), app->pref_toolbar_show_search);
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton18"), app->pref_toolbar_show_search);
+	utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem5"), app->pref_toolbar_show_search);
+	// goto line
+	utils_widget_show_hide(lookup_widget(app->window, "entry_goto_line"), app->pref_toolbar_show_goto);
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton25"), app->pref_toolbar_show_goto);
+	utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem8"), app->pref_toolbar_show_goto);
+	// compile
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton13"), app->pref_toolbar_show_compile);
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton26"), app->pref_toolbar_show_compile);
+	utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem6"), app->pref_toolbar_show_compile);
+	// colour
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton24"), app->pref_toolbar_show_colour);
+	utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem3"), app->pref_toolbar_show_colour);
+	// zoom
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton20"), app->pref_toolbar_show_zoom);
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton21"), app->pref_toolbar_show_zoom);
+	utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem4"), app->pref_toolbar_show_zoom);
+	// undo
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton_undo"), app->pref_toolbar_show_undo);
+	utils_widget_show_hide(lookup_widget(app->window, "toolbutton_redo"), app->pref_toolbar_show_undo);
+	utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem9"), app->pref_toolbar_show_undo);
+}
+

src/utils.h

@@ -222,4 +222,6 @@ gchar *utils_get_current_time_string();
 
 TMTag *utils_find_tm_tag(const GPtrArray *tags, const gchar *tag_name);
 
+void utils_update_toolbar_items(void);
+
 #endif

src/vte.c

@@ -331,7 +331,7 @@ static void vte_popup_menu_clicked(GtkMenuItem *menuitem, gpointer user_data)
 		case 2:
 		{
 			on_preferences1_activate(menuitem, NULL);
-			gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 6);
+			gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 7);
 			break;
 		}
 	}