[nautilus-actions] Display a first toolbar

[Pierre Wieser <pwieser src gnome org>]

commit ce314351fd625a6b5722bcb2588704bbd53a441a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Oct 9 13:09:45 2009 +0200

    Display a first toolbar

 ChangeLog                                     |    5 +++++
 src/nact/nact-main-menubar.c                  |   12 +++++++++++-
 src/nact/nautilus-actions-config-tool.actions |    6 ++++++
 src/nact/nautilus-actions-config-tool.ui      |    6 ++++--
 4 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 86abdac..c537379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,12 +14,17 @@
 	* src/nact/nact-main-menubar.c (nact_main_menubar_runtime_init):
 	Display a Maintainer menu when in maintainer mode.
 	Add BriefTreeStoreDumpItem new item.
+	Display a first toolbar.
 
 	* src/nact/nact-tree-model.c (nact_tree_model_insert):
 	Add debug traces.
 
 	* src/nact/nautilus-actions-config-tool.actions:
 	Define a placeholder for the Maintainer menu.
+	Define a first toolbar.
+
+	* src/nact/nautilus-actions-config-tool.ui:
+	Replace the GtkToolbar with a VBox placeholder.
 
 	* src/nact/nautilus-actions-maintainer.actions: New file.
 
diff --git a/src/nact/nact-main-menubar.c b/src/nact/nact-main-menubar.c
index 4117fe6..7bf07b2 100644
--- a/src/nact/nact-main-menubar.c
+++ b/src/nact/nact-main-menubar.c
@@ -238,7 +238,7 @@ nact_main_menubar_runtime_init( NactMainWindow *window )
 	GError *error = NULL;
 	guint merge_id;
 	GtkAccelGroup *accel_group;
-	GtkWidget *menubar, *vbox;
+	GtkWidget *menubar, *vbox, *toolbar;
 	GtkWindow *toplevel;
 	MenubarIndicatorsStruct *mis;
 	gboolean has_maintainer_menu;
@@ -303,6 +303,16 @@ nact_main_menubar_runtime_init( NactMainWindow *window )
 	vbox = base_window_get_widget( BASE_WINDOW( window ), "MenubarVBox" );
 	gtk_box_pack_start( GTK_BOX( vbox ), menubar, FALSE, FALSE, 0 );
 
+	/* this works, but we should only display buttons which have icons
+	 * (a button with only text in a toolbar is somewhat sad..
+	 */
+	toolbar = gtk_ui_manager_get_widget( ui_manager, "/ui/FileToolbar" );
+	vbox = base_window_get_widget( BASE_WINDOW( window ), "ToolbarVBox" );
+	gtk_box_pack_start( GTK_BOX( vbox ), toolbar, FALSE, FALSE, 0 );
+
+	/* this creates a submenu in the toolbar */
+	/*gtk_container_add( GTK_CONTAINER( vbox ), toolbar );*/
+
 	base_window_signal_connect(
 			BASE_WINDOW( window ),
 			G_OBJECT( toplevel ),
diff --git a/src/nact/nautilus-actions-config-tool.actions b/src/nact/nautilus-actions-config-tool.actions
index 3723ba5..484fb40 100644
--- a/src/nact/nautilus-actions-config-tool.actions
+++ b/src/nact/nautilus-actions-config-tool.actions
@@ -36,4 +36,10 @@
             <menuitem action="AboutItem" />
         </menu>
     </menubar>
+
+    <toolbar name="FileToolbar">
+        <toolitem action="NewActionItem" />
+        <toolitem action="SaveItem" />
+        <toolitem action="QuitItem" />
+    </toolbar>
 </ui>
diff --git a/src/nact/nautilus-actions-config-tool.ui b/src/nact/nautilus-actions-config-tool.ui
index 6dcbb1c..8f74027 100644
--- a/src/nact/nautilus-actions-config-tool.ui
+++ b/src/nact/nautilus-actions-config-tool.ui
@@ -19,9 +19,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar1">
+          <object class="GtkVBox" id="ToolbarVBox">
             <property name="visible">True</property>
-            <property name="toolbar_style">both</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>