summaryrefslogtreecommitdiff
path: root/libnautilus-extensions/nautilus-global-preferences.c
diff options
context:
space:
mode:
authorJohn Sullivan <sullivan@src.gnome.org>2001-02-22 17:56:40 +0000
committerJohn Sullivan <sullivan@src.gnome.org>2001-02-22 17:56:40 +0000
commit21173338be1af37e476a1f93c1dc479e1c2f8e35 (patch)
treeb5c0135f01d765cfc31a55d42c3c7f3cb7c1dc71 /libnautilus-extensions/nautilus-global-preferences.c
parentd956ada655071a3de75c22ba6b15318e88dd9e7c (diff)
downloadnautilus-21173338be1af37e476a1f93c1dc479e1c2f8e35.tar.gz
reviewed by: Darin Adler <darin@eazel.com>
Fixed bug 3321 (Finalize contents of Help menu for 1.0). Actually there's still an open issue about the Customer Service item, which I've left in for now. * src/nautilus-shell-ui.xml: Added Quick Reference, removed License, put About last after a separator. * src/nautilus-window-menus.c: (help_menu_nautilus_quick_reference_callback): New callback. (help_menu_nautilus_license_callback): Removed this. (nautilus_window_initialize_menus): Install callback for Quick Reference, remove for License. Also removed the space from "tool bar" everywhere, per the final decision of Vera & Rhoda. I grepped and replaced everywhere for "tool bar", "Tool Bar", "TOOL_BAR", and "tool_bar". * components/loser/content/nautilus-content-loser-ui.xml: * components/loser/sidebar/nautilus-sidebar-loser-ui.xml: * components/mozilla/bonobo-extensions.c: * components/sample/nautilus-sample-content-view-ui.xml: * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-global-preferences.c: (global_preferences_install_descriptions), (global_preferences_install_defaults), (global_preferences_install_visibility), (global_preferences_create_dialog): * libnautilus-extensions/nautilus-global-preferences.h: * src/nautilus-service-ui.xml: * src/nautilus-shell-ui.xml: * src/nautilus-window-menus.c: (view_menu_show_hide_toolbar_callback), (nautilus_window_update_show_hide_menu_items), (help_menu_nautilus_quick_reference_callback), (nautilus_window_initialize_menus): * src/nautilus-window-toolbars.c: (set_up_special_bonobo_button), (set_up_toolbar_images), (theme_changed_callback), (set_up_back_or_forward_toolbar_item), (nautilus_window_initialize_toolbars): * src/nautilus-window.c: (nautilus_window_constructed), (nautilus_window_hide_toolbar), (nautilus_window_show_toolbar), (nautilus_window_toolbar_showing), (nautilus_window_show): * src/nautilus-window.h: Made toolbar one word.
Diffstat (limited to 'libnautilus-extensions/nautilus-global-preferences.c')
-rw-r--r--libnautilus-extensions/nautilus-global-preferences.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index 63a466311..1b075dd08 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -154,8 +154,8 @@ global_preferences_install_descriptions (void)
_("Use this font family to display file names:"));
- nautilus_preferences_set_description (NAUTILUS_PREFERENCES_START_WITH_TOOL_BAR,
- _("Display tool bar in new windows"));
+ nautilus_preferences_set_description (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
+ _("Display toolbar in new windows"));
nautilus_preferences_set_description (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR,
_("Display location bar in new windows"));
@@ -342,7 +342,7 @@ global_preferences_install_defaults (void)
NAUTILUS_USER_LEVEL_NOVICE,
"http://www.eazel.com/websearch");
- nautilus_preferences_default_set_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOL_BAR,
+ nautilus_preferences_default_set_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
NAUTILUS_USER_LEVEL_NOVICE,
TRUE);
nautilus_preferences_default_set_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR,
@@ -425,7 +425,7 @@ global_preferences_install_visibility (void)
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE,
NAUTILUS_USER_LEVEL_INTERMEDIATE);
- nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_START_WITH_TOOL_BAR,
+ nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
NAUTILUS_USER_LEVEL_INTERMEDIATE);
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR,
@@ -562,7 +562,7 @@ global_preferences_create_dialog (void)
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (windows_and_desktop_pane),
1,
- NAUTILUS_PREFERENCES_START_WITH_TOOL_BAR,
+ NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (windows_and_desktop_pane),
1,