[gtk+] file chooser: Make search work again
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] file chooser: Make search work again
- Date: Mon, 19 Jan 2015 00:01:31 +0000 (UTC)
commit 1a38c4d066951c9b339e1d26423858cd03181156
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 18 18:59:43 2015 -0500
file chooser: Make search work again
The last round of filechooser redesign work had left
search somewhat dysfunctional. This commit fixes things
up enough that search is once again a working feature
of the file chooser.
gtk/gtkfilechooserwidget.c | 70 ++++++++-------------
gtk/ui/gtkfilechooserwidget.ui | 127 +++++++++++++++++++++++++++++++-------
gtk/ui/gtkfilechooserwidget.ui.h | 5 +-
3 files changed, 136 insertions(+), 66 deletions(-)
---
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 40c7280..44ff413 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -229,7 +229,6 @@ struct _GtkFileChooserWidgetPrivate {
StartupMode startup_mode;
/* OPERATION_MODE_SEARCH */
- GtkWidget *search_bar;
GtkWidget *search_entry;
GtkSearchEngine *search_engine;
GtkQuery *search_query;
@@ -1972,7 +1971,14 @@ location_entry_create (GtkFileChooserWidget *impl)
priv->location_entry = _gtk_file_chooser_entry_new (TRUE);
if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
- gtk_entry_set_placeholder_text (GTK_ENTRY (priv->location_entry), _("Location"));
+ {
+#if 0
+ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->location_entry), GTK_ENTRY_ICON_PRIMARY,
"folder-symbolic");
+ gtk_entry_set_icon_activatable (GTK_ENTRY (priv->location_entry), GTK_ENTRY_ICON_PRIMARY, FALSE);
+#endif
+ gtk_entry_set_placeholder_text (GTK_ENTRY (priv->location_entry), _("Location"));
+ }
+
g_signal_connect (priv->location_entry, "changed",
G_CALLBACK (location_entry_changed_cb), impl);
}
@@ -2457,8 +2463,12 @@ operation_mode_stop (GtkFileChooserWidget *impl, OperationMode mode)
static void
operation_mode_set_enter_location (GtkFileChooserWidget *impl)
{
+ GtkFileChooserWidgetPrivate *priv = impl->priv;
+
location_mode_set (impl, LOCATION_MODE_FILENAME_ENTRY);
location_bar_update (impl);
+ gtk_stack_set_visible_child_name (GTK_STACK (priv->browse_header_stack), "pathbar");
+ gtk_widget_set_sensitive (priv->filter_combo, TRUE);
}
static void
@@ -2467,7 +2477,8 @@ operation_mode_set_browse (GtkFileChooserWidget *impl)
GtkFileChooserWidgetPrivate *priv = impl->priv;
location_bar_update (impl);
- gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), FALSE);
+ gtk_stack_set_visible_child_name (GTK_STACK (priv->browse_header_stack), "pathbar");
+ gtk_widget_set_sensitive (priv->filter_combo, TRUE);
}
static void
@@ -2477,8 +2488,11 @@ operation_mode_set_search (GtkFileChooserWidget *impl)
g_assert (priv->search_model == NULL);
+ location_bar_update (impl);
search_setup_widgets (impl);
- gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), TRUE);
+ gtk_stack_set_visible_child_name (GTK_STACK (priv->browse_header_stack), "search");
+ gtk_widget_set_sensitive (priv->filter_combo, FALSE);
+ gtk_entry_grab_focus_without_selecting (GTK_ENTRY (priv->search_entry));
}
static void
@@ -2492,6 +2506,8 @@ operation_mode_set_recent (GtkFileChooserWidget *impl)
file = g_file_new_for_uri ("recent:///");
gtk_places_sidebar_set_location (GTK_PLACES_SIDEBAR (priv->places_sidebar), file);
g_object_unref (file);
+ gtk_stack_set_visible_child_name (GTK_STACK (priv->browse_header_stack), "pathbar");
+ gtk_widget_set_sensitive (priv->filter_combo, TRUE);
}
static void
@@ -6248,39 +6264,16 @@ search_entry_activate_cb (GtkEntry *entry,
search_start_query (impl, text);
}
-static gboolean
-focus_entry_idle_cb (GtkFileChooserWidget *impl)
+static void
+search_button_clicked_cb (GtkFileChooserWidget *impl)
{
- GtkFileChooserWidgetPrivate *priv = impl->priv;
-
- gdk_threads_enter ();
-
- g_source_destroy (priv->focus_entry_idle);
- priv->focus_entry_idle = NULL;
-
- if (priv->search_entry)
- gtk_widget_grab_focus (priv->search_entry);
-
- gdk_threads_leave ();
-
- return FALSE;
+ operation_mode_set (impl, OPERATION_MODE_SEARCH);
}
static void
-focus_search_entry_in_idle (GtkFileChooserWidget *impl)
+location_button_clicked_cb (GtkFileChooserWidget *impl)
{
- GtkFileChooserWidgetPrivate *priv = impl->priv;
-
- /* bgo#634558 - When the user clicks on the Search entry in the shortcuts
- * pane, we get a selection-changed signal and we set up the search widgets.
- * However, gtk_tree_view_button_press() focuses the treeview *after* making
- * the change to the selection. So, we need to re-focus the search entry
- * after the treeview has finished doing its work; we'll do that in an idle
- * handler.
- */
-
- if (!priv->focus_entry_idle)
- priv->focus_entry_idle = add_idle_while_impl_is_alive (impl, G_CALLBACK (focus_entry_idle_cb));
+ operation_mode_set (impl, OPERATION_MODE_BROWSE);
}
/* Hides the path bar and creates the search entry */
@@ -6308,8 +6301,6 @@ search_setup_widgets (GtkFileChooserWidget *impl)
}
}
- focus_search_entry_in_idle (impl);
-
/* FMQ: hide the filter combo? */
}
@@ -6977,15 +6968,7 @@ desktop_folder_handler (GtkFileChooserWidget *impl)
static void
search_shortcut_handler (GtkFileChooserWidget *impl)
{
- GtkFileChooserWidgetPrivate *priv = impl->priv;
-
operation_mode_set (impl, OPERATION_MODE_SEARCH);
-
- /* we want the entry widget to grab the focus the first
- * time, not the browse_files_tree_view widget.
- */
- if (priv->search_entry)
- gtk_widget_grab_focus (priv->search_entry);
}
/* Handler for the "recent-shortcut" keybinding signal */
@@ -7426,7 +7409,6 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, extra_align);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, extra_and_filters);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, location_entry_box);
- gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, search_bar);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, search_entry);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, list_name_column);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, list_pixbuf_renderer);
@@ -7454,6 +7436,8 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
gtk_widget_class_bind_template_callback (widget_class, places_sidebar_show_error_message_cb);
gtk_widget_class_bind_template_callback (widget_class, places_sidebar_show_enter_location_cb);
gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb);
+ gtk_widget_class_bind_template_callback (widget_class, search_button_clicked_cb);
+ gtk_widget_class_bind_template_callback (widget_class, location_button_clicked_cb);
}
static void
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 61b7635..a783a5c 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -63,7 +63,7 @@
<object class="GtkBox" id="browse_path_bar_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<property name="border_width">6</property>
<child>
<object class="GtkPathBar" id="browse_path_bar">
@@ -79,11 +79,46 @@
</child>
<child>
<object class="GtkButton" id="browse_new_folder_button">
- <property name="label" translatable="yes">Create Fo_lder</property>
+ <property name="tooltip-text" translatable="yes">Create Folder</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="new_folder_button_clicked" swapped="no"/>
+ <style>
+ <class name="image-button"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">list-add-symbolic</property>
+ <property name="icon-size">1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">Search</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="search_button_clicked_cb" swapped="yes"/>
+ <style>
+ <class name="image-button"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">edit-find-symbolic</property>
+ <property name="icon-size">1</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -102,16 +137,82 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no-show-all">True</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<property name="border_width">6</property>
<child>
- <placeholder/>
+ <object class="GtkButton">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">Search</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="search_button_clicked_cb" swapped="yes"/>
+ <style>
+ <class name="image-button"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">edit-find-symbolic</property>
+ <property name="icon-size">1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="name">location</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="search_entry_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="spacing">6</property>
+ <property name="border_width">6</property>
+ <child>
+ <object class="GtkSearchEntry" id="search_entry">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ <signal name="search-changed" handler="search_entry_activate_cb"
swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">Browse</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="location_button_clicked_cb" swapped="true"/>
+ <style>
+ <class name="image-button"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">folder-symbolic</property>
+ <property name="icon-size">1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="name">search</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -127,24 +228,6 @@
</packing>
</child>
<child>
- <object class="GtkSearchBar" id="search_bar">
- <property name="visible">True</property>
- <property name="border_width">0</property>
- <child>
- <object class="GtkSearchEntry" id="search_entry">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
- <signal name="search-changed" handler="search_entry_activate_cb" swapped="no"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="list_and_preview_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/gtk/ui/gtkfilechooserwidget.ui.h b/gtk/ui/gtkfilechooserwidget.ui.h
index 9c8a16a..5872a15 100644
--- a/gtk/ui/gtkfilechooserwidget.ui.h
+++ b/gtk/ui/gtkfilechooserwidget.ui.h
@@ -1,4 +1,7 @@
-N_("Create Fo_lder");
+N_("Create Folder");
+N_("Search");
+N_("Search");
+N_("Browse");
N_("Files");
N_("Name");
N_("Size");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
