gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Convert sort-directories-first to gsettings

Browse source
This commit is contained in:
Alexander Larsson 2010-07-22 17:36:26 +02:00
parent c6a6fb894c
commit 87aa83c531
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnautilus-private/nautilus-global-preferences.c
View file

@ -232,10 +232,6 @@ static const PreferenceDefault preference_defaults[] = {
NULL, NULL, NULL, NULL,
"speed_tradeoff" "speed_tradeoff"
}, },
{ NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST,
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (FALSE)
},
{ NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE, { NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
PREFERENCE_STRING, PREFERENCE_STRING,
"search_by_text", "search_by_text",

2
libnautilus-private/nautilus-global-preferences.h
View file

@ -115,7 +115,7 @@ typedef enum
#define NAUTILUS_WINDOW_STATE_SIDEBAR_WIDTH "sidebar-width" #define NAUTILUS_WINDOW_STATE_SIDEBAR_WIDTH "sidebar-width"
/* Sorting order */ /* Sorting order */
#define NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST "preferences/sort_directories_first" #define NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST "sort-directories-first"
/* The default folder viewer - one of the two enums below */ /* The default folder viewer - one of the two enums below */
#define NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER "preferences/default_folder_viewer" #define NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER "preferences/default_folder_viewer"

17
src/file-manager/fm-directory-view.c
View file

@ -1611,8 +1611,8 @@ sort_directories_first_changed_callback (gpointer callback_data)
view = FM_DIRECTORY_VIEW (callback_data); view = FM_DIRECTORY_VIEW (callback_data);
preference_value = preference_value =
eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
if (preference_value != view->details->sort_directories_first) { if (preference_value != view->details->sort_directories_first) {
view->details->sort_directories_first = preference_value; view->details->sort_directories_first = preference_value;
@ -1969,8 +1969,8 @@ fm_directory_view_init (FMDirectoryView *view)
G_CALLBACK (user_dirs_changed), G_CALLBACK (user_dirs_changed),
view, G_CONNECT_SWAPPED); view, G_CONNECT_SWAPPED);
view->details->sort_directories_first = view->details->sort_directories_first =
eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
g_signal_connect_object (nautilus_trash_monitor_get (), "trash_state_changed", g_signal_connect_object (nautilus_trash_monitor_get (), "trash_state_changed",
G_CALLBACK (fm_directory_view_trash_state_changed_callback), view, 0); G_CALLBACK (fm_directory_view_trash_state_changed_callback), view, 0);
@ -1997,8 +1997,9 @@ fm_directory_view_init (FMDirectoryView *view)
view); view);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_CLICK_POLICY, eel_preferences_add_callback (NAUTILUS_PREFERENCES_CLICK_POLICY,
click_policy_changed_callback, view); click_policy_changed_callback, view);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, g_signal_connect_swapped (nautilus_preferences,
sort_directories_first_changed_callback, view); "changed::" NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST,
G_CALLBACK(sort_directories_first_changed_callback), view);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE, eel_preferences_add_callback (NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE,
lockdown_disable_command_line_changed_callback, view); lockdown_disable_command_line_changed_callback, view);
} }
@ -2011,7 +2012,7 @@ real_unmerge_menus (FMDirectoryView *view)
if (view->details->window == NULL) { if (view->details->window == NULL) {
return; return;
} }
ui_manager = nautilus_window_info_get_ui_manager (view->details->window); ui_manager = nautilus_window_info_get_ui_manager (view->details->window);
nautilus_ui_unmerge_ui (ui_manager, nautilus_ui_unmerge_ui (ui_manager,
@ -2111,7 +2112,7 @@ fm_directory_view_finalize (GObject *object)
image_display_policy_changed_callback, view); image_display_policy_changed_callback, view);
g_signal_handlers_disconnect_by_func (nautilus_preferences, g_signal_handlers_disconnect_by_func (nautilus_preferences,
click_policy_changed_callback, view); click_policy_changed_callback, view);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, g_signal_handlers_disconnect_by_func (nautilus_preferences,
sort_directories_first_changed_callback, view); sort_directories_first_changed_callback, view);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE, eel_preferences_remove_callback (NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE,
lockdown_disable_command_line_changed_callback, view); lockdown_disable_command_line_changed_callback, view);

6
src/nautilus-file-management-properties.c
View file

@ -871,9 +871,9 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
eel_preferences_builder_connect_bool (builder, eel_preferences_builder_connect_bool (builder,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH, NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH,
NAUTILUS_PREFERENCES_COMPACT_VIEW_ALL_COLUMNS_SAME_WIDTH); NAUTILUS_PREFERENCES_COMPACT_VIEW_ALL_COLUMNS_SAME_WIDTH);
eel_preferences_builder_connect_bool (builder, bind_builder_bool (builder, nautilus_preferences,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET, NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET,
NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
bind_builder_bool_inverted (builder, nautilus_preferences, bind_builder_bool_inverted (builder, nautilus_preferences,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET, NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET,
NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER); NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER);