summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libnautilus-private/nautilus-global-preferences.h1
-rw-r--r--libnautilus-private/nautilus.convert1
-rw-r--r--libnautilus-private/org.gnome.nautilus.gschema.xml.in5
-rw-r--r--src/nautilus-actions.h1
-rw-r--r--src/nautilus-shell-ui.xml1
-rw-r--r--src/nautilus-window-menus.c14
-rw-r--r--src/nautilus-window-pane.c24
7 files changed, 1 insertions, 46 deletions
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 89a569f72..716328d30 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -79,7 +79,6 @@ typedef enum
/* Which views should be displayed for new windows */
#define NAUTILUS_WINDOW_STATE_START_WITH_STATUS_BAR "start-with-status-bar"
#define NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR "start-with-sidebar"
-#define NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR "start-with-toolbar"
#define NAUTILUS_WINDOW_STATE_SIDE_PANE_VIEW "side-pane-view"
#define NAUTILUS_WINDOW_STATE_GEOMETRY "geometry"
#define NAUTILUS_WINDOW_STATE_MAXIMIZED "maximized"
diff --git a/libnautilus-private/nautilus.convert b/libnautilus-private/nautilus.convert
index a8fff1548..ab3f96ba6 100644
--- a/libnautilus-private/nautilus.convert
+++ b/libnautilus-private/nautilus.convert
@@ -58,7 +58,6 @@ text-ellipsis-limit = /apps/nautilus/desktop/text_ellipsis_limit
geometry = /apps/nautilus/preferences/navigation_window_saved_geometry
maximized = /apps/nautilus/preferences/navigation_window_saved_maximized
sidebar-width = /apps/nautilus/preferences/sidebar_width
-start-with-toolbar = /apps/nautilus/preferences/start_with_toolbar
start-with-location-bar = /apps/nautilus/preferences/start_with_location_bar
start-with-status-bar = /apps/nautilus/preferences/start_with_status_bar
start-with-sidebar = /apps/nautilus/preferences/start_with_sidebar
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
index 7419e2673..f1f18c584 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
@@ -367,11 +367,6 @@
<_summary>Width of the side pane</_summary>
<_description>The default width of the side pane in new windows.</_description>
</key>
- <key name="start-with-toolbar" type="b">
- <default>true</default>
- <_summary>Show toolbar in new windows</_summary>
- <_description>If set to true, newly opened windows will have toolbars visible.</_description>
- </key>
<key name="start-with-location-bar" type="b">
<default>true</default>
<_summary>Show location bar in new windows</_summary>
diff --git a/src/nautilus-actions.h b/src/nautilus-actions.h
index 7bd1cd1a0..c6a5b4f4e 100644
--- a/src/nautilus-actions.h
+++ b/src/nautilus-actions.h
@@ -33,7 +33,6 @@
#define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
#define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
#define NAUTILUS_ACTION_FORWARD "Forward"
-#define NAUTILUS_ACTION_SHOW_HIDE_TOOLBAR "Show Hide Toolbar"
#define NAUTILUS_ACTION_SHOW_HIDE_SIDEBAR "Show Hide Sidebar"
#define NAUTILUS_ACTION_SHOW_HIDE_STATUSBAR "Show Hide Statusbar"
#define NAUTILUS_ACTION_SHOW_HIDE_LOCATION_BAR "Show Hide Location Bar"
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 0861fa66c..ed927ad7a 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -63,7 +63,6 @@
<separator/>
<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
</menu>
- <menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>
<menuitem name="Show Hide Statusbar" action="Show Hide Statusbar"/>
<menuitem name="Show Hide Extra Pane" action="Show Hide Extra Pane"/>
</placeholder>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 76992cfc9..8546f734a 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -935,11 +935,6 @@ static const GtkToggleActionEntry main_toggle_entries[] = {
/* tooltip */ N_("Toggle the display of hidden files in the current window"),
G_CALLBACK (action_show_hidden_files_callback),
TRUE },
- /* name, stock id */ { "Show Hide Toolbar", NULL,
- /* label, accelerator */ N_("_Main Toolbar"), NULL,
- /* tooltip */ N_("Change the visibility of this window's main toolbar"),
- NULL,
- /* is_active */ TRUE },
/* name, stock id */ { "Show Hide Sidebar", NULL,
/* label, accelerator */ N_("_Show Sidebar"), "F9",
/* tooltip */ N_("Change the visibility of this window's side pane"),
@@ -1051,15 +1046,6 @@ window_menus_set_bindings (NautilusWindow *window)
action_group = nautilus_window_get_main_action_group (window);
action = gtk_action_group_get_action (action_group,
- NAUTILUS_ACTION_SHOW_HIDE_TOOLBAR);
-
- g_settings_bind (nautilus_window_state,
- NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR,
- action,
- "active",
- G_SETTINGS_BIND_DEFAULT);
-
- action = gtk_action_group_get_action (action_group,
NAUTILUS_ACTION_SHOW_HIDE_STATUSBAR);
g_settings_bind (nautilus_window_state,
diff --git a/src/nautilus-window-pane.c b/src/nautilus-window-pane.c
index 7b6ba81cf..bf58d301b 100644
--- a/src/nautilus-window-pane.c
+++ b/src/nautilus-window-pane.c
@@ -242,15 +242,6 @@ nautilus_window_pane_ensure_search_bar (NautilusWindowPane *pane)
nautilus_toolbar_set_show_search_bar (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);
- if (!g_settings_get_boolean (nautilus_window_state,
- NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR)) {
- nautilus_toolbar_set_show_main_bar (NAUTILUS_TOOLBAR (pane->tool_bar), FALSE);
- gtk_widget_show (pane->tool_bar);
- nautilus_search_bar_clear (NAUTILUS_SEARCH_BAR (pane->search_bar));
-
- pane->temporary_search_bar = TRUE;
- }
-
nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (pane->search_bar));
}
@@ -655,6 +646,7 @@ nautilus_window_pane_constructed (GObject *obj)
action_group = nautilus_window_create_toolbar_action_group (window);
pane->tool_bar = nautilus_toolbar_new (action_group);
pane->action_group = action_group;
+ gtk_widget_show (pane->tool_bar);
setup_search_action (pane);
g_signal_connect (pane->action_group, "pre-activate",
@@ -667,14 +659,6 @@ nautilus_window_pane_constructed (GObject *obj)
/* start as non-active */
nautilus_window_pane_set_active (pane, FALSE);
- g_settings_bind_with_mapping (nautilus_window_state,
- NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR,
- pane->tool_bar,
- "visible",
- G_SETTINGS_BIND_GET,
- nautilus_window_disable_chrome_mapping, NULL,
- window, NULL);
-
/* connect to the pathbar signals */
pane->path_bar = nautilus_toolbar_get_path_bar (NAUTILUS_TOOLBAR (pane->tool_bar));
gtk_size_group_add_widget (header_size_group, pane->path_bar);
@@ -967,12 +951,6 @@ nautilus_window_pane_ensure_location_bar (NautilusWindowPane *pane)
nautilus_toolbar_set_show_main_bar (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);
nautilus_toolbar_set_show_location_entry (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);
- if (!g_settings_get_boolean (nautilus_window_state,
- NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR)) {
- gtk_widget_show (pane->tool_bar);
- pane->temporary_navigation_bar = TRUE;
- }
-
nautilus_location_bar_activate
(NAUTILUS_LOCATION_BAR (pane->location_bar));
}
View Lorry Controller Status