diff options
| author | Neil Herald <neil.herald@gmail.com> | 2016-05-13 22:11:21 +0100 |
|---|---|---|
| committer | Neil Herald <neil.herald@gmail.com> | 2016-06-22 23:38:23 +0100 |
| commit | 3fd3bf70adc9c3431cb7601e85ab53a23a2c3d05 (patch) | |
| tree | e975eefd0d676913f1e8c80bbd38a838b9b7e98f | |
| parent | b18989c2505cd072c40e931c666ba6ea9f1dab63 (diff) | |
| download | nautilus-3fd3bf70adc9c3431cb7601e85ab53a23a2c3d05.tar.gz | |
toolbar-view-menu: remove the Search Relevance sort option
This sort option is never shown in the menu and therefore doesn't need
to be in the menu xml. The view is sorted on search relevance when the
user is searching, however all of the sort options are hidden in this
case.
https://bugzilla.gnome.org/show_bug.cgi?id=764632
| -rw-r--r-- | src/nautilus-files-view.c | 9 | ||||
| -rw-r--r-- | src/resources/ui/nautilus-toolbar-view-menu.ui | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 04fac012b..9a0018396 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -264,7 +264,6 @@ struct NautilusFilesViewDetails GtkWidget *view_menu_widget; GtkWidget *sort_menu; GtkWidget *sort_trash_time; - GtkWidget *sort_search_relevance; GtkWidget *visible_columns; GtkWidget *stop; GtkWidget *reload; @@ -6907,7 +6906,7 @@ nautilus_files_view_reset_view_menu (NautilusFilesView *view) GActionGroup *view_action_group; GVariant *variant; GVariantIter iter; - gboolean show_sort_trash, show_sort_search, show_sort_access, show_sort_modification, sort_available; + gboolean show_sort_trash, show_sort_access, show_sort_modification, sort_available; const gchar *hint; g_autofree gchar *zoom_level_percent = NULL; @@ -6917,7 +6916,7 @@ nautilus_files_view_reset_view_menu (NautilusFilesView *view) g_action_group_has_action (view_action_group, "visible-columns")); sort_available = g_action_group_get_action_enabled (view_action_group, "sort"); - show_sort_trash = show_sort_search = show_sort_modification = show_sort_access = FALSE; + show_sort_trash = show_sort_modification = show_sort_access = FALSE; gtk_widget_set_visible (view->details->sort_menu, sort_available); /* We want to make insensitive available actions but that are not current @@ -6935,15 +6934,12 @@ nautilus_files_view_reset_view_menu (NautilusFilesView *view) while (g_variant_iter_next (&iter, "&s", &hint)) { if (g_strcmp0 (hint, "trash-time") == 0) show_sort_trash = TRUE; - if (g_strcmp0 (hint, "search-relevance") == 0) - show_sort_search = TRUE; } g_variant_unref (variant); } gtk_widget_set_visible (view->details->sort_trash_time, show_sort_trash); - gtk_widget_set_visible (view->details->sort_search_relevance, show_sort_search); zoom_level_percent = g_strdup_printf ("%.0f%%", nautilus_files_view_get_zoom_level_percentage (view) * 100.0); gtk_label_set_label (GTK_LABEL (view->details->zoom_level_label), zoom_level_percent); @@ -8264,7 +8260,6 @@ nautilus_files_view_init (NautilusFilesView *view) view->details->sort_menu = GTK_WIDGET (gtk_builder_get_object (builder, "sort_menu")); view->details->sort_trash_time = GTK_WIDGET (gtk_builder_get_object (builder, "sort_trash_time")); - view->details->sort_search_relevance = GTK_WIDGET (gtk_builder_get_object (builder, "sort_search_relevance")); view->details->visible_columns = GTK_WIDGET (gtk_builder_get_object (builder, "visible_columns")); view->details->reload = GTK_WIDGET (gtk_builder_get_object (builder, "reload")); view->details->stop = GTK_WIDGET (gtk_builder_get_object (builder, "stop")); diff --git a/src/resources/ui/nautilus-toolbar-view-menu.ui b/src/resources/ui/nautilus-toolbar-view-menu.ui index f56d54756..6bbe3b26c 100644 --- a/src/resources/ui/nautilus-toolbar-view-menu.ui +++ b/src/resources/ui/nautilus-toolbar-view-menu.ui @@ -260,15 +260,6 @@ </object> </child> <child> - <object class="GtkModelButton" id="sort_search_relevance"> - <property name="visible">False</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">Search _Relevance</property> - <property name="action-name">view.sort</property> - <property name="action-target">'search-relevance'</property> - </object> - </child> - <child> <object class="GtkSeparator"> <property name="visible">True</property> <property name="orientation">horizontal</property> |