From 5b9a7c8bf16b781dfc335df9f118f442a3398d9b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 24 Jul 2015 16:26:32 -0400 Subject: [PATCH] file chooser: Note when searching remote locations Inform the user that we won't search recursively when searching in remote locations. --- gtk/gtkfilechooserwidget.c | 6 ++ gtk/ui/gtkfilechooserwidget.ui | 177 ++++++++++++++++++--------------- 2 files changed, 104 insertions(+), 79 deletions(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index d4c4f432e1..991753e861 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -216,6 +216,7 @@ struct _GtkFileChooserWidgetPrivate { GtkWidget *browse_files_stack; GtkWidget *browse_files_swin; GtkWidget *browse_files_tree_view; + GtkWidget *remote_warning_bar; GtkWidget *browse_files_popover; GtkWidget *add_shortcut_item; @@ -3024,6 +3025,7 @@ operation_mode_stop (GtkFileChooserWidget *impl, g_clear_object (&impl->priv->model_for_search); search_stop_searching (impl, TRUE); search_clear_model (impl, TRUE); + gtk_widget_hide (impl->priv->remote_warning_bar); } } @@ -7227,6 +7229,9 @@ search_start_query (GtkFileChooserWidget *impl, G_CALLBACK (search_engine_error_cb), impl); _gtk_search_engine_start (priv->search_engine); + + if (_gtk_file_consider_as_remote (gtk_query_get_location (priv->search_query))) + gtk_widget_show (priv->remote_warning_bar); } /* Callback used when the user presses Enter while typing on the search @@ -8356,6 +8361,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class) gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, rename_file_rename_button); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, rename_file_error_label); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, rename_file_popover); + gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, remote_warning_bar); /* And a *lot* of callbacks to bind ... */ gtk_widget_class_bind_template_callback (widget_class, browse_files_key_press_event_cb); diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui index e86c374426..c7994e8863 100644 --- a/gtk/ui/gtkfilechooserwidget.ui +++ b/gtk/ui/gtkfilechooserwidget.ui @@ -152,95 +152,114 @@ - + True - never + vertical - + True - True - False - - - Files - - - - - - - - - - - - - - - - - - + never - - Name - True - True - - - 6 + + True + True + False + + + Files + + + + + + + + + + + + + + + + - - 10 - end + + Name + True + True + + + 6 + + + + + 10 + end + + + + + + + Location + True + False + True + + + 0 + 10 + start + 6 + + + + + + + Size + fixed + + + 0 + 6 + + + + + + + Modified + fixed + + + 6 + + + + + 6 + + - - - Location - True - False - True - - - 0 - 10 - start - 6 - - - - - - - Size - fixed - - - 0 - 6 - - - - - - - Modified - fixed - - - 6 - - - - - 6 - - + + + True + + + + + + + True + Remote location — only searching the current folder @@ -253,7 +272,7 @@ True - +