diff options
author | Carlos Soriano <csoriano@gnome.org> | 2015-07-20 11:20:04 +0200 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2015-07-20 18:41:48 +0200 |
commit | 3cf7ad637b06afd7b4f589e4c5674eabee2e9737 (patch) | |
tree | 039ee22223248bb23c9b0be5e7f727cc76cd6c72 /src | |
parent | c19bdcdcd30035beb15fba401fa7bcbbb4fc02bc (diff) | |
download | nautilus-3cf7ad637b06afd7b4f589e4c5674eabee2e9737.tar.gz |
toolbar: remove access-date menu item
Since we don't longer show it in Recent, the only places
where we were showing it.
Diffstat (limited to 'src')
-rw-r--r-- | src/nautilus-canvas-view.c | 8 | ||||
-rw-r--r-- | src/nautilus-toolbar-view-menu.xml | 9 | ||||
-rw-r--r-- | src/nautilus-toolbar.c | 10 |
3 files changed, 0 insertions, 27 deletions
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c index e19fb09a9..7bcbebca9 100644 --- a/src/nautilus-canvas-view.c +++ b/src/nautilus-canvas-view.c @@ -107,12 +107,6 @@ struct NautilusCanvasViewDetails gboolean supports_keep_aligned; }; -static gboolean -file_is_not_in_recent (NautilusFile *file) -{ - return !nautilus_file_is_in_recent (file); -} - /* Note that the first item in this list is the default sort, * and that the items show up in the menu in the order they * appear in this list. @@ -137,13 +131,11 @@ static const SortCriterion sort_criteria[] = { NAUTILUS_FILE_SORT_BY_MTIME, "modification date", "modification-date", - file_is_not_in_recent }, { NAUTILUS_FILE_SORT_BY_ATIME, "access date", "access-date", - nautilus_file_is_in_recent }, { NAUTILUS_FILE_SORT_BY_TRASHED_TIME, diff --git a/src/nautilus-toolbar-view-menu.xml b/src/nautilus-toolbar-view-menu.xml index f2e034177..db6fbd85c 100644 --- a/src/nautilus-toolbar-view-menu.xml +++ b/src/nautilus-toolbar-view-menu.xml @@ -123,15 +123,6 @@ </object> </child> <child> - <object class="GtkModelButton" id="sort_access_date"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">Last _Opened</property> - <property name="action-name">view.sort</property> - <property name="action-target">'access-date'</property> - </object> - </child> - <child> <object class="GtkModelButton" id="sort_modification_date"> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index f5154e76e..5d67c833f 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -73,8 +73,6 @@ struct _NautilusToolbarPrivate { GtkWidget *operations_icon; GtkWidget *view_menu_widget; GtkWidget *sort_menu; - GtkWidget *sort_modification_date; - GtkWidget *sort_access_date; GtkWidget *sort_trash_time; GtkWidget *sort_search_relevance; GtkWidget *visible_columns; @@ -769,8 +767,6 @@ nautilus_toolbar_init (NautilusToolbar *self) self->priv->zoom_adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "zoom_adjustment")); self->priv->sort_menu = GTK_WIDGET (gtk_builder_get_object (builder, "sort_menu")); - self->priv->sort_modification_date = GTK_WIDGET (gtk_builder_get_object (builder, "sort_modification_date")); - self->priv->sort_access_date = GTK_WIDGET (gtk_builder_get_object (builder, "sort_access_date")); self->priv->sort_trash_time = GTK_WIDGET (gtk_builder_get_object (builder, "sort_trash_time")); self->priv->sort_search_relevance = GTK_WIDGET (gtk_builder_get_object (builder, "sort_search_relevance")); self->priv->visible_columns = GTK_WIDGET (gtk_builder_get_object (builder, "visible_columns")); @@ -957,10 +953,6 @@ nautilus_toolbar_reset_menus (NautilusToolbar *self) show_sort_trash = TRUE; if (g_strcmp0 (hint, "search-relevance") == 0) show_sort_search = TRUE; - if (g_strcmp0 (hint, "access-date") == 0) - show_sort_access = TRUE; - if (g_strcmp0 (hint, "modification-date") == 0) - show_sort_modification = TRUE; } g_variant_unref (variant); @@ -968,8 +960,6 @@ nautilus_toolbar_reset_menus (NautilusToolbar *self) gtk_widget_set_visible (self->priv->sort_trash_time, show_sort_trash); gtk_widget_set_visible (self->priv->sort_search_relevance, show_sort_search); - gtk_widget_set_visible (self->priv->sort_modification_date, show_sort_modification); - gtk_widget_set_visible (self->priv->sort_access_date, show_sort_access); variant = g_action_group_get_action_state (view_action_group, "zoom-to-level"); gtk_adjustment_set_value (self->priv->zoom_adjustment, |