diff options
author | Carlos Soriano <csoriano@gnome.org> | 2016-01-31 17:57:23 +0100 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2016-02-02 22:22:38 +0100 |
commit | db8267a6a6ef0d2a2b660f1dedded8d15c8927b5 (patch) | |
tree | c85573dc8f664878cd13ed88b6a32ec49795fab7 | |
parent | 44a3363fdf261a40bcefdd08693f70c2f5f42e55 (diff) | |
download | nautilus-db8267a6a6ef0d2a2b660f1dedded8d15c8927b5.tar.gz |
files-view: remove remote warning bar
We use it now directly in the search bar.
-rw-r--r-- | src/nautilus-files-view.c | 22 | ||||
-rw-r--r-- | src/resources/nautilus.gresource.xml | 1 | ||||
-rw-r--r-- | src/resources/ui/nautilus-remote-warning-bar.ui | 11 |
3 files changed, 0 insertions, 34 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 953962afa..e6058b0e9 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -170,7 +170,6 @@ struct NautilusFilesViewDetails { /* Main components */ GtkWidget *overlay; - GtkWidget *remote_warning_bar; NautilusWindowSlot *slot; NautilusDirectory *model; @@ -7163,20 +7162,6 @@ load_directory (NautilusFilesView *view, } static void -check_remote_warning_bar (NautilusFilesView *view) -{ - if (nautilus_view_is_searching (NAUTILUS_VIEW (view))) { - if (showing_remote_directory (view)) - gtk_widget_show_all (view->details->remote_warning_bar); - else - gtk_widget_hide (view->details->remote_warning_bar); - } else { - gtk_widget_hide (view->details->remote_warning_bar); - } -} - - -static void finish_loading (NautilusFilesView *view) { NautilusFileAttributes attributes; @@ -7191,7 +7176,6 @@ finish_loading (NautilusFilesView *view) nautilus_profile_end ("BEGIN_LOADING"); check_empty_states (view); - check_remote_warning_bar (view); if (nautilus_directory_are_all_files_seen (view->details->model)) { /* Unschedule a pending update and schedule a new one with the minimal @@ -7904,7 +7888,6 @@ set_search_query_internal (NautilusFilesView *files_view, nautilus_view_set_location (NAUTILUS_VIEW (files_view), location); } } - check_remote_warning_bar (files_view); g_clear_object (&location); } @@ -8137,14 +8120,9 @@ nautilus_files_view_init (NautilusFilesView *view) view->details->overlay = gtk_overlay_new (); gtk_widget_set_vexpand (view->details->overlay, TRUE); gtk_widget_set_hexpand (view->details->overlay, TRUE); - builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-remote-warning-bar.ui"); - view->details->remote_warning_bar = GTK_WIDGET (gtk_builder_get_object (builder, "remote_warning_bar")); gtk_container_add (GTK_CONTAINER (view), view->details->overlay); - gtk_container_add (GTK_CONTAINER (view), view->details->remote_warning_bar); gtk_widget_show (view->details->overlay); - g_object_unref (builder); - /* NautilusFloatingBar listen to its parent's 'enter-notify-event' signal * and GtkOverlay doesn't have it enabled by default, so we have to add them * here. diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml index c961c5f50..853f7d45f 100644 --- a/src/resources/nautilus.gresource.xml +++ b/src/resources/nautilus.gresource.xml @@ -16,7 +16,6 @@ <file>ui/nautilus-window.ui</file> <file>ui/nautilus-no-search-results.ui</file> <file>ui/nautilus-folder-is-empty.ui</file> - <file>ui/nautilus-remote-warning-bar.ui</file> <file>gtk/help-overlay.ui</file> <file alias="gtk/gtkplacesview.ui">../gtk/gtkplacesview.ui</file> <file alias="gtk/gtkplacesviewrow.ui">../gtk/gtkplacesviewrow.ui</file> diff --git a/src/resources/ui/nautilus-remote-warning-bar.ui b/src/resources/ui/nautilus-remote-warning-bar.ui deleted file mode 100644 index 322289102..000000000 --- a/src/resources/ui/nautilus-remote-warning-bar.ui +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <object class="GtkActionBar" id="remote_warning_bar"> - <child type="center"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="label" translatable="yes">Remote location — only searching the current folder</property> - </object> - </child> - </object> -</interface> |