diff options
-rw-r--r-- | .SRCINFO | 48 | ||||
-rw-r--r-- | PKGBUILD | 60 | ||||
-rw-r--r-- | appearance__buttons-menus-icons.patch | 57 | ||||
-rw-r--r-- | appearance__disable-backdrop.patch | 13 | ||||
-rw-r--r-- | appearance__file-chooser.patch | 29 | ||||
-rw-r--r-- | appearance__message-dialogs.patch | 149 | ||||
-rw-r--r-- | appearance__print-dialog.patch | 51 | ||||
-rw-r--r-- | appearance__smaller-statusbar.patch | 15 | ||||
-rw-r--r-- | csd__clean-headerbar.patch | 82 | ||||
-rw-r--r-- | csd__disabled-by-default.patch | 19 | ||||
-rw-r--r-- | csd__server-side-shadow.patch | 13 | ||||
-rw-r--r-- | file-chooser__places-sidebar.patch | 62 | ||||
-rw-r--r-- | file-chooser__typeahead.patch | 59 | ||||
-rw-r--r-- | fixes__atk-bridge-errors.patch | 15 | ||||
-rw-r--r-- | fixes__labels-wrapping.patch | 19 | ||||
-rw-r--r-- | fixes__too-large-menu-covers-bar.disabled-patch | 21 | ||||
-rw-r--r-- | other__default-settings.patch | 39 | ||||
-rw-r--r-- | other__hide-insert-emoji.patch | 28 | ||||
-rw-r--r-- | other__mnemonics-delay.patch | 13 | ||||
-rw-r--r-- | popovers__color-chooser.patch | 22 | ||||
-rw-r--r-- | popovers__file-chooser-list.patch | 61 | ||||
-rw-r--r-- | popovers__places-sidebar.patch | 146 | ||||
-rw-r--r-- | series | 20 | ||||
-rw-r--r-- | smaller-adwaita.css | 98 |
24 files changed, 8 insertions, 1131 deletions
@@ -1,7 +1,7 @@ pkgbase = gtk3-classic pkgdesc = GTK3 patched to provide a more classic experience pkgver = 3.24.28 - pkgrel = 1 + pkgrel = 2 url = https://github.com/lah7/gtk3-classic install = gtk3.install arch = x86_64 @@ -68,54 +68,12 @@ pkgbase = gtk3-classic conflicts = gtk3 conflicts = gtk3-typeahead conflicts = gtk3-print-backends - source = series - source = appearance__buttons-menus-icons.patch - source = appearance__disable-backdrop.patch - source = appearance__file-chooser.patch - source = appearance__message-dialogs.patch - source = appearance__print-dialog.patch - source = appearance__smaller-statusbar.patch - source = csd__clean-headerbar.patch - source = csd__disabled-by-default.patch - source = csd__server-side-shadow.patch - source = file-chooser__places-sidebar.patch - source = file-chooser__typeahead.patch - source = fixes__atk-bridge-errors.patch - source = fixes__labels-wrapping.patch - source = fixes__too-large-menu-covers-bar.disabled-patch - source = other__default-settings.patch - source = other__hide-insert-emoji.patch - source = other__mnemonics-delay.patch - source = popovers__color-chooser.patch - source = popovers__file-chooser-list.patch - source = popovers__places-sidebar.patch - source = smaller-adwaita.css + source = git+https://github.com/lah7/gtk3-classic.git#commit=ed8470be4939999902fd643d8c281619dd31add1 source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.28.tar.xz source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=408873e9af613dc26f6d434fe489735fb8c5de75 source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=408873e9af613dc26f6d434fe489735fb8c5de75 source = README.md - sha256sums = 4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c - sha256sums = 6de32e1bee6bf4307aaec072fc8431b044e73299720a490298b8c1b7c502e039 - sha256sums = c8f6be1df687bf2ccaaeff63fffdc13e2c1d41f89ad1dfa391120c509dba7f33 - sha256sums = 760bd3d65b3c5c0be19311d3b9d2be1f33c3bec198bc470de5afe23f5d488b8f - sha256sums = 00927690718c65f6b3c025e2e919028f41cd522c573964dd7fdc31b3022b983f - sha256sums = db82bc4647eda7cc102590d5cfffd8524cf126a704358096e0e66f5c068fe46f - sha256sums = f29097aaa6fb8b99ce1a4659856dbc290d299befb1b09fd6158cbb3f539d890c - sha256sums = 110d2a2d8fc8f3f4ad1b40abd319f18fbb571b1f1bc121de1a8e0037eb3d9df8 - sha256sums = caa4da5e786a38e788617d6c9a844dfc604038d2a5d57033273859cad46d14cd - sha256sums = cf26ab623fec6fc4f24628bdbe4b81ba5f56e8e0c61de78474d5c2411901931a - sha256sums = 57b7b7725b9afe24dc29c6315e3162f297632525b32e329e18b32aba1112eed2 - sha256sums = c6fd146e7ab332dd9a394b666b19e6ba7d6ac0932f33fb396f66630134257309 - sha256sums = 54fb3a39475644abaded2ac2db32c72ce8c36ee7b98ced0ee52a3f89dcac8d83 - sha256sums = 7157b665e2ae724bb6abe8fc382d7178dc4d8d00f29bc63ed2942307ff41914b - sha256sums = 2b10b436ebcf8c124fac6e7867f0bf0573ecfb70130893fea37724c5f6719caf - sha256sums = cad4baea9e4d7af33814f6430cc700357e43f5ba567ea16b87e1876e23e382a1 - sha256sums = 974374f2799aaa48b9ded985c47d2dda45d2fcdcd63f1749e74b243279467d49 - sha256sums = 9761a289cf93558ec67bb498b765ccb757027b10071da938ff14fca695a0103d - sha256sums = bf0e188ba6cfb24b506e4eab7e62a020348cce307d4eecde571227a058c441ad - sha256sums = 17aa98262b96817396c74c303c83eee2a0c9c94b10e31d8de48a44cb17b08dc1 - sha256sums = af2d2d4a0d876f9abc350a1cdb09ffc016a8894ee3c46030c3d90c6e99b27c5a - sha256sums = ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31 + sha256sums = SKIP sha256sums = b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6 sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202 sha256sums = a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229 @@ -11,7 +11,7 @@ _gtkver=3.24.28 pkgbase=gtk3-classic pkgname=($pkgbase lib32-$pkgbase) pkgver=${_gtkver} -pkgrel=1 +pkgrel=2 pkgdesc="GTK3 patched to provide a more classic experience" url="https://github.com/lah7/gtk3-classic" conflicts=(gtk3 gtk3-typeahead gtk3-print-backends) @@ -34,63 +34,13 @@ makedepends=( ) install=gtk3.install source=( - # Patch files. - series - appearance__buttons-menus-icons.patch - appearance__disable-backdrop.patch - appearance__file-chooser.patch - appearance__message-dialogs.patch - appearance__print-dialog.patch - appearance__smaller-statusbar.patch - csd__clean-headerbar.patch - csd__disabled-by-default.patch - csd__server-side-shadow.patch - file-chooser__places-sidebar.patch - file-chooser__typeahead.patch - fixes__atk-bridge-errors.patch - fixes__labels-wrapping.patch - fixes__too-large-menu-covers-bar.disabled-patch - other__default-settings.patch - other__hide-insert-emoji.patch - other__mnemonics-delay.patch - popovers__color-chooser.patch - popovers__file-chooser-list.patch - popovers__places-sidebar.patch - - # Theme CSS stylesheet. - smaller-adwaita.css - - # GTK source code. + git+$url.git#commit=ed8470be4939999902fd643d8c281619dd31add1 "https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$_gtkver.tar.xz" - - # Arch Linux package files. "settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=$__arch_pkg_commit" "gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=$__arch_pkg_commit" - README.md ) -sha256sums=('4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c' - '6de32e1bee6bf4307aaec072fc8431b044e73299720a490298b8c1b7c502e039' - 'c8f6be1df687bf2ccaaeff63fffdc13e2c1d41f89ad1dfa391120c509dba7f33' - '760bd3d65b3c5c0be19311d3b9d2be1f33c3bec198bc470de5afe23f5d488b8f' - '00927690718c65f6b3c025e2e919028f41cd522c573964dd7fdc31b3022b983f' - 'db82bc4647eda7cc102590d5cfffd8524cf126a704358096e0e66f5c068fe46f' - 'f29097aaa6fb8b99ce1a4659856dbc290d299befb1b09fd6158cbb3f539d890c' - '110d2a2d8fc8f3f4ad1b40abd319f18fbb571b1f1bc121de1a8e0037eb3d9df8' - 'caa4da5e786a38e788617d6c9a844dfc604038d2a5d57033273859cad46d14cd' - 'cf26ab623fec6fc4f24628bdbe4b81ba5f56e8e0c61de78474d5c2411901931a' - '57b7b7725b9afe24dc29c6315e3162f297632525b32e329e18b32aba1112eed2' - 'c6fd146e7ab332dd9a394b666b19e6ba7d6ac0932f33fb396f66630134257309' - '54fb3a39475644abaded2ac2db32c72ce8c36ee7b98ced0ee52a3f89dcac8d83' - '7157b665e2ae724bb6abe8fc382d7178dc4d8d00f29bc63ed2942307ff41914b' - '2b10b436ebcf8c124fac6e7867f0bf0573ecfb70130893fea37724c5f6719caf' - 'cad4baea9e4d7af33814f6430cc700357e43f5ba567ea16b87e1876e23e382a1' - '974374f2799aaa48b9ded985c47d2dda45d2fcdcd63f1749e74b243279467d49' - '9761a289cf93558ec67bb498b765ccb757027b10071da938ff14fca695a0103d' - 'bf0e188ba6cfb24b506e4eab7e62a020348cce307d4eecde571227a058c441ad' - '17aa98262b96817396c74c303c83eee2a0c9c94b10e31d8de48a44cb17b08dc1' - 'af2d2d4a0d876f9abc350a1cdb09ffc016a8894ee3c46030c3d90c6e99b27c5a' - 'ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31' +sha256sums=('SKIP' 'b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229' @@ -99,10 +49,10 @@ sha256sums=('4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c' prepare() { cd gtk+-$_gtkver - QUILT_PATCHES=.. quilt push -av + QUILT_PATCHES=../$pkgbase quilt push -av rm -f "$srcdir"/gtk+-"$_gtkver"/gtk/theme/Adwaita/gtk-contained{,-dark}.css - cat "$srcdir/smaller-adwaita.css" | tee -a "$srcdir"/gtk+-"$_gtkver"/gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null + cat "$srcdir/$pkgbase/smaller-adwaita.css" | tee -a "$srcdir"/gtk+-"$_gtkver"/gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null } build() diff --git a/appearance__buttons-menus-icons.patch b/appearance__buttons-menus-icons.patch deleted file mode 100644 index 201d80f2d994..000000000000 --- a/appearance__buttons-menus-icons.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: b/gtk/gtkbutton.c -=================================================================== ---- a/gtk/gtkbutton.c -+++ b/gtk/gtkbutton.c -@@ -2164,6 +2164,27 @@ gtk_button_set_label (GtkButton *butto - g_return_if_fail (GTK_IS_BUTTON (button)); - - priv = button->priv; -+ if (priv->image == NULL) -+ { -+ gchar *use_this_icon = NULL; -+ if (g_strcmp0 (label, _("_Select")) == 0 || g_strcmp0 (label, _("_OK")) == 0) use_this_icon = "gtk-ok"; -+ else if (g_strcmp0 (label, _("_Cancel")) == 0) use_this_icon = "gtk-cancel"; -+ else if (g_strcmp0 (label, _("_Close")) == 0) use_this_icon = "gtk-close"; -+ else if (g_strcmp0 (label, _("_Yes")) == 0) use_this_icon = "gtk-yes"; -+ else if (g_strcmp0 (label, _("_No")) == 0) use_this_icon = "gtk-no"; -+ else if (g_strcmp0 (label, _("_Print")) == 0) use_this_icon = "gtk-print"; -+ else if (g_strcmp0 (label, _("Pre_view")) == 0) use_this_icon = "gtk-print-preview"; -+ else if (g_strcmp0 (label, _("_Open")) == 0) use_this_icon = "gtk-open"; -+ else if (g_strcmp0 (label, _("_Save")) == 0) use_this_icon = "gtk-save"; -+ else if (g_strcmp0 (label, _("_Apply")) == 0) use_this_icon = "gtk-apply"; -+ else if (g_strcmp0 (label, _("_Stop")) == 0) use_this_icon = "gtk-stop"; -+ else if (g_strcmp0 (label, _("_Delete")) == 0) use_this_icon = "gtk-delete"; -+ else if (g_strcmp0 (label, _("_Remove")) == 0) use_this_icon = "gtk-remove"; -+ else if (g_strcmp0 (label, _("_Add")) == 0) use_this_icon = "gtk-add"; -+ else if (g_strcmp0 (label, _("_Help")) == 0) use_this_icon = "gtk-help"; -+ if (use_this_icon) -+ g_object_set (button, "image", gtk_image_new_from_icon_name (use_this_icon, GTK_ICON_SIZE_BUTTON), NULL); -+ } - - new_label = g_strdup (label); - g_free (priv->label_text); -Index: b/gtk/gtkmenuitem.c -=================================================================== ---- a/gtk/gtkmenuitem.c -+++ b/gtk/gtkmenuitem.c -@@ -1010,6 +1010,20 @@ gtk_menu_item_new_with_label (const gcha - GtkWidget* - gtk_menu_item_new_with_mnemonic (const gchar *label) - { -+ gchar *use_this_icon = NULL; -+ if (g_strcmp0 (label, _("Copy _Link Address")) == 0 || g_strcmp0 (label, _("_Copy")) == 0 -+ || g_strcmp0 (label, _("Copy URL")) == 0) use_this_icon = "gtk-copy"; -+ else if (g_strcmp0 (label, _("Cu_t")) == 0) use_this_icon = "gtk-cut"; -+ else if (g_strcmp0 (label, _("_Paste")) == 0) use_this_icon = "gtk-paste"; -+ else if (g_strcmp0 (label, _("_Delete")) == 0) use_this_icon = "gtk-delete"; -+ else if (g_strcmp0 (label, _("Select _All")) == 0) use_this_icon = "gtk-select-all"; -+ else if (g_strcmp0 (label, _("_Open Link")) == 0) use_this_icon = "gtk-jump-to"; -+ if (use_this_icon) -+ return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM, -+ "use-underline", TRUE, -+ "label", label, -+ "image", gtk_image_new_from_icon_name (use_this_icon, GTK_ICON_SIZE_MENU), -+ NULL); - return g_object_new (GTK_TYPE_MENU_ITEM, - "use-underline", TRUE, - "label", label, diff --git a/appearance__disable-backdrop.patch b/appearance__disable-backdrop.patch deleted file mode 100644 index 7f83409a19c0..000000000000 --- a/appearance__disable-backdrop.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/gtk/gtkwindow.c -=================================================================== ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -8017,7 +8017,7 @@ gtk_window_state_event (GtkWidget - GtkWindow *window = GTK_WINDOW (widget); - GtkWindowPrivate *priv = window->priv; - -- if (event->changed_mask & GDK_WINDOW_STATE_FOCUSED) -+ if ((event->changed_mask & GDK_WINDOW_STATE_FOCUSED) && priv->client_decorated) - ensure_state_flag_backdrop (widget); - - if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) diff --git a/appearance__file-chooser.patch b/appearance__file-chooser.patch deleted file mode 100644 index 5681fcfe0f6d..000000000000 --- a/appearance__file-chooser.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: b/gtk/gtkfilechooserwidget.c -=================================================================== ---- a/gtk/gtkfilechooserwidget.c -+++ b/gtk/gtkfilechooserwidget.c -@@ -79,6 +79,7 @@ - #include "gtkseparator.h" - #include "gtkmodelbutton.h" - #include "gtkgesturelongpress.h" -+#include "gtkcssprovider.h" - - #include <cairo-gobject.h> - -@@ -8826,6 +8827,16 @@ post_process_ui (GtkFileChooserWidget *i - gtk_popover_set_relative_to (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->browse_files_tree_view); - - add_actions (impl); -+ static gboolean style_added = FALSE; -+ if (!style_added) -+ { -+ style_added = TRUE; -+ GtkCssProvider *provider = gtk_css_provider_new (); -+ gtk_css_provider_load_from_data (provider, -+ "filechooser .sidebar-icon, filechooser .path-bar, filechooser .path-bar + button { opacity: 1; -gtk-icon-style: regular; }", -1, NULL); -+ gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)), -+ GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ } - } - - void diff --git a/appearance__message-dialogs.patch b/appearance__message-dialogs.patch deleted file mode 100644 index 1b993d84c8a9..000000000000 --- a/appearance__message-dialogs.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: b/gtk/gtkdialog.c -=================================================================== ---- a/gtk/gtkdialog.c -+++ b/gtk/gtkdialog.c -@@ -700,12 +700,12 @@ update_spacings (GtkDialog *dialog) - - /* don't set spacing when buttons are linked */ - if (gtk_button_box_get_layout (GTK_BUTTON_BOX (priv->action_area)) != GTK_BUTTONBOX_EXPAND) -- gtk_box_set_spacing (GTK_BOX (priv->action_area), button_spacing); -+ gtk_box_set_spacing (GTK_BOX (priv->action_area), (button_spacing == 0) ? 6 : button_spacing); - - if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->action_area))) - { - gtk_container_set_border_width (GTK_CONTAINER (priv->action_area), -- action_area_border); -+ (action_area_border == 0) ? 5 : action_area_border); - _gtk_container_set_border_width_set (GTK_CONTAINER (priv->action_area), FALSE); - } - } -Index: b/gtk/gtkmessagedialog.c -=================================================================== ---- a/gtk/gtkmessagedialog.c -+++ b/gtk/gtkmessagedialog.c -@@ -37,6 +37,7 @@ - #include "gtkintl.h" - #include "gtkprivate.h" - #include "gtktypebuiltins.h" -+#include "gtkcssprovider.h" - - /** - * SECTION:gtkmessagedialog -@@ -327,7 +328,17 @@ gtk_message_dialog_init (GtkMessageDialo - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); - G_GNUC_END_IGNORE_DEPRECATIONS -- gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_EXPAND); -+ static gboolean style_added = FALSE; -+ if (!style_added) -+ { -+ style_added = TRUE; -+ GtkCssProvider *provider = gtk_css_provider_new (); -+ gtk_css_provider_load_from_data (provider, -+ "messagedialog > *, messagedialog buttonbox.dialog-action-area, messagedialog box.dialog-action-box { margin: 0; margin-top: 0; padding: 0; }", -+ -1, NULL); -+ gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (GTK_WIDGET (dialog)), -+ GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ } - - settings = gtk_widget_get_settings (GTK_WIDGET (dialog)); - g_object_get (settings, "gtk-keynav-use-caret", &use_caret, NULL); -@@ -372,6 +383,7 @@ setup_type (GtkMessageDialog *dialog, - { - GtkMessageDialogPrivate *priv = dialog->priv; - const gchar *name = NULL; -+ const gchar *icon = NULL; - AtkObject *atk_obj; - - if (priv->message_type == type) -@@ -383,18 +395,22 @@ setup_type (GtkMessageDialog *dialog, - { - case GTK_MESSAGE_INFO: - name = _("Information"); -+ icon = "gtk-dialog-info"; - break; - - case GTK_MESSAGE_QUESTION: - name = _("Question"); -+ icon = "gtk-dialog-question"; - break; - - case GTK_MESSAGE_WARNING: - name = _("Warning"); -+ icon = "gtk-dialog-warning"; - break; - - case GTK_MESSAGE_ERROR: - name = _("Error"); -+ icon = "gtk-dialog-error"; - break; - - case GTK_MESSAGE_OTHER: -@@ -405,6 +421,12 @@ setup_type (GtkMessageDialog *dialog, - break; - } - -+ if (icon) -+ { -+ GtkWidget *image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_DIALOG); -+ g_object_set (image, "visible", TRUE, NULL); -+ g_object_set (dialog, "image", image, NULL); -+ } - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog)); - if (GTK_IS_ACCESSIBLE (atk_obj)) - { -Index: b/gtk/ui/gtkmessagedialog.ui -=================================================================== ---- a/gtk/ui/gtkmessagedialog.ui -+++ b/gtk/ui/gtkmessagedialog.ui -@@ -6,6 +6,7 @@ - <property name="resizable">0</property> - <property name="type-hint">dialog</property> - <property name="skip-taskbar-hint">1</property> -+ <property name="border-width">5</property> - <child internal-child="headerbar"> - <object class="GtkHeaderBar" id="headerbar1"> - <property name="visible">1</property> -@@ -14,23 +15,25 @@ - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox1"> - <property name="orientation">vertical</property> -- <property name="spacing">20</property> -- <property name="border-width">0</property> -+ <property name="spacing">8</property> -+ <property name="border-width">2</property> - <child> - <object class="GtkBox" id="box"> - <property name="visible">1</property> -- <property name="margin-start">30</property> -- <property name="margin-end">30</property> -- <property name="spacing">30</property> -+ <property name="margin-start">2</property> -+ <property name="margin-end">2</property> -+ <property name="spacing">12</property> -+ <property name="border-width">5</property> - <child> - <object class="GtkBox" id="message_area"> - <property name="visible">1</property> - <property name="orientation">vertical</property> -- <property name="spacing">10</property> -+ <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">1</property> -- <property name="halign">center</property> -+ <property name="halign">start</property> -+ <property name="xalign">0</property> - <property name="valign">start</property> - <property name="wrap">1</property> - <property name="max-width-chars">60</property> -@@ -43,7 +46,8 @@ - <object class="GtkLabel" id="secondary_label"> - <property name="no-show-all">1</property> - <property name="margin-bottom">2</property> -- <property name="halign">center</property> -+ <property name="halign">start</property> -+ <property name="xalign">0</property> - <property name="valign">start</property> - <property name="wrap">1</property> - <property name="max-width-chars">60</property> diff --git a/appearance__print-dialog.patch b/appearance__print-dialog.patch deleted file mode 100644 index cc5ad6650f9e..000000000000 --- a/appearance__print-dialog.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: b/gtk/gtkprintunixdialog.c -=================================================================== ---- a/gtk/gtkprintunixdialog.c -+++ b/gtk/gtkprintunixdialog.c -@@ -750,6 +750,11 @@ gtk_print_unix_dialog_init (GtkPrintUnix - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - widget = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - gtk_widget_set_sensitive (widget, FALSE); -+ GtkCssProvider *provider = gtk_css_provider_new (); -+ gtk_css_provider_load_from_data (provider, ".dialog-action-box { margin: 0; }", -1, NULL); -+ GtkStyleContext *context = gtk_widget_get_style_context (gtk_widget_get_parent (gtk_dialog_get_action_area (GTK_DIALOG (dialog)))); -+ gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ gtk_style_context_save (context); - - /* Treeview auxiliary functions need to be setup here */ - gtk_tree_model_filter_set_visible_func (priv->printer_list_filter, -Index: b/gtk/ui/gtkprintunixdialog.ui -=================================================================== ---- a/gtk/ui/gtkprintunixdialog.ui -+++ b/gtk/ui/gtkprintunixdialog.ui -@@ -48,6 +48,7 @@ - <property name="step-increment">1</property> - </object> - <template class="GtkPrintUnixDialog" parent="GtkDialog"> -+ <property name="border-width">5</property> - <property name="can-focus">False</property> - <property name="type-hint">dialog</property> - <signal name="notify::page-setup" handler="redraw_page_layout_preview" swapped="no"/> -@@ -56,19 +57,19 @@ - <object class="GtkBox" id="dialog-vbox1"> - <property name="orientation">vertical</property> - <property name="spacing">2</property> -- <property name="border-width">0</property> -+ <property name="border-width">2</property> - <style> -- <class name="view"/> - </style> - <child> - <object class="GtkBox" id="box1"> -+ <property name="border-width">5</property> - <property name="visible">1</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkNotebook" id="notebook"> - <property name="visible">1</property> - <property name="can-focus">1</property> -- <property name="show-border">0</property> -+ <property name="show-border">1</property> - <child> - <object class="GtkBox" id="general_main_box"> - <property name="visible">1</property> diff --git a/appearance__smaller-statusbar.patch b/appearance__smaller-statusbar.patch deleted file mode 100644 index ed423e1ef34b..000000000000 --- a/appearance__smaller-statusbar.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/gtk/ui/gtkstatusbar.ui -=================================================================== ---- a/gtk/ui/gtkstatusbar.ui -+++ b/gtk/ui/gtkstatusbar.ui -@@ -5,8 +5,8 @@ - <property name="spacing">2</property> - <property name="margin-start">10</property> - <property name="margin-end">10</property> -- <property name="margin-top">6</property> -- <property name="margin-bottom">6</property> -+ <property name="margin-top">1</property> -+ <property name="margin-bottom">1</property> - <child> - <object class="GtkFrame" id="frame"> - <property name="visible">1</property> diff --git a/csd__clean-headerbar.patch b/csd__clean-headerbar.patch deleted file mode 100644 index 09612d4ab68e..000000000000 --- a/csd__clean-headerbar.patch +++ /dev/null @@ -1,82 +0,0 @@ -Index: b/gtk/gtkheaderbar.c -=================================================================== ---- a/gtk/gtkheaderbar.c -+++ b/gtk/gtkheaderbar.c -@@ -300,6 +300,27 @@ _gtk_header_bar_update_window_buttons (G - - priv->titlebar_icon = NULL; - -+ gboolean csd_cleaned_headerbar = (!gtk_style_context_has_class (gtk_widget_get_style_context (toplevel), "csd") && -+ !gtk_style_context_has_class (gtk_widget_get_style_context (toplevel), "solid-csd")); -+ if (csd_cleaned_headerbar) -+ { -+ if (priv->label_box != NULL) -+ { -+ priv->label_box = NULL; -+ priv->title_label = NULL; -+ priv->subtitle_label = NULL; -+ } -+ static gboolean style_added = FALSE; -+ if (!style_added) -+ { -+ style_added = TRUE; -+ GtkCssProvider *provider = gtk_css_provider_new (); -+ gtk_css_provider_load_from_data (provider, -+ "headerbar, .titlebar { border-radius: 0; border-top: 0; box-shadow: none; }", -1, NULL); -+ gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (widget), -+ GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ } -+ } - if (!priv->shows_wm_decorations) - return; - -@@ -327,6 +348,8 @@ _gtk_header_bar_update_window_buttons (G - gtk_window_get_transient_for (window) == NULL && - gtk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_NORMAL); - -+ if (csd_cleaned_headerbar) -+ layout_desc = strstr (layout_desc, "menu") ? g_strdup ("menu") : g_strdup (""); - tokens = g_strsplit (layout_desc, ":", 2); - if (tokens) - { -@@ -391,9 +414,9 @@ _gtk_header_bar_update_window_buttons (G - atk_object_set_name (accessible, _("Application menu")); - - priv->titlebar_icon = image; -- if (!_gtk_header_bar_update_window_icon (bar, window)) -+ if (csd_cleaned_headerbar || !_gtk_header_bar_update_window_icon (bar, window)) - gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), -- "application-x-executable-symbolic", GTK_ICON_SIZE_MENU); -+ "pan-down-symbolic", GTK_ICON_SIZE_MENU); - } - else if (strcmp (t[j], "minimize") == 0 && - is_sovereign_window) -@@ -1361,6 +1384,7 @@ gtk_header_bar_set_subtitle (GtkHeaderBa - gtk_widget_set_visible (priv->subtitle_sizing_label, priv->has_subtitle || (priv->subtitle && priv->subtitle[0])); - - g_object_notify_by_pspec (G_OBJECT (bar), header_bar_props[PROP_SUBTITLE]); -+ g_object_notify_by_pspec (G_OBJECT (bar), header_bar_props[PROP_TITLE]); - } - - /** -Index: b/gtk/gtkwindow.c -=================================================================== ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -4174,6 +4174,8 @@ on_titlebar_title_notify (GtkHeaderBar * - const gchar *title; - - title = gtk_header_bar_get_title (titlebar); -+ if (gtk_header_bar_get_subtitle (titlebar)) -+ title = g_strconcat (title, " — ", gtk_header_bar_get_subtitle (titlebar), NULL); - gtk_window_set_title_internal (self, title, FALSE); - } - -@@ -9366,6 +9368,7 @@ static void - gtk_window_do_popup (GtkWindow *window, - GdkEventButton *event) - { -+ if (!window->priv->client_decorated) return; - if (!gdk_window_show_window_menu (_gtk_widget_get_window (GTK_WIDGET (window)), - (GdkEvent *) event)) - gtk_window_do_popup_fallback (window, event); diff --git a/csd__disabled-by-default.patch b/csd__disabled-by-default.patch deleted file mode 100644 index fc6b85221b70..000000000000 --- a/csd__disabled-by-default.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: b/gtk/gtkwindow.c -=================================================================== ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -4164,6 +4164,14 @@ gtk_window_enable_csd (GtkWindow *window - } - - priv->client_decorated = TRUE; -+#ifdef GDK_WINDOWING_X11 -+ if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget)) && g_getenv("GTK_CSD") == FALSE) -+ { -+ gtk_style_context_remove_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_CSD); -+ gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "solid-csd"); -+ priv->client_decorated = FALSE; -+ } -+#endif - } - - static void diff --git a/csd__server-side-shadow.patch b/csd__server-side-shadow.patch deleted file mode 100644 index 602ae262602e..000000000000 --- a/csd__server-side-shadow.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/gtk/gtkwindow.c -=================================================================== ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -4113,6 +4113,8 @@ gtk_window_supports_client_shadow (GtkWi - #ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (display)) - { -+ if (g_strcmp0 (g_getenv ("GTK_CSD"), "1") != 0) -+ return FALSE; - if (!gdk_screen_is_composited (screen)) - return FALSE; - diff --git a/file-chooser__places-sidebar.patch b/file-chooser__places-sidebar.patch deleted file mode 100644 index b3735805e74c..000000000000 --- a/file-chooser__places-sidebar.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: b/gtk/gtkplacessidebar.c -=================================================================== ---- a/gtk/gtkplacessidebar.c -+++ b/gtk/gtkplacessidebar.c -@@ -633,6 +633,7 @@ open_home (GtkPlacesSidebar *sidebar) - static void - add_special_dirs (GtkPlacesSidebar *sidebar) - { -+ return; - GList *dirs; - gint index; - -@@ -1427,8 +1428,6 @@ update_places (GtkPlacesSidebar *sidebar - 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; -@@ -1536,6 +1535,17 @@ update_places (GtkPlacesSidebar *sidebar - - 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 */ -@@ -4155,7 +4165,7 @@ gtk_places_sidebar_init (GtkPlacesSideba - - 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, -Index: b/gtk/ui/gtkfilechooserwidget.ui -=================================================================== ---- a/gtk/ui/gtkfilechooserwidget.ui -+++ b/gtk/ui/gtkfilechooserwidget.ui -@@ -16,7 +16,8 @@ - <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> diff --git a/file-chooser__typeahead.patch b/file-chooser__typeahead.patch deleted file mode 100644 index fa0ac10a4cd3..000000000000 --- a/file-chooser__typeahead.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: b/gtk/gtkfilechooserwidget.c -=================================================================== ---- a/gtk/gtkfilechooserwidget.c -+++ b/gtk/gtkfilechooserwidget.c -@@ -1423,7 +1423,7 @@ gtk_file_chooser_widget_key_press_event - 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); -@@ -2493,7 +2493,7 @@ file_list_set_sort_column_ids (GtkFileCh - { - 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); -@@ -7347,8 +7347,6 @@ search_engine_hits_added_cb (GtkSearchEn - 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; -@@ -7693,7 +7691,7 @@ recent_idle_cleanup (gpointer data) - - 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); -@@ -8646,10 +8644,6 @@ gtk_file_chooser_widget_class_init (GtkF - "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); -@@ -8770,6 +8764,7 @@ post_process_ui (GtkFileChooserWidget *i - 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, diff --git a/fixes__atk-bridge-errors.patch b/fixes__atk-bridge-errors.patch deleted file mode 100644 index 0b944a0dcb58..000000000000 --- a/fixes__atk-bridge-errors.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/gtk/a11y/gtkaccessibility.c -=================================================================== ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -989,7 +989,10 @@ _gtk_accessibility_init (void) - 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/fixes__labels-wrapping.patch b/fixes__labels-wrapping.patch deleted file mode 100644 index 3f8d73426e28..000000000000 --- a/fixes__labels-wrapping.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: b/gtk/gtklabel.c -=================================================================== ---- a/gtk/gtklabel.c -+++ b/gtk/gtklabel.c -@@ -3685,6 +3685,14 @@ gtk_label_get_preferred_layout_size (Gtk - GtkLabelPrivate *priv = label->priv; - PangoLayout *layout; - gint char_pixels; -+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (label)); -+ if (GTK_IS_WINDOW (toplevel)) -+ { -+ gint default_window_width; -+ gtk_window_get_default_size (GTK_WINDOW (toplevel), &default_window_width, NULL); -+ if (default_window_width == -1 && priv->max_width_chars == -1 && priv->ellipsize == PANGO_ELLIPSIZE_NONE) -+ priv->max_width_chars = 56; -+ } - - /* "width-chars" Hard-coded minimum width: - * - minimum size should be MAX (width-chars, strlen ("...")); diff --git a/fixes__too-large-menu-covers-bar.disabled-patch b/fixes__too-large-menu-covers-bar.disabled-patch deleted file mode 100644 index 6bdbc7de42c4..000000000000 --- a/fixes__too-large-menu-covers-bar.disabled-patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --color -U 5 -r -Z -B gtk/gtkmenu.c gtk/gtkmenu.c ---- src/gtk/gtkmenu.c 2018-01-31 18:37:18.000000000 +0100 -+++ src/gtk/gtkmenu.c 2018-07-16 23:43:51.061469725 +0200 -@@ -1393,10 +1393,17 @@ - const GdkRectangle *final_rect, - gboolean flipped_x, - gboolean flipped_y, - GtkMenu *menu) - { -+ if (GTK_IS_MENU_ITEM (menu->priv->widget) && GTK_IS_MENU_BAR (gtk_widget_get_parent (menu->priv->widget)) -+ && flipped_rect != NULL && final_rect != NULL && !flipped_y && flipped_rect->y > final_rect->y) -+ { -+ gint new_height = final_rect->height - (flipped_rect->y - final_rect->y); -+ if (new_height > 200) -+ gdk_window_move_resize (window, final_rect->x, flipped_rect->y, final_rect->width, new_height); -+ } - g_signal_emit (menu, - menu_signals[POPPED_UP], - 0, - flipped_rect, - final_rect, diff --git a/other__default-settings.patch b/other__default-settings.patch deleted file mode 100644 index 7096b074232d..000000000000 --- a/other__default-settings.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: b/gtk/gtkscrolledwindow.c -=================================================================== ---- a/gtk/gtkscrolledwindow.c -+++ b/gtk/gtkscrolledwindow.c -@@ -4491,7 +4491,7 @@ gtk_scrolled_window_update_use_indicator - - use_indicators = overlay_scrolling && priv->overlay_scrolling; - -- if (g_strcmp0 (g_getenv ("GTK_OVERLAY_SCROLLING"), "0") == 0) -+ if (g_strcmp0 (g_getenv ("GTK_OVERLAY_SCROLLING"), "1") != 0) - use_indicators = FALSE; - - if (priv->use_indicators != use_indicators) -Index: b/gtk/gtksettings.c -=================================================================== ---- a/gtk/gtksettings.c -+++ b/gtk/gtksettings.c -@@ -61,7 +61,7 @@ - #ifdef GDK_WINDOWING_QUARTZ - #define PRINT_PREVIEW_COMMAND "open -b com.apple.Preview %f" - #else --#define PRINT_PREVIEW_COMMAND "evince --unlink-tempfile --preview --print-settings %s %f" -+#define PRINT_PREVIEW_COMMAND "atril --unlink-tempfile --preview --print-settings %s %f" - #endif - - /** -Index: b/gtk/org.gtk.Settings.FileChooser.gschema.xml -=================================================================== ---- a/gtk/org.gtk.Settings.FileChooser.gschema.xml -+++ b/gtk/org.gtk.Settings.FileChooser.gschema.xml -@@ -133,7 +133,7 @@ - </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 diff --git a/other__hide-insert-emoji.patch b/other__hide-insert-emoji.patch deleted file mode 100644 index 4d6590623c1d..000000000000 --- a/other__hide-insert-emoji.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: b/gtk/gtkentry.c -=================================================================== ---- a/gtk/gtkentry.c -+++ b/gtk/gtkentry.c -@@ -9627,7 +9627,8 @@ popup_targets_received (GtkClipboard - g_signal_connect_swapped (menuitem, "activate", - G_CALLBACK (gtk_entry_insert_emoji), entry); - gtk_widget_show (menuitem); -- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); -+ if (g_getenv ("GTKM_INSERT_EMOJI") != FALSE) -+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - } - - g_signal_emit (entry, signals[POPULATE_POPUP], 0, menu); -Index: b/gtk/gtktextview.c -=================================================================== ---- a/gtk/gtktextview.c -+++ b/gtk/gtktextview.c -@@ -9555,7 +9555,8 @@ popup_targets_received (GtkClipboard - g_signal_connect_swapped (menuitem, "activate", - G_CALLBACK (gtk_text_view_insert_emoji), text_view); - gtk_widget_show (menuitem); -- gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem); -+ if (g_getenv ("GTKM_INSERT_EMOJI") != FALSE) -+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem); - } - - g_signal_emit (text_view, signals[POPULATE_POPUP], diff --git a/other__mnemonics-delay.patch b/other__mnemonics-delay.patch deleted file mode 100644 index 54fb51039778..000000000000 --- a/other__mnemonics-delay.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/gtk/gtkwindow.c -=================================================================== ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -147,7 +147,7 @@ - * widget that is added as a titlebar child. - */ - --#define MNEMONICS_DELAY 300 /* ms */ -+#define MNEMONICS_DELAY 0 /* ms */ - #define NO_CONTENT_CHILD_NAT 200 - /* In case the content (excluding header bar and shadows) of the window - * would be empty, either because there is no visible child widget or only an diff --git a/popovers__color-chooser.patch b/popovers__color-chooser.patch deleted file mode 100644 index c26b2b49aeaa..000000000000 --- a/popovers__color-chooser.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: b/gtk/gtkcolorswatch.c -=================================================================== ---- a/gtk/gtkcolorswatch.c -+++ b/gtk/gtkcolorswatch.c -@@ -349,6 +349,17 @@ do_popup (GtkColorSwatch *swatch) - { - if (swatch->priv->popover == NULL) - { -+ GtkWidget *item; -+ swatch->priv->popover = gtk_menu_new (); -+ item = gtk_menu_item_new_with_mnemonic (_ ("C_ustomize")); -+ g_signal_connect_swapped (item, "activate", G_CALLBACK (emit_customize), swatch); -+ gtk_widget_set_visible (GTK_WIDGET (item), TRUE); -+ gtk_menu_shell_append (GTK_MENU_SHELL (swatch->priv->popover), item); -+ } -+ gtk_menu_popup_at_pointer (GTK_MENU (swatch->priv->popover), NULL); -+ return; -+ if (swatch->priv->popover == NULL) -+ { - GtkWidget *box; - GtkWidget *item; - diff --git a/popovers__file-chooser-list.patch b/popovers__file-chooser-list.patch deleted file mode 100644 index 43235b507e33..000000000000 --- a/popovers__file-chooser-list.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: b/gtk/gtkfilechooserwidget.c -=================================================================== ---- a/gtk/gtkfilechooserwidget.c -+++ b/gtk/gtkfilechooserwidget.c -@@ -29,6 +29,7 @@ - #include "gtkcellrendererpixbuf.h" - #include "gtkcellrenderertext.h" - #include "gtkcheckmenuitem.h" -+#include "deprecated/gtkimagemenuitem.h" - #include "gtkclipboard.h" - #include "gtkcomboboxtext.h" - #include "gtkdragsource.h" -@@ -2281,6 +2282,10 @@ append_separator (GtkWidget *box) - { - GtkWidget *separator; - -+ separator = gtk_separator_menu_item_new (); -+ gtk_widget_set_visible (GTK_WIDGET (separator), TRUE); -+ gtk_menu_shell_append (GTK_MENU_SHELL (box), separator); -+ return separator; - separator = g_object_new (GTK_TYPE_SEPARATOR, - "orientation", GTK_ORIENTATION_HORIZONTAL, - "visible", TRUE, -@@ -2302,6 +2307,14 @@ add_button (GtkWidget *box, - { - GtkWidget *item; - -+ if (g_str_match_string ("toggle", action, TRUE)) -+ item = gtk_check_menu_item_new_with_mnemonic (label); -+ else -+ item = gtk_image_menu_item_new_with_mnemonic (label); -+ g_object_set (G_OBJECT (item), "action-name", action, NULL); -+ gtk_widget_set_visible (GTK_WIDGET (item), TRUE); -+ gtk_menu_shell_append (GTK_MENU_SHELL (box), item); -+ return item; - item = g_object_new (GTK_TYPE_MODEL_BUTTON, - "visible", TRUE, - "action-name", action, -@@ -2326,6 +2339,9 @@ file_list_build_popover (GtkFileChooserW - g_object_set (box, "margin", 10, NULL); - gtk_widget_show (box); - gtk_container_add (GTK_CONTAINER (priv->browse_files_popover), box); -+ priv->browse_files_popover = gtk_menu_new (); -+ gtk_menu_attach_to_widget (GTK_MENU (priv->browse_files_popover), GTK_WIDGET (priv->browse_files_tree_view), NULL); -+ box = priv->browse_files_popover; - - priv->visit_file_item = add_button (box, _("_Visit File"), "item.visit"); - priv->open_folder_item = add_button (box, _("_Open With File Manager"), "item.open"); -@@ -2342,6 +2358,12 @@ file_list_build_popover (GtkFileChooserW - priv->type_column_item = add_button (box, _("Show T_ype Column"), "item.toggle-show-type"); - priv->show_time_item = add_button (box, _("Show _Time"), "item.toggle-show-time"); - priv->sort_directories_item = add_button (box, _("Sort _Folders before Files"), "item.toggle-sort-dirs-first"); -+ g_object_set (priv->visit_file_item, "image", gtk_image_new_from_icon_name ("gtk-jump-to", GTK_ICON_SIZE_MENU), NULL); -+ g_object_set (priv->open_folder_item, "image", gtk_image_new_from_icon_name ("gtk-open", GTK_ICON_SIZE_MENU), NULL); -+ g_object_set (priv->copy_file_location_item, "image", gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_MENU), NULL); -+ g_object_set (priv->add_shortcut_item, "image", gtk_image_new_from_icon_name ("gtk-add", GTK_ICON_SIZE_MENU), NULL); -+ g_object_set (priv->delete_file_item, "image", gtk_image_new_from_icon_name ("gtk-delete", GTK_ICON_SIZE_MENU), NULL); -+ g_object_set (priv->trash_file_item, "image", gtk_image_new_from_icon_name ("user-trash-full",GTK_ICON_SIZE_MENU), NULL); - } - - /* Updates the popover for the file list, creating it if necessary */ diff --git a/popovers__places-sidebar.patch b/popovers__places-sidebar.patch deleted file mode 100644 index be8566da7839..000000000000 --- a/popovers__places-sidebar.patch +++ /dev/null @@ -1,146 +0,0 @@ -Index: b/gtk/gtkplacessidebar.c -=================================================================== ---- a/gtk/gtkplacessidebar.c -+++ b/gtk/gtkplacessidebar.c -@@ -64,6 +64,7 @@ - #include "gtkgesturelongpress.h" - #include "gtkbox.h" - #include "gtkmodelbutton.h" -+#include "deprecated/gtkimagemenuitem.h" - - /** - * SECTION:gtkplacessidebar -@@ -2341,32 +2342,32 @@ check_popover_sensitivity (GtkSidebarRow - gtk_widget_set_visible (data->stop_item, show_stop); - - /* Adjust start/stop items to reflect the type of the drive */ -- g_object_set (data->start_item, "text", _("_Start"), NULL); -- g_object_set (data->stop_item, "text", _("_Stop"), NULL); -+ g_object_set (data->start_item, "label", _("_Start"), "use_underline", TRUE, NULL); -+ g_object_set (data->stop_item, "label", _("_Stop"), "use_underline", TRUE, NULL); - if ((show_start || show_stop) && drive != NULL) - { - switch (g_drive_get_start_stop_type (drive)) - { - case G_DRIVE_START_STOP_TYPE_SHUTDOWN: - /* start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used */ -- g_object_set (data->start_item, "text", _("_Power On"), NULL); -- g_object_set (data->stop_item, "text", _("_Safely Remove Drive"), NULL); -+ g_object_set (data->start_item, "label", _("_Power On"), "use_underline", TRUE, NULL); -+ g_object_set (data->stop_item, "label", _("_Safely Remove Drive"), "use_underline", TRUE, NULL); - break; - - case G_DRIVE_START_STOP_TYPE_NETWORK: -- g_object_set (data->start_item, "text", _("_Connect Drive"), NULL); -- g_object_set (data->stop_item, "text", _("_Disconnect Drive"), NULL); -+ g_object_set (data->start_item, "label", _("_Connect Drive"), "use_underline", TRUE, NULL); -+ g_object_set (data->stop_item, "label", _("_Disconnect Drive"), "use_underline", TRUE, NULL); - break; - - case G_DRIVE_START_STOP_TYPE_MULTIDISK: -- g_object_set (data->start_item, "text", _("_Start Multi-disk Device"), NULL); -- g_object_set (data->stop_item, "text", _("_Stop Multi-disk Device"), NULL); -+ g_object_set (data->start_item, "label", _("_Start Multi-disk Device"), "use_underline", TRUE, NULL); -+ g_object_set (data->stop_item, "label", _("_Stop Multi-disk Device"), "use_underline", TRUE, NULL); - break; - - case G_DRIVE_START_STOP_TYPE_PASSWORD: - /* stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used */ -- g_object_set (data->start_item, "text", _("_Unlock Device"), NULL); -- g_object_set (data->stop_item, "text", _("_Lock Device"), NULL); -+ g_object_set (data->start_item, "label", _("_Unlock Device"), "use_underline", TRUE, NULL); -+ g_object_set (data->stop_item, "label", _("_Lock Device"), "use_underline", TRUE, NULL); - break; - - default: -@@ -3559,6 +3560,13 @@ append_separator (GtkWidget *box) - { - GtkWidget *separator; - -+ if (GTK_IS_MENU (box)) -+ { -+ separator = gtk_separator_menu_item_new(); -+ gtk_widget_set_visible(GTK_WIDGET(separator), TRUE); -+ gtk_menu_shell_append(GTK_MENU_SHELL(box), separator); -+ return separator; -+ } - separator = g_object_new (GTK_TYPE_SEPARATOR, - "orientation", GTK_ORIENTATION_HORIZONTAL, - "visible", TRUE, -@@ -3577,6 +3585,14 @@ add_button (GtkWidget *box, - { - GtkWidget *item; - -+ if (GTK_IS_MENU (box)) -+ { -+ item = gtk_image_menu_item_new_with_mnemonic(label); -+ g_object_set(G_OBJECT(item), "action-name", action, NULL); -+ gtk_widget_set_visible(GTK_WIDGET(item), TRUE); -+ gtk_menu_shell_append(GTK_MENU_SHELL(box), item); -+ return item; -+ } - item = g_object_new (GTK_TYPE_MODEL_BUTTON, - "visible", TRUE, - "action-name", action, -@@ -3594,6 +3610,17 @@ add_open_button (GtkWidget *box - { - GtkWidget *item; - -+ if (GTK_IS_MENU (box)) -+ { -+ item = gtk_image_menu_item_new_with_mnemonic (label); -+ g_object_set(G_OBJECT (item), -+ "action-name", flags == GTK_PLACES_OPEN_NORMAL ? "row.open" : "row.open-other", -+ "action-target", g_variant_new_int32 (flags), -+ NULL); -+ gtk_widget_set_visible (GTK_WIDGET (item), TRUE); -+ gtk_menu_shell_append (GTK_MENU_SHELL (box), item); -+ return item; -+ } - item = g_object_new (GTK_TYPE_MODEL_BUTTON, - "visible", TRUE, - "action-name", flags == GTK_PLACES_OPEN_NORMAL ? "row.open" : "row.open-other", -@@ -3699,6 +3726,13 @@ create_row_popover (GtkPlacesSidebar *si - g_object_set (box, "margin", 10, NULL); - gtk_widget_show (box); - gtk_container_add (GTK_CONTAINER (sidebar->popover), box); -+ if (!sidebar->populate_all) -+ { -+ sidebar->popover = gtk_menu_new (); -+ g_signal_connect (sidebar->popover, "destroy", G_CALLBACK (on_row_popover_destroy), sidebar); -+ gtk_menu_attach_to_widget (GTK_MENU (sidebar->popover), GTK_WIDGET (sidebar), NULL); -+ box = sidebar->popover; -+ } - - add_open_button (box, _("_Open"), GTK_PLACES_OPEN_NORMAL); - -@@ -3722,6 +3756,15 @@ create_row_popover (GtkPlacesSidebar *si - data.rescan_item = add_button (box, _("_Detect Media"), "row.rescan"); - data.start_item = add_button (box, _("_Start"), "row.start"); - data.stop_item = add_button (box, _("_Stop"), "row.stop"); -+ if (!sidebar->populate_all) -+ { -+ g_object_set ( -+ g_list_first (gtk_container_get_children (GTK_CONTAINER (box)))->data, -+ "image", gtk_image_new_from_icon_name ("gtk-open", GTK_ICON_SIZE_MENU), NULL -+ ); -+ g_object_set (data.remove_item, "image", gtk_image_new_from_icon_name("gtk-remove",GTK_ICON_SIZE_MENU), NULL); -+ g_object_set (data.add_shortcut_item, "image", gtk_image_new_from_icon_name("gtk-add", GTK_ICON_SIZE_MENU), NULL); -+ } - - /* Update everything! */ - check_popover_sensitivity (row, &data); -@@ -3765,6 +3808,13 @@ show_row_popover (GtkSidebarRow *row) - gtk_widget_destroy (sidebar->popover); - - create_row_popover (sidebar, row); -+ if (GTK_IS_MENU (sidebar->popover)) -+ { -+ sidebar->context_row = row; -+ gtk_menu_popup_at_pointer (GTK_MENU (sidebar->popover), NULL); -+ g_object_unref (sidebar); -+ return; -+ } - - gtk_popover_set_relative_to (GTK_POPOVER (sidebar->popover), GTK_WIDGET (row)); - diff --git a/series b/series deleted file mode 100644 index fc430c001aaa..000000000000 --- a/series +++ /dev/null @@ -1,20 +0,0 @@ -appearance__buttons-menus-icons.patch -appearance__disable-backdrop.patch -appearance__file-chooser.patch -appearance__message-dialogs.patch -appearance__print-dialog.patch -appearance__smaller-statusbar.patch -csd__clean-headerbar.patch -csd__disabled-by-default.patch -csd__server-side-shadow.patch -file-chooser__places-sidebar.patch -file-chooser__typeahead.patch -fixes__atk-bridge-errors.patch -fixes__labels-wrapping.patch -#fixes__too-large-menu-covers-bar.patch -other__default-settings.patch -other__hide-insert-emoji.patch -other__mnemonics-delay.patch -popovers__color-chooser.patch -popovers__file-chooser-list.patch -popovers__places-sidebar.patch diff --git a/smaller-adwaita.css b/smaller-adwaita.css deleted file mode 100644 index fade5f322622..000000000000 --- a/smaller-adwaita.css +++ /dev/null @@ -1,98 +0,0 @@ - -/* GTK3-mushrooms */ -button, -button.titlebutton, -button.image-button, -button.text-button, -button.image-button.text-button, -.stack-switcher > button.text-button { - padding: 3px 6px; - min-height: 20px; - min-width: 0; -} -.stack-switcher > button.text-button { - min-width: 80px; -} -button.text-button.image-button label { - padding: 0 2px; -} -notebook > header.top tab, -notebook > header.bottom tab { - padding: 0 5px; -} -notebook > header.left tab, -notebook > header.right tab { - padding: 0 8px; -} -notebook tab button { - padding: 0px; - min-height: 15px; -} -entry, -spinbutton:not(.vertical) { - min-height: 26px; -} -treeview button { - padding: 0 7px; - min-height: 23px; -} -progressbar.horizontal trough, -progressbar.horizontal progress, -progressbar.vertical trough, -progressbar.vertical progress, -levelbar trough { - min-height: 9px; - min-width: 9px; -} -scale { - padding: 10px 0; -} -headerbar, switch slider { - min-height: 0; -} -popover:not(.emoji-picker) > *:not(grid) { - margin: -3px; -} -tooltip * { - padding: 0px; -} -placessidebar row { - min-height: 29px; -} -placessidebar row button.sidebar-button { - min-height: 20px; - min-width: 20px; - padding: 0; -} -filechooser > box.search-bar, filechooser > box:last-child { - border-bottom: 1px solid alpha(#000, 0.15); -} -filechooser > actionbar > revealer > box { - border-top: 1px solid alpha(#000, 0.15); -} -* { - -GtkDialog-action-area-border: 5; -} -messagedialog > box { - padding: 7px; -} -messagedialog buttonbox { - margin-top: -17px; -} -menu, .menu, .context-menu, tooltip { - border-radius: 0; -} -.background:not(.csd):not(.solid-csd) .titlebar:not(.default-decoration), -.background:not(.csd):not(.solid-csd) .titlebar:not(.default-decoration) headerbar { - background: inherit; -} -entry undershoot.left, -entry undershoot.right, -spinbutton:not(.vertical) undershoot.left, -spinbutton:not(.vertical) undershoot.right, -scrolledwindow undershoot.left, -scrolledwindow undershoot.right, -scrolledwindow undershoot.top, -scrolledwindow undershoot.bottom { - background-image: none; -}
\ No newline at end of file |