Work on bug 1021, should ba bale to open smaller Nautilus windows.

2000-07-08  Gene Z. Ragan  <gzr@eazel.com>

	Work on bug 1021, should ba bale to open smaller Nautilus windows.

	* src/nautilus-window.c: (nautilus_window_constructed),
	* src/nautilus-window.h:
	(sidebar_panels_changed_callback),
	(nautilus_window_hide_locationbar),
	(nautilus_window_show_locationbar), (nautilus_window_hide_toolbar),
	(nautilus_window_show_toolbar), (nautilus_window_hide_sidebar),
	(nautilus_window_show_sidebar), (nautilus_window_hide_statusbar),
	(nautilus_window_show_statusbar):
	Added several new functions that control the visibility
	of NautilusWindow elements.

	* src/nautilus-window-menus.c: (edit_menu_cut_callback),
	(edit_menu_copy_callback), (settings_menu_toolbar_callback),
	(settings_menu_locationbar_callback),
	(settings_menu_statusbar_callback),
	(settings_menu_sidebar_callback),
	(settings_menu_normalize_menu_callback),
	(nautilus_window_initialize_menus):
	Test menu items to exercise the new code above.  These can be
	removed from the build by undefining WINDOW_ITEMS_TEST.

10 files changed, 816 insertions, 8 deletions

diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 134e1fc6c..1bf79eff5 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -44,6 +44,8 @@
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-user-level-manager.h>
 
+#define WINDOW_ITEMS_TEST
+
 static GtkWindow *bookmarks_window = NULL;
 
 static void                  activate_bookmark_in_menu_item                 (BonoboUIHandler        *uih,
@@ -123,6 +125,15 @@ bookmark_holder_free (BookmarkHolder *bookmark_holder)
 
 #define NAUTILUS_MENU_PATH_CUSTOMIZE_ITEM			"/Settings/Customize"
 
+#ifdef WINDOW_ITEMS_TEST
+#define NAUTILUS_MENU_PATH_AFTER_CURSTOMIZE_SEPARATOR		"/Settings/After Curstomize Separator"
+#define NAUTILUS_MENU_PATH_TOOLBAR_ITEM				"/Settings/Toolbar"
+#define NAUTILUS_MENU_PATH_LOCATIONBAR_ITEM			"/Settings/Locationbar"
+#define NAUTILUS_MENU_PATH_STATUSBAR_ITEM			"/Settings/Statusbar"
+#define NAUTILUS_MENU_PATH_SIDEBAR_ITEM				"/Settings/Sidebar"
+#define NAUTILUS_MENU_PATH_NORMALIZE_ITEM			"/Settings/Normalize"
+#endif
+
 static void
 file_menu_new_window_callback (BonoboUIHandler *ui_handler, 
 			       gpointer user_data, 
@@ -174,7 +185,6 @@ edit_menu_cut_callback (BonoboUIHandler *ui_handler,
 	if (GTK_IS_EDITABLE (window->focus_widget)) {
 		gtk_editable_cut_clipboard (GTK_EDITABLE (window->focus_widget));
 	}
-
 }
 
 static void
@@ -188,7 +198,6 @@ edit_menu_copy_callback (BonoboUIHandler *ui_handler,
 	if (GTK_IS_EDITABLE (window->focus_widget)) {
 		gtk_editable_copy_clipboard (GTK_EDITABLE (window->focus_widget));
 	}
-
 }
 
 
@@ -319,6 +328,97 @@ settings_menu_customize_callback (BonoboUIHandler *ui_handler,
 	nautilus_property_browser_new ();
 }
 
+
+#ifdef WINDOW_ITEMS_TEST
+static void
+settings_menu_toolbar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_toolbar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_toolbar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_locationbar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_locationbar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_locationbar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_statusbar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+	
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_statusbar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_statusbar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_sidebar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_sidebar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_sidebar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_normalize_menu_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+	
+	window = NAUTILUS_WINDOW (user_data);
+	app = GNOME_APP (window);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		if (app->menubar != NULL) {
+			gtk_widget_set_usize(app->menubar, 0, app->menubar->allocation.height - 6);
+		}
+	} else {
+		if (app->menubar != NULL) {
+			gtk_widget_set_usize(app->menubar, 0, app->menubar->allocation.height + 6);
+		}
+	}
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_MENUBAR_NAME);
+	gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+}
+
+#endif
+
+
 static void
 help_menu_about_nautilus_callback (BonoboUIHandler *ui_handler, 
 		       		   gpointer user_data,
@@ -963,6 +1063,70 @@ nautilus_window_initialize_menus (NautilusWindow *window)
         				 settings_menu_customize_callback,
         				 NULL);
 
