From eb66cf903e4eb43dce7339e760361cd1ca7ceea3 Mon Sep 17 00:00:00 2001 From: Mohammed Sadiq Date: Wed, 21 Sep 2016 19:36:48 +0530 Subject: files-view: better empty state for Trash Implement better empty state for Trash as per new design. https://bugzilla.gnome.org/show_bug.cgi?id=763147 --- po/POTFILES.in | 1 + src/nautilus-files-view.c | 19 +++++++++++++ src/resources/nautilus.gresource.xml | 1 + src/resources/ui/nautilus-trash-is-empty.ui | 42 +++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 src/resources/ui/nautilus-trash-is-empty.ui diff --git a/po/POTFILES.in b/po/POTFILES.in index 8647562f0..277a7ff0a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -85,6 +85,7 @@ src/resources/ui/nautilus-compress-dialog.ui src/resources/ui/nautilus-create-folder-dialog.ui src/resources/ui/nautilus-files-view-context-menus.ui src/resources/ui/nautilus-folder-is-empty.ui +src/resources/ui/nautilus-trash-is-empty.ui src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui src/resources/ui/nautilus-no-search-results.ui src/resources/ui/nautilus-pathbar-context-menu.ui diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 97bff409d..ba19de34c 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -258,6 +258,7 @@ struct NautilusFilesViewDetails /* Empty states */ GtkWidget *folder_is_empty_widget; + GtkWidget *trash_is_empty_widget; GtkWidget *no_search_results_widget; /* Floating bar */ @@ -3353,15 +3354,25 @@ nautilus_files_view_check_empty_states (NautilusFilesView *view) static void real_check_empty_states (NautilusFilesView *view) { + g_autofree gchar *uri = NULL; + gtk_widget_hide (view->details->no_search_results_widget); gtk_widget_hide (view->details->folder_is_empty_widget); + gtk_widget_hide (view->details->trash_is_empty_widget); + if (!view->details->loading && nautilus_files_view_is_empty (view)) { + uri = g_file_get_uri (view->details->location); + if (nautilus_view_is_searching (NAUTILUS_VIEW (view))) { gtk_widget_show (view->details->no_search_results_widget); } + else if (eel_uri_is_trash (uri)) + { + gtk_widget_show (view->details->trash_is_empty_widget); + } else { gtk_widget_show (view->details->folder_is_empty_widget); @@ -9140,6 +9151,14 @@ nautilus_files_view_init (NautilusFilesView *view) TRUE); g_object_unref (builder); + builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-trash-is-empty.ui"); + view->details->trash_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder, "trash_is_empty")); + gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay), view->details->trash_is_empty_widget); + gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (view->details->overlay), + view->details->trash_is_empty_widget, + TRUE); + g_object_unref (builder); + /* Floating bar */ view->details->floating_bar = nautilus_floating_bar_new (NULL, NULL, FALSE); gtk_widget_set_halign (view->details->floating_bar, GTK_ALIGN_END); diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml index 53682b612..720bfa5d5 100644 --- a/src/resources/nautilus.gresource.xml +++ b/src/resources/nautilus.gresource.xml @@ -17,6 +17,7 @@ ui/nautilus-window.ui ui/nautilus-no-search-results.ui ui/nautilus-folder-is-empty.ui + ui/nautilus-trash-is-empty.ui gtk/help-overlay.ui ui/nautilus-batch-rename-dialog.ui ../gtk/nautilusgtkplacesview.ui diff --git a/src/resources/ui/nautilus-trash-is-empty.ui b/src/resources/ui/nautilus-trash-is-empty.ui new file mode 100644 index 000000000..d0d9412d5 --- /dev/null +++ b/src/resources/ui/nautilus-trash-is-empty.ui @@ -0,0 +1,42 @@ + + + + False + 12 + True + True + center + center + + + + True + user-trash-symbolic + 72 + + + + 0 + 0 + + + + + True + Trash is Empty + + + + + + + 0 + 1 + + + + -- cgit v1.2.1