[nautilus] Move status bar to under view in navigational view

[Alexander Larsson <alexl src gnome org>]

commit 04c26296fb78b6de1a5bf933e543734ce18bd062
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Dec 11 17:14:42 2009 +0100

    Move status bar to under view in navigational view
    
    This means the status bar moves closer to what it shows the status
    of. Additionally it gives more space for the sidebar, which is not
    needed for the normally small status messages we have.

 src/nautilus-navigation-window.c |   10 +++++++++-
 src/nautilus-spatial-window.c    |    8 ++++++++
 src/nautilus-window.c            |    8 +-------
 3 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 257ce51..92dee1d 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -144,6 +144,7 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 	NautilusNavigationWindowPane *pane;
 	NautilusWindowSlot *slot;
 	GtkWidget *hpaned;
+	GtkWidget *vbox;
 
 	win = NAUTILUS_WINDOW (window);
 
@@ -161,11 +162,18 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 			  0,                                  0);
 	gtk_widget_show (window->details->content_paned);
 
+	vbox = gtk_vbox_new (FALSE, 0);
+	nautilus_horizontal_splitter_pack2 (NAUTILUS_HORIZONTAL_SPLITTER (window->details->content_paned), vbox);
+	gtk_widget_show (vbox);
+
 	hpaned = gtk_hpaned_new ();
+	gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
 	gtk_widget_show (hpaned);
-	nautilus_horizontal_splitter_pack2 (NAUTILUS_HORIZONTAL_SPLITTER (window->details->content_paned), hpaned);
 	window->details->split_view_hpane = hpaned;
 
+	gtk_box_pack_start (GTK_BOX (vbox), win->details->statusbar, FALSE, FALSE, 0);
+	gtk_widget_show (win->details->statusbar);
+
 	nautilus_navigation_window_pane_setup (pane);
 
 	gtk_paned_pack1 (GTK_PANED(hpaned), pane->widget, TRUE, TRUE);
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index ba36b03..c9177ae 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -973,6 +973,14 @@ nautilus_spatial_window_init (NautilusSpatialWindow *window)
 
 	win = NAUTILUS_WINDOW (window);
 
+	gtk_table_attach (GTK_TABLE (win->details->table),
+			  win->details->statusbar,
+			  /* X direction */                   /* Y direction */
+			  0, 1,                               5, 6,
+			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
+			  0,                                  0);
+	gtk_widget_show (win->details->statusbar);
+
 	pane = nautilus_window_pane_new (win);
 	win->details->panes = g_list_prepend (win->details->panes, pane);
 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index eaaefdb..3bdc516 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -176,15 +176,9 @@ nautilus_window_init (NautilusWindow *window)
 	statusbar = gtk_statusbar_new ();
 	gtk_widget_set_name (statusbar, "statusbar-noborder");
 	window->details->statusbar = statusbar;
-	gtk_table_attach (GTK_TABLE (table),
-			  statusbar,
-			  /* X direction */                   /* Y direction */
-			  0, 1,                               5, 6,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0,                                  0);
 	window->details->help_message_cid = gtk_statusbar_get_context_id
 		(GTK_STATUSBAR (statusbar), "help_message");
-	gtk_widget_show (statusbar);
+	/* Statusbar is packed in the subclasses */
 
 	nautilus_window_initialize_menus (window);