+#ifdef WINDOW_ITEMS_TEST
+	/* Test window modification items */
+	bonobo_ui_handler_menu_new_separator (ui_handler,
+					      NAUTILUS_MENU_PATH_AFTER_CURSTOMIZE_SEPARATOR,
+					      -1);
+
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_TOOLBAR_ITEM,
+        				 _("Toolbar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_toolbar_callback,
+        				 window);
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_TOOLBAR_ITEM, TRUE);
+        				 
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_LOCATIONBAR_ITEM,
+        				 _("Locationbar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_locationbar_callback,
+        				 window);        				 
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_LOCATIONBAR_ITEM, TRUE);
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_STATUSBAR_ITEM,
+        				 _("Statusbar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_statusbar_callback,
+        				 window);        				 
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_STATUSBAR_ITEM, TRUE);
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_SIDEBAR_ITEM,
+        				 _("Sidebar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_sidebar_callback,
+        				 window);    
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_SIDEBAR_ITEM, TRUE);
+	
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_NORMALIZE_ITEM,
+        				 _("Normalize Menu"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_normalize_menu_callback,
+        				 window);            				     				 
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_NORMALIZE_ITEM, FALSE);        				 
+#endif
+
 	/* Help */
         new_top_level_menu (window, NAUTILUS_MENU_PATH_HELP_MENU, _("_Help"));
 
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index e7e1a9709..499d24d93 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -65,6 +65,9 @@
 /* Milliseconds */
 #define STATUSBAR_CLEAR_TIMEOUT 5000
 
+/* GNOME Dock Items */
+#define URI_ENTRY_DOCK_ITEM	"uri_entry"
+
 enum {
 	ARG_0,
 	ARG_APP_ID,
@@ -259,7 +262,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	}
 
 	gnome_app_add_docked (app, location_bar_box,
-			      "uri-entry", behavior,
+			      URI_ENTRY_DOCK_ITEM, behavior,
 			      GNOME_DOCK_TOP, 2, 0, 0);
 
 	/* Option menu for content view types; it's empty here, filled in when a uri is set. */
@@ -1423,3 +1426,110 @@ sidebar_panels_changed_callback (gpointer user_data)
 {
 	window_update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
 }
