[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 445/473: Move commands back to their own preferences tab.

[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 6342719fe28948c77c542915530ba8245bd590ca
Author: Graeme Gott <graeme at gottcode.org>
Date:   Sun Feb 8 08:37:09 2015 -0500

    Move commands back to their own preferences tab.
---
 panel-plugin/configuration-dialog.cpp |   18 +++++++++++++-----
 panel-plugin/configuration-dialog.h   |    1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/configuration-dialog.cpp b/panel-plugin/configuration-dialog.cpp
index 95151c7..49356a9 100644
--- a/panel-plugin/configuration-dialog.cpp
+++ b/panel-plugin/configuration-dialog.cpp
@@ -78,6 +78,7 @@ ConfigurationDialog::ConfigurationDialog(Plugin* plugin) :
 	GtkNotebook* notebook = GTK_NOTEBOOK(gtk_notebook_new());
 	gtk_notebook_append_page(notebook, init_appearance_tab(), gtk_label_new_with_mnemonic(_("_Appearance")));
 	gtk_notebook_append_page(notebook, init_behavior_tab(), gtk_label_new_with_mnemonic(_("_Behavior")));
+	gtk_notebook_append_page(notebook, init_commands_tab(), gtk_label_new_with_mnemonic(_("_Commands")));
 	gtk_notebook_append_page(notebook, init_search_actions_tab(), gtk_label_new_with_mnemonic(_("Search Actio_ns")));
 
 	// Add tabs to dialog
@@ -667,12 +668,19 @@ GtkWidget* ConfigurationDialog::init_behavior_tab()
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_display_recent), wm_settings->display_recent);
 	g_signal_connect_slot(m_display_recent, "toggled", &ConfigurationDialog::toggle_display_recent, this);
 
-	// Create commands section
+	return page;
+}
+
+//-----------------------------------------------------------------------------
+
+GtkWidget* ConfigurationDialog::init_commands_tab()
+{
+	// Create behavior section
+	GtkWidget* page = gtk_alignment_new(0, 0, 1, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(page), 8);
+	GtkBox* commands_vbox = GTK_BOX(gtk_vbox_new(false, 8));
+	gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(commands_vbox));
 	GtkSizeGroup* label_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	GtkBox* commands_vbox = GTK_BOX(gtk_vbox_new(false, 6));
-	GtkWidget* commands_frame = xfce_gtk_frame_box_new_with_content(_("Commands"), GTK_WIDGET(commands_vbox));
-	gtk_box_pack_start(behavior_vbox, commands_frame, false, false, 6);
-	gtk_container_set_border_width(GTK_CONTAINER(commands_frame), 0);
 
 	// Add command entries
 	for (int i = 0; i < Settings::CountCommands; ++i)
diff --git a/panel-plugin/configuration-dialog.h b/panel-plugin/configuration-dialog.h
index 55fd3fb..56d3003 100644
--- a/panel-plugin/configuration-dialog.h
+++ b/panel-plugin/configuration-dialog.h
@@ -73,6 +73,7 @@ private:
 	void response(GtkDialog*, int response_id);
 	GtkWidget* init_appearance_tab();
 	GtkWidget* init_behavior_tab();
+	GtkWidget* init_commands_tab();
 	GtkWidget* init_search_actions_tab();
 
 private:

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