diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-09-05 19:39:30 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-09-05 19:39:30 +0000 |
| commit | 1b18a656209f630d30bc0e68eb8842950644e6ba (patch) | |
| tree | 441458c4cce59c817e624cc74f8138952ec9d7ac /libnautilus-private/nautilus-text-caption.h | |
| parent | 18587fcb495d8a2e6e4ccd088e2162061847f2f9 (diff) | |
| download | nautilus-1b18a656209f630d30bc0e68eb8842950644e6ba.tar.gz | |
Fixed bug 1247 ("Edit Novice Settings" menu item
needs to be handled better)
Now this menu item is enabled, and choosing it explains
that you can't edited the Novice settings but offers
to switch to Intermediate and let you edit those
settings.
* libnautilus-extensions/nautilus-user-level-manager.c,
* libnautilus-extensions/nautilus-user-level-manager.h:
Made the #defines for the user level ints public, so
code elsewhere could use them rather than hardwiring
a bunch of 0s, 1s, and 2s.
* libnautilus-extensions/nautilus-caption-table.h:
* libnautilus-extensions/nautilus-caption.h:
* libnautilus-extensions/nautilus-font-picker.h:
* libnautilus-extensions/nautilus-global-preferences.h:
* libnautilus-extensions/nautilus-password-dialog.h:
* libnautilus-extensions/nautilus-preference.h:
* libnautilus-extensions/nautilus-preferences-box.h:
* libnautilus-extensions/nautilus-preferences-dialog.h:
* libnautilus-extensions/nautilus-preferences-group.h:
* libnautilus-extensions/nautilus-preferences-item.h:
* libnautilus-extensions/nautilus-preferences-pane.h:
* libnautilus-extensions/nautilus-preferences-private.h:
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-radio-button-group.h:
* libnautilus-extensions/nautilus-string-picker.h:
* libnautilus-extensions/nautilus-text-caption.h:
Changed the closing BEGIN_GNOME_DECLS in these header files
to END_GNOME_DECLS.
* src/nautilus-window-menus.c:
(get_user_level_string_for_display): New function, extracted
from get_customize_user_level_string. Returns the user level
string to be put into user messages or menu item names.
(get_customize_user_level_string): Now calls
get_user_level_string_for_display
(switch_and_show_intermediate_settings_callback): New function,
switches to intermediate level and displays the user level
settings dialog.
(user_level_customize_callback): If the current user level is
NAUTILUS_USER_LEVEL_NOVICE, puts up a dialog telling the user
that the Novice settings can't be changed, and asking them if
they want to switch to Intermediate and edit those settings.
(get_user_level_image), (user_level_changed_callback),
(nautilus_window_initialize_menus),
(convert_menu_path_to_user_level),
(convert_user_level_to_menu_path):
Use #defines for user levels instead of hardwiring integers.
(switch_to_user_level): New function, extracted from
user_level_menu_item_callback. Switches to a specified user
level and updates menu items & title image appropriately.
(user_level_menu_item_callback): Now calls switch_to_user_level.
(update_user_level_menu_items): Don't desensitize the Edit
Settings item at Novice user level anymore.
Diffstat (limited to 'libnautilus-private/nautilus-text-caption.h')
| -rw-r--r-- | libnautilus-private/nautilus-text-caption.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnautilus-private/nautilus-text-caption.h b/libnautilus-private/nautilus-text-caption.h index f7a2e7aca..76cc938a7 100644 --- a/libnautilus-private/nautilus-text-caption.h +++ b/libnautilus-private/nautilus-text-caption.h @@ -69,7 +69,7 @@ char *nautilus_text_caption_get_text (NautilusTextCaption *text_capt void nautilus_text_caption_set_text (NautilusTextCaption *text_caption, const char *text); -BEGIN_GNOME_DECLS +END_GNOME_DECLS #endif /* NAUTILUS_TEXT_CAPTION_H */ |