+
+
+void 
+nautilus_window_hide_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+
+void 
+nautilus_window_show_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_show_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_sidebar (NautilusWindow *window)
+{
+	gtk_widget_hide (GTK_WIDGET (window->sidebar));
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), 0);
+	}
+}
+
+void 
+nautilus_window_show_sidebar (NautilusWindow *window)
+{
+	GtkWidget *widget;
+
+	widget = GTK_WIDGET (window->sidebar);
+	gtk_widget_show (widget);
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), widget->allocation.width);
+	}
+}
+
+void 
+nautilus_window_hide_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_hide (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
+
+void 
+nautilus_window_show_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_show (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index 65293f5eb..7172322eb 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -171,4 +171,14 @@ void             nautilus_window_allow_stop           (NautilusWindow    *window
                                                        gboolean           allow);
 void             nautilus_bookmarks_exiting           (void);
 void		 nautilus_window_reload		      (NautilusWindow	 *window);
+
+void 		nautilus_window_hide_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_show_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_hide_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_statusbar        (NautilusWindow 	 *window);
+void 		nautilus_window_show_statusbar        (NautilusWindow 	 *window);
+
 #endif
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index e7e1a9709..499d24d93 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -65,6 +65,9 @@
 /* Milliseconds */
 #define STATUSBAR_CLEAR_TIMEOUT 5000
 
+/* GNOME Dock Items */
+#define URI_ENTRY_DOCK_ITEM	"uri_entry"
+
 enum {
 	ARG_0,
 	ARG_APP_ID,
@@ -259,7 +262,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	}
 
 	gnome_app_add_docked (app, location_bar_box,
-			      "uri-entry", behavior,
+			      URI_ENTRY_DOCK_ITEM, behavior,
 			      GNOME_DOCK_TOP, 2, 0, 0);
 
 	/* Option menu for content view types; it's empty here, filled in when a uri is set. */
@@ -1423,3 +1426,110 @@ sidebar_panels_changed_callback (gpointer user_data)
 {
 	window_update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
 }
+
+
+void 
+nautilus_window_hide_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+
+void 
+nautilus_window_show_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_show_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_sidebar (NautilusWindow *window)
+{
+	gtk_widget_hide (GTK_WIDGET (window->sidebar));
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), 0);
+	}
+}
+
+void 
+nautilus_window_show_sidebar (NautilusWindow *window)
+{
+	GtkWidget *widget;
+
+	widget = GTK_WIDGET (window->sidebar);
+	gtk_widget_show (widget);
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), widget->allocation.width);
+	}
+}
+
+void 
+nautilus_window_hide_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_hide (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
+
+void 
+nautilus_window_show_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_show (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h
index 65293f5eb..7172322eb 100644
--- a/src/nautilus-object-window.h
+++ b/src/nautilus-object-window.h
@@ -171,4 +171,14 @@ void             nautilus_window_allow_stop           (NautilusWindow    *window
                                                        gboolean           allow);
 void             nautilus_bookmarks_exiting           (void);
 void		 nautilus_window_reload		      (NautilusWindow	 *window);
+
+void 		nautilus_window_hide_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_show_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_hide_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_statusbar        (NautilusWindow 	 *window);
+void 		nautilus_window_show_statusbar        (NautilusWindow 	 *window);
+
 #endif
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index e7e1a9709..499d24d93 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -65,6 +65,9 @@
 /* Milliseconds */
 #define STATUSBAR_CLEAR_TIMEOUT 5000
 
+/* GNOME Dock Items */
+#define URI_ENTRY_DOCK_ITEM	"uri_entry"
+
 enum {
 	ARG_0,
 	ARG_APP_ID,
@@ -259,7 +262,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	}
 
 	gnome_app_add_docked (app, location_bar_box,
-			      "uri-entry", behavior,
+			      URI_ENTRY_DOCK_ITEM, behavior,
 			      GNOME_DOCK_TOP, 2, 0, 0);
 
 	/* Option menu for content view types; it's empty here, filled in when a uri is set. */
@@ -1423,3 +1426,110 @@ sidebar_panels_changed_callback (gpointer user_data)
 {
 	window_update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
 }
+
+
+void 
+nautilus_window_hide_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+
+void 
+nautilus_window_show_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_show_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_sidebar (NautilusWindow *window)
+{
+	gtk_widget_hide (GTK_WIDGET (window->sidebar));
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), 0);
+	}
+}
+
+void 
+nautilus_window_show_sidebar (NautilusWindow *window)
+{
+	GtkWidget *widget;
+
+	widget = GTK_WIDGET (window->sidebar);
+	gtk_widget_show (widget);
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), widget->allocation.width);
+	}
+}
+
+void 
+nautilus_window_hide_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_hide (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
+
+void 
+nautilus_window_show_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_show (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h
index 65293f5eb..7172322eb 100644
--- a/src/nautilus-spatial-window.h
+++ b/src/nautilus-spatial-window.h
@@ -171,4 +171,14 @@ void             nautilus_window_allow_stop           (NautilusWindow    *window
                                                        gboolean           allow);
 void             nautilus_bookmarks_exiting           (void);
 void		 nautilus_window_reload		      (NautilusWindow	 *window);
+
+void 		nautilus_window_hide_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_show_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_hide_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_statusbar        (NautilusWindow 	 *window);
+void 		nautilus_window_show_statusbar        (NautilusWindow 	 *window);
+
 #endif
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 134e1fc6c..1bf79eff5 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -44,6 +44,8 @@
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-user-level-manager.h>
 
+#define WINDOW_ITEMS_TEST
+
 static GtkWindow *bookmarks_window = NULL;
 
 static void                  activate_bookmark_in_menu_item                 (BonoboUIHandler        *uih,
@@ -123,6 +125,15 @@ bookmark_holder_free (BookmarkHolder *bookmark_holder)
 
 #define NAUTILUS_MENU_PATH_CUSTOMIZE_ITEM			"/Settings/Customize"
 
+#ifdef WINDOW_ITEMS_TEST
+#define NAUTILUS_MENU_PATH_AFTER_CURSTOMIZE_SEPARATOR		"/Settings/After Curstomize Separator"
+#define NAUTILUS_MENU_PATH_TOOLBAR_ITEM				"/Settings/Toolbar"
+#define NAUTILUS_MENU_PATH_LOCATIONBAR_ITEM			"/Settings/Locationbar"
+#define NAUTILUS_MENU_PATH_STATUSBAR_ITEM			"/Settings/Statusbar"
+#define NAUTILUS_MENU_PATH_SIDEBAR_ITEM				"/Settings/Sidebar"
+#define NAUTILUS_MENU_PATH_NORMALIZE_ITEM			"/Settings/Normalize"
+#endif
+
 static void
 file_menu_new_window_callback (BonoboUIHandler *ui_handler, 
 			       gpointer user_data, 
@@ -174,7 +185,6 @@ edit_menu_cut_callback (BonoboUIHandler *ui_handler,
 	if (GTK_IS_EDITABLE (window->focus_widget)) {
 		gtk_editable_cut_clipboard (GTK_EDITABLE (window->focus_widget));
 	}
-
 }
 
 static void
@@ -188,7 +198,6 @@ edit_menu_copy_callback (BonoboUIHandler *ui_handler,
 	if (GTK_IS_EDITABLE (window->focus_widget)) {
 		gtk_editable_copy_clipboard (GTK_EDITABLE (window->focus_widget));
 	}
-
 }
 
 
@@ -319,6 +328,97 @@ settings_menu_customize_callback (BonoboUIHandler *ui_handler,
 	nautilus_property_browser_new ();
 }
 
+
+#ifdef WINDOW_ITEMS_TEST
+static void
+settings_menu_toolbar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_toolbar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_toolbar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_locationbar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_locationbar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_locationbar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_statusbar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+	
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_statusbar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_statusbar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_sidebar_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		nautilus_window_show_sidebar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_sidebar (NAUTILUS_WINDOW (window));
+	}
+}
+
+static void
+settings_menu_normalize_menu_callback (BonoboUIHandler *ui_handler, 
+				  gpointer user_data,
+				  const char *path)
+{
+	NautilusWindow *window;
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+	
+	window = NAUTILUS_WINDOW (user_data);
+	app = GNOME_APP (window);
+
+	if (bonobo_ui_handler_menu_get_toggle_state (ui_handler, path) == TRUE) {
+		if (app->menubar != NULL) {
+			gtk_widget_set_usize(app->menubar, 0, app->menubar->allocation.height - 6);
+		}
+	} else {
+		if (app->menubar != NULL) {
+			gtk_widget_set_usize(app->menubar, 0, app->menubar->allocation.height + 6);
+		}
+	}
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_MENUBAR_NAME);
+	gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+}
+
+#endif
+
+
 static void
 help_menu_about_nautilus_callback (BonoboUIHandler *ui_handler, 
 		       		   gpointer user_data,
@@ -963,6 +1063,70 @@ nautilus_window_initialize_menus (NautilusWindow *window)
         				 settings_menu_customize_callback,
         				 NULL);
 
+#ifdef WINDOW_ITEMS_TEST
+	/* Test window modification items */
+	bonobo_ui_handler_menu_new_separator (ui_handler,
+					      NAUTILUS_MENU_PATH_AFTER_CURSTOMIZE_SEPARATOR,
+					      -1);
+
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_TOOLBAR_ITEM,
+        				 _("Toolbar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_toolbar_callback,
+        				 window);
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_TOOLBAR_ITEM, TRUE);
+        				 
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_LOCATIONBAR_ITEM,
+        				 _("Locationbar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_locationbar_callback,
+        				 window);        				 
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_LOCATIONBAR_ITEM, TRUE);
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_STATUSBAR_ITEM,
+        				 _("Statusbar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_statusbar_callback,
+        				 window);        				 
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_STATUSBAR_ITEM, TRUE);
+
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_SIDEBAR_ITEM,
+        				 _("Sidebar"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_sidebar_callback,
+        				 window);    
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_SIDEBAR_ITEM, TRUE);
+	
+	bonobo_ui_handler_menu_new_toggleitem (ui_handler,
+        				 NAUTILUS_MENU_PATH_NORMALIZE_ITEM,
+        				 _("Normalize Menu"),
+        				 _("Show/Hide Stuff"),
+        				 -1,
+        				 0,
+        				 0,
+        				 settings_menu_normalize_menu_callback,
+        				 window);            				     				 
+	bonobo_ui_handler_menu_set_toggle_state (ui_handler, NAUTILUS_MENU_PATH_NORMALIZE_ITEM, FALSE);        				 
+#endif
+
 	/* Help */
         new_top_level_menu (window, NAUTILUS_MENU_PATH_HELP_MENU, _("_Help"));
 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index e7e1a9709..499d24d93 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -65,6 +65,9 @@
 /* Milliseconds */
 #define STATUSBAR_CLEAR_TIMEOUT 5000
 
