summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.eu>2019-11-11 21:32:56 +0100
committerRené 'Necoro' Neumann <necoro@necoro.eu>2019-11-11 21:32:56 +0100
commit73ef09e1d5813f72ad801f70fad2ec83b46be126 (patch)
tree41bbaf25f243ae1c6742de37bdce5635e38ab04e
parent372f3c09f22097ad7f076f2f56a959ca9215320f (diff)
downloadpatches-master.tar.gz
patches-master.tar.bz2
patches-master.zip
GTK3 PatchesHEADmaster
-rw-r--r--x11-libs/gtk+:3/README1
-rw-r--r--x11-libs/gtk+:3/file-chooser__places-sidebar.patch81
-rw-r--r--x11-libs/gtk+:3/file-chooser__typeahead.patch82
-rw-r--r--x11-libs/gtk+:3/fixes__atk-bridge-errors.patch17
-rw-r--r--x11-libs/gtk+:3/other__default-settings.patch16
5 files changed, 197 insertions, 0 deletions
diff --git a/x11-libs/gtk+:3/README b/x11-libs/gtk+:3/README
new file mode 100644
index 0000000..d6ef8c1
--- /dev/null
+++ b/x11-libs/gtk+:3/README
@@ -0,0 +1 @@
+Source of patches: https://github.com/krumelmonster/gtk3-mushrooms/ / Arch gtk3-mushrooms
diff --git a/x11-libs/gtk+:3/file-chooser__places-sidebar.patch b/x11-libs/gtk+:3/file-chooser__places-sidebar.patch
new file mode 100644
index 0000000..f9b6b58
--- /dev/null
+++ b/x11-libs/gtk+:3/file-chooser__places-sidebar.patch
@@ -0,0 +1,81 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
+--- a/gtk/gtkplacessidebar.c 2018-09-22 01:04:58.832337000 +0200
++++ b/gtk/gtkplacessidebar.c 2018-09-22 01:24:14.618504785 +0200
+@@ -631,10 +631,11 @@
+ }
+
+ static void
+ add_special_dirs (GtkPlacesSidebar *sidebar)
+ {
++ return;
+ GList *dirs;
+ gint index;
+
+ dirs = NULL;
+ for (index = 0; index < G_USER_N_DIRECTORIES; index++)
+@@ -1418,12 +1419,10 @@
+ BookmarkQueryClosure *clos;
+
+ root = sl->data;
+ is_native = g_file_is_native (root);
+
+- if (_gtk_bookmarks_manager_get_is_builtin (sidebar->bookmarks_manager, root))
+- continue;
+
+ if (sidebar->local_only && !is_native)
+ continue;
+
+ clos = g_slice_new (BookmarkQueryClosure);
+@@ -1527,10 +1526,21 @@
+ _("Other Locations"), start_icon, NULL, "other-locations:///",
+ NULL, NULL, NULL, NULL, 0, _("Show other locations"));
+
+ g_object_unref (start_icon);
+ }
++ else if (!sidebar->local_only)
++ {
++ start_icon = g_themed_icon_new_with_default_fallbacks (ICON_NAME_NETWORK);
++
++ add_place (sidebar, PLACES_BUILT_IN,
++ SECTION_OTHER_LOCATIONS,
++ _("Networks"), start_icon, NULL, "network:///",
++ NULL, NULL, NULL, NULL, 0, _("Show other locations"));
++
++ g_object_unref (start_icon);
++ }
+
+ gtk_widget_show_all (GTK_WIDGET (sidebar));
+ /* We want this hidden by default, but need to do it after the show_all call */
+ gtk_sidebar_row_hide (GTK_SIDEBAR_ROW (sidebar->new_bookmark_row), TRUE);
+
+@@ -4143,11 +4153,11 @@
+ sidebar->dragging_over = FALSE;
+ sidebar->drag_data_info = DND_UNKNOWN;
+
+ gtk_container_add (GTK_CONTAINER (sidebar), sidebar->list_box);
+
+- sidebar->hostname = g_strdup (_("Computer"));
++ sidebar->hostname = g_strdup (_("File System"));
+ sidebar->hostnamed_cancellable = g_cancellable_new ();
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+ NULL,
+ "org.freedesktop.hostname1",
+Tylko w ./mod/gtk: gtkplacessidebar.c.orig
+diff --color -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
+--- a/gtk/ui/gtkfilechooserwidget.ui 2017-11-16 14:21:24.000000000 +0100
++++ b/gtk/ui/gtkfilechooserwidget.ui 2018-09-22 01:21:49.227346988 +0200
+@@ -14,11 +14,12 @@
+ <child>
+ <object class="GtkPlacesSidebar" id="places_sidebar">
+ <property name="visible">1</property>
+ <property name="hscrollbar-policy">never</property>
+ <property name="local-only">1</property>
+- <property name="show-other-locations">1</property>
++ <property name="show-other-locations">0</property>
++ <property name="show-trash">0</property>
+ <style>
+ <class name="sidebar"/>
+ </style>
+ <signal name="open-location" handler="places_sidebar_open_location_cb" swapped="no"/>
+ <signal name="show-error-message" handler="places_sidebar_show_error_message_cb" swapped="no"/>
diff --git a/x11-libs/gtk+:3/file-chooser__typeahead.patch b/x11-libs/gtk+:3/file-chooser__typeahead.patch
new file mode 100644
index 0000000..9c09a80
--- /dev/null
+++ b/x11-libs/gtk+:3/file-chooser__typeahead.patch
@@ -0,0 +1,82 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- a/gtk/gtkfilechooserwidget.c 2017-10-02 18:00:49.000000000 +0200
++++ b/gtk/gtkfilechooserwidget.c 2017-10-30 21:23:33.040328332 +0100
+@@ -1398,11 +1398,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;
+ }
+@@ -2475,11 +2475,11 @@
+ static void
+ file_list_set_sort_column_ids (GtkFileChooserWidget *impl)
+ {
+ GtkFileChooserWidgetPrivate *priv = impl->priv;
+
+- gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
++ gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), 0);
+
+ gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
+ 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);
+@@ -7151,12 +7151,10 @@
+ {
+ GList *l, *files, *files_with_info, *infos;
+ GFile *file;
+ gboolean select = FALSE;
+
+- if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (impl->priv->search_model), NULL) == 0)
+- select = TRUE;
+
+ files = NULL;
+ files_with_info = NULL;
+ infos = NULL;
+ for (l = hits; l; l = l->next)
+@@ -7495,11 +7493,11 @@
+ GtkFileChooserWidget *impl = load_data->impl;
+ GtkFileChooserWidgetPrivate *priv = impl->priv;
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
+ GTK_TREE_MODEL (priv->recent_model));
+- gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
++ gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), 0);
+
+ gtk_tree_view_column_set_sort_column_id (priv->list_name_column, -1);
+ 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);
+@@ -8421,14 +8419,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,
+@@ -8542,10 +8536,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),
diff --git a/x11-libs/gtk+:3/fixes__atk-bridge-errors.patch b/x11-libs/gtk+:3/fixes__atk-bridge-errors.patch
new file mode 100644
index 0000000..e727103
--- /dev/null
+++ b/x11-libs/gtk+:3/fixes__atk-bridge-errors.patch
@@ -0,0 +1,17 @@
+diff --color -U 5 -r -Z -B ./org/gtk/a11y/gtkaccessibility.c ./mod/gtk/a11y/gtkaccessibility.c
+--- a/gtk/a11y/gtkaccessibility.c 2017-10-02 18:00:49.000000000 +0200
++++ b/gtk/a11y/gtkaccessibility.c 2017-10-30 21:26:10.880336153 +0100
+@@ -987,10 +987,13 @@
+
+ _gtk_accessibility_override_atk_util ();
+ do_window_event_initialization ();
+
+ #ifdef GDK_WINDOWING_X11
++ GLogWriterOutput mushrooms_null_writer () { return G_LOG_WRITER_HANDLED; }
++ g_log_set_writer_func (mushrooms_null_writer, NULL, NULL);
+ atk_bridge_adaptor_init (NULL, NULL);
++ g_log_set_writer_func (g_log_writer_default, NULL, NULL);
+ #endif
+
+ atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+ }
diff --git a/x11-libs/gtk+:3/other__default-settings.patch b/x11-libs/gtk+:3/other__default-settings.patch
new file mode 100644
index 0000000..da1960f
--- /dev/null
+++ b/x11-libs/gtk+:3/other__default-settings.patch
@@ -0,0 +1,16 @@
+diff --color -U 5 -r -Z -B ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml
+--- org/gtk/org.gtk.Settings.FileChooser.gschema.xml 2016-10-22 06:17:51.000000000 +0200
++++ mod/gtk/org.gtk.Settings.FileChooser.gschema.xml 2017-10-30 21:18:17.206979350 +0100
+@@ -117,11 +117,11 @@
+ <description>
+ The size (width, height) of the GtkFileChooserDialog's window, in pixels.
+ </description>
+ </key>
+ <key name='startup-mode' enum='org.gtk.Settings.FileChooser.StartupMode'>
+- <default>'recent'</default>
++ <default>'cwd'</default>
+ <summary>Startup mode</summary>
+ <description>
+ Either "recent" or "cwd"; controls whether the file chooser
+ starts up showing the list of recently-used files, or the
+ contents of the current working directory.