diff options
| author | Andy Hertzfeld <andy@src.gnome.org> | 2001-04-03 21:26:25 +0000 |
|---|---|---|
| committer | Andy Hertzfeld <andy@src.gnome.org> | 2001-04-03 21:26:25 +0000 |
| commit | fb05e8728c50b64b3a3f6b3820292f2aafbce4aa (patch) | |
| tree | c3af908ac817eaf1f7f60bf0f0f8b2937fb86be2 | |
| parent | 2f454456b590b2fa9d116c4ec8ca1fd5350ab479 (diff) | |
| download | nautilus-fb05e8728c50b64b3a3f6b3820292f2aafbce4aa.tar.gz | |
restored the annotation preferences that was inadvertently left out of
* libnautilus-extensions/nautilus-global-preferences.c:
(global_preferences_create_dialog):
restored the annotation preferences that was inadvertently left
out of yesterday's merge.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-global-preferences.c | 35 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.c | 35 |
3 files changed, 77 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2001-04-03 Andy Hertzfeld <andy@eazel.com> + + * libnautilus-extensions/nautilus-global-preferences.c: + (global_preferences_create_dialog): + restored the annotation preferences that was inadvertently left + out of yesterday's merge. + 2001-04-02 Andy Hertzfeld <andy@eazel.com> merged with HEAD to create the post-1_0_9 branch. diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c index cf965b71a..a152816ee 100644 --- a/libnautilus-extensions/nautilus-global-preferences.c +++ b/libnautilus-extensions/nautilus-global-preferences.c @@ -241,6 +241,18 @@ static const PreferenceDefault preference_defaults[] = { { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, + { NAUTILUS_PREFERENCES_LOOKUP_ANNOTATIONS, + PREFERENCE_BOOLEAN, + NAUTILUS_USER_LEVEL_INTERMEDIATE, + { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + { USER_LEVEL_NONE } + }, + { NAUTILUS_PREFERENCES_DISPLAY_ANNOTATIONS, + PREFERENCE_BOOLEAN, + NAUTILUS_USER_LEVEL_INTERMEDIATE, + { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + { USER_LEVEL_NONE } + }, { NAUTILUS_PREFERENCES_PREVIEW_SOUND, PREFERENCE_INTEGER, NAUTILUS_USER_LEVEL_INTERMEDIATE, @@ -911,6 +923,24 @@ static PreferenceDialogItem tradeoffs_items[] = { { NULL, NULL, NULL, 0, NULL, 0 } }; +static PreferenceDialogItem annotation_items[] = { + { N_("Lookup File Annotations"), + NAUTILUS_PREFERENCES_LOOKUP_ANNOTATIONS, + N_("Use the service to lookup file annotations"), + NAUTILUS_PREFERENCE_ITEM_BOOLEAN, + NULL, + 0 + }, + { N_("Display File Annotations"), + NAUTILUS_PREFERENCES_DISPLAY_ANNOTATIONS, + N_("Display emblems for file annotations"), + NAUTILUS_PREFERENCE_ITEM_BOOLEAN, + NULL, + 0 + }, + { NULL, NULL, NULL, 0, NULL, 0 } +}; + static GtkWidget * global_preferences_create_dialog (void) { @@ -969,6 +999,11 @@ global_preferences_create_dialog (void) _("Speed Tradeoffs"), tradeoffs_items); + /* Annotations */ + global_preferences_populate_pane (preference_box, + _("Annotations"), + annotation_items); + /* Update the dialog so that the right items show up based on the current user level */ nautilus_preferences_dialog_update (NAUTILUS_PREFERENCES_DIALOG (prefs_dialog)); diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index cf965b71a..a152816ee 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -241,6 +241,18 @@ static const PreferenceDefault preference_defaults[] = { { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, + { NAUTILUS_PREFERENCES_LOOKUP_ANNOTATIONS, + PREFERENCE_BOOLEAN, + NAUTILUS_USER_LEVEL_INTERMEDIATE, + { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + { USER_LEVEL_NONE } + }, + { NAUTILUS_PREFERENCES_DISPLAY_ANNOTATIONS, + PREFERENCE_BOOLEAN, + NAUTILUS_USER_LEVEL_INTERMEDIATE, + { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + { USER_LEVEL_NONE } + }, { NAUTILUS_PREFERENCES_PREVIEW_SOUND, PREFERENCE_INTEGER, NAUTILUS_USER_LEVEL_INTERMEDIATE, @@ -911,6 +923,24 @@ static PreferenceDialogItem tradeoffs_items[] = { { NULL, NULL, NULL, 0, NULL, 0 } }; +static PreferenceDialogItem annotation_items[] = { + { N_("Lookup File Annotations"), + NAUTILUS_PREFERENCES_LOOKUP_ANNOTATIONS, + N_("Use the service to lookup file annotations"), + NAUTILUS_PREFERENCE_ITEM_BOOLEAN, + NULL, + 0 + }, + { N_("Display File Annotations"), + NAUTILUS_PREFERENCES_DISPLAY_ANNOTATIONS, + N_("Display emblems for file annotations"), + NAUTILUS_PREFERENCE_ITEM_BOOLEAN, + NULL, + 0 + }, + { NULL, NULL, NULL, 0, NULL, 0 } +}; + static GtkWidget * global_preferences_create_dialog (void) { @@ -969,6 +999,11 @@ global_preferences_create_dialog (void) _("Speed Tradeoffs"), tradeoffs_items); + /* Annotations */ + global_preferences_populate_pane (preference_box, + _("Annotations"), + annotation_items); + /* Update the dialog so that the right items show up based on the current user level */ nautilus_preferences_dialog_update (NAUTILUS_PREFERENCES_DIALOG (prefs_dialog)); |