diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-02-10 14:29:24 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-02-12 18:19:38 +0100 |
| commit | 27c62f297ed2472a5c7021a8a01a61e6d4735dd1 (patch) | |
| tree | b21233199ed9c6225fa845e5224c98cbe63dc15b /src/nautilus-query-editor.c | |
| parent | 4a7d0a49a0d77e0b4aef030289fd7845db90a763 (diff) | |
| download | nautilus-27c62f297ed2472a5c7021a8a01a61e6d4735dd1.tar.gz | |
preferences: rework preferences window
With designers guidance, rework the preferences window to a better state.
Also, do few improvement on the way, like converting it to a GtkWindow.
Diffstat (limited to 'src/nautilus-query-editor.c')
| -rw-r--r-- | src/nautilus-query-editor.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c index ebfa84fcb..403929e47 100644 --- a/src/nautilus-query-editor.c +++ b/src/nautilus-query-editor.c @@ -81,7 +81,6 @@ settings_search_is_recursive (NautilusQueryEditor *editor) { NautilusQueryEditorPrivate *priv; NautilusFile *file; - gchar *recursive_search_key; gboolean recursive; priv = nautilus_query_editor_get_instance_private (editor); @@ -92,13 +91,13 @@ settings_search_is_recursive (NautilusQueryEditor *editor) file = nautilus_file_get (priv->location); if (nautilus_file_is_remote (file)) { - recursive_search_key = "remote-recursive-search"; + recursive = g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_ALWAYS; } else { - recursive_search_key = "local-recursive-search"; + recursive = g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY || + g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_ALWAYS; } nautilus_file_unref (file); - recursive = g_settings_get_boolean (nautilus_preferences, recursive_search_key); return recursive; } @@ -339,13 +338,7 @@ create_query (NautilusQueryEditor *editor) file = nautilus_file_get (priv->location); query = nautilus_query_new (); - if (nautilus_file_is_remote (file)) { - recursive = g_settings_get_boolean (nautilus_preferences, - "remote-recursive-search"); - } else { - recursive = g_settings_get_boolean (nautilus_preferences, - "local-recursive-search"); - } + recursive = settings_search_is_recursive (editor); nautilus_query_set_text (query, gtk_entry_get_text (GTK_ENTRY (priv->entry))); nautilus_query_set_location (query, priv->location); @@ -397,12 +390,7 @@ static void nautilus_query_editor_init (NautilusQueryEditor *editor) { g_signal_connect (nautilus_preferences, - "changed::remote-recursive-search", - G_CALLBACK (recursive_search_preferences_changed), - editor); - - g_signal_connect (nautilus_preferences, - "changed::local-recursive-search", + "changed::recursive-search", G_CALLBACK (recursive_search_preferences_changed), editor); } |