+/* GNOME Dock Items */
+#define URI_ENTRY_DOCK_ITEM	"uri_entry"
+
 enum {
 	ARG_0,
 	ARG_APP_ID,
@@ -259,7 +262,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	}
 
 	gnome_app_add_docked (app, location_bar_box,
-			      "uri-entry", behavior,
+			      URI_ENTRY_DOCK_ITEM, behavior,
 			      GNOME_DOCK_TOP, 2, 0, 0);
 
 	/* Option menu for content view types; it's empty here, filled in when a uri is set. */
@@ -1423,3 +1426,110 @@ sidebar_panels_changed_callback (gpointer user_data)
 {
 	window_update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
 }
+
+
+void 
+nautilus_window_hide_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+
+void 
+nautilus_window_show_locationbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, URI_ENTRY_DOCK_ITEM);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_hide (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_show_toolbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+	GnomeDockItem *dock_item;
+
+	app = GNOME_APP (window);
+
+	dock_item = gnome_app_get_dock_item_by_name (app, GNOME_APP_TOOLBAR_NAME);
+	if (dock_item != NULL) {
+		gtk_widget_show (GTK_WIDGET (dock_item));
+		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
+	}
+}
+
+void 
+nautilus_window_hide_sidebar (NautilusWindow *window)
+{
+	gtk_widget_hide (GTK_WIDGET (window->sidebar));
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), 0);
+	}
+}
+
+void 
+nautilus_window_show_sidebar (NautilusWindow *window)
+{
+	GtkWidget *widget;
+
+	widget = GTK_WIDGET (window->sidebar);
+	gtk_widget_show (widget);
+	if (window->content_hbox != NULL) {
+		e_paned_set_position (E_PANED (window->content_hbox), widget->allocation.width);
+	}
+}
+
+void 
+nautilus_window_hide_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_hide (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
+
+void 
+nautilus_window_show_statusbar (NautilusWindow *window)
+{
+	GnomeApp *app;
+
+	app = GNOME_APP (window);
+
+	if (app->statusbar != NULL) {
+		gtk_widget_show (GTK_WIDGET (app->statusbar)->parent);
+	}	
+}
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 65293f5eb..7172322eb 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -171,4 +171,14 @@ void             nautilus_window_allow_stop           (NautilusWindow    *window
                                                        gboolean           allow);
 void             nautilus_bookmarks_exiting           (void);
 void		 nautilus_window_reload		      (NautilusWindow	 *window);
+
+void 		nautilus_window_hide_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_show_locationbar      (NautilusWindow 	 *window);
+void 		nautilus_window_hide_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_toolbar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_show_sidebar          (NautilusWindow 	 *window);
+void 		nautilus_window_hide_statusbar        (NautilusWindow 	 *window);
+void 		nautilus_window_show_statusbar        (NautilusWindow 	 *window);
+
 #endif