[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 253/473: Rename option for showing menu hierarchy. References #40.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 4e159d67db87f388955dbfbed18cb97cf99c0590
Author: Graeme Gott <graeme at gottcode.org>
Date:   Wed Nov 20 16:30:18 2013 -0500

    Rename option for showing menu hierarchy. References #40.
---
 panel-plugin/configuration-dialog.cpp |   32 ++++++++++++++++----------------
 panel-plugin/configuration-dialog.h   |   14 +++++++-------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/panel-plugin/configuration-dialog.cpp b/panel-plugin/configuration-dialog.cpp
index 8fe8d57..f170663 100644
--- a/panel-plugin/configuration-dialog.cpp
+++ b/panel-plugin/configuration-dialog.cpp
@@ -172,29 +172,29 @@ void ConfigurationDialog::toggle_show_description(GtkToggleButton* button)
 
 //-----------------------------------------------------------------------------
 
-void ConfigurationDialog::toggle_position_search_alternate(GtkToggleButton* button)
+void ConfigurationDialog::toggle_show_hierarchy(GtkToggleButton* button)
 {
-	bool active = gtk_toggle_button_get_active(button);
-	wm_settings->position_search_alternate = gtk_toggle_button_get_active(button);
+	wm_settings->load_hierarchy = gtk_toggle_button_get_active(button);
 	wm_settings->set_modified();
-	gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), active);
+	m_plugin->reload();
 }
 
 //-----------------------------------------------------------------------------
 
-void ConfigurationDialog::toggle_position_commands_alternate(GtkToggleButton* button)
+void ConfigurationDialog::toggle_position_search_alternate(GtkToggleButton* button)
 {
-	wm_settings->position_commands_alternate = gtk_toggle_button_get_active(button);
+	bool active = gtk_toggle_button_get_active(button);
+	wm_settings->position_search_alternate = gtk_toggle_button_get_active(button);
 	wm_settings->set_modified();
+	gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), active);
 }
 
 //-----------------------------------------------------------------------------
 
-void ConfigurationDialog::toggle_load_hierarchy(GtkToggleButton* button)
+void ConfigurationDialog::toggle_position_commands_alternate(GtkToggleButton* button)
 {
-	wm_settings->load_hierarchy = gtk_toggle_button_get_active(button);
+	wm_settings->position_commands_alternate = gtk_toggle_button_get_active(button);
 	wm_settings->set_modified();
-	m_plugin->reload();
 }
 
 //-----------------------------------------------------------------------------
@@ -320,6 +320,12 @@ GtkWidget* ConfigurationDialog::init_appearance_tab()
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_show_descriptions), wm_settings->launcher_show_description);
 	g_signal_connect(m_show_descriptions, "toggled", G_CALLBACK(ConfigurationDialog::toggle_show_description_slot), this);
 
+	// Add option to show menu hierarchy
+	m_show_hierarchy = gtk_check_button_new_with_mnemonic(_("Show menu hie_rarchy"));
+	gtk_box_pack_start(appearance_vbox, m_show_hierarchy, true, true, 0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_show_hierarchy), wm_settings->load_hierarchy);
+	g_signal_connect(m_show_hierarchy, "toggled", G_CALLBACK(ConfigurationDialog::toggle_show_hierarchy_slot), this);
+
 	// Add option to use alternate search entry position
 	m_position_search_alternate = gtk_check_button_new_with_mnemonic(_("Position _search entry next to panel button"));
 	gtk_box_pack_start(appearance_vbox, m_position_search_alternate, true, true, 0);
@@ -385,18 +391,12 @@ GtkWidget* ConfigurationDialog::init_behavior_tab()
 	GtkBox* behavior_vbox = GTK_BOX(gtk_vbox_new(false, 8));
 	gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(behavior_vbox));
 
-	// Add option to use generic names
+	// Add option to switch categories by hovering
 	m_hover_switch_category = gtk_check_button_new_with_mnemonic(_("Switch categories by _hovering"));
 	gtk_box_pack_start(behavior_vbox, m_hover_switch_category, true, true, 0);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_hover_switch_category), wm_settings->category_hover_activate);
 	g_signal_connect(m_hover_switch_category, "toggled", G_CALLBACK(ConfigurationDialog::toggle_hover_switch_category_slot), this);
 
-	// Add option to load menu hierarchy
-	m_load_hierarchy = gtk_check_button_new_with_mnemonic(_("Load menu hie_rarchy"));
-	gtk_box_pack_start(behavior_vbox, m_load_hierarchy, true, true, 0);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_load_hierarchy), wm_settings->load_hierarchy);
-	g_signal_connect(m_load_hierarchy, "toggled", G_CALLBACK(ConfigurationDialog::toggle_load_hierarchy_slot), this);
-
 	// Add option to remember favorites
 	m_remember_favorites = gtk_check_button_new_with_mnemonic(_("Include _favorites in recently used"));
 	gtk_box_pack_start(behavior_vbox, m_remember_favorites, true, true, 0);
diff --git a/panel-plugin/configuration-dialog.h b/panel-plugin/configuration-dialog.h
index bd51f5b..f476cb7 100644
--- a/panel-plugin/configuration-dialog.h
+++ b/panel-plugin/configuration-dialog.h
@@ -40,6 +40,7 @@ public:
 private:
 	void toggle_show_name(GtkToggleButton* button);
 	void toggle_show_description(GtkToggleButton* button);
+	void toggle_show_hierarchy(GtkToggleButton* button);
 	void toggle_position_search_alternate(GtkToggleButton* button);
 	void toggle_position_commands_alternate(GtkToggleButton* button);
 	void category_icon_size_changed(GtkComboBox* combo);
@@ -50,7 +51,6 @@ private:
 	void choose_icon();
 
 	void toggle_hover_switch_category(GtkToggleButton* button);
-	void toggle_load_hierarchy(GtkToggleButton* button);
 	void toggle_remember_favorites(GtkToggleButton* button);
 	void toggle_display_recent(GtkToggleButton* button);
 
@@ -65,6 +65,7 @@ private:
 
 	GtkWidget* m_show_names;
 	GtkWidget* m_show_descriptions;
+	GtkWidget* m_show_hierarchy;
 	GtkWidget* m_position_search_alternate;
 	GtkWidget* m_position_commands_alternate;
 	GtkWidget* m_category_icon_size;
@@ -76,7 +77,6 @@ private:
 	GtkWidget* m_icon_button;
 
 	GtkWidget* m_hover_switch_category;
-	GtkWidget* m_load_hierarchy;
 	GtkWidget* m_remember_favorites;
 	GtkWidget* m_display_recent;
 
@@ -128,6 +128,11 @@ private:
 		obj->toggle_show_description(button);
 	}
 
+	static void toggle_show_hierarchy_slot(GtkToggleButton* button, ConfigurationDialog* obj)
+	{
+		obj->toggle_show_hierarchy(button);
+	}
+
 	static void toggle_position_search_alternate_slot(GtkToggleButton* button, ConfigurationDialog* obj)
 	{
 		obj->toggle_position_search_alternate(button);
@@ -138,11 +143,6 @@ private:
 		obj->toggle_position_commands_alternate(button);
 	}
 
-	static void toggle_load_hierarchy_slot(GtkToggleButton* button, ConfigurationDialog* obj)
-	{
-		obj->toggle_load_hierarchy(button);
-	}
-
 	static void toggle_remember_favorites_slot(GtkToggleButton* button, ConfigurationDialog* obj)
 	{
 		obj->toggle_remember_favorites(button);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.