mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-29 03:34:16 +00:00
reviewed by: Maciej Stachowiak <mjs@eazel.com>
* libnautilus-extensions/nautilus-global-preferences.c: (global_preferences_install_defaults), (global_preferences_install_visibility), (global_preferences_install_sidebar_panel_defaults): * libnautilus-extensions/nautilus-preferences.c: (nautilus_preferences_get_user_level): * libnautilus-extensions/nautilus-preferences.h: * src/nautilus-first-time-druid.c: (set_up_user_level_page): * src/nautilus-window-menus.c: (get_user_level_icon_name), (nautilus_window_initialize_menus), (convert_verb_to_user_level), (convert_user_level_to_path): * test/test-nautilus-preferences-change.c: (main): Change 'hacker' to 'advanced' for the advanced user level so that the names used for storage match those used for display.
This commit is contained in:
Ramiro Estrugo
parent
2fa1795d4a
commit
a02986d457
11 changed files with 55 additions and 36 deletions
19
ChangeLog
19
ChangeLog
|
|
@ -1,3 +1,22 @@
|
|||
2001-02-01 Ramiro Estrugo <ramiro@eazel.com>
|
||||
|
||||
reviewed by: Maciej Stachowiak <mjs@eazel.com>
|
||||
|
||||
* libnautilus-extensions/nautilus-global-preferences.c:
|
||||
(global_preferences_install_defaults),
|
||||
(global_preferences_install_visibility),
|
||||
(global_preferences_install_sidebar_panel_defaults):
|
||||
* libnautilus-extensions/nautilus-preferences.c:
|
||||
(nautilus_preferences_get_user_level):
|
||||
* libnautilus-extensions/nautilus-preferences.h:
|
||||
* src/nautilus-first-time-druid.c: (set_up_user_level_page):
|
||||
* src/nautilus-window-menus.c: (get_user_level_icon_name),
|
||||
(nautilus_window_initialize_menus), (convert_verb_to_user_level),
|
||||
(convert_user_level_to_path):
|
||||
* test/test-nautilus-preferences-change.c: (main):
|
||||
Change 'hacker' to 'advanced' for the advanced user level so that
|
||||
the names used for storage match those used for display.
|
||||
|
||||
2001-02-01 Maciej Stachowiak <mjs@eazel.com>
|
||||
|
||||
reviewed by: Darin Adler <darin@eazel.com> and
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ global_preferences_install_defaults (void)
|
|||
NAUTILUS_USER_LEVEL_NOVICE,
|
||||
FALSE);
|
||||
nautilus_preferences_default_set_boolean (NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS,
|
||||
NAUTILUS_USER_LEVEL_HACKER,
|
||||
NAUTILUS_USER_LEVEL_ADVANCED,
|
||||
TRUE);
|
||||
|
||||
nautilus_preferences_default_set_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP,
|
||||
|
|
@ -411,7 +411,7 @@ global_preferences_install_visibility (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
|
@ -423,10 +423,10 @@ global_preferences_install_visibility (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
|
@ -459,7 +459,7 @@ global_preferences_install_visibility (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
|
@ -880,7 +880,7 @@ static struct
|
|||
const char *name;
|
||||
gboolean novice_default;
|
||||
gboolean intermediate_default;
|
||||
gboolean hacker_default;
|
||||
gboolean advanced_default;
|
||||
int visible_user_level;
|
||||
} known_sidebar_panels[] =
|
||||
{
|
||||
|
|
@ -906,8 +906,8 @@ global_preferences_install_sidebar_panel_defaults (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE,
|
||||
known_sidebar_panels[i].intermediate_default);
|
||||
nautilus_preferences_default_set_boolean (key,
|
||||
NAUTILUS_USER_LEVEL_HACKER,
|
||||
known_sidebar_panels[i].hacker_default);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED,
|
||||
known_sidebar_panels[i].advanced_default);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (key,
|
||||
known_sidebar_panels[i].visible_user_level);
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ static const char *user_level_names_for_storage[] =
|
|||
{
|
||||
"novice",
|
||||
"intermediate",
|
||||
"hacker"
|
||||
"advanced"
|
||||
};
|
||||
|
||||
static char * preferences_get_path (void);
|
||||
|
|
@ -564,7 +564,7 @@ nautilus_preferences_get_user_level (void)
|
|||
user_level = nautilus_gconf_get_string (key);
|
||||
g_free (key);
|
||||
|
||||
if (nautilus_str_is_equal (user_level, "hacker")) {
|
||||
if (nautilus_str_is_equal (user_level, "advanced")) {
|
||||
result = 2;
|
||||
} else if (nautilus_str_is_equal (user_level, "intermediate")) {
|
||||
result = 1;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ typedef void (*NautilusPreferencesCallback) (gpointer callback_data);
|
|||
*/
|
||||
#define NAUTILUS_USER_LEVEL_NOVICE 0
|
||||
#define NAUTILUS_USER_LEVEL_INTERMEDIATE 1
|
||||
#define NAUTILUS_USER_LEVEL_HACKER 2
|
||||
#define NAUTILUS_USER_LEVEL_ADVANCED 2
|
||||
|
||||
char * nautilus_preferences_get_user_level_name_for_display (int user_level);
|
||||
char * nautilus_preferences_get_user_level_name_for_storage (int user_level);
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ global_preferences_install_defaults (void)
|
|||
NAUTILUS_USER_LEVEL_NOVICE,
|
||||
FALSE);
|
||||
nautilus_preferences_default_set_boolean (NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS,
|
||||
NAUTILUS_USER_LEVEL_HACKER,
|
||||
NAUTILUS_USER_LEVEL_ADVANCED,
|
||||
TRUE);
|
||||
|
||||
nautilus_preferences_default_set_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP,
|
||||
|
|
@ -411,7 +411,7 @@ global_preferences_install_visibility (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
|
@ -423,10 +423,10 @@ global_preferences_install_visibility (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
|
@ -459,7 +459,7 @@ global_preferences_install_visibility (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
|
|
@ -880,7 +880,7 @@ static struct
|
|||
const char *name;
|
||||
gboolean novice_default;
|
||||
gboolean intermediate_default;
|
||||
gboolean hacker_default;
|
||||
gboolean advanced_default;
|
||||
int visible_user_level;
|
||||
} known_sidebar_panels[] =
|
||||
{
|
||||
|
|
@ -906,8 +906,8 @@ global_preferences_install_sidebar_panel_defaults (void)
|
|||
NAUTILUS_USER_LEVEL_INTERMEDIATE,
|
||||
known_sidebar_panels[i].intermediate_default);
|
||||
nautilus_preferences_default_set_boolean (key,
|
||||
NAUTILUS_USER_LEVEL_HACKER,
|
||||
known_sidebar_panels[i].hacker_default);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED,
|
||||
known_sidebar_panels[i].advanced_default);
|
||||
|
||||
nautilus_preferences_set_visible_user_level (key,
|
||||
known_sidebar_panels[i].visible_user_level);
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ static const char *user_level_names_for_storage[] =
|
|||
{
|
||||
"novice",
|
||||
"intermediate",
|
||||
"hacker"
|
||||
"advanced"
|
||||
};
|
||||
|
||||
static char * preferences_get_path (void);
|
||||
|
|
@ -564,7 +564,7 @@ nautilus_preferences_get_user_level (void)
|
|||
user_level = nautilus_gconf_get_string (key);
|
||||
g_free (key);
|
||||
|
||||
if (nautilus_str_is_equal (user_level, "hacker")) {
|
||||
if (nautilus_str_is_equal (user_level, "advanced")) {
|
||||
result = 2;
|
||||
} else if (nautilus_str_is_equal (user_level, "intermediate")) {
|
||||
result = 1;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ typedef void (*NautilusPreferencesCallback) (gpointer callback_data);
|
|||
*/
|
||||
#define NAUTILUS_USER_LEVEL_NOVICE 0
|
||||
#define NAUTILUS_USER_LEVEL_INTERMEDIATE 1
|
||||
#define NAUTILUS_USER_LEVEL_HACKER 2
|
||||
#define NAUTILUS_USER_LEVEL_ADVANCED 2
|
||||
|
||||
char * nautilus_preferences_get_user_level_name_for_display (int user_level);
|
||||
char * nautilus_preferences_get_user_level_name_for_storage (int user_level);
|
||||
|
|
|
|||
|
|
@ -467,18 +467,18 @@ set_up_user_level_page (NautilusDruidPageEazel *page)
|
|||
NULL);
|
||||
gtk_box_pack_start (GTK_BOX (main_box), hbox, FALSE, FALSE, 2);
|
||||
hbox = make_hbox_user_level_radio_button
|
||||
(NAUTILUS_USER_LEVEL_HACKER, radio_buttons, "expert.png",
|
||||
(NAUTILUS_USER_LEVEL_ADVANCED, radio_buttons, "expert.png",
|
||||
_("For users that have the need to be exposed\n"
|
||||
"to every detail of their operating system."),
|
||||
NULL);
|
||||
gtk_box_pack_start (GTK_BOX (main_box), hbox, FALSE, FALSE, 2);
|
||||
|
||||
user_level = nautilus_preferences_get_user_level ();
|
||||
g_assert (user_level >= NAUTILUS_USER_LEVEL_NOVICE && user_level <= NAUTILUS_USER_LEVEL_HACKER);
|
||||
g_assert (user_level >= NAUTILUS_USER_LEVEL_NOVICE && user_level <= NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_buttons[user_level]), TRUE);
|
||||
|
||||
|
||||
for (index = NAUTILUS_USER_LEVEL_NOVICE; index <= NAUTILUS_USER_LEVEL_HACKER; index ++) {
|
||||
for (index = NAUTILUS_USER_LEVEL_NOVICE; index <= NAUTILUS_USER_LEVEL_ADVANCED; index ++) {
|
||||
gtk_signal_connect (GTK_OBJECT (radio_buttons[index]),
|
||||
"toggled",
|
||||
GTK_SIGNAL_FUNC (user_level_selection_changed),
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@ get_user_level_icon_name (int user_level, gboolean is_selected)
|
|||
case NAUTILUS_USER_LEVEL_NOVICE:
|
||||
image_name = "novice";
|
||||
break;
|
||||
case NAUTILUS_USER_LEVEL_HACKER:
|
||||
case NAUTILUS_USER_LEVEL_ADVANCED:
|
||||
image_name = "expert";
|
||||
break;
|
||||
case NAUTILUS_USER_LEVEL_INTERMEDIATE:
|
||||
|
|
@ -1209,7 +1209,7 @@ nautilus_window_initialize_menus (NautilusWindow *window)
|
|||
add_user_level_menu_item (window, NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
add_user_level_menu_item (window, NAUTILUS_MENU_PATH_EXPERT_ITEM,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
update_user_level_menu_items (window);
|
||||
bonobo_ui_component_thaw (window->details->shell_ui, NULL);
|
||||
|
||||
|
|
@ -1417,7 +1417,7 @@ convert_verb_to_user_level (const char *verb)
|
|||
} else if (strcmp (verb, SWITCH_TO_INTERMEDIATE_VERB) == 0) {
|
||||
return NAUTILUS_USER_LEVEL_INTERMEDIATE;
|
||||
} else if (strcmp (verb, SWITCH_TO_ADVANCED_VERB) == 0) {
|
||||
return NAUTILUS_USER_LEVEL_HACKER;
|
||||
return NAUTILUS_USER_LEVEL_ADVANCED;
|
||||
}
|
||||
|
||||
g_assert_not_reached ();
|
||||
|
|
@ -1432,7 +1432,7 @@ convert_user_level_to_path (guint user_level)
|
|||
return NAUTILUS_MENU_PATH_NOVICE_ITEM;
|
||||
case NAUTILUS_USER_LEVEL_INTERMEDIATE:
|
||||
return NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM;
|
||||
case NAUTILUS_USER_LEVEL_HACKER:
|
||||
case NAUTILUS_USER_LEVEL_ADVANCED:
|
||||
return NAUTILUS_MENU_PATH_EXPERT_ITEM;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@ get_user_level_icon_name (int user_level, gboolean is_selected)
|
|||
case NAUTILUS_USER_LEVEL_NOVICE:
|
||||
image_name = "novice";
|
||||
break;
|
||||
case NAUTILUS_USER_LEVEL_HACKER:
|
||||
case NAUTILUS_USER_LEVEL_ADVANCED:
|
||||
image_name = "expert";
|
||||
break;
|
||||
case NAUTILUS_USER_LEVEL_INTERMEDIATE:
|
||||
|
|
@ -1209,7 +1209,7 @@ nautilus_window_initialize_menus (NautilusWindow *window)
|
|||
add_user_level_menu_item (window, NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM,
|
||||
NAUTILUS_USER_LEVEL_INTERMEDIATE);
|
||||
add_user_level_menu_item (window, NAUTILUS_MENU_PATH_EXPERT_ITEM,
|
||||
NAUTILUS_USER_LEVEL_HACKER);
|
||||
NAUTILUS_USER_LEVEL_ADVANCED);
|
||||
update_user_level_menu_items (window);
|
||||
bonobo_ui_component_thaw (window->details->shell_ui, NULL);
|
||||
|
||||
|
|
@ -1417,7 +1417,7 @@ convert_verb_to_user_level (const char *verb)
|
|||
} else if (strcmp (verb, SWITCH_TO_INTERMEDIATE_VERB) == 0) {
|
||||
return NAUTILUS_USER_LEVEL_INTERMEDIATE;
|
||||
} else if (strcmp (verb, SWITCH_TO_ADVANCED_VERB) == 0) {
|
||||
return NAUTILUS_USER_LEVEL_HACKER;
|
||||
return NAUTILUS_USER_LEVEL_ADVANCED;
|
||||
}
|
||||
|
||||
g_assert_not_reached ();
|
||||
|
|
@ -1432,7 +1432,7 @@ convert_user_level_to_path (guint user_level)
|
|||
return NAUTILUS_MENU_PATH_NOVICE_ITEM;
|
||||
case NAUTILUS_USER_LEVEL_INTERMEDIATE:
|
||||
return NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM;
|
||||
case NAUTILUS_USER_LEVEL_HACKER:
|
||||
case NAUTILUS_USER_LEVEL_ADVANCED:
|
||||
return NAUTILUS_MENU_PATH_EXPERT_ITEM;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -156,14 +156,14 @@ main (int argc, char *argv[])
|
|||
|
||||
nautilus_global_preferences_initialize ();
|
||||
|
||||
user_level_entries = nautilus_string_list_new_from_tokens ("Beginner,Intermediate,Hacker", ",", TRUE);
|
||||
user_level_entries = nautilus_string_list_new_from_tokens ("Beginner,Intermediate,Advanced", ",", TRUE);
|
||||
color_entries = nautilus_string_list_new_from_tokens ("0,1,2,3,4,5,6,7,8,9,10", ",", TRUE);
|
||||
fruits_entries = nautilus_string_list_new_from_tokens ("0,1,2,3", ",", TRUE);
|
||||
|
||||
nautilus_preferences_default_set_string ("user_level",
|
||||
NAUTILUS_USER_LEVEL_NOVICE,
|
||||
"hacker");
|
||||
|
||||
"advanced");
|
||||
|
||||
nautilus_preferences_default_set_integer ("green",
|
||||
NAUTILUS_USER_LEVEL_NOVICE,
|
||||
3);
|
||||
|
|
|
|||
Loading…
Reference in a new issue