diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2015-07-20 11:15:35 +0200 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-07-20 18:41:48 +0200 |
| commit | c19bdcdcd30035beb15fba401fa7bcbbb4fc02bc (patch) | |
| tree | 690a5e7a6e7c07c177860592f4eed43787d268ca | |
| parent | fd871c945720fa4458bd977309e64c7087328c06 (diff) | |
| download | nautilus-c19bdcdcd30035beb15fba401fa7bcbbb4fc02bc.tar.gz | |
toolbar: don't show sort menu in recent
Since we always want to order by recent...
This matchs with latests changes on gtk+ file chooser.
| -rw-r--r-- | src/nautilus-canvas-view.c | 15 | ||||
| -rw-r--r-- | src/nautilus-toolbar.c | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c index 07199c9f6..e19fb09a9 100644 --- a/src/nautilus-canvas-view.c +++ b/src/nautilus-canvas-view.c @@ -1055,6 +1055,18 @@ update_sort_action_state_hint (NautilusCanvasView *canvas_view) g_variant_unref (state_hint); } +static gboolean +showing_recent_directory (NautilusView *view) +{ + NautilusFile *file; + + file = nautilus_view_get_directory_as_file (view); + if (file != NULL) { + return nautilus_file_is_in_recent (file); + } + return FALSE; +} + static void nautilus_canvas_view_update_actions_state (NautilusView *view) { @@ -1103,6 +1115,9 @@ nautilus_canvas_view_update_actions_state (NautilusView *view) action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), "keep-aligned"); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), canvas_view->details->supports_keep_aligned); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), "sort"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + !showing_recent_directory (view)); if (canvas_view->details->supports_keep_aligned) { keep_aligned = nautilus_canvas_container_is_keep_aligned (get_canvas_container (canvas_view)); g_action_change_state (action, g_variant_new_boolean (keep_aligned)); diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index b4934fe9f..f5154e76e 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -929,7 +929,7 @@ nautilus_toolbar_reset_menus (NautilusToolbar *self) GActionGroup *view_action_group; GVariant *variant; GVariantIter iter; - gboolean show_sort_trash, show_sort_search, show_sort_access, show_sort_modification, has_sort; + gboolean show_sort_trash, show_sort_search, show_sort_access, show_sort_modification, enable_sort; const gchar *hint; /* Allow actions from the current view to be activated through @@ -944,11 +944,11 @@ nautilus_toolbar_reset_menus (NautilusToolbar *self) gtk_widget_set_visible (self->priv->visible_columns, g_action_group_has_action (view_action_group, "visible-columns")); - has_sort = g_action_group_has_action (view_action_group, "sort"); + enable_sort = g_action_group_get_action_enabled (view_action_group, "sort"); show_sort_trash = show_sort_search = show_sort_modification = show_sort_access = FALSE; - gtk_widget_set_visible (self->priv->sort_menu, has_sort); + gtk_widget_set_visible (self->priv->sort_menu, enable_sort); - if (has_sort) { + if (enable_sort) { variant = g_action_group_get_action_state_hint (view_action_group, "sort"); g_variant_iter_init (&iter, variant); |