diff options
Diffstat (limited to 'file-chooser__typeahead.patch')
| -rw-r--r-- | file-chooser__typeahead.patch | 100 |
1 files changed, 54 insertions, 46 deletions
diff --git a/file-chooser__typeahead.patch b/file-chooser__typeahead.patch index d61f8f732774..eebf7a00660b 100644 --- a/file-chooser__typeahead.patch +++ b/file-chooser__typeahead.patch @@ -1,22 +1,19 @@ -diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserdialog.c ./mod/gtk/gtkfilechooserdialog.c ---- ./org/gtk/gtkfilechooserdialog.c 2017-07-19 04:55:39.000000000 +0200 -+++ ./mod/gtk/gtkfilechooserdialog.c 2017-07-30 13:23:41.280123562 +0200 -@@ -479,11 +479,11 @@ - return; - - dialog->priv->search_setup = TRUE; - - g_object_get (dialog, "use-header-bar", &use_header, NULL); -- if (use_header) -+ if (FALSE && use_header) - { - GtkWidget *button; - GtkWidget *image; - GtkWidget *header; - diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c ---- ./org/gtk/gtkfilechooserwidget.c 2017-07-19 04:55:39.000000000 +0200 -+++ ./mod/gtk/gtkfilechooserwidget.c 2017-07-30 13:24:45.543460079 +0200 +--- ./org/gtk/gtkfilechooserwidget.c 2017-08-22 14:33:11.000000000 +0200 ++++ ./mod/gtk/gtkfilechooserwidget.c 2017-08-25 00:23:59.644034148 +0200 +@@ -1399,11 +1399,11 @@ + { + location_popup_handler (impl, event->string); + return TRUE; + } + } +- else if (gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event)) ++ else if (FALSE && gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event)) + { + if (priv->operation_mode != OPERATION_MODE_SEARCH) + operation_mode_set (impl, OPERATION_MODE_SEARCH); + return TRUE; + } @@ -2476,11 +2476,11 @@ static void file_list_set_sort_column_ids (GtkFileChooserWidget *impl) @@ -30,20 +27,20 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME); gtk_tree_view_column_set_sort_column_id (priv->list_size_column, MODEL_COL_SIZE); gtk_tree_view_column_set_sort_column_id (priv->list_location_column, MODEL_COL_LOCATION_TEXT); -@@ -3246,10 +3246,12 @@ - case OPERATION_MODE_BROWSE: - operation_mode_set_browse (impl); - break; +@@ -7152,12 +7152,10 @@ + { + GList *l, *files, *files_with_info, *infos; + GFile *file; + gboolean select = FALSE; - case OPERATION_MODE_SEARCH: -+ priv->operation_mode = old_mode; -+ return; - operation_mode_set_search (impl); - break; +- if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (impl->priv->search_model), NULL) == 0) +- select = TRUE; - case OPERATION_MODE_RECENT: - operation_mode_set_recent (impl); -@@ -7496,11 +7498,11 @@ + files = NULL; + files_with_info = NULL; + infos = NULL; + for (l = hits; l; l = l->next) +@@ -7496,11 +7494,11 @@ GtkFileChooserWidget *impl = load_data->impl; GtkFileChooserWidgetPrivate *priv = impl->priv; @@ -56,19 +53,30 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1); gtk_tree_view_column_set_sort_column_id (priv->list_size_column, -1); gtk_tree_view_column_set_sort_column_id (priv->list_location_column, -1); -diff -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui ---- ./org/gtk/ui/gtkfilechooserwidget.ui 2017-07-19 04:55:39.000000000 +0200 -+++ ./mod/gtk/ui/gtkfilechooserwidget.ui 2017-07-30 13:25:38.093462683 +0200 -@@ -160,11 +160,11 @@ - <property name="hscrollbar-policy">never</property> - <child> - <object class="GtkTreeView" id="browse_files_tree_view"> - <property name="visible">1</property> - <property name="has-tooltip">1</property> -- <property name="enable-search">0</property> -+ <property name="enable-search">1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="browse_files_tree_view-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Files</property> - </object> - </child> +@@ -8422,14 +8420,10 @@ + gtk_binding_entry_add_signal (binding_set, + GDK_KEY_s, GDK_MOD1_MASK, + "search-shortcut", + 0); + gtk_binding_entry_add_signal (binding_set, +- GDK_KEY_f, GDK_CONTROL_MASK, +- "search-shortcut", +- 0); +- gtk_binding_entry_add_signal (binding_set, + GDK_KEY_r, GDK_MOD1_MASK, + "recent-shortcut", + 0); + gtk_binding_entry_add_signal (binding_set, + GDK_KEY_p, GDK_MOD1_MASK, +@@ -8543,10 +8537,11 @@ + /* Some qdata, qdata can't be set with GtkBuilder */ + g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), "fmq-name", "file_list"); + g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), I_("GtkFileChooserWidget"), impl); + + /* Setup file list treeview */ ++ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (impl->priv->browse_files_tree_view), TRUE); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->priv->browse_files_tree_view)); + gtk_tree_selection_set_select_function (selection, + list_select_func, + impl, NULL); + gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->priv->browse_files_tree_view), |