diff -pruN 1:43.2-2/build-aux/flatpak/org.gnome.Settings.json 1:44~alpha-0ubuntu1/build-aux/flatpak/org.gnome.Settings.json --- 1:43.2-2/build-aux/flatpak/org.gnome.Settings.json 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/build-aux/flatpak/org.gnome.Settings.json 2023-01-09 20:06:57.000000000 +0000 @@ -26,7 +26,10 @@ "cxxflags" : "-O2 -g", "env" : { "V" : "1" - } + }, + "build-args": [ + "--share=network" + ] }, "x-run-args" : [ "--verbose" @@ -72,7 +75,6 @@ "config-opts" : [ "--disable-polkitd", "--disable-man-pages", - "--disable-introspection", "--disable-examples", "--disable-gtk-doc", "--disable-libelogind", @@ -111,17 +113,15 @@ "name" : "accountservice", "buildsystem" : "meson", "config-opts" : [ - "-Ddocbook=false", - "-Delogind=false", - "-Dgtk_doc=false", + "-Dsystemdsystemunitdir=no", "-Dintrospection=false", - "-Dsystemd=false", - "-Dsystemdsystemunitdir=no" + "-Dvapi=false" ], "sources" : [ { "type" : "git", - "url" : "git://anongit.freedesktop.org/accountsservice" + "url" : "https://gitlab.freedesktop.org/accountsservice/accountsservice", + "branch" : "main" } ] }, @@ -187,20 +187,6 @@ ] }, { - "name" : "gudev", - "buildsystem" : "meson", - "config-opts" : [ - "-Dtests=disabled", - "-Dintrospection=disabled" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/libgudev.git" - } - ] - }, - { "name" : "colord", "buildsystem" : "meson", "config-opts" : [ @@ -279,9 +265,10 @@ "name" : "geocode-glib", "buildsystem" : "meson", "config-opts" : [ - "-Denable-gtk-doc=false", + "-Denable-installed-tests=false", "-Denable-introspection=false", - "-Denable-installed-tests=false" + "-Denable-gtk-doc=false", + "-Dsoup2=false" ], "sources" : [ { @@ -294,9 +281,10 @@ "name" : "libgweather", "buildsystem" : "meson", "config-opts" : [ - "-Dglade_catalog=false", "-Denable_vala=false", - "-Dgtk_doc=false" + "-Dgtk_doc=false", + "-Dintrospection=false", + "-Dtests=false" ], "sources" : [ { @@ -357,14 +345,10 @@ "config-opts" : [ "-Dlibaudit=no", "-Ddbus_conf_dir=/app/etc/dbus-1/system.d", - "-Ddbus_ifaces_dir=/app/share/dbus-1/interfaces", - "-Ddbus_sys_dir=/app/share/dbus-1/system.d", "-Ddnsmasq=/usr/bin/true", "-Ddocs=false", "-Dintrospection=false", "-Diptables=/usr/bin/true", - "-Djson_validation=false", - "-Dlibnm_glib=false", "-Dlibpsl=false", "-Dmodem_manager=false", "-Dnmtui=false", @@ -419,12 +403,9 @@ "buildsystem" : "meson", "config-opts" : [ "-Dappindicator=no", - "-Dgtk_doc=false", - "-Dintrospection=false", - "-Dlibnm_gtk=false", + "-Dwwan=false", "-Dselinux=false", - "-Dteam=false", - "-Dwwan=false" + "-Dteam=false" ], "sources" : [ { @@ -635,6 +616,142 @@ ] }, { + "name" : "mutter", + "buildsystem" : "meson", + "config-opts" : [ + "-Dgles2=false", + "-Dglx=false", + "-Dxwayland=false", + "-Dwayland=false", + "-Dsystemd=false", + "-Dnative_backend=false", + "-Dremote_desktop=false", + "-Degl_device=false", + "-Dudev=false", + "-Dstartup_notification=false", + "-Dsm=false", + "-Dintrospection=true", + "-Ddocs=false", + "-Dtests=false", + "-Dprofiler=false" + ], + "sources" : [ + { + "type" : "git", + "branch" : "main", + "url" : "https://gitlab.gnome.org/gnome/mutter.git" + } + ] + }, + { + "name" : "libical", + "buildsystem" : "cmake", + "config-opts" : [ + "-DICAL_BUILD_DOCS=false", + "-DICAL_GLIB=true", + "-DLIBICAL_BUILD_TESTING=false" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/libical/libical.git" + } + ] + }, + { + "name" : "evolution-data-server", + "buildsystem" : "cmake", + "config-opts" : [ + "-DWITH_LIBDB=OFF" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/evolution-data-server.git" + } + ] + }, + { + "name" : "libstartup-notification", + "buildsystem" : "autotools", + "sources" : [ + { + "type" : "git", + "url" : "https://gitlab.freedesktop.org/xdg/startup-notification.git" + } + ] + }, + { + "name" : "sassc", + "buildsystem" : "simple", + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/sass/libsass" + }, + { + "type" : "git", + "url" : "https://github.com/sass/sassc.git", + "dest" : "sassc" + } + ], + "build-commands" : [ + "make -C sassc", + "PREFIX=/app make -C sassc install" + ] + }, + { + "name" : "cogl", + "buildsystem" : "autotools", + "sources" : [ + { + "type" : "git", + "tag" : "cogl-1.22", + "url" : "https://gitlab.gnome.org/Archive/cogl.git" + } + ] + }, + { + "name" : "clutter", + "buildsystem" : "meson", + "config-opts" : [ + "-Dbackends='system'", + "-Ddrivers='all'", + "-Dbuild_tests=false", + "-Dbuild_examples=false", + "-Ddocumentation=false", + "-Dintrospection=true", + "-Dpixbuf_tests=false" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/clutter.git" + } + ] + }, + { + "name" : "gnome-shell", + "buildsystem" : "meson", + "config-opts" : [ + "-Dextensions_tool=false", + "-Dextensions_app=false", + "-Dgtk_doc=false", + "-Dman=false", + "-Dtests=false", + "-Dnetworkmanager=false", + "-Dsystemd=false" + ], + "sources" : [ + { + "type" : "git", + "branch" : "main", + "url" : "https://gitlab.gnome.org/GNOME/gnome-shell.git" + } + ] + }, + + { "name" : "gnome-backgrounds", "buildsystem" : "meson", "sources" : [ @@ -650,12 +767,11 @@ "buildsystem" : "meson", "sources" : [ { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/gnome-control-center.git" + "type" : "dir", + "path" : "../../" } ], "config-opts" : [ - "-Dtracing=true", "-Dprofile=development" ] } diff -pruN 1:43.2-2/debian/changelog 1:44~alpha-0ubuntu1/debian/changelog --- 1:43.2-2/debian/changelog 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/changelog 2023-01-13 16:48:57.000000000 +0000 @@ -1,9 +1,74 @@ -gnome-control-center (1:43.2-2) unstable; urgency=medium +gnome-control-center (1:44~alpha-0ubuntu1) lunar; urgency=medium - * d/control.in: Add libspa-0.2-bluetooth as an alternative for - pulseaudio-module-bluetooth + [ Jeremy Bicha ] + * New upstream release + * debian/control.in: Bump minimum GTK4 to 4.8 and libnma-gtk4 to 1.10.2 + * Stop disabling the Device Security panel + * Revert commit that hides Device Security panel when chassis_type is empty + * Refresh patches + * Update patches to drop deprecated gtk_widget_show/hide + + [ Gunnar Hjalmarsson ] + * Make "Color" in "Appearance" view translatable (LP: #2000937) + * Use a context aware gettext function in the Ubuntu panel (LP: #2000937) + + -- Jeremy Bicha Fri, 13 Jan 2023 11:48:57 -0500 + +gnome-control-center (1:43.2-1ubuntu1) lunar; urgency=medium - -- Laurent Bigonville Wed, 25 Jan 2023 13:01:34 +0100 + * Merge with Debian. Remaining changes: + + Add gnome-control-center-faces package to share with unity-control-center + + Install apport hook + + debian/control.in: + - Build-Depend on libwhoopsie-preferences-dev + - Depend on language-selector-gnome, system-config-printer & + whoopsie-preferences + - Don't depend on desktop-base + - Recommend ibus + - Suggest instead of recommend gnome-user-share & realmd + - Don't recommend malcontent-gui or system-config-printer-common + - Don't recommend or suggest pulseaudio (or even pipewire) stuff + - Don't recommend libnss-myhostname since we use systemd-resolved + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + * debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + * debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. (LP: #1704002) + + debian/rules: Enable whoospie integration + + Add patches: + - keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch + - keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch + - u/keyboard-Add-launch-terminal-shortcut.patch + - u/sound-Allow-volume-to-be-set-above-100.patch + - u/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch + - u/background-Allow-configuring-the-ubuntu-accent-color.patch + - u/multitasking-panel-Sync-workspace-and-monitor-isolation-d.patch + - u/Modify-Mulitasking-assets-for-accent-colors.patch + - u/lock-Add-Lock-Screen-on-Suspend-option.patch + - u/region-Add-Language-Selector-button.patch + - u/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch + - u/printers-Temporarily-add-an-additional-advanced-printer-b.patch + - u/notifications-Handle-.desktop-files-that-got-renamed.patch + - u/shell-Change-the-default-height-so-all-category-are-on-sc.patch + - u/connectivity-add-network-connectivity-checking-toggle.patch + - u/diagnostics-Add-Whoopsie-support.patch + - u/online-accounts-Hide-window-after-adding-an-online-accoun.patch + - u/display-Support-UI-scaled-logical-monitor-mode.patch + - u/Disable-non-working-camera-microphones-panels.patch + - u/info-overview-Show-updates-in-software-propeties-instead-.patch + - u/sound-Add-a-button-to-select-the-default-theme.patch + - u/applications-Launch-snap-store-if-it-is-installed.patch + - u/display-Allow-fractional-scaling-to-be-enabled.patch + * d/p/keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch: + + Add nodefault_option after the main option, not before + (LP: #2000423) + + Get back the "Use layout default" switch_row title + + -- Gunnar Hjalmarsson Thu, 29 Dec 2022 18:39:39 +0100 gnome-control-center (1:43.2-1) unstable; urgency=medium @@ -30,6 +95,60 @@ gnome-control-center (1:43.1-2) unstable -- Jeremy Bicha Thu, 08 Dec 2022 21:06:20 -0500 +gnome-control-center (1:43.1-1ubuntu1) lunar; urgency=medium + + * Merge with Debian. Remaining changes: + + Add gnome-control-center-faces package to share with unity-control-center + + Install apport hook + + debian/control.in: + - Build-Depend on libwhoopsie-preferences-dev + - Depend on language-selector-gnome, system-config-printer & + whoopsie-preferences + - Don't depend on desktop-base + - Recommend ibus + - Suggest instead of recommend gnome-user-share & realmd + - Don't recommend malcontent-gui or system-config-printer-common + - Don't recommend or suggest pulseaudio (or even pipewire) stuff + - Don't recommend libnss-myhostname since we use systemd-resolved + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + * debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + * debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. (LP: #1704002) + + debian/rules: Enable whoospie integration + + Add patches: + - keyboard-Allow-disabling-alternate-characters-key.patch + - keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch + - keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch + - u/keyboard-Add-launch-terminal-shortcut.patch + - u/sound-Allow-volume-to-be-set-above-100.patch + - u/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch + - u/background-Allow-configuring-the-ubuntu-accent-color.patch + - u/multitasking-panel-Sync-workspace-and-monitor-isolation-d.patch + - u/Modify-Mulitasking-assets-for-accent-colors.patch + - u/lock-Add-Lock-Screen-on-Suspend-option.patch + - u/region-Add-Language-Selector-button.patch + - u/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch + - u/printers-Temporarily-add-an-additional-advanced-printer-b.patch + - u/notifications-Handle-.desktop-files-that-got-renamed.patch + - u/shell-Change-the-default-height-so-all-category-are-on-sc.patch + - u/connectivity-add-network-connectivity-checking-toggle.patch + - u/diagnostics-Add-Whoopsie-support.patch + - u/online-accounts-Hide-window-after-adding-an-online-accoun.patch + - u/display-Support-UI-scaled-logical-monitor-mode.patch + - u/Disable-non-working-camera-microphones-panels.patch + - u/info-overview-Show-updates-in-software-propeties-instead-.patch + - u/sound-Add-a-button-to-select-the-default-theme.patch + - u/applications-Launch-snap-store-if-it-is-installed.patch + - u/display-Allow-fractional-scaling-to-be-enabled.patch + - build-Look-for-snapd-glib-2.patch + + -- Jeremy Bicha Tue, 22 Nov 2022 14:39:59 -0500 + gnome-control-center (1:43.1-1) unstable; urgency=medium [ Jeremy Bicha ] @@ -59,6 +178,65 @@ gnome-control-center (1:43.0-2) unstable -- Simon McVittie Fri, 14 Oct 2022 10:05:39 +0100 +gnome-control-center (1:43.0-1ubuntu2) kinetic; urgency=medium + + * Don't recommend libnss-myhostname since we use systemd-resolved + + -- Jeremy Bicha Tue, 20 Sep 2022 09:44:03 -0400 + +gnome-control-center (1:43.0-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian. Remaining changes: + + Add gnome-control-center-faces package to share with unity-control-center + + Install apport hook + + debian/control.in: + - Build-Depend on libwhoopsie-preferences-dev + - Depend on language-selector-gnome, system-config-printer & + whoopsie-preferences + - Don't depend on desktop-base + - Recommend ibus + - Suggest instead of recommend gnome-user-share & realmd + - Don't recommend malcontent-gui or system-config-printer-common + - Don't recommend or suggest pulseaudio (or even pipewire) stuff + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + * debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + * debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. (LP: #1704002) + + debian/rules: Enable whoospie integration + + Add patches: + - keyboard-Allow-disabling-alternate-characters-key.patch + - keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch + - keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch + - u/keyboard-Add-launch-terminal-shortcut.patch + - u/sound-Allow-volume-to-be-set-above-100.patch + - u/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch + - u/background-Allow-configuring-the-ubuntu-accent-color.patch + - u/multitasking-panel-Sync-workspace-and-monitor-isolation-d.patch + - u/Modify-Mulitasking-assets-for-accent-colors.patch + - u/lock-Add-Lock-Screen-on-Suspend-option.patch + - u/region-Add-Language-Selector-button.patch + - u/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch + - u/printers-Temporarily-add-an-additional-advanced-printer-b.patch + - u/notifications-Handle-.desktop-files-that-got-renamed.patch + - u/shell-Change-the-default-height-so-all-category-are-on-sc.patch + - u/connectivity-add-network-connectivity-checking-toggle.patch + - u/diagnostics-Add-Whoopsie-support.patch + - u/online-accounts-Hide-window-after-adding-an-online-accoun.patch + - u/display-Support-UI-scaled-logical-monitor-mode.patch + - u/Disable-non-working-camera-microphones-panels.patch + - u/info-overview-Show-updates-in-software-propeties-instead-.patch + - u/sound-Add-a-button-to-select-the-default-theme.patch + - u/applications-Launch-snap-store-if-it-is-installed.patch + - u/display-Allow-fractional-scaling-to-be-enabled.patch + - build-Look-for-snapd-glib-2.patch + + -- Jeremy Bicha Thu, 15 Sep 2022 15:42:16 -0400 + gnome-control-center (1:43.0-1) unstable; urgency=medium [ Jeremy Bicha ] @@ -69,6 +247,21 @@ gnome-control-center (1:43.0-1) unstable -- Jeremy Bicha Thu, 15 Sep 2022 14:17:01 -0400 +gnome-control-center (1:43~rc-1ubuntu2) kinetic; urgency=medium + + * debian/rules: + - restore the dh_translations override which was forgotten during one + of the recent merge, it's still needed (lp: #1989403) + + -- Sebastien Bacher Tue, 13 Sep 2022 12:10:16 +0200 + +gnome-control-center (1:43~rc-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian + * Refresh patches + + -- Jeremy Bicha Tue, 06 Sep 2022 09:25:05 -0400 + gnome-control-center (1:43~rc-2) unstable; urgency=medium * New upstream release @@ -105,6 +298,29 @@ gnome-control-center (1:43~beta-2) unsta -- Jeremy Bicha Sun, 21 Aug 2022 18:48:25 -0400 +gnome-control-center (1:43~beta-1ubuntu3) kinetic; urgency=medium + + * Recommend gnome-bluetooth-sendto + * Build against libsoup3 libraries + * Add patch to build against snapd-glib-2 + + -- Jeremy Bicha Fri, 26 Aug 2022 08:59:24 -0400 + +gnome-control-center (1:43~beta-1ubuntu2) kinetic; urgency=medium + + * Add patch to disable the new Device Security panel (LP: #1987162) + + -- Jeremy Bicha Mon, 22 Aug 2022 10:09:25 -0400 + +gnome-control-center (1:43~beta-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian + * Drop patches applied in new release + * Refresh patches + * Drop the VNC patch (LP: #1987159) + + -- Jeremy Bicha Sat, 20 Aug 2022 07:47:32 -0400 + gnome-control-center (1:43~beta-1) experimental; urgency=medium * New upstream release @@ -115,6 +331,16 @@ gnome-control-center (1:43~beta-1) exper -- Jeremy Bicha Fri, 19 Aug 2022 13:33:46 -0400 +gnome-control-center (1:42.3-2ubuntu1) kinetic; urgency=medium + + * Merge with Debian + - Fix GNOME version number with latest gnome-desktop (LP: #1986616) + * Recommend libcanberra-pulse for Test Sound Output feature (Closes: #676234) + (LP: #1983638) (LP: #1004973) + * Refresh patches + + -- Jeremy Bicha Thu, 18 Aug 2022 09:16:02 -0400 + gnome-control-center (1:42.3-2) unstable; urgency=medium * Lower gnome-remote-desktop from Depends to Recommends (Closes: #1014879) @@ -134,6 +360,44 @@ gnome-control-center (1:42.3-1) unstable -- Jeremy Bicha Sun, 03 Jul 2022 19:21:29 -0400 +gnome-control-center (1:42.2-1ubuntu2) kinetic; urgency=medium + + * Rebuild against latest gnome-desktop + + -- Jeremy Bicha Thu, 28 Jul 2022 07:22:14 -0400 + +gnome-control-center (1:42.2-1ubuntu1) kinetic; urgency=medium + + * debian/patches: Drop applied upstream and update old to use Gtk4 and Adw. + Some have been dropped as not relevant anymore. + While usage of AdwLeaf is now too invasive to do a revert as per + debian/patches/ubuntu/window-Stop-using-HdyLeaflet.patch so it's better + if we just help fixing the issues upstream. + * debian/patches: Ensure VNC/RDP remote control setting is honored + (LP: #1977663) + * debian/patches: Drop workaround for X-SnapInstanceName. + It's in snapd for 3 years now, we can safely assume we support it. + * background: Allow configuring the ubuntu accent color. + Move the ubuntu colors configuration to a single widget + (CcUbuntuColorsRow) so that it can be easily included in other widgets + with minimal changes. + We keep resources and the widget itself compiled together with the ubuntu + panel, so that there's no need to change multiple panels build scripts, + given that these are per-process anyways. + Helps with LP: #1968213 + * ubuntu-colors-row: Do not change themes on startup (or on user changes) + Do not override user themes unless an user has explicitly selected a + color theme. This applies to both the user theme and the icons, as we + want a consistent experience. But users could still use tweaks to change + them. + At the same time, avoid changing the gedit color scheme if an user + previously set a non-Yaru theme. (LP: #1968213) + * debian/patches: Ensure both VNC and RDP settings are disabled if requested + (LP: #1971415) + * debian/patches: Move the VNC support patch under the ubuntu topic + + -- Marco Trevisan (Treviño) Tue, 28 Jun 2022 02:24:04 +0200 + gnome-control-center (1:42.2-1) unstable; urgency=medium * New upstream release @@ -209,6 +473,13 @@ gnome-control-center (1:42.0-1) experime -- Simon McVittie Wed, 30 Mar 2022 20:24:07 +0100 +gnome-control-center (1:41.7-0ubuntu1) kinetic; urgency=medium + + * New upstream release (LP: #1975945) + * Drop 6 patches applied in new release + + -- Jeremy Bicha Fri, 27 May 2022 09:17:14 -0400 + gnome-control-center (1:41.4-2) unstable; urgency=medium * Team upload @@ -239,6 +510,218 @@ gnome-control-center (1:41.4-2) unstable -- Simon McVittie Mon, 28 Mar 2022 19:13:05 +0100 +gnome-control-center (1:41.4-1ubuntu15) kinetic; urgency=medium + + * Don't depend on gedit-common. We fixed bug 1947519 differently. + * Don't recommend pulseaudio-module-bluetooth; we are switching to PipeWire + + -- Jeremy Bicha Tue, 17 May 2022 16:33:11 -0400 + +gnome-control-center (1:41.4-1ubuntu14) kinetic; urgency=medium + + * Add patch to turn off RDP gsettings key when turning off RDP (LP: #1971415) + + -- Jeremy Bicha Tue, 10 May 2022 22:01:31 -0400 + +gnome-control-center (1:41.4-1ubuntu13) jammy; urgency=medium + + * Add patch to fix RDP Sharing on switch (LP: #1969619) + + -- Jeremy Bicha Wed, 20 Apr 2022 15:02:15 -0400 + +gnome-control-center (1:41.4-1ubuntu12) jammy; urgency=medium + + * debian/patches: Refresh + * debian/patches: Support configuring VNC backend along with RDP one. + Do not regress, allowing to configure and keep VNC support together with + the RDP one. + This was supposed to be part of the previous upload, given that it's + reducing the regression potential of the FFe. (LP: #1968518) + + -- Marco Trevisan (Treviño) Wed, 13 Apr 2022 08:41:30 +0200 + +gnome-control-center (1:41.4-1ubuntu11) jammy; urgency=medium + + * debian/patches/ubuntu/sharing-rdp/*.path: + - Backport RDP support (LP: #1968518) + * debian/patches/ubuntu/update-vnc-key.patch: + - Dropped as fixed in the above backport. + + -- Robert Ancell Wed, 13 Apr 2022 11:38:18 +1200 + +gnome-control-center (1:41.4-1ubuntu10) jammy; urgency=medium + + * debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch + Use the correct gettext function in the ubuntu panel for context strings + * debian/patches/ubuntu/update-vnc-key.patch: + Update the grd vnc key when sharing as required by the new version + + -- Sebastien Bacher Fri, 08 Apr 2022 13:45:39 +0200 + +gnome-control-center (1:41.4-1ubuntu9) jammy; urgency=medium + + * debian/patches: Refresh (and drop removed ones) + * ubuntu-panel: Update color assets to match tuned yaru colors + * ubuntu-panel: Auto-generate color assets, to make them easier to maintain + * ubuntu-panel: Fully auto-generate the gresource xml file + * background: Do not show the dark/light notice on GNOME session + (LP: #1965507) + + -- Marco Trevisan (Treviño) Mon, 28 Mar 2022 18:15:08 +0200 + +gnome-control-center (1:41.4-1ubuntu8) jammy; urgency=medium + + * debian/gnome-control-center-data.install, + debian/patches/ubuntu/distro-logo.patch, + debian/patches/debian/info-overview-Use-the-Vendor-logo-prominently.patch, + debian/rules, + debian/source/include-binaries, + debian/ubuntu-logo-dark.png: + - replace the Debian vendor logo patch by the one used in fedora which + handle having a dark variant and provides the corresponding image + in the package + + -- Sebastien Bacher Fri, 18 Mar 2022 16:30:25 +0100 + +gnome-control-center (1:41.4-1ubuntu7) jammy; urgency=medium + + * debian/ubuntu-logo-icon.png: + - use a variant of the logo with the ubuntu label + + -- Sebastien Bacher Fri, 18 Mar 2022 15:27:28 +0100 + +gnome-control-center (1:41.4-1ubuntu6) jammy; urgency=medium + + [ Marco Trevisan (Treviño) ] + * background: Support changing the light / dark wallpaper + + -- Jeremy Bicha Thu, 17 Mar 2022 22:46:55 -0400 + +gnome-control-center (1:41.4-1ubuntu5) jammy; urgency=medium + + [ Sebastien Bacher ] + * debian/ubuntu-logo-icon.png: + - update with the new Ubuntu logo + + [ Muqtxdir ] + * Add settings to control the main desktop icons options (LP: #1964732) + * modernize the over-amplification row + * debian/patches: add RTL condition from upstream to cc-multitasking-panel. + Use GtkIMage from resource + * updated color selectors to match Yaru palette + - Added bark, olive, viridian to replace aqua, green and yellow. + - Updated colors from yaru PR #3486 + - remove unnecessary metadata from theme-dark and theme-light now that + gradient is not used in SVG. + - changed color-names in cc-ubuntu.panel.c and cc-ubuntu-panel.ui + - arranged the colors in colors_row based on hue + * Remove gradient from SVG, let CSS handle the background-gradient. + + [ Marco Trevisan (Treviño) ] + * ubuntu-panel: Update the icon theme on color variant change + * ubuntu-panel: Fix issue causing g-c-c to reset the theme when using dark + variants + * ubuntu-panel: Set new color-scheme preference on dark/light changes. + This allows to keep in sync the options to that Hdy and Adw apps can + obey to that. + * ubuntu-panel: Add more Yaru color variants + * ubuntu-panel: Update the keywords for the ubuntu appearance panel + * ubuntu-panel: Use more consistent pop-over to show the desktop Icons + settings (LP: #1964732) + * debian/patches: Cherry-pick various upstream fixes part of 42 branch. + Even though we stick on 41 there are some upstream changes that couldn't + land on upstream's gnome-41 branch because they may change behavior in a + way that is not wanted in a stable update, but this is not the case for + us yet, so let's pick them. They include: + - Support for new high-contrast and color scheme settings keys + - Support for applying gracefully the theme changes + - Various memory fixes + * debian/patches: Fix a leak when creating a new user. + ANDREAAAAAAAAAAAaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! :-* + * ubuntu-panel: Ensure accent colors are visible and widget not selectable + * ubuntu-panel: Add support for configuring Desktop extension + * ubuntu-panel: Check for theme availability in Yaru gresource path + * ubuntu-panel: Ensure relevant settings work on missing optional schemas + * ubuntu-panel: Support Shell screen transition on theme change + * ubuntu-panel: Use faster and saver qdata for the accent values + * ubuntu-panel: Improve wording on Desktop Icons settings + * ubuntu-panel: Update the keywords for the ubuntu appearance panel + * ubuntu-panel: Use more consistent pop-over for the desktop Icons settings + (LP: #1964732) + + [ Jeremy Bicha ] + * debian/patches: Remove Screenshot key settings. + They are under gnome-shell umbrella now + + -- Marco Trevisan (Treviño) Fri, 18 Mar 2022 02:23:54 +0100 + +gnome-control-center (1:41.4-1ubuntu3.1) jammy; urgency=medium + + * debian/patches/git_owe_settings.patch: Fix OWE settings (lp: #1963906) + + -- Sebastien Bacher Mon, 07 Mar 2022 17:05:27 +0100 + +gnome-control-center (1:41.4-1ubuntu3) jammy; urgency=medium + + [ Marco Trevisan (Treviño) ] + * debian/patches: Refresh + * debian/patches: Backport Privacy Screen support patches + * debian/control: Depend on gnome schemas 42 + * ubuntu: Cleanup accent-color selection code and enable only when relevant + + [ Muqtxdir ] + * ubuntu-panel: minor-tweaks to cc-ubuntu-dock-dialog + * ubuntu-panel: Add switch to change dock panel-mode + * ubuntu: Add support to selecting a theme accent color + * Modify Mulitasking assets for accent-colors + + -- Marco Trevisan (Treviño) Fri, 25 Feb 2022 11:39:21 +0100 + +gnome-control-center (1:41.4-1ubuntu2) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + * d/p/u/display-Allow-fractional-scaling-to-be-enabled.patch: + Ensure renderer is initialized. + It may not be the case when running with non-patched mutter, so not a + bug, but this helps in development scenarios. + * d/p/u/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Do not crash if gedit is not installed + * ubuntu-panel: Save dock monitor by connector and support primary monitor + Dash to dock used to use the shell's monitor ID to pick the monitor in + which should be used, however this is not something that worked well + in case one switches configuration or uses a laptop in different + scenarios as the dock may be moved to the wrong display. + As per this: + - Add a "Primary monitor" item, to bind the dock position to the + primary monitor (whatever it is) + - Store the selected monitor by its connector + - Add backward compatibility support for the old 'preferred-monitor' + key, and migrate to it. + Related to: https://github.com/micheleg/dash-to-dock/pull/1630 + * multitasking-panel: Sync workspace and monitor isolation dock settings. + When using ubuntu-dock the multitasking panel setting doesn't fully + apply, because even though the user selects to isolate workspaces, the + dock may still continue to show icons from all the workspaces. + As per this, ensure that the settings are applied also to the dock, plus + include dock-specifc settings to control multi-monitor behavior. + * ubuntu-panel: Use libhandy widgets for the dock section. + This will help with Gtk and libadwaita porting in future, so let's just + such widgets that are also more integrated with the current g-c-c design + - ubuntu-panel: Use more modern libadwaita widgets for dock settings. + This should make gtk4 porting even easier, plus we can be more consitent + with the majority of other g-c-c panels. + - ubuntu-panel: Add dock specific dialog to control. + Add a dock settings dialog to control some more specific settings. + So far we only support toggling the visualization of device and trash + icons, but this could be extended more in future. (LP: #1846205) + - ubuntu-panel: Improve appearance-page to use more consistent look + - Make use of HdyPrefrencesPage for Appearance-panel. + - Make use of HdyPrefrencesGroup for Window colors. + - Make use of custom css style classes from appearance.css + - Update the light/dark variant preview images (LP: #1943849) + + -- Gianfranco Costamagna Thu, 17 Feb 2022 20:50:39 +0100 + gnome-control-center (1:41.4-1) unstable; urgency=medium * Team upload @@ -257,6 +740,52 @@ gnome-control-center (1:41.4-1) unstable -- Simon McVittie Wed, 16 Feb 2022 10:54:42 +0000 +gnome-control-center (1:41.2-2ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + * debian/patches: Refresh + * d/p/u/display-Allow-fractional-scaling-to-be-enabled.patch: + Ensure renderer is initialized. + It may not be the case when running with non-patched mutter, so not a + bug, but this helps in development scenarios. + * d/p/u/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Do not crash if gedit is not installed + * ubuntu-panel: Save dock monitor by connector and support primary monitor + Dash to dock used to use the shell's monitor ID to pick the monitor in + which should be used, however this is not something that worked well + in case one switches configuration or uses a laptop in different + scenarios as the dock may be moved to the wrong display. + As per this: + - Add a "Primary monitor" item, to bind the dock position to the + primary monitor (whatever it is) + - Store the selected monitor by its connector + - Add backward compatibility support for the old 'preferred-monitor' + key, and migrate to it. + Related to: https://github.com/micheleg/dash-to-dock/pull/1630 + * multitasking-panel: Sync workspace and monitor isolation dock settings. + When using ubuntu-dock the multitasking panel setting doesn't fully + apply, because even though the user selects to isolate workspaces, the + dock may still continue to show icons from all the workspaces. + As per this, ensure that the settings are applied also to the dock, plus + include dock-specifc settings to control multi-monitor behavior. + * ubuntu-panel: Use libhandy widgets for the dock section. + This will help with Gtk and libadwaita porting in future, so let's just + such widgets that are also more integrated with the current g-c-c design + - ubuntu-panel: Use more modern libadwaita widgets for dock settings. + This should make gtk4 porting even easier, plus we can be more consitent + with the majority of other g-c-c panels. + - ubuntu-panel: Add dock specific dialog to control. + Add a dock settings dialog to control some more specific settings. + So far we only support toggling the visualization of device and trash + icons, but this could be extended more in future. (LP: #1846205) + - ubuntu-panel: Improve appearance-page to use more consistent look + - Make use of HdyPrefrencesPage for Appearance-panel. + - Make use of HdyPrefrencesGroup for Window colors. + - Make use of custom css style classes from appearance.css + - Update the light/dark variant preview images (LP: #1943849) + + -- Gianfranco Costamagna Sun, 06 Feb 2022 22:57:51 +0100 + gnome-control-center (1:41.2-2) unstable; urgency=medium * Team upload @@ -279,6 +808,66 @@ gnome-control-center (1:41.2-1) unstable -- Jeremy Bicha Sun, 05 Dec 2021 09:54:38 -0500 +gnome-control-center (1:41.1-1ubuntu3) jammy; urgency=medium + + [ Marco Trevisan (Treviño) ] + * debian/patches: Refresh + * d/p/u/display-Allow-fractional-scaling-to-be-enabled.patch: + Ensure renderer is initialized. + It may not be the case when running with non-patched mutter, so not a + bug, but this helps in development scenarios. + * d/p/u/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Do not crash if gedit is not installed + * ubuntu-panel: Save dock monitor by connector and support primary monitor + Dash to dock used to use the shell's monitor ID to pick the monitor in + which should be used, however this is not something that worked well + in case one switches configuration or uses a laptop in different + scenarios as the dock may be moved to the wrong display. + As per this: + - Add a "Primary monitor" item, to bind the dock position to the + primary monitor (whatever it is) + - Store the selected monitor by its connector + - Add backward compatibility support for the old 'preferred-monitor' + key, and migrate to it. + Related to: https://github.com/micheleg/dash-to-dock/pull/1630 + * multitasking-panel: Sync workspace and monitor isolation dock settings. + When using ubuntu-dock the multitasking panel setting doesn't fully + apply, because even though the user selects to isolate workspaces, the + dock may still continue to show icons from all the workspaces. + As per this, ensure that the settings are applied also to the dock, plus + include dock-specifc settings to control multi-monitor behavior. + * ubuntu-panel: Use libhandy widgets for the dock section. + This will help with Gtk and libadwaita porting in future, so let's just + such widgets that are also more integrated with the current g-c-c design + * ubuntu-panel: Use more modern libadwaita widgets for dock settings. + This should make gtk4 porting even easier, plus we can be more consitent + with the majority of other g-c-c panels. + * ubuntu-panel: Add dock specific dialog to control. + Add a dock settings dialog to control some more specific settings. + So far we only support toggling the visualization of device and trash + icons, but this could be extended more in future. (LP: #1846205) + + [ Muqtxdir ] + * ubuntu-panel: Improve appearance-page to use more consistent look + - Make use of HdyPrefrencesPage for Appearance-panel. + - Make use of HdyPrefrencesGroup for Window colors. + - Make use of custom css style classes from appearance.css + - Update the light/dark variant preview images (LP: #1943849) + + -- Marco Trevisan (Treviño) Mon, 31 Jan 2022 03:42:47 +0100 + +gnome-control-center (1:41.1-1ubuntu2) jammy; urgency=medium + + * Fix FTBFS with recent meson version. + + -- Robert Ancell Wed, 19 Jan 2022 15:03:40 +1300 + +gnome-control-center (1:41.1-1ubuntu1) jammy; urgency=medium + + * Resynchronize with debian and update to the new serie + + -- Sebastien Bacher Tue, 16 Nov 2021 13:37:15 +0100 + gnome-control-center (1:41.1-1) unstable; urgency=medium * Team upload @@ -323,6 +912,85 @@ gnome-control-center (1:40.0-2) unstable -- Simon McVittie Sat, 11 Sep 2021 21:32:44 +0100 +gnome-control-center (1:40.0-1ubuntu6) UNRELEASED; urgency=medium + + [ Gunnar Hjalmarsson ] + * Add gedit-common to gcc Depends (LP: #1947519) + - Needed for Allow-tweaking-some-settings-for-Ubuntu-Dock.patch + + -- Gunnar Hjalmarsson Mon, 18 Oct 2021 13:23:44 +0200 + +gnome-control-center (1:40.0-1ubuntu5) impish; urgency=medium + + * d/p/keyboard-Create-CcXkbModifierDialog-only-when-used.patch, + d/p/keyboard-Rename-XkbOption-and-XkbModifier-with-Cc-prefix.patch: + - Avoid Alternate Characters Key unexpected behavior (LP: #1934761) + * d/p/keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch: + - Extra 'safety' (LP: #1934761) + + -- Gunnar Hjalmarsson Thu, 19 Aug 2021 12:58:46 +0200 + +gnome-control-center (1:40.0-1ubuntu4) impish; urgency=medium + + [ Muqtadir ] + * d/p/u/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Update theme selector to match theme changes. + + -- Robert Ancell Thu, 05 Aug 2021 12:40:07 +1200 + +gnome-control-center (1:40.0-1ubuntu3) impish; urgency=medium + + [ Gunnar Hjalmarsson ] + * Adapts-the-region-capplet-and-the-language-chooser-in-the.patch: + - Revert the "Fix locales updates" commit + - Drop update_region() call with NULL argument + * d/p/u/Fix-volume-adjustment-failure-on-volume-slider.patch: + - Added patch headers + + [ Hui Wang ] + * d/p/u/Fix-volume-adjustment-failure-on-volume-slider.patch: + - Can't adjust the output volume via volume-slider after changing + the current output-device. (LP: #1938747) + + -- Gunnar Hjalmarsson Tue, 03 Aug 2021 12:46:03 +0200 + +gnome-control-center (1:40.0-1ubuntu2) impish; urgency=medium + + * debian/ubuntu-logo-icon.png, + debian/gnome-control-center-data.install, + d/p/d/info-overview-Use-the-Vendor-logo-prominently.patch: + - use a vendor logo icon which is available in Ubuntu (lp: #1934564) + + -- Sebastien Bacher Fri, 09 Jul 2021 13:10:17 +0200 + +gnome-control-center (1:40.0-1ubuntu1) impish; urgency=medium + + * Merge with debian + * debian/patches: Refresh and rebase + * debian/patches: Use debian-gnome standard unnumered names. + Having numbered patches makes it only harder to maintain and rebase, so + let's just follow the gnome-team rules and use proper names for them as + gbp pq generates. + If you don't use it, well do :). + * debian/patches: Cherry-pick upstream proposed patches to handle cases + that we were handlig by reverting 3.38 changes. + * d/p/Provide-an-api-for-the-installation-of-language-pack.patch: Drop. + This was needed to handle language pack installation, but it's something + that is obsolete now. + * d/p/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch: + - Looks like it needed to be ordered to be rebased proplerly, so adapt it + to new code hiding the "more" button from ui file. + - Fix locales updates. + Ensure that when user language changes we set back the region to the + default per the chosen language + * debian/patches: Move patches into the debian namespace. + They're all only needed in debian, so let's use a proper namespace. + * debian/patches: Move the ubuntu-only patches into the ubuntu namespace. + We can organize patches better this way avoiding comments that gbp pq + would delete. + + -- Marco Trevisan (Treviño) Fri, 11 Jun 2021 03:38:52 +0200 + gnome-control-center (1:40.0-1) experimental; urgency=medium [ Marco Trevisan (Treviño) ] @@ -339,18 +1007,96 @@ gnome-control-center (1:40.0-1) experime -- Marco Trevisan (Treviño) Thu, 10 Jun 2021 18:36:49 +0200 +gnome-control-center (1:3.38.6-0ubuntu2) impish; urgency=medium + + [ Gunnar Hjalmarsson ] + * Added note to the header of patch 0030 + + [ Marco Trevisan (Treviño) ] + * debian/patches: Ensure we list all the usable scaling values. + List all the usable scaling values without limiting us to the first 5 + available, but try instead to show the values closer to the one selected. + (LP: #1795483) + * debian/patches: Do not leak a variant builder on single monitor setup + + -- Marco Trevisan (Treviño) Fri, 28 May 2021 20:48:42 +0200 + +gnome-control-center (1:3.38.6-0ubuntu1) impish; urgency=medium + + * New bugfix update based on Debian + + [ Simon McVittie ] + * New upstream release + - Translation update: pt + + [ Laurent Bigonville ] + * debian/control.in: Bump libnm-dev BD to 1.20.0 + + -- Sebastien Bacher Mon, 17 May 2021 16:02:35 +0200 + +gnome-control-center (1:3.38.5-1ubuntu1) hirsute; urgency=medium + + * New bugfix update based on Debian + + -- Sebastien Bacher Tue, 23 Mar 2021 08:54:54 +0100 + gnome-control-center (1:3.38.5-1) experimental; urgency=medium * New upstream release -- Sebastien Bacher Tue, 23 Mar 2021 08:46:50 +0100 +gnome-control-center (1:3.38.4-1ubuntu2) hirsute; urgency=medium + + * debian/control.in: + - Recommends power-profiles-daemon + * debian/patches/git_power_profiles.patch: + - power: Add "Power Mode" sectionn. Use power-profiles-daemon + to implement switchable power profiles. The performance profile will + only be available on systems which provide this functionality. + + -- Sebastien Bacher Tue, 23 Feb 2021 20:59:56 +0100 + +gnome-control-center (1:3.38.4-1ubuntu1) hirsute; urgency=medium + + * New upstream version based on Debian + + -- Sebastien Bacher Fri, 19 Feb 2021 12:25:12 +0100 + gnome-control-center (1:3.38.4-1) unstable; urgency=medium * New upstream release -- Sebastien Bacher Fri, 19 Feb 2021 11:59:19 +0100 +gnome-control-center (1:3.38.3-1ubuntu3) hirsute; urgency=medium + + * d/p/0024-display-Allow-fractional-scaling-to-be-enabled.patch: + - Support kms renderer in fractional scaling toggle (LP: #1894593) + - Change logical layout mode when switching mode in wayland + + -- Marco Trevisan (Treviño) Wed, 10 Feb 2021 13:43:55 +0100 + +gnome-control-center (1:3.38.3-1ubuntu2) hirsute; urgency=medium + + * debian/patches/ubuntu_restore_sharing.patch: + - remove the patch bringing back the vino desktop sharing since + gnome-remote-desktop support is enabled in Ubuntu now + * debian/patches/git_fingerprint_improvements.patch: + - backport fingerprint improvements made by Treviño + * Remove user config migration script which was needed until focal + + -- Sebastien Bacher Tue, 09 Feb 2021 11:31:06 +0100 + +gnome-control-center (1:3.38.3-1ubuntu1) hirsute; urgency=medium + + * New upstream version based on Debian (lp: #1911918) + * debian/patches/0016-diagnostics-Add-Whoopsie-support.patch: + - display the whoopsie status to 'autoreport' if the corresponding key + is set to true even if report=false (see lp #1906877) + + -- Sebastien Bacher Fri, 15 Jan 2021 15:10:51 +0100 + gnome-control-center (1:3.38.3-1) unstable; urgency=medium * Team upload @@ -367,6 +1113,23 @@ gnome-control-center (1:3.38.2-2) unstab -- Laurent Bigonville Fri, 25 Dec 2020 10:16:26 +0100 +gnome-control-center (1:3.38.2-1ubuntu2) hirsute; urgency=medium + + [ Brian Murray ] + * 0016-diagnostics-Add-Whoopsie-support.patch: ensure that we always perform + the call to automatically report crashes so that it will be turned off if + "never" is chosen. (LP: #1906877) + + -- Sebastien Bacher Mon, 07 Dec 2020 18:56:07 +0100 + +gnome-control-center (1:3.38.2-1ubuntu1) hirsute; urgency=medium + + * New upstream version based on Debian + * debian/patches/gitlab_ucm_mixer_control_select.patch: + - remove change included in the new version + + -- Sebastien Bacher Mon, 23 Nov 2020 21:03:57 +0100 + gnome-control-center (1:3.38.2-1) unstable; urgency=medium * Team upload @@ -387,6 +1150,15 @@ gnome-control-center (1:3.38.2-1) unstab -- Simon McVittie Mon, 23 Nov 2020 10:14:09 +0000 +gnome-control-center (1:3.38.1-1ubuntu1) groovy; urgency=medium + + * New upstream version based on Debian + * d/p/0033-sound-update-the-profile-list-after-getting-the-sign.patch: + - removed, the change is in the new version + * Build without malcontent which is in universe + + -- Sebastien Bacher Mon, 05 Oct 2020 15:20:23 +0200 + gnome-control-center (1:3.38.1-1) unstable; urgency=medium * New upstream release @@ -403,6 +1175,23 @@ gnome-control-center (1:3.38.0-2) unstab -- Simon McVittie Fri, 25 Sep 2020 10:27:01 +0100 +gnome-control-center (1:3.38.0-1ubuntu2) groovy; urgency=medium + + * d/p/0033-sound-update-the-profile-list-after-getting-the-sign.patch + - signal to update profile combo list after the PA changes the + active profile, this patch fixes the empty profile combo list issue + after selecting the hdmi/dp audio in the g-c-c. (LP: #1896919) + + -- Hui Wang Thu, 24 Sep 2020 09:54:10 +0000 + +gnome-control-center (1:3.38.0-1ubuntu1) groovy; urgency=medium + + * New upstream version based on Debian + * debian/patches/gitlab_details_layout.patch: + - removed, the change is in the new version + + -- Sebastien Bacher Tue, 15 Sep 2020 15:05:08 +0200 + gnome-control-center (1:3.38.0-1) experimental; urgency=medium * New upstream release @@ -452,18 +1241,139 @@ gnome-control-center (1:3.36.4-1) unstab -- Sebastien Bacher Mon, 06 Jul 2020 16:47:10 +0200 +gnome-control-center (1:3.36.3-1ubuntu2) groovy; urgency=medium + + * debian/patches/git-sound-profile.patch: + - sound: Stop non-interactive profile changes from triggering + changed events, fix selection issues (lp: #1885673) + + -- Sebastien Bacher Thu, 02 Jul 2020 11:01:31 +0200 + +gnome-control-center (1:3.36.3-1ubuntu1) groovy; urgency=medium + + * New upstream version rebased on Debian (lp: #1884063) + + [ Gunnar Hjalmarsson ] + * debian/patches/0030-temporarily-revert-alt-char-key.patch: + - Change po/POTFILES.in too, so dh_translations can create + gnome-control-center-2.0.pot. + * d/p/0015-connectivity-add-network-connectivity-checking-toggl.patch: + - Add "privacy" to Keywords in the .desktop file in line with + https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/05f3cb67 + (LP: #1869288) + + [ Marco Trevisan (Treviño) ] + * d/p/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Ensure dock position is respected in RTL (LP: #1876937) + - Add proper matching the dock monitor ID (LP: #1877108) + * d/p/0024-display-Allow-fractional-scaling-to-be-enabled.patch: + - Improve fractional scaling toggling (LP: #1876891, #1876894) + - Look for proper fractional scaling key in Wayland and X11 (LP: #1871864) + * d/p/0031-fingerprint-dialog-Don-t-limit-the-number-of-maximum.patch: + - Don't make flowbox children selectable (LP: #1877441) + + -- Sebastien Bacher Thu, 18 Jun 2020 13:44:56 +0200 + gnome-control-center (1:3.36.3-1) unstable; urgency=medium * New upstream release -- Sebastien Bacher Thu, 18 Jun 2020 13:38:15 +0200 +gnome-control-center (1:3.36.2-1ubuntu1) groovy; urgency=medium + + * New upstream version rebased on Debian (lp: #1876256) + * debian/patches/0001-sound-Fix-translation-of-System-Sounds.patch, + debian/patches/0028-applications-Fix-only-connected-snap-interfaces-show.patch, + debian/patches/git-info-crash-on-nvidia.patch, + debian/patches/git-nongnome-segfault.patch: + - removed, included in the new version + + -- Sebastien Bacher Fri, 01 May 2020 09:10:17 +0200 + gnome-control-center (1:3.36.2-1) unstable; urgency=medium * New upstream release -- Sebastien Bacher Fri, 01 May 2020 09:02:41 +0200 +gnome-control-center (1:3.36.1-1ubuntu6) groovy; urgency=medium + + [ Marco Trevisan ] + * debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - disable dock in all monitors when choosing a specific one (lp: #1866088) + - Ignore inactive monitors (lp: #1873890) + - Show shell labels when using appearance panel (lp: #1873883) + + [ Olivier Tilloy ] + * d/p/0032-online-accounts-maybe-leak-a-reference-to-the-panel.patch: + maybe leak a reference to the panel, to prevent a crash (LP: #1862553) + + -- Olivier Tilloy Mon, 27 Apr 2020 22:47:58 +0200 + +gnome-control-center (1:3.36.1-1ubuntu5) focal; urgency=medium + + * debian/patches/git-info-crash-on-nvidia.patch: + - backport a fix for an info panel segfault on nvidia cards + (lp: #1870737) + * debian/patches/git-nongnome-segfault.patch: + - don't segfault when started outside of GNOME (lp: #1870735) + + [ Marco Trevisan ] + * d/p/0028-user-panel-Add-reference-to-selected-user-and-clear-.patch, + * d/p/0029-user-panel-Don-t-wait-for-fprintd-on-initialization.patch, + d/p/0030-fingerprint-dialog-Don-t-use-sync-calls-for-deleting.patch, + d/p/0031-fingerprint-dialog-Don-t-limit-the-number-of-maximum.patch: + - Don't wait for fprintd on initialization and don't limit enroll stages + (lp: #1865845) + + [ Robert Ancell ] + * debian/patches/0027-window-Stop-using-HdyLeaflet.patch: + - Disable adaptive layouts, theres some bugs and they're not required on + desktop (LP: #1871195) + * debian/patches/0028-applications-Fix-only-connected-snap-interfaces-show.patch: + - Fix disconnected snap interfaces not showing (LP: #1870600) + * debian/patches/0029-applications-Use-new-snapd-glib-API-for-labelling-Sn.patch: + * debian/control: + - Use shared names for snap interfaces, fixing some interfaces that don't + have labels. + + [ Gunnar Hjalmarsson ] + * debian/patches/0030-temporarily-revert-alt-char-key.patch: + - Revert the "Alternate Characters Key" commit temporarily awaiting + a proper fix of LP: #1867548. + + -- Sebastien Bacher Thu, 16 Apr 2020 12:30:37 +0200 + +gnome-control-center (1:3.36.1-1ubuntu4) focal; urgency=medium + + * debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch: + * debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch: + - Launch snap-store if it is installed (LP: #1867000) + + -- Robert Ancell Mon, 06 Apr 2020 11:00:15 +1200 + +gnome-control-center (1:3.36.1-1ubuntu3) focal; urgency=medium + + * debian/patches/0001-sound-Fix-translation-of-System-Sounds.patch: + - Fix system sounds not being translated (LP: #1870152) + + -- Robert Ancell Thu, 02 Apr 2020 13:47:54 +1300 + +gnome-control-center (1:3.36.1-1ubuntu2) focal; urgency=medium + + [ Robert Ancell ] + * debian/patches/ubuntu-scaling-option.patch: + - display: Allow fractional scaling to be enabled (lp: #1868019) + + -- Sebastien Bacher Tue, 31 Mar 2020 11:31:20 +0200 + +gnome-control-center (1:3.36.1-1ubuntu1) focal; urgency=medium + + * New upstream version + + -- Sebastien Bacher Fri, 27 Mar 2020 10:27:03 +0100 + gnome-control-center (1:3.36.1-1) unstable; urgency=medium * New upstream release @@ -480,6 +1390,34 @@ gnome-control-center (1:3.36.0-1) unstab -- Laurent Bigonville Tue, 10 Mar 2020 19:17:55 +0100 +gnome-control-center (1:3.36.0-0ubuntu3) focal; urgency=medium + + * debian/patches/0023-sound-Add-a-button-to-select-the-default-theme.patch + - Make able to restore sound theme to default (LP: #1753070) + + -- Robert Ancell Thu, 19 Mar 2020 16:50:02 +1300 + +gnome-control-center (1:3.36.0-0ubuntu2) focal; urgency=medium + + * debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Only show appearance panel in Ubuntu session (LP: #1866618) + + -- Robert Ancell Tue, 10 Mar 2020 12:47:02 +1300 + +gnome-control-center (1:3.36.0-0ubuntu1) focal; urgency=medium + + * New upstream release + * debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Fix crash when theme changed to unknown value (LP: #1866246) + + -- Robert Ancell Tue, 10 Mar 2020 11:55:07 +1300 + +gnome-control-center (1:3.35.92-1ubuntu1) focal; urgency=medium + + * New upstream version + + -- Sebastien Bacher Wed, 04 Mar 2020 15:02:08 +0100 + gnome-control-center (1:3.35.92-1) experimental; urgency=medium * New upstream version, update based on Ubuntu @@ -494,6 +1432,42 @@ gnome-control-center (1:3.35.92-1) exper -- Sebastien Bacher Wed, 04 Mar 2020 12:18:35 +0100 +gnome-control-center (1:3.35.91-0ubuntu3) focal; urgency=medium + + * debian/patches/0003-info-overview-Use-the-Ubuntu-logo-prominently.patch: + - Fix Ubuntu logo not showing in about panel (LP: #1864577) + + -- Robert Ancell Tue, 03 Mar 2020 13:55:58 +0100 + +gnome-control-center (1:3.35.91-0ubuntu2) focal; urgency=medium + + * debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch: + - Add theme selector to Ubuntu settings panel + + -- Robert Ancell Tue, 25 Feb 2020 11:19:28 +1300 + +gnome-control-center (1:3.35.91-0ubuntu1) focal; urgency=medium + + * New upstream release + + -- Robert Ancell Tue, 18 Feb 2020 15:41:59 +1300 + +gnome-control-center (1:3.35.90-0ubuntu1) focal; urgency=medium + + * New upstream release + * debian/control: + - Set minimum version for libgudev-1.0-dev + + -- Robert Ancell Mon, 03 Feb 2020 14:30:26 +1300 + +gnome-control-center (1:3.35.2-0ubuntu1) focal; urgency=medium + + * New upstream release + * debian/rules: + - Build with -Dprivileged_group=sudo + + -- Robert Ancell Fri, 31 Jan 2020 15:33:30 +1300 + gnome-control-center (1:3.34.4-1) unstable; urgency=medium * Team upload @@ -524,6 +1498,78 @@ gnome-control-center (1:3.34.2-1) unstab -- Simon McVittie Tue, 10 Dec 2019 12:24:48 +0000 +gnome-control-center (1:3.34.1-1ubuntu2) eoan; urgency=medium + + * debian/patches/gitlab_background_segfault.patch: + - patch from Robert Ancell to fix a segfault in the background panel + (lp: #1847103) + + -- Sebastien Bacher Tue, 15 Oct 2019 17:52:51 +0200 + +gnome-control-center (1:3.34.1-1ubuntu1) eoan; urgency=medium + + * Merge with debian unstable. Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend system-config-printer + - Recommend ibus and ubuntu-system-service + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on dh-migrations and libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + - Bump dep on g-s-d and schema + + Split gnome-control-center-faces to a separate package so that it can be + used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + + debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + + debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + Add migration script to transition from old user settings to new one. + + debian/patches: + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-default-height.patch: + Ensure all items fit in sidebar without scrolling with Yaru theme + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to work around + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-region-langpack-install.patch: + Check for missing language packs when loading region panel to pull + in packs that aren't included with the installer + - ubuntu-region-packagekit.patch + Fix detection of installed language packs + * debian/patches/online_accounts_segfault.patch: + - removed, the issue is fixed in the new version + + -- Sebastien Bacher Mon, 07 Oct 2019 17:26:09 +0200 + gnome-control-center (1:3.34.1-1) unstable; urgency=medium * New upstream release @@ -545,6 +1591,75 @@ gnome-control-center (1:3.34.0.1-1) expe -- Iain Lane Mon, 09 Sep 2019 17:11:55 +0100 +gnome-control-center (1:3.33.90-1ubuntu2) eoan; urgency=medium + + * debian/control.in: + - restore rygel to a recommends since the MIR got review now + + -- Sebastien Bacher Thu, 22 Aug 2019 17:37:01 +0200 + +gnome-control-center (1:3.33.90-1ubuntu1) eoan; urgency=medium + + * Merge with debian unstable. Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend system-config-printer + - Recommend ibus and ubuntu-system-service + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on dh-migrations and libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + - Bump dep on g-s-d and schema + + Split gnome-control-center-faces to a separate package so that it can be + used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + + debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + + debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + Add migration script to transition from old user settings to new one. + + debian/patches: + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-default-height.patch: + Ensure all items fit in sidebar without scrolling with Yaru theme + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to work around + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-region-langpack-install.patch: + Check for missing language packs when loading region panel to pull + in packs that aren't included with the installer + - ubuntu-region-packagekit.patch + Fix detection of installed language packs + + -- Iain Lane Mon, 19 Aug 2019 17:10:39 +0100 + gnome-control-center (1:3.33.90-1) experimental; urgency=medium [ Laurent Bigonville ] @@ -579,18 +1694,170 @@ gnome-control-center (1:3.33.90-1) exper -- Iain Lane Mon, 19 Aug 2019 15:21:34 +0100 +gnome-control-center (1:3.32.2-1ubuntu5) eoan; urgency=medium + + * Rebuild for new gnome-desktop soname version + + -- Sebastien Bacher Mon, 19 Aug 2019 16:37:40 +0200 + +gnome-control-center (1:3.32.2-1ubuntu4) eoan; urgency=medium + + * Patch fixing: + - Upstreamed changes broken out to git_locale_modifiers.patch + - 52_region_language.patch modified accordingly and the description + somewhat updated. + + -- Gunnar Hjalmarsson Mon, 22 Jul 2019 23:08:00 +0200 + +gnome-control-center (1:3.32.2-1ubuntu3) eoan; urgency=medium + + * debian/patches/52_region_language.patch: + - Enable translation of locale modifiers shown in the language + list. + * debian/control, debian/control.in: + - Bump version of the libgnome-desktop-3-dev build dependency due + to use of a new gnome_get_translated_modifier() function. + + -- Gunnar Hjalmarsson Sat, 13 Jul 2019 21:09:00 +0200 + +gnome-control-center (1:3.32.2-1ubuntu2) eoan; urgency=medium + + * Restore revision 1:3.32.1-1ubuntu5 discarded by error + + -- Sebastien Bacher Wed, 29 May 2019 12:50:31 +0200 + +gnome-control-center (1:3.32.2-1ubuntu1) eoan; urgency=medium + + * New upstream stable version, based on the Debian update (lp: #1830884) + - Fix crash if a monitor has no preferred mode (lp: #1820861) + - Set correct sleep value for the 90 minutes choice (lp: #1827346) + * d/p/git_nightlight_translations.patch, + d/p/0001-region-Fix-input-source-options-not-being-applied.patch: + - remove those patches, the changes are in the new version + + -- Sebastien Bacher Wed, 29 May 2019 12:43:47 +0200 + gnome-control-center (1:3.32.2-1) experimental; urgency=medium * New upstream release -- Sebastien Bacher Wed, 29 May 2019 12:27:36 +0200 +gnome-control-center (1:3.32.1-1ubuntu5) eoan; urgency=medium + + * debian/patches/52_region_language.patch: + Fix languages whose locale includes a modifier (LP: #1823778): + - Make language labels include modifiers when present + - Don't drop possible modifier when setting language + + -- Gunnar Hjalmarsson Mon, 29 Apr 2019 13:23:29 +0100 + +gnome-control-center (1:3.32.1-1ubuntu4) disco; urgency=medium + + * debian/patches/git_nightlight_translations.patch: + - define some strings in the night light dialog as translatable + + [ Gunnar Hjalmarsson ] + * debian/patches/series: + - Disable ubuntu-region-langpack-install.patch (partially fixes + LP: #1823778). + + [ Iain Lane ] + * Fix mismerged ubuntu-language-support patch. The UI was put in the wrong + place in the .ui file, where it didn't show up. + * debian/patches/info-use-UDisks-to-retrieve-disk-size.patch: Drop. + This is upstream and no longer in the patch series. + + -- Sebastien Bacher Fri, 12 Apr 2019 16:20:42 +0200 + +gnome-control-center (1:3.32.1-1ubuntu3) disco; urgency=medium + + * debian/patches/0001-region-Fix-input-source-options-not-being-applied.patch: + - Fix input sources per-window setting not being applied (LP: #1822775) + + -- Robert Ancell Tue, 09 Apr 2019 14:27:07 +1200 + +gnome-control-center (1:3.32.1-1ubuntu2) disco; urgency=medium + + * debian/patches/ubuntu_privacy_hide_buggy_controls.patch: + - don't list non working camera/microphones items in the privacy + settings, those have been added this cycle but are not working + + [ Marco Trevisan (Treviño) ] + * debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch: + - Take care of global UI scaled logical monitors width (LP: #1823488) + + -- Sebastien Bacher Mon, 08 Apr 2019 15:32:37 +0200 + +gnome-control-center (1:3.32.1-1ubuntu1) disco; urgency=medium + + * New upstream stable version, based on the Debian update + - Only show Bluetooth devices in Bluetooth section (lp: #1785311) + * Remove the patches included in the new version + + -- Sebastien Bacher Fri, 05 Apr 2019 23:01:07 +0200 + gnome-control-center (1:3.32.1-1) experimental; urgency=medium * New upstream release -- Sebastien Bacher Wed, 03 Apr 2019 18:25:00 +0200 +gnome-control-center (1:3.32.0.1-1ubuntu6) disco; urgency=medium + + * debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch: + - Make sure the display panel primary monitor matches configured one + * debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch: + - Support scaled logical monitors using UI scale as it could happen when + using the X11 Randr scaling (LP: #1820850) + + -- Marco Trevisan (Treviño) Wed, 27 Mar 2019 06:10:59 +0100 + +gnome-control-center (1:3.32.0.1-1ubuntu5) disco; urgency=medium + + * debian/patches/0001-sound-Fix-crash-when-sound-device-set-to-NULL.patch: + - Fix crash introduced in previous fix + + -- Robert Ancell Thu, 14 Mar 2019 11:31:22 +1300 + +gnome-control-center (1:3.32.0.1-1ubuntu4) disco; urgency=medium + + * debian/patches/0001-sound-Apply-device-changes.patch: + - Fix sound output device change not being applied (LP: #1817338) + + -- Robert Ancell Thu, 14 Mar 2019 11:05:45 +1300 + +gnome-control-center (1:3.32.0.1-1ubuntu3) disco; urgency=medium + + * debian/control: + - Add libsnapd-glib-deb to build-depends + + -- Robert Ancell Wed, 13 Mar 2019 16:41:46 +1300 + +gnome-control-center (1:3.32.0.1-1ubuntu2) disco; urgency=medium + + * debian/rules: + * debian/patches/0001-applications-Fix-wrong-IDs-being-passed-to-portal-pe.patch: + * debian/patches/0002-applications-Add-missing-whitespace.patch: + * debian/patches/0003-applications-Fix-builtin-permissions-showing-when-no.patch: + * debian/patches/0004-applications-Rename-functions-as-portal-permssions-a.patch: + * debian/patches/0005-applications-Show-portal-permissions-for-snaps.patch: + * debian/patches/0006-applications-Show-snap-app-sizes.patch: + * debian/patches/0007-applications-Show-snap-interface-controls.patch: + * debian/patches/0008-applications-Add-hack-detect-snaps-before-X-SnapInst.patch: + - Show snap information on applications page (LP: #1819788) + + -- Robert Ancell Wed, 13 Mar 2019 11:03:01 +1300 + +gnome-control-center (1:3.32.0.1-1ubuntu1) disco; urgency=medium + + * New upstream version + - Correctly select "single" mode when opening display panel + (lp: #1818751) + * Remove the patches included in the new version + + -- Sebastien Bacher Tue, 12 Mar 2019 11:08:37 +0100 + gnome-control-center (1:3.32.0.1-1) experimental; urgency=medium * New upstream release @@ -611,6 +1878,78 @@ gnome-control-center (1:3.31.92-2) exper -- Sebastien Bacher Wed, 06 Mar 2019 16:05:01 +0100 +gnome-control-center (1:3.31.92-1ubuntu1) disco; urgency=medium + + * New version includes: + - Revert making Settings responsive; it needs more polish to reach the + quality we want (lp: #1817509, #1817425) + * debian/patches/online_accounts_segfault.patch: + don't segfault when calling the online account panel with add provider, + thanks Andrea Azzarone + * Merge with debian unstable. Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend system-config-printer + - Recommend ibus and ubuntu-system-service + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on dh-migrations and libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + - Bump dep on g-s-d and schema + + Split gnome-control-center-faces to a separate package so that it can be + used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + + debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + + debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + Add migration script to transition from old user settings to new one. + + debian/patches: + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-default-height.patch: + Ensure all items fit in sidebar without scrolling with Yaru theme + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to work around + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-region-langpack-install.patch: + Check for missing language packs when loading region panel to pull + in packs that aren't included with the installer + - ubuntu-region-packagekit.patch + Fix detection of installed language packs + * debian/control.in: Don't depend on desktop-base + * Modify distro-logo.patch: Use Ubuntu logo + * Refresh patches + * Fix 99_add_lock-on-suspend so that the switch actually shows up + + -- Sebastien Bacher Wed, 06 Mar 2019 15:45:06 +0100 + gnome-control-center (1:3.31.92-1) experimental; urgency=medium * New upstream release @@ -635,6 +1974,79 @@ gnome-control-center (1:3.30.2-5) unstab -- Jeremy Bicha Wed, 06 Feb 2019 20:39:07 -0500 +gnome-control-center (1:3.30.2-4ubuntu2) disco; urgency=medium + + * debian/patches/71_ubuntu_dock_settings.patch, + debian/patches/ubuntu-default-height.patch: + - change the default height so all category are on screen, + we previously increased the value in the dock patch since we add an + entry there but that's not enough so let's split that part now + (lp: #1728450) + + -- Sebastien Bacher Thu, 31 Jan 2019 15:10:30 +0100 + +gnome-control-center (1:3.30.2-4ubuntu1) disco; urgency=medium + + * Merge with debian unstable. Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend system-config-printer + - Recommend ibus and ubuntu-system-service + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on dh-migrations and libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + - Bump dep on g-s-d and schema + + Split gnome-control-center-faces to a separate package so that it can be + used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + + debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + + debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + Add migration script to transition from old user settings to new one. + + debian/patches: + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - distro-logo.patch: + Add Ubuntu branding to Details panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to work around + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-region-langpack-install.patch: + Check for missing language packs when loading region panel to pull + in packs that aren't included with the installer + - ubuntu-region-packagekit.patch + Fix detection of installed language packs + + -- Iain Lane Fri, 25 Jan 2019 14:02:27 +0000 + gnome-control-center (1:3.30.2-4) unstable; urgency=medium * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch: @@ -642,6 +2054,68 @@ gnome-control-center (1:3.30.2-4) unstab -- Marco Trevisan (Treviño) Fri, 25 Jan 2019 12:39:58 +0000 +gnome-control-center (1:3.30.2-3ubuntu1) disco; urgency=medium + + * Merge with debian unstable. Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend system-config-printer + - Recommend ibus and ubuntu-system-service + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on dh-migrations and libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + - Bump dep on g-s-d and schema + + Split gnome-control-center-faces to a separate package so that it can be + used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + + debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + + debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + Add migration script to transition from old user settings to new one. + + debian/patches: + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - distro-logo.patch: + Add Ubuntu branding to Details panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to work around + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-region-langpack-install.patch: + Check for missing language packs when loading region panel to pull + in packs that aren't included with the installer + - ubuntu-region-packagekit.patch + Fix detection of installed language packs + + -- Iain Lane Mon, 14 Jan 2019 16:35:53 +0000 + gnome-control-center (1:3.30.2-3) unstable; urgency=medium * Cherry-pick 8 commits to improve accessibility @@ -658,6 +2132,75 @@ gnome-control-center (1:3.30.2-2) unstab -- Jeremy Bicha Sun, 23 Dec 2018 11:17:33 -0500 +gnome-control-center (1:3.30.2-1ubuntu1) disco; urgency=medium + + * Merge with debian unstable (LP: #1802313). Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend system-config-printer + - Recommend ibus and ubuntu-system-service + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on dh-migrations and libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + - Bump dep on g-s-d and schema + + Split gnome-control-center-faces to a separate package so that it can be + used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + + debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + + debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + Add migration script to transition from old user settings to new one. + + debian/patches: + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - distro-logo.patch: + Add Ubuntu branding to Details panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to work around + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-region-langpack-install.patch: + Check for missing language packs when loading region panel to pull + in packs that aren't included with the installer + - ubuntu-region-packagekit.patch + Fix detection of installed language packs + * debian/patches: + + 08_lowercase_user_names.patch: Drop because an alternative fix is included + in Debian. + + d/p/region-Fix-double-free-when-closing-the-input-chooser-dia.patch: Drop + because applied upstream. + + Patches have been round-tripped through gbp-pq and all rebased on the new + version - that's why their metadata has changed. + + -- Andrea Azzarone Fri, 09 Nov 2018 18:05:32 +0000 + gnome-control-center (1:3.30.2-1) unstable; urgency=medium * d/p/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch: @@ -670,6 +2213,83 @@ gnome-control-center (1:3.30.2-1) unstab -- Andrea Azzarone Thu, 08 Nov 2018 12:55:32 +0000 +gnome-control-center (1:3.30.1-1ubuntu2) cosmic; urgency=medium + + * d/p/region-Fix-double-free-when-closing-the-input-chooser-dia.patch: + - Cherry pick upstream segfault fix for the region settings + + [ Andrea Azzarone ] + * d/p/privacy-panel-whoopsie.patch: Unref the whoopsie proxy (LP: #1796872) + + -- Sebastien Bacher Wed, 10 Oct 2018 16:28:01 +0200 + +gnome-control-center (1:3.30.1-1ubuntu1) cosmic; urgency=medium + + * Merge with debian unstable (LP: #1795460) + Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend system-config-printer + - Recommend ibus and ubuntu-system-service + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on dh-migrations and libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + - Bump dep on g-s-d and schema + + Split gnome-control-center-faces to a separate package so that it can be + used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + + debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + + debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + Add migration script to transition from old user settings to new one. + + debian/patches: + - 08_lowercase_user_names.patch: + Disallow upper-case letters in user names for compliance with adduser + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - distro-logo.patch: + Add Ubuntu branding to Details panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to work around + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-region-langpack-install.patch: + Check for missing language packs when loading region panel to pull + in packs that aren't included with the installer + - ubuntu-region-packagekit.patch + Fix detection of installed language packs + * Patches have been round-tripped through gbp-pq and all rebased on the new + version - that's why their metadata has changed. + + -- Andrea Azzarone Tue, 02 Oct 2018 18:18:58 +0100 + gnome-control-center (1:3.30.1-1) unstable; urgency=medium * New upstream release @@ -715,6 +2335,18 @@ gnome-control-center (1:3.30.0-1) experi -- Simon McVittie Wed, 19 Sep 2018 14:55:49 +0100 +gnome-control-center (1:3.30.0-0ubuntu1) cosmic; urgency=medium + + * Update to 3.30.0 + + -- Didier Roche Tue, 04 Sep 2018 11:34:27 +0200 + +gnome-control-center (1:3.29.92-1ubuntu1) cosmic; urgency=medium + + * Update to 3.29.92 + + -- Sebastien Bacher Tue, 28 Aug 2018 10:57:56 +0200 + gnome-control-center (1:3.29.92-1) experimental; urgency=medium * New upstream version @@ -778,6 +2410,148 @@ gnome-control-center (1:3.29.90-1) exper -- Simon McVittie Sun, 05 Aug 2018 18:18:52 +0100 +gnome-control-center (1:3.29.90-1~ubuntu2) cosmic; urgency=medium + + [ Gunnar Hjalmarsson ] + * Fix a typo in debian/patches/52_region_language.patch which broke + displaying the selected language in the language panell of + gnome-control-center (LP: #1786880) + * debian/rules: + Make use of updated dh_translations; drop workarounds. + + -- Iain Lane Fri, 24 Aug 2018 11:53:10 +0200 + +gnome-control-center (1:3.29.90-1~ubuntu1) cosmic; urgency=medium + + [ Iain Lane ] + * Merge with unreleased Debian version (LP: #1784396) + Remaining changes: + + debian/control.in: + - Depend on language-selector-gnome and whoopsie-preferences + - Depend on instead of Recommend network-manager-gnome and + system-config-printer-common + - Recommend ibus + - Suggest instead of Recommend gnome-user-share, realmd and rygel + - Build-Depend on libwhoopsie-preferences-dev + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality + + Split gnome-control-center-faces to a separate package so + that it can be used by unity-control-center & recommend this + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + * debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + * debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. + + debian/rules: Enable whoospie integration + + debian/patches: + - 08_lowercase_user_names.patch: + Disallow upper-case letters in user names for compliance with adduser + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - distro-logo.patch: + Add Ubuntu branding to Details panel + - ubuntu-region-packagekit.patch + fix detection of installed language packs + - ubuntu-region-langpack-install.patch: + check for missing language packs when loading region panel to pull + in packs that arent included with the installer + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to + work around + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - auto_quit_after_goa_add.patch + Hide window after adding an online account from another app. + * Patches have been round-tripped through gbp-pq and all rebased on the new + version- that's why their metadata has changed. + + [ Didier Roche ] + * debian/patches/70_allow_sound_above_100.patch: + - switch gsettings key targetting volume above 100% to use now + upstream key (schema already in 3.28, but support introduced in + g-s-d in 3.29.90.1) + * debian/control*: + - bump dep on g-s-d and schema + * add migration script to transition from old user settings to new one. + + -- Iain Lane Fri, 03 Aug 2018 11:34:57 +0100 + +gnome-control-center (1:3.29.90-1) UNRELEASED; urgency=medium + + [ Arnaud Rebillout ] + * Team upload + * Bump requirement for libgtk-3, libupower-glib and cheese (per meson.build) + + [ Simon McVittie ] + * Bump Standards-Version to 4.1.5 (no changes required) + * Set Rules-Requires-Root to no + + [ Iain Lane ] + * debian/gbp.conf: + + Upstream's tags are normal now - remove the commented out + upstream-vcs-tag. + + Use patch-numbers = False + * debian/*: Update for experimental / 3.29 series + * New upstream release 3.29.4 + + Use symbolic icons in Shell search + + Introduce Dynamic Panel + + Display: + - Improve display arrangement widget + - Fix a few crashers + + Sharing: + - Expose Remote Desktop work on Wayland + + User Accounts: + - Use term "Confirm" instead of "Verify" + - Use the same phrase when passwords do not match + + Wacom: + - Hide when no Wacom devices are connected + - Remove deprecated APIs + + Wi-Fi: + - Hide when no Wi-Fi adapters are available + + Power: + - Fix showing approximate percentages + + Thunderbolt: + - Introduce new Thunderbolt panel + + User Accounts: + - Fix hint for wrong enterprise user/password + + Improve logging engine + + Add an object caching mechanism + + Vastly improve CI + + Organize tests + + Add Network tests + * d/p/Show-scrollbar-on-first-Language-window-if-needed.patch: Drop, applied + upstream. + * d/p/Expose-touchpad-settings-if-synaptics-is-in-use.patch: Refresh. + * debian/control*: + + Bump libnm* deps, and add libsecret-1-dev per meson.build. + + Add test deps (xvfb, python3-dbusmock, at-spi2-core) + * debian/gnome-control-center.docs: Remove AUTHORS, README → README.md + * debian/control*: Require gnome-settings-daemon 3.29 + + -- Iain Lane Fri, 27 Jul 2018 16:32:23 +0100 + gnome-control-center (1:3.28.2-1) unstable; urgency=medium * Team upload @@ -788,6 +2562,17 @@ gnome-control-center (1:3.28.2-1) unstab -- Simon McVittie Wed, 27 Jun 2018 09:18:33 +0100 +gnome-control-center (1:3.28.2-0ubuntu1) cosmic; urgency=medium + + * New bugfix version (lp: #1780280) + * debian/patches/0006-build-Fix-USER_DIR_MODE-value-in-config.h.patch, + debian/patches/0007-fix-open-last-page.patch, + debian/patches/only-try-to-select-an-existing-panel-on-startup.patch, + git_invalid_dereferencing.patch: + - remove, it's included in the new version + + -- Sebastien Bacher Thu, 05 Jul 2018 16:52:46 +0200 + gnome-control-center (1:3.28.1-1) unstable; urgency=medium [ Gunnar Hjalmarsson ] @@ -801,6 +2586,69 @@ gnome-control-center (1:3.28.1-1) unstab -- Michael Biebl Wed, 11 Apr 2018 18:20:17 +0200 +gnome-control-center (1:3.28.1-0ubuntu5) cosmic; urgency=medium + + * debian/{gbp.conf,control{,.in}}: Added and updated for Ubuntu + * debian/patches/privacy-panel-whoopsie.patch: + - display and enable correct section of error reporting mode + (never/manual/auto) (LP: #1774597) + + -- Didier Roche Thu, 31 May 2018 17:21:59 +0200 + +gnome-control-center (1:3.28.1-0ubuntu4) cosmic; urgency=medium + + [ Andrea Azzarone ] + * debian/patches/git_invalid_dereferencing.patch: + - Avoid dereferencing invalid pointer (lp: #1759468) + + -- Sebastien Bacher Fri, 25 May 2018 16:25:16 +0200 + +gnome-control-center (1:3.28.1-0ubuntu3) cosmic; urgency=medium + + * debian/patches/0001-shell-Don-t-set-per-panel-icon.patch, + debian/patches/0002-shell-Icon-name-helper-returns-symbolic-name.patch, + debian/patches/0003-thunderbolt-new-panel-for-device-management.patch, + debian/patches/0004-thunderbolt-move-to-the-Devices-page.patch: + - backport the new upstream "thunderbolt" panel (same patches as fedora + is using). Also change to not use per panel icons but just the + settings one, that's the right thing to do and avoid issues when + some panels like the thunderbolt one don't have a symbolic icon. + (lp: #1773378) + + [ Jeremy Bicha ] + * Cherry-pick only-try-to-select-an-existing-panel-on-startup.patch: + Fix crash when trying to open non-existent panel (LP: #1766799) + + -- Sebastien Bacher Fri, 25 May 2018 16:06:18 +0200 + +gnome-control-center (1:3.28.1-0ubuntu2) cosmic; urgency=medium + + * Rename ubuntu-gnome-version.patch to distro-logo.patch for proposed + upstreaming to Debian. Drop the hardcoded use of the Ubuntu font. + (LP: #1770473) + * debian/control.in: + - Drop now unnecessary fonts-ubuntu dependency + - Don't recommend libnss-myhostname since systemd-resolved handles this + functionality (LP: #1766575) + - Demote network-manager-gnome dependency back to recommends + (LP: #1770673) + - Depend on system-config-printer instead of system-config-printer-common + for the Additional Printer Settings button (LP: #1770695) + * Add 0007-fix-open-last-page.patch: + - Proposed patch fixes the "open last opened page" feature for Devices and + Details pages (LP: #1770699) + + -- Jeremy Bicha Fri, 11 May 2018 12:59:17 -0400 + +gnome-control-center (1:3.28.1-0ubuntu1) bionic; urgency=medium + + * New upstream release (LP: #1764591) + * Drop Build-Depends on network-manager-dev, no longer necessary + * Cherry-pick 0006-build-Fix-USER_DIR_MODE-value-in-config.h.patch: + - Fix file permissions regression introduced in meson conversion + + -- Jeremy Bicha Mon, 16 Apr 2018 21:46:17 -0400 + gnome-control-center (1:3.28.0-1) unstable; urgency=medium [ Simon McVittie ] @@ -817,6 +2665,152 @@ gnome-control-center (1:3.28.0-1) unstab -- Jeremy Bicha Sun, 18 Mar 2018 20:14:00 -0400 +gnome-control-center (1:3.28.0-0ubuntu6) bionic; urgency=medium + + [ Gunnar Hjalmarsson ] + * debian/patches/0005-region-Show-scrollbars-if-needed.patch: Apply to + Formats and Input Sources as well. (LP: #1758979) + + -- Iain Lane Thu, 29 Mar 2018 17:30:50 +0100 + +gnome-control-center (1:3.28.0-0ubuntu5) bionic; urgency=medium + + * debian/patches/71_ubuntu_dock_settings.patch: + - add context for dock settings where left/right is translated differently + to mouse buttons (LP: #1719462). + + -- Didier Roche Wed, 28 Mar 2018 15:27:01 +0200 + +gnome-control-center (1:3.28.0-0ubuntu4) bionic; urgency=medium + + * debian/patches/ubuntu-printer-support.patch + - Connect to the system-config-printer-button{1,2} clicked signals + during init rather than in update_sensitivity. This prevents us + from connecting to the signal multiple times. (LP: #1755514) + + -- Ken VanDine Tue, 27 Mar 2018 14:59:55 -0400 + +gnome-control-center (1:3.28.0-0ubuntu3) bionic; urgency=medium + + * debian/patches/ubuntu-white-lists.patch: + - remove patch, this is done in the theme now + + -- Marco Trevisan (Treviño) Thu, 22 Mar 2018 14:31:51 -0500 + +gnome-control-center (1:3.28.0-0ubuntu2) bionic; urgency=medium + + [ Gunnar Hjalmarsson ] + * debian/patches/52_region_language.patch: + - Enable scrollbar in "Language" window when needed (LP: #1727710). + - Hide the "Install More..." thing since we can't install languages + that way yet. + + [ Iain Lane ] + * debian/patches/0005-Show-scrollbar-on-first-Language-window-if-needed.patch: + Split out from 52_region_language as forwarded upstream. + + -- Iain Lane Mon, 19 Mar 2018 15:34:01 +0000 + +gnome-control-center (1:3.28.0-0ubuntu1) bionic; urgency=medium + + [ Jeremy Bicha ] + * New upstream release + + [ Gunnar Hjalmarsson ] + * debian/rules: + - Add X-Ubuntu-Gettext-Domain to .desktop files and strip inline + translations (LP: #1755473). + - Build gnome-control-center-2.0.pot. + * Modify 71_ubuntu_dock_settings.patch: + - Drop non-existing gnome-ubuntu-panel.desktop.in from POTFILES.in. + + [ Daniel van Vugt ] + * Add 0004-Expose-touchpad-settings-if-synaptics-is-in-use.patch + - Allow touchpad settings to work with xserver-xorg-input-synaptics + Note that this is unneeded on GNOME on Wayland where libinput is + always used. (LP: #1686081) + + [ Andrea Azzarone ] + * Add auto_quit_after_goa_add.patch: + - Hide window after adding an online account from another app. + (LP: #1754651) + + -- Jeremy Bicha Mon, 19 Mar 2018 08:37:32 -0400 + +gnome-control-center (1:3.27.92-1ubuntu1) bionic; urgency=medium + + [ Jeremy Bicha ] + * Sync with Debian. (LP: #1750174, LP: #1752928, LP: #1691867) + Remaining changes: + + debian/control.in: + - Depend on fonts-ubuntu, language-selector-gnome, and + whoopsie-preferences + - Depend on instead of Recommend network-manager-gnome and + system-config-printer-common + - Recommend ibus, unity-control-center-faces, & ubuntu-system-service + - Suggest instead of Recommend realmd and rygel + - Build-Depend on libwhoopsie-preferences-dev + + Split gnome-control-center-faces to a separate package so + that it can be used by unity-control-center + + Install apport hook + + debian/gnome-control-center-data.install: + - Don't install gnome-control-center.pkla since we use + policykit-desktop-privileges instead + - Install additional assets used by unity-control-center + * debian/ubuntu-logo-icon.png, debian/source/include-binaries, + debian/gnome-control-center-data.install: Include an Ubuntu logo + * debian/gnome-control-center-data.links: + - Link audio-speaker-center* to audio-speaker-mono* so that an + icon is shown in the test speaker panel. (LP: #1704002) + + debian/rules: Enable whoospie integration + + debian/patches: + - 08_lowercase_user_names.patch: + Disallow upper-case letters in user names for compliance with adduser + - 52_region_language.patch: + Adapt region panel to use Ubuntu style regions + - 64_restore_terminal_keyboard_shortcut.patch + Bring back terminal shortcut + - 70_allow_sound_above_100.patch: + Allow setting volume above 100% in the Ubuntu session + - 71_ubuntu_dock_settings.patch + Add Dock panel for Ubuntu session + - 99_add_lock-on-suspend.patch + Add option to lock on suspend + - ubuntu-gnome-version.patch: + Add Ubuntu branding to Details panel + - ubuntu-region-packagekit.patch + fix detection of installed language packs + - ubuntu-region-langpack-install.patch: + check for missing language packs when loading region panel to pull + in packs that arent included with the installer + - ubuntu-language-support.patch + Add Language Support button to Region & Language panel to + work around (LP: #1631750) + - ubuntu-printer-support.patch + Add Advanced Printer Settings button to work around missing printer + sharing feature (LP: #1718083) + - ubuntu-legacy-notifications.patch + Ubuntu ships compatibility names for .desktop that got renamed + upstream, those use NoDisplay but the panel doesn't respect that key, + skip known buggy entries for file-roller and nautilus (LP: #1716267) + - connectivity-switch.patch + Add Connectivity Checking switch to Privacy panel + - privacy-panel-whoopsie.patch + Support Ubuntu's whoopsie service in the Privacy panel + - ubuntu-white-lists.patch + Ensure lists have white background when used with Ambiance & Radiance + * Update connectivity-switch.patch with latest version proposed to GNOME + * Drop patches applied in new release: + - gnome-desktop327.patch + - monospace-wifihotspot-password.patch + - search-provider-locale.patch + + [ Didier Roche ] + * Rebased 70_allow_sound_above_100.patch + * Dep on latest gsettings-desktop-schemas for binary + + -- Jeremy Bicha Sat, 10 Mar 2018 15:54:34 -0500 + gnome-control-center (1:3.27.92-1) unstable; urgency=medium * New upstream release candidate diff -pruN 1:43.2-2/debian/control 1:44~alpha-0ubuntu1/debian/control --- 1:43.2-2/debian/control 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/control 2023-01-13 16:48:57.000000000 +0000 @@ -5,8 +5,9 @@ Source: gnome-control-center Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Gunnar Hjalmarsson , Jeremy Bicha , Laurent Bigonville +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Gunnar Hjalmarsson , Jeremy Bicha Build-Depends: debhelper-compat (= 13), dh-sequence-gnome (>= 0.22.2), libaccountsservice-dev (>= 0.6.39), @@ -31,13 +32,13 @@ Build-Depends: debhelper-compat (= 13), libgoa-1.0-dev (>= 3.45), libgoa-backend-1.0-dev (>= 3.45), libgsound-dev, - libgtk-4-dev (>= 4.4), + libgtk-4-dev (>= 4.8), libgtop2-dev, libgudev-1.0-dev (>= 232) [linux-any], libhandy-1-dev (>= 1.2.0), libkrb5-dev, libnm-dev (>= 1.24.0) [linux-any], - libnma-gtk4-dev (>= 1.8.0) [linux-any], + libnma-gtk4-dev (>= 1.10.2) [linux-any], libmalcontent-0-dev (>= 0.7.0) [amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x hppa powerpc powerpcspe ppc64], libmm-glib-dev [linux-any], libpolkit-gobject-1-dev (>= 0.103), @@ -49,6 +50,7 @@ Build-Depends: debhelper-compat (= 13), libudisks2-dev, libupower-glib-dev (>= 0.99.8), libwacom-dev (>= 0.7) [linux-any], + libwhoopsie-preferences-dev, libxi-dev (>= 2:1.2), libx11-dev, libxft-dev (>= 2.1.2), @@ -64,8 +66,10 @@ Build-Depends: debhelper-compat (= 13), python3-dbusmock, Standards-Version: 4.6.2 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/master Package: gnome-control-center Architecture: any @@ -74,37 +78,37 @@ Depends: ${misc:Depends}, accountsservice, apg, colord (>= 0.1.34), - desktop-base (>= 10.0.0), desktop-file-utils, -# fwupd [linux-any], + fwupd [linux-any], gnome-control-center-data (<< ${gnome:NextVersion}), gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-settings-daemon (>= 41), gsettings-desktop-schemas (>= 42~), + language-selector-gnome (>= 0.179~), + system-config-printer (>= 1.4), + whoopsie-preferences, webp-pixbuf-loader Recommends: cups-pk-helper, gnome-bluetooth-sendto, gnome-online-accounts (>= 3.25.3), gnome-remote-desktop (>= 42), gnome-user-docs, - gnome-user-share, gkbd-capplet, + ibus, iso-codes, libcanberra-pulse, polkitd, power-profiles-daemon, rygel | rygel-tracker, - system-config-printer-common (>= 1.4), - malcontent-gui [amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x hppa powerpc powerpcspe ppc64], network-manager-gnome (>= 0.9.8), - libnss-myhostname, cracklib-runtime, - libspa-0.2-bluetooth | pulseaudio-module-bluetooth, - realmd + gnome-control-center-faces, Suggests: gnome-software | gnome-packagekit, + gnome-user-share, gstreamer1.0-pulseaudio, pkexec, + realmd, x11-xserver-utils Breaks: gnome-remote-desktop (<< 42), gnome-shell (<< 42) @@ -117,6 +121,16 @@ Description: utilities to configure the It also contains a front end to these applets, which can also be accessed with the GNOME panel or the Nautilus file manager. +Package: gnome-control-center-faces +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Conflicts: unity-control-center-faces +Replaces: unity-control-center-faces +Provides: unity-control-center-faces +Description: utilities to configure the GNOME desktop - faces images + This package contains images that can be used for user profile's icon + Package: gnome-control-center-dev Architecture: all Multi-Arch: foreign diff -pruN 1:43.2-2/debian/control.in 1:44~alpha-0ubuntu1/debian/control.in --- 1:43.2-2/debian/control.in 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/control.in 2023-01-13 16:48:57.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-control-center Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 13), dh-sequence-gnome (>= 0.22.2), @@ -27,13 +28,13 @@ Build-Depends: debhelper-compat (= 13), libgoa-1.0-dev (>= 3.45), libgoa-backend-1.0-dev (>= 3.45), libgsound-dev, - libgtk-4-dev (>= 4.4), + libgtk-4-dev (>= 4.8), libgtop2-dev, libgudev-1.0-dev (>= 232) [linux-any], libhandy-1-dev (>= 1.2.0), libkrb5-dev, libnm-dev (>= 1.24.0) [linux-any], - libnma-gtk4-dev (>= 1.8.0) [linux-any], + libnma-gtk4-dev (>= 1.10.2) [linux-any], libmalcontent-0-dev (>= 0.7.0) [amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x hppa powerpc powerpcspe ppc64], libmm-glib-dev [linux-any], libpolkit-gobject-1-dev (>= 0.103), @@ -45,6 +46,7 @@ Build-Depends: debhelper-compat (= 13), libudisks2-dev, libupower-glib-dev (>= 0.99.8), libwacom-dev (>= 0.7) [linux-any], + libwhoopsie-preferences-dev, libxi-dev (>= 2:1.2), libx11-dev, libxft-dev (>= 2.1.2), @@ -60,8 +62,10 @@ Build-Depends: debhelper-compat (= 13), python3-dbusmock, Standards-Version: 4.6.2 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/master Package: gnome-control-center Architecture: any @@ -70,37 +74,37 @@ Depends: ${misc:Depends}, accountsservice, apg, colord (>= 0.1.34), - desktop-base (>= 10.0.0), desktop-file-utils, -# fwupd [linux-any], + fwupd [linux-any], gnome-control-center-data (<< ${gnome:NextVersion}), gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-settings-daemon (>= 41), gsettings-desktop-schemas (>= 42~), + language-selector-gnome (>= 0.179~), + system-config-printer (>= 1.4), + whoopsie-preferences, webp-pixbuf-loader Recommends: cups-pk-helper, gnome-bluetooth-sendto, gnome-online-accounts (>= 3.25.3), gnome-remote-desktop (>= 42), gnome-user-docs, - gnome-user-share, gkbd-capplet, + ibus, iso-codes, libcanberra-pulse, polkitd, power-profiles-daemon, rygel | rygel-tracker, - system-config-printer-common (>= 1.4), - malcontent-gui [amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x hppa powerpc powerpcspe ppc64], network-manager-gnome (>= 0.9.8), - libnss-myhostname, cracklib-runtime, - libspa-0.2-bluetooth | pulseaudio-module-bluetooth, - realmd + gnome-control-center-faces, Suggests: gnome-software | gnome-packagekit, + gnome-user-share, gstreamer1.0-pulseaudio, pkexec, + realmd, x11-xserver-utils Breaks: gnome-remote-desktop (<< 42), gnome-shell (<< 42) @@ -113,6 +117,16 @@ Description: utilities to configure the It also contains a front end to these applets, which can also be accessed with the GNOME panel or the Nautilus file manager. +Package: gnome-control-center-faces +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Conflicts: unity-control-center-faces +Replaces: unity-control-center-faces +Provides: unity-control-center-faces +Description: utilities to configure the GNOME desktop - faces images + This package contains images that can be used for user profile's icon + Package: gnome-control-center-dev Architecture: all Multi-Arch: foreign diff -pruN 1:43.2-2/debian/gbp.conf 1:44~alpha-0ubuntu1/debian/gbp.conf --- 1:43.2-2/debian/gbp.conf 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/gbp.conf 2023-01-13 16:48:57.000000000 +0000 @@ -1,7 +1,8 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch=ubuntu/master upstream-branch = upstream/latest +debian-tag=ubuntu/%(version)s [buildpackage] sign-tags = True diff -pruN 1:43.2-2/debian/gnome-control-center-data.install 1:44~alpha-0ubuntu1/debian/gnome-control-center-data.install --- 1:43.2-2/debian/gnome-control-center-data.install 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/gnome-control-center-data.install 2023-01-13 16:48:57.000000000 +0000 @@ -4,6 +4,8 @@ usr/share/sounds usr/share/locale usr/share/gettext/its usr/share/icons -usr/share/pixmaps/faces usr/share/polkit-1 -debian/gnome-control-center.pkla /var/lib/polkit-1/localauthority/10-vendor.d/ +debian/source_gnome-control-center.py /usr/share/apport/package-hooks +debian/ubuntu-logo-icon.png /usr/share/pixmaps/ +debian/ubuntu-logo-dark.png /usr/share/pixmaps/ +debian/ubuntu-panel-assets/* /usr/share/icons/hicolor/ diff -pruN 1:43.2-2/debian/gnome-control-center-data.links 1:44~alpha-0ubuntu1/debian/gnome-control-center-data.links --- 1:43.2-2/debian/gnome-control-center-data.links 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/gnome-control-center-data.links 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/gnome-control-center/icons/hicolor/48x48/devices/audio-speaker-center.svg usr/share/gnome-control-center/icons/hicolor/48x48/devices/audio-speaker-mono.svg +usr/share/gnome-control-center/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg usr/share/gnome-control-center/icons/hicolor/48x48/devices/audio-speaker-mono-testing.svg diff -pruN 1:43.2-2/debian/gnome-control-center-faces.install 1:44~alpha-0ubuntu1/debian/gnome-control-center-faces.install --- 1:43.2-2/debian/gnome-control-center-faces.install 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/gnome-control-center-faces.install 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1 @@ +usr/share/pixmaps/faces diff -pruN 1:43.2-2/debian/patches/build-Look-for-snapd-glib-2.patch 1:44~alpha-0ubuntu1/debian/patches/build-Look-for-snapd-glib-2.patch --- 1:43.2-2/debian/patches/build-Look-for-snapd-glib-2.patch 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/build-Look-for-snapd-glib-2.patch 2023-01-13 16:48:57.000000000 +0000 @@ -7,10 +7,10 @@ Subject: build: Look for snapd-glib-2 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index bd2ade9..24059a6 100644 +index 77b7454..66aa643 100644 --- a/meson.build +++ b/meson.build -@@ -204,7 +204,7 @@ config_h.set10('HAVE_FN_EXPLICIT_BZERO', +@@ -208,7 +208,7 @@ config_h.set10('HAVE_FN_EXPLICIT_BZERO', enable_snap = get_option('snap') if enable_snap snapd_glib_deps = [ diff -pruN 1:43.2-2/debian/patches/debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch 1:44~alpha-0ubuntu1/debian/patches/debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch --- 1:43.2-2/debian/patches/debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch 2023-01-13 16:48:57.000000000 +0000 @@ -9,10 +9,10 @@ Bug-Debian: https://bugs.debian.org/cgi- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/panels/user-accounts/cc-add-user-dialog.c b/panels/user-accounts/cc-add-user-dialog.c -index e462015..031eaa7 100644 +index 3814103..2354e52 100644 --- a/panels/user-accounts/cc-add-user-dialog.c +++ b/panels/user-accounts/cc-add-user-dialog.c -@@ -229,6 +229,7 @@ create_user_done (ActUserManager *manager, +@@ -230,6 +230,7 @@ create_user_done (ActUserManager *manager, static void local_create_user (CcAddUserDialog *self) { @@ -20,7 +20,7 @@ index e462015..031eaa7 100644 ActUserManager *manager; const gchar *username; const gchar *name; -@@ -240,11 +241,12 @@ local_create_user (CcAddUserDialog *self) +@@ -241,11 +242,12 @@ local_create_user (CcAddUserDialog *self) username = gtk_combo_box_text_get_active_text (self->local_username_combo); account_type = gtk_switch_get_active (self->local_account_type_switch) ? ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR : ACT_USER_ACCOUNT_TYPE_STANDARD; diff -pruN 1:43.2-2/debian/patches/debian/Expose-touchpad-settings-if-synaptics-is-in-use.patch 1:44~alpha-0ubuntu1/debian/patches/debian/Expose-touchpad-settings-if-synaptics-is-in-use.patch --- 1:43.2-2/debian/patches/debian/Expose-touchpad-settings-if-synaptics-is-in-use.patch 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/debian/Expose-touchpad-settings-if-synaptics-is-in-use.patch 2023-01-13 16:48:57.000000000 +0000 @@ -38,7 +38,7 @@ index 6658f41..12aafdb 100644 display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False); diff --git a/panels/mouse/cc-mouse-panel.c b/panels/mouse/cc-mouse-panel.c -index cdd28ab..6d1269a 100644 +index 8427a49..f903731 100644 --- a/panels/mouse/cc-mouse-panel.c +++ b/panels/mouse/cc-mouse-panel.c @@ -64,7 +64,6 @@ struct _CcMousePanel @@ -55,7 +55,7 @@ index cdd28ab..6d1269a 100644 - if (self->have_synaptics || !self->have_touchpad) { + if (!self->have_touchpad) { - gtk_widget_hide (GTK_WIDGET (self->touchpad_group)); + gtk_widget_set_visible (GTK_WIDGET (self->touchpad_group), FALSE); return; } @@ -308,7 +307,10 @@ setup_dialog (CcMousePanel *self) diff -pruN 1:43.2-2/debian/patches/debian/firmware-security-disable.patch 1:44~alpha-0ubuntu1/debian/patches/debian/firmware-security-disable.patch --- 1:43.2-2/debian/patches/debian/firmware-security-disable.patch 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/debian/firmware-security-disable.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From: Jeremy Bicha -Date: Mon, 22 Aug 2022 08:31:15 -0400 -Subject: firmware-security: Disable - -Not yet useful enough to justify its inclusion by default here - -You can get the same info by running -fwupdmgr security - -If you drop this patch, add a Depends: fwupd [linux-any] - -https://launchpad.net/bugs/1987162 - -https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1938 ---- - shell/cc-panel-loader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 17f9601..1b819a5 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -113,7 +113,7 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("info-overview", cc_info_overview_panel_get_type, NULL), - PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL), - PANEL_TYPE("location", cc_location_panel_get_type, NULL), -- PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func), -+ // PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func), - PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL), - PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL), - PANEL_TYPE("multitasking", cc_multitasking_panel_get_type, NULL), diff -pruN 1:43.2-2/debian/patches/keyboard-Allow-disabling-alternate-characters-key.patch 1:44~alpha-0ubuntu1/debian/patches/keyboard-Allow-disabling-alternate-characters-key.patch --- 1:43.2-2/debian/patches/keyboard-Allow-disabling-alternate-characters-key.patch 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/keyboard-Allow-disabling-alternate-characters-key.patch 2023-01-13 16:48:57.000000000 +0000 @@ -18,10 +18,10 @@ Bug-GNOME: https://gitlab.gnome.org/GNOM 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-panel.c -index 663bcc2..9679b0d 100644 +index 1e45222..25b70a2 100644 --- a/panels/keyboard/cc-keyboard-panel.c +++ b/panels/keyboard/cc-keyboard-panel.c -@@ -72,7 +72,7 @@ static const CcXkbModifier LV3_MODIFIER = { +@@ -71,7 +71,7 @@ static const CcXkbModifier LV3_MODIFIER = { { NC_("keyboard key", "Right Ctrl"), "lv3:switch" }, { NULL, NULL } }, diff -pruN 1:43.2-2/debian/patches/keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch 1:44~alpha-0ubuntu1/debian/patches/keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch --- 1:43.2-2/debian/patches/keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,61 @@ +From: Ian Douglas Scott +Date: Mon, 16 Aug 2021 13:56:05 -0700 +Subject: keyboard: Avoid modifying `xkb-options` when user changes nothing + +Avoids clobbering certain custom settings that can't be set in UI. + +Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/910 +Bug-Ubuntu: https://launchpad.net/bugs/1934761 +--- + panels/keyboard/cc-xkb-modifier-dialog.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/panels/keyboard/cc-xkb-modifier-dialog.c b/panels/keyboard/cc-xkb-modifier-dialog.c +index e52eeb4..8aaf752 100644 +--- a/panels/keyboard/cc-xkb-modifier-dialog.c ++++ b/panels/keyboard/cc-xkb-modifier-dialog.c +@@ -36,6 +36,7 @@ struct _CcXkbModifierDialog + GSettings *input_source_settings; + const CcXkbModifier *modifier; + GSList *radio_group; ++ gboolean updating_active_radio; + }; + + G_DEFINE_TYPE (CcXkbModifierDialog, cc_xkb_modifier_dialog, GTK_TYPE_DIALOG) +@@ -85,6 +86,9 @@ update_active_radio (CcXkbModifierDialog *self) + guint i; + gboolean have_nodefault_option = FALSE; + ++ // Block `on_active_radio_changed_cb` from running ++ self->updating_active_radio = TRUE; ++ + options = g_settings_get_strv (self->input_source_settings, "xkb-options"); + + for (i = 0; options != NULL && options[i] != NULL; i++) +@@ -104,6 +108,7 @@ update_active_radio (CcXkbModifierDialog *self) + + gtk_check_button_set_active (GTK_CHECK_BUTTON (radio), TRUE); + gtk_switch_set_active (self->default_switch, FALSE); ++ self->updating_active_radio = FALSE; + return; + } + +@@ -117,6 +122,8 @@ update_active_radio (CcXkbModifierDialog *self) + { + gtk_switch_set_active (self->default_switch, TRUE); + } ++ ++ self->updating_active_radio = FALSE; + } + + static void +@@ -181,6 +188,9 @@ on_active_radio_changed_cb (CcXkbModifierDialog *self, + if (gtk_switch_get_state (self->default_switch)) + return; + ++ if (self->updating_active_radio) ++ return; ++ + xkb_option = (gchar *)g_object_get_data (G_OBJECT (radio), "xkb-option"); + set_xkb_option (self, xkb_option); + } diff -pruN 1:43.2-2/debian/patches/keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch 1:44~alpha-0ubuntu1/debian/patches/keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch --- 1:43.2-2/debian/patches/keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,303 @@ +From: Ian Douglas Scott +Date: Mon, 28 Dec 2020 13:25:50 -0800 +Subject: keyboard: For xkb options, have "Layout default" toggle, and "None" + +Meant to address issues mentioned in +https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1214 +using the solution proposed there. + +There is no "None" option for the compose key, since there doesn't +appear to be a way to disable it on the unusual layouts where it's +available by default. + +XKB options are a mess, but this seems like a more accurate +representation of how they function. + +Changes compared to the original patch made 2022-12-25: +* Add nodefault_option after the main option, not before (LP: #2000423) + +Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/910 +Bug-Ubuntu: https://launchpad.net/bugs/1867548 +Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/918 +Last-Update: 2022-12-25 +--- + panels/keyboard/cc-keyboard-panel.c | 5 +- + panels/keyboard/cc-xkb-modifier-dialog.c | 78 +++++++++++++++++-------------- + panels/keyboard/cc-xkb-modifier-dialog.h | 1 + + panels/keyboard/cc-xkb-modifier-dialog.ui | 5 +- + 4 files changed, 52 insertions(+), 37 deletions(-) + +diff --git a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-panel.c +index 25b70a2..058c27b 100644 +--- a/panels/keyboard/cc-keyboard-panel.c ++++ b/panels/keyboard/cc-keyboard-panel.c +@@ -63,6 +63,7 @@ static const CcXkbModifier LV3_MODIFIER = { + N_("Alternate Characters Key"), + N_("The alternate characters key can be used to enter additional characters. These are sometimes printed as a third-option on your keyboard."), + (CcXkbOption[]){ ++ { NC_("keyboard key", "None"), "lv3:ralt_alt" }, + { NC_("keyboard key", "Left Alt"), "lv3:lalt_switch" }, + { NC_("keyboard key", "Right Alt"), "lv3:ralt_switch" }, + { NC_("keyboard key", "Left Super"), "lv3:lwin_switch" }, +@@ -71,7 +72,8 @@ static const CcXkbModifier LV3_MODIFIER = { + { NC_("keyboard key", "Right Ctrl"), "lv3:switch" }, + { NULL, NULL } + }, +- NULL, ++ "lv3:ralt_switch", ++ "lv3:ralt_alt", + }; + + static const CcXkbModifier COMPOSE_MODIFIER = { +@@ -93,6 +95,7 @@ static const CcXkbModifier COMPOSE_MODIFIER = { + { NULL, NULL } + }, + NULL, ++ NULL, + }; + + static void +diff --git a/panels/keyboard/cc-xkb-modifier-dialog.c b/panels/keyboard/cc-xkb-modifier-dialog.c +index da8116e..e52eeb4 100644 +--- a/panels/keyboard/cc-xkb-modifier-dialog.c ++++ b/panels/keyboard/cc-xkb-modifier-dialog.c +@@ -28,7 +28,7 @@ struct _CcXkbModifierDialog + GtkDialog parent_instance; + + GtkLabel *description_label; +- GtkSwitch *enabled_switch; ++ GtkSwitch *default_switch; + GtkListBox *listbox; + GtkListBox *switch_listbox; + AdwActionRow *switch_row; +@@ -51,9 +51,9 @@ get_xkb_option_from_name (const CcXkbModifier *modifier, const gchar* name) + const CcXkbOption *options = modifier->options; + int i; + +- for (i = 0; options[i].label && options[i].xkb_option; i++) ++ for (i = 0; options[i].label; i++) + { +- if (g_str_equal (name, options[i].xkb_option)) ++ if (g_strcmp0 (name, options[i].xkb_option) == 0) + return &options[i]; + } + +@@ -81,9 +81,9 @@ static void + update_active_radio (CcXkbModifierDialog *self) + { + g_auto(GStrv) options = NULL; +- GtkCheckButton *rightalt_radio; +- const CcXkbOption *default_option; ++ GtkCheckButton *none_radio; + guint i; ++ gboolean have_nodefault_option = FALSE; + + options = g_settings_get_strv (self->input_source_settings, "xkb-options"); + +@@ -94,26 +94,28 @@ update_active_radio (CcXkbModifierDialog *self) + if (!g_str_has_prefix (options[i], self->modifier->prefix)) + continue; + ++ if (g_strcmp0 (options[i], self->modifier->nodefault_option) == 0) ++ have_nodefault_option = TRUE; ++ + radio = get_radio_button_from_xkb_option_name (self, options[i]); + + if (!radio) + continue; + + gtk_check_button_set_active (GTK_CHECK_BUTTON (radio), TRUE); +- gtk_switch_set_active (self->enabled_switch, TRUE); ++ gtk_switch_set_active (self->default_switch, FALSE); + return; + } + +- if (self->modifier->default_option != NULL) ++ if (have_nodefault_option) + { +- default_option = get_xkb_option_from_name(self->modifier, self->modifier->default_option); +- rightalt_radio = get_radio_button_from_xkb_option_name (self, default_option->xkb_option); +- gtk_check_button_set_active (GTK_CHECK_BUTTON (rightalt_radio), TRUE); +- gtk_switch_set_active (self->enabled_switch, TRUE); ++ none_radio = get_radio_button_from_xkb_option_name (self, self->modifier->nodefault_option); ++ gtk_check_button_set_active (GTK_CHECK_BUTTON (none_radio), TRUE); ++ gtk_switch_set_active (self->default_switch, FALSE); + } + else + { +- gtk_switch_set_active (self->enabled_switch, FALSE); ++ gtk_switch_set_active (self->default_switch, TRUE); + } + } + +@@ -125,6 +127,12 @@ set_xkb_option (CcXkbModifierDialog *self, + g_auto(GStrv) options = NULL; + gboolean found; + guint i; ++ gboolean add_nodefault; ++ ++ add_nodefault = xkb_option != self->modifier->default_option ++ && xkb_option != self->modifier->nodefault_option ++ && xkb_option != NULL ++ && self->modifier->nodefault_option != NULL; + + /* Either replace the existing ":" option in the string + * array, or add the option at the end +@@ -139,6 +147,8 @@ set_xkb_option (CcXkbModifierDialog *self, + { + if (!found && xkb_option != NULL) + g_ptr_array_add (array, xkb_option); ++ if (!found && add_nodefault) ++ g_ptr_array_add (array, self->modifier->nodefault_option); + found = TRUE; + } + else +@@ -149,6 +159,8 @@ set_xkb_option (CcXkbModifierDialog *self, + + if (!found && xkb_option != NULL) + g_ptr_array_add (array, xkb_option); ++ if (!found && add_nodefault) ++ g_ptr_array_add (array, self->modifier->nodefault_option); + + g_ptr_array_add (array, NULL); + +@@ -166,7 +178,7 @@ on_active_radio_changed_cb (CcXkbModifierDialog *self, + if (!gtk_check_button_get_active (GTK_CHECK_BUTTON (radio))) + return; + +- if (!gtk_switch_get_state (self->enabled_switch)) ++ if (gtk_switch_get_state (self->default_switch)) + return; + + xkb_option = (gchar *)g_object_get_data (G_OBJECT (radio), "xkb-option"); +@@ -181,17 +193,17 @@ on_xkb_options_changed_cb (CcXkbModifierDialog *self) + } + + static gboolean +-enable_switch_changed_cb (GtkSwitch *widget, +- gboolean state, +- gpointer user_data) ++default_switch_changed_cb (GtkSwitch *widget, ++ gboolean state, ++ gpointer user_data) + { + CcXkbModifierDialog *self = user_data; + gchar *xkb_option; + GSList *l; + +- gtk_widget_set_sensitive (GTK_WIDGET (self->listbox), state); ++ gtk_widget_set_sensitive (GTK_WIDGET (self->listbox), !state); + +- if (state) ++ if (!state) + { + for (l = self->radio_group; l != NULL; l = l->next) + { +@@ -232,12 +244,12 @@ cc_xkb_modifier_dialog_class_init (CcXkbModifierDialogClass *klass) + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/keyboard/cc-xkb-modifier-dialog.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcXkbModifierDialog, description_label); +- gtk_widget_class_bind_template_child (widget_class, CcXkbModifierDialog, enabled_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcXkbModifierDialog, default_switch); + gtk_widget_class_bind_template_child (widget_class, CcXkbModifierDialog, listbox); + gtk_widget_class_bind_template_child (widget_class, CcXkbModifierDialog, switch_listbox); + gtk_widget_class_bind_template_child (widget_class, CcXkbModifierDialog, switch_row); + +- gtk_widget_class_bind_template_callback (widget_class, enable_switch_changed_cb); ++ gtk_widget_class_bind_template_callback (widget_class, default_switch_changed_cb); + } + + static void +@@ -248,7 +260,7 @@ add_radio_buttons (CcXkbModifierDialog *self) + CcXkbOption *options = self->modifier->options; + int i; + +- for (i = 0; options[i].label && options[i].xkb_option; i++) ++ for (i = 0; options[i].label != NULL; i++) + { + row = g_object_new (GTK_TYPE_LIST_BOX_ROW, + "visible", TRUE, +@@ -310,12 +322,10 @@ cc_xkb_modifier_dialog_new (GSettings *input_settings, + + self->modifier = modifier; + gtk_window_set_title (GTK_WINDOW (self), gettext (modifier->title)); +- adw_preferences_row_set_title (ADW_PREFERENCES_ROW (self->switch_row), gettext (modifier->title)); + gtk_label_set_markup (self->description_label, gettext (modifier->description)); +- gtk_widget_set_visible (GTK_WIDGET (self->switch_listbox), modifier->default_option == NULL); + add_radio_buttons (self); + update_active_radio (self); +- gtk_widget_set_sensitive (GTK_WIDGET (self->listbox), gtk_switch_get_state (self->enabled_switch)); ++ gtk_widget_set_sensitive (GTK_WIDGET (self->listbox), !gtk_switch_get_state (self->default_switch)); + + return self; + } +@@ -329,6 +339,7 @@ xcb_modifier_transform_binding_to_label (GValue *value, + const CcXkbOption *entry = NULL; + const char **items; + guint i; ++ gboolean have_nodefault_option = FALSE; + + items = g_variant_get_strv (variant, NULL); + +@@ -337,19 +348,18 @@ xcb_modifier_transform_binding_to_label (GValue *value, + entry = get_xkb_option_from_name (modifier, items[i]); + if (entry != NULL) + break; +- } + +- if (entry == NULL && modifier->default_option == NULL) +- { +- g_value_set_string (value, _("Disabled")); +- return TRUE; ++ if (g_strcmp0 (items[i], modifier->nodefault_option) == 0) ++ have_nodefault_option = TRUE; + } ++ ++ if (entry != NULL) ++ g_value_set_string (value, ++ g_dpgettext2 (NULL, "keyboard key", entry->label)); ++ if (entry == NULL && have_nodefault_option) ++ g_value_set_string (value, _("None")); + else if (entry == NULL) +- { +- entry = get_xkb_option_from_name(modifier, modifier->default_option); +- } ++ g_value_set_string (value, _("Layout default")); + +- g_value_set_string (value, +- g_dpgettext2 (NULL, "keyboard key", entry->label)); + return TRUE; + } +diff --git a/panels/keyboard/cc-xkb-modifier-dialog.h b/panels/keyboard/cc-xkb-modifier-dialog.h +index 91efbcd..fd05b32 100644 +--- a/panels/keyboard/cc-xkb-modifier-dialog.h ++++ b/panels/keyboard/cc-xkb-modifier-dialog.h +@@ -37,6 +37,7 @@ typedef struct + gchar *description; + CcXkbOption *options; + gchar *default_option; ++ gchar *nodefault_option; + } CcXkbModifier; + + #define CC_TYPE_XKB_MODIFIER_DIALOG (cc_xkb_modifier_dialog_get_type()) +diff --git a/panels/keyboard/cc-xkb-modifier-dialog.ui b/panels/keyboard/cc-xkb-modifier-dialog.ui +index e5612ba..a0b6cf3 100644 +--- a/panels/keyboard/cc-xkb-modifier-dialog.ui ++++ b/panels/keyboard/cc-xkb-modifier-dialog.ui +@@ -36,13 +36,14 @@ + + False + False ++ Use layout default + +- ++ + center + + Enabled + +- ++ + + + diff -pruN 1:43.2-2/debian/patches/Revert-firmware-security-Hide-the-panel-when-chassis-type.patch 1:44~alpha-0ubuntu1/debian/patches/Revert-firmware-security-Hide-the-panel-when-chassis-type.patch --- 1:43.2-2/debian/patches/Revert-firmware-security-Hide-the-panel-when-chassis-type.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/Revert-firmware-security-Hide-the-panel-when-chassis-type.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,26 @@ +From: Jeremy Bicha +Date: Fri, 13 Jan 2023 11:38:19 -0500 +Subject: Revert "firmware-security: Hide the panel when chassis type is an + empty string" + +This reverts commit 0245329949957e7f7ab56f240faaf336408ced86. + +It seems to not be working correctly in some cases: +https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2301 +--- + panels/firmware-security/cc-firmware-security-panel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panels/firmware-security/cc-firmware-security-panel.c b/panels/firmware-security/cc-firmware-security-panel.c +index c43b9db..b90462e 100644 +--- a/panels/firmware-security/cc-firmware-security-panel.c ++++ b/panels/firmware-security/cc-firmware-security-panel.c +@@ -638,7 +638,7 @@ update_panel_visibility (const gchar *chassis_type) + gboolean visible = TRUE; + + /* there's no point showing this */ +- if (g_strcmp0 (chassis_type, "vm") == 0 || g_strcmp0 (chassis_type, "") == 0) ++ if (g_strcmp0 (chassis_type, "vm") == 0) + visible = FALSE; + application = CC_APPLICATION (g_application_get_default ()); + cc_shell_model_set_panel_visibility (cc_application_get_model (application), diff -pruN 1:43.2-2/debian/patches/series 1:44~alpha-0ubuntu1/debian/patches/series --- 1:43.2-2/debian/patches/series 2023-01-25 12:01:34.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/series 2023-01-13 16:48:57.000000000 +0000 @@ -1,6 +1,29 @@ keyboard-Allow-disabling-alternate-characters-key.patch +keyboard-For-xkb-options-have-Layout-default-toggle-and-N.patch +keyboard-Avoid-modifying-xkb-options-when-user-changes-n.patch build-Look-for-snapd-glib-2.patch +Revert-firmware-security-Hide-the-panel-when-chassis-type.patch debian/Expose-touchpad-settings-if-synaptics-is-in-use.patch debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch debian/Ignore-result-of-test-network-panel.patch -debian/firmware-security-disable.patch +ubuntu/keyboard-Add-launch-terminal-shortcut.patch +ubuntu/sound-Allow-volume-to-be-set-above-100.patch +ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch +ubuntu/background-Allow-configuring-the-ubuntu-accent-color.patch +ubuntu/multitasking-panel-Sync-workspace-and-monitor-isolation-d.patch +ubuntu/Modify-Mulitasking-assets-for-accent-colors.patch +ubuntu/lock-Add-Lock-Screen-on-Suspend-option.patch +ubuntu/region-Add-Language-Selector-button.patch +ubuntu/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch +ubuntu/printers-Temporarily-add-an-additional-advanced-printer-b.patch +ubuntu/notifications-Handle-.desktop-files-that-got-renamed.patch +ubuntu/shell-Change-the-default-height-so-all-category-are-on-sc.patch +ubuntu/connectivity-add-network-connectivity-checking-toggle.patch +ubuntu/diagnostics-Add-Whoopsie-support.patch +ubuntu/online-accounts-Hide-window-after-adding-an-online-accoun.patch +ubuntu/display-Support-UI-scaled-logical-monitor-mode.patch +ubuntu/Disable-non-working-camera-microphones-panels.patch +ubuntu/info-overview-Show-updates-in-software-propeties-instead-.patch +ubuntu/sound-Add-a-button-to-select-the-default-theme.patch +ubuntu/applications-Launch-snap-store-if-it-is-installed.patch +ubuntu/display-Allow-fractional-scaling-to-be-enabled.patch diff -pruN 1:43.2-2/debian/patches/ubuntu/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch --- 1:43.2-2/debian/patches/ubuntu/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Adapts-the-region-capplet-and-the-language-chooser-in-the.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,533 @@ +From: Gunnar Hjalmarsson +Date: Mon, 22 Jul 2019 22:24:00 +0200 +Subject: Adapts the region capplet and the language chooser in the user + accounts capplet + + Some background that explains the need for this patch: + + * Ubuntu isn't shipped with all languages installed and all locales generated. + Instead the users install the needed language pack(s), and the corresponding + locales are generated. + + * The code in accountsservice for handling languages has been extended via Ubuntu + specific patches. That code is shared by multiple packages. Currently those + packages are: + - gnome-control-center + - unity-control-center + - language-selector + - lightdm (for the language chooser in lightdm-gtk-greeter) + + With this patch applied, the g-c-c region capplet and the language chooser in the + user accounts capplet behave approximately the same way as language-selector. No + migration code needed when standard Ubuntu drops the language-selector UI. + + Compared with how the region capplet in g-c-c works out of the box, this patch + results in: + + * Languages are dealt with using 'll' and 'll_CC' language codes instead of + complete locale names. + + * Selected language is stored in both LANGUAGE and LANG. + + * Only one language list that shows the translations belonging to the installed + language packs (not a 'short' and a 'long' list). + + * User level settings of language and regional formats are stored as + accountsservice properties and in ~/.pam_environment. + + * All the formats related locale categories set, not just a subset. +--- + panels/common/cc-common-language.c | 137 +++++++++++++++++++++++++++++------ + panels/common/cc-common-language.h | 4 + + panels/region/cc-region-panel.c | 124 +++++++++++++++++++++++-------- + panels/user-accounts/cc-user-panel.c | 13 +++- + 4 files changed, 220 insertions(+), 58 deletions(-) + +diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c +index 9357c3e..c923d82 100644 +--- a/panels/common/cc-common-language.c ++++ b/panels/common/cc-common-language.c +@@ -161,6 +161,55 @@ cc_common_language_get_current_language (void) + return language; + } + ++gchar * ++cc_common_language_get_property (const gchar *prop_name) ++{ ++ g_autoptr(GDBusConnection) bus = NULL; ++ g_autofree gchar *user_path = NULL; ++ g_autoptr(GVariant) properties = NULL; ++ g_autoptr(GVariantIter) iter = NULL; ++ const gchar *key; ++ GVariant *value; ++ g_autoptr(GError) error = NULL; ++ ++ if (g_strcmp0 (prop_name, "Language") != 0 && g_strcmp0 (prop_name, "FormatsLocale") != 0) { ++ g_warning ("Invalid argument: '%s'", prop_name); ++ return NULL; ++ } ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); ++ user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ()); ++ ++ properties = g_dbus_connection_call_sync (bus, ++ "org.freedesktop.Accounts", ++ user_path, ++ "org.freedesktop.DBus.Properties", ++ "GetAll", ++ g_variant_new ("(s)", "org.freedesktop.Accounts.User"), ++ G_VARIANT_TYPE ("(a{sv})"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ if (!properties) { ++ g_warning ("Error calling GetAll() when retrieving properties for %s: %s", user_path, error->message); ++ ++ /* g_hash_table_lookup() is not NULL-safe, so don't return NULL */ ++ if (g_strcmp0 (prop_name, "Language") == 0) ++ return g_strdup ("en"); ++ else ++ return g_strdup ("en_US.UTF-8"); ++ } ++ ++ g_variant_get (properties, "(a{sv})", &iter); ++ while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) { ++ if (g_strcmp0 (key, prop_name) == 0) ++ return g_variant_dup_string (value, NULL); ++ } ++ ++ return NULL; ++} ++ + static char * + get_lang_for_user_object_path (const char *path) + { +@@ -201,30 +250,62 @@ insert_language (GHashTable *ht, + g_autofree gchar *label_own_lang = NULL; + g_autofree gchar *label_current_lang = NULL; + g_autofree gchar *label_untranslated = NULL; ++ g_autofree gchar *key = NULL; ++ ++ cc_common_language_get_locale (lang, &key); + +- label_own_lang = gnome_get_language_from_locale (lang, lang); +- label_current_lang = gnome_get_language_from_locale (lang, NULL); +- label_untranslated = gnome_get_language_from_locale (lang, "C"); ++ label_own_lang = gnome_get_language_from_locale (key, key); ++ label_current_lang = gnome_get_language_from_locale (key, NULL); ++ label_untranslated = gnome_get_language_from_locale (key, "C"); + + /* We don't have a translation for the label in + * its own language? */ + if (g_strcmp0 (label_own_lang, label_untranslated) == 0) { + if (g_strcmp0 (label_current_lang, label_untranslated) == 0) +- g_hash_table_insert (ht, g_strdup (lang), g_strdup (label_untranslated)); ++ g_hash_table_insert (ht, g_strdup (key), g_strdup (label_untranslated)); + else +- g_hash_table_insert (ht, g_strdup (lang), g_strdup (label_current_lang)); ++ g_hash_table_insert (ht, g_strdup (key), g_strdup (label_current_lang)); + } else { +- g_hash_table_insert (ht, g_strdup (lang), g_strdup (label_own_lang)); ++ g_hash_table_insert (ht, g_strdup (key), g_strdup (label_own_lang)); + } + } + ++gchar ** ++cc_common_language_get_installed_languages (void) ++{ ++ g_autofree gchar *output = NULL; ++ g_auto(GStrv) langs = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ if (!g_spawn_command_line_sync ("/usr/share/language-tools/language-options", ++ &output, NULL, NULL, &error)) { ++ g_warning ("Couldn't get installed languages: %s", error->message); ++ return NULL; ++ } ++ langs = g_strsplit (output, "\n", 0); ++ ++ return g_steal_pointer (&langs); ++} ++ + GHashTable * + cc_common_language_get_initial_languages (void) + { + GHashTable *ht; ++ gchar **langs; ++ gint i; + + ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + ++ langs = cc_common_language_get_installed_languages (); ++ ++ if (langs) { ++ for (i = 0; langs[i]; i++) { ++ insert_language (ht, langs[i]); ++ } ++ ++ g_strfreev (langs); ++ } ++/* + insert_language (ht, "en_US.UTF-8"); + insert_language (ht, "en_GB.UTF-8"); + insert_language (ht, "de_DE.UTF-8"); +@@ -234,10 +315,30 @@ cc_common_language_get_initial_languages (void) + insert_language (ht, "ja_JP.UTF-8"); + insert_language (ht, "ru_RU.UTF-8"); + insert_language (ht, "ar_EG.UTF-8"); +- ++*/ + return ht; + } + ++void ++cc_common_language_get_locale (const gchar *language, gchar **locale) ++{ ++ g_autofree gchar *command = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ /* Get locale that corresponds to the language */ ++ command = g_strconcat ("/usr/share/language-tools/language2locale ", language, NULL); ++ if (!g_spawn_command_line_sync (command, locale, NULL, NULL, &error)) { ++ g_warning ("Couldn't get locale: %s", error->message); ++ return; ++ } ++ ++ g_strchomp (*locale); ++ if (strlen (*locale) == 0) { ++ g_warning ("Couldn't get locale for language: %s", language); ++ return; ++ } ++ ++} + static void + foreach_user_lang_cb (gpointer key, + gpointer value, +@@ -263,28 +364,18 @@ cc_common_language_add_user_languages (GtkTreeModel *model) + GtkListStore *store = GTK_LIST_STORE (model); + GHashTable *user_langs; + const char *display; ++ const char *lang; + + gtk_list_store_clear (store); + + user_langs = cc_common_language_get_initial_languages (); + + /* Add the current locale first */ +- name = cc_common_language_get_current_language (); ++ lang = cc_common_language_get_property ("Language"); ++ cc_common_language_get_locale (lang, &name); + display = g_hash_table_lookup (user_langs, name); + if (!display) { +- g_autofree gchar *language = NULL; +- g_autofree gchar *country = NULL; +- g_autofree gchar *codeset = NULL; +- +- gnome_parse_locale (name, &language, &country, &codeset, NULL); +- +- if (!codeset || !g_str_equal (codeset, "UTF-8")) +- g_warning ("Current user locale codeset isn't UTF-8"); +- +- g_free (name); +- name = g_strdup_printf ("%s_%s.UTF-8", language, country); +- +- insert_language (user_langs, name); ++ insert_language (user_langs, lang); + display = g_hash_table_lookup (user_langs, name); + } + +@@ -296,8 +387,8 @@ cc_common_language_add_user_languages (GtkTreeModel *model) + g_hash_table_foreach (user_langs, (GHFunc) foreach_user_lang_cb, store); + + /* And now the "Other…" selection */ +- gtk_list_store_append (store, &iter); +- gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other…"), -1); ++ //gtk_list_store_append (store, &iter); ++ //gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other…"), -1); + + g_hash_table_destroy (user_langs); + } +diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h +index 1f578b7..2e5a446 100644 +--- a/panels/common/cc-common-language.h ++++ b/panels/common/cc-common-language.h +@@ -43,6 +43,8 @@ guint cc_common_language_add_available_languages (GtkListStore *store, + GHashTable *user_langs); + gboolean cc_common_language_has_font (const gchar *locale); + gchar *cc_common_language_get_current_language (void); ++gchar *cc_common_language_get_property (const gchar *prop_name); ++gchar **cc_common_language_get_installed_languages (void); + + GHashTable *cc_common_language_get_initial_languages (void); + GHashTable *cc_common_language_get_user_languages (void); +@@ -55,4 +57,6 @@ void cc_common_language_select_current_language (GtkTreeView *treeview); + + void cc_common_language_add_user_languages (GtkTreeModel *model); + ++void cc_common_language_get_locale (const gchar *language, gchar **locale); ++ + G_END_DECLS +diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c +index 00190f5..0547778 100644 +--- a/panels/region/cc-region-panel.c ++++ b/panels/region/cc-region-panel.c +@@ -237,27 +237,26 @@ set_localed_locale (CcRegionPanel *self) + { + g_autoptr(GVariantBuilder) b = NULL; + g_autofree gchar *lang_value = NULL; ++ g_autofree gchar *lang = NULL; ++ ++ cc_common_language_get_locale (self->system_language, &lang); + + b = g_variant_builder_new (G_VARIANT_TYPE ("as")); +- lang_value = g_strconcat ("LANG=", self->system_language, NULL); ++ lang_value = g_strconcat ("LANG=", lang, NULL); ++ g_variant_builder_add (b, "s", lang_value); ++ ++ g_free (lang_value); ++ ++ lang_value = g_strconcat ("LANGUAGE=", self->system_language, NULL); + g_variant_builder_add (b, "s", lang_value); + +- if (self->system_region != NULL) { +- g_autofree gchar *time_value = NULL; +- g_autofree gchar *numeric_value = NULL; +- g_autofree gchar *monetary_value = NULL; +- g_autofree gchar *measurement_value = NULL; +- g_autofree gchar *paper_value = NULL; +- time_value = g_strconcat ("LC_TIME=", self->system_region, NULL); +- g_variant_builder_add (b, "s", time_value); +- numeric_value = g_strconcat ("LC_NUMERIC=", self->system_region, NULL); +- g_variant_builder_add (b, "s", numeric_value); +- monetary_value = g_strconcat ("LC_MONETARY=", self->system_region, NULL); +- g_variant_builder_add (b, "s", monetary_value); +- measurement_value = g_strconcat ("LC_MEASUREMENT=", self->system_region, NULL); +- g_variant_builder_add (b, "s", measurement_value); +- paper_value = g_strconcat ("LC_PAPER=", self->system_region, NULL); +- g_variant_builder_add (b, "s", paper_value); ++ const gchar *format_categories[] = { "LC_NUMERIC", "LC_TIME", ++ "LC_MONETARY", "LC_PAPER", "LC_IDENTIFICATION", "LC_NAME", ++ "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", NULL }; ++ for (int i = 0; format_categories[i] != NULL; i++) { ++ g_autofree gchar *s = NULL; ++ s = g_strconcat (format_categories[i], "=", self->system_region, NULL); ++ g_variant_builder_add (b, "s", s); + } + g_dbus_proxy_call (self->localed, + "SetLocale", +@@ -284,6 +283,8 @@ update_language (CcRegionPanel *self, + CcLocaleTarget target, + const gchar *language) + { ++ g_debug ("Setting language to %s", language); ++ + switch (target) { + case USER: + if (g_strcmp0 (language, self->language) == 0) +@@ -313,6 +314,40 @@ set_system_region (CcRegionPanel *self, + set_localed_locale (self); + } + ++static void ++set_formats_locale (const gchar *formats_locale) ++{ ++ g_autoptr(GDBusProxy) proxy = NULL; ++ g_autofree gchar *user_path = NULL; ++ g_autoptr(GVariant) ret = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ()); ++ proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, ++ "org.freedesktop.Accounts", ++ user_path, ++ "org.freedesktop.Accounts.User", ++ NULL, ++ &error); ++ if (!proxy) { ++ g_warning ("Couldn't get accountsservice proxy for %s: %s", user_path, error->message); ++ return; ++ } ++ ++ ret = g_dbus_proxy_call_sync (proxy, ++ "SetFormatsLocale", ++ g_variant_new ("(s)", formats_locale), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ if (!ret) ++ g_warning ("Couldn't set FormatsLocale: %s", error->message); ++} ++ ++ + static void + update_region (CcRegionPanel *self, + CcLocaleTarget target, +@@ -322,6 +357,7 @@ update_region (CcRegionPanel *self, + case USER: + if (g_strcmp0 (region, self->region) == 0) + return; ++ set_formats_locale (region); + if (region == NULL || region[0] == '\0') + g_settings_reset (self->locale_settings, KEY_REGION); + else +@@ -523,15 +559,19 @@ static void + update_language_from_user (CcRegionPanel *self) + { + const gchar *language = NULL; ++ g_autofree gchar *locale = NULL; + +- if (act_user_is_loaded (self->user)) ++ if (act_user_is_loaded (self->user)) { + language = act_user_get_language (self->user); ++ cc_common_language_get_locale (language, &locale); ++ } + +- if (language == NULL || *language == '\0') +- language = setlocale (LC_MESSAGES, NULL); ++ if (language == NULL || *language == '\0') { ++ locale = g_strdup (setlocale (LC_MESSAGES, NULL)); ++ } + + g_free (self->language); +- self->language = g_strdup (language); ++ self->language = g_steal_pointer (&locale); + update_user_language_row (self); + } + +@@ -539,7 +579,7 @@ static void + update_region_from_setting (CcRegionPanel *self) + { + g_free (self->region); +- self->region = g_settings_get_string (self->locale_settings, KEY_REGION); ++ self->region = cc_common_language_get_property ("FormatsLocale"); + update_user_region_row (self); + } + +@@ -629,6 +669,16 @@ set_login_button_visibility (CcRegionPanel *self) + + /* Callbacks */ + ++static gchar * ++strip_quotes (const gchar *str) ++{ ++ if ((g_str_has_prefix (str, "\"") && g_str_has_suffix (str, "\"")) ++ || (g_str_has_prefix (str, "'") && g_str_has_suffix (str, "'"))) ++ return g_strndup (str + 1, strlen (str) - 2); ++ else ++ return g_strdup (str); ++} ++ + static void + on_localed_properties_changed (GDBusProxy *localed_proxy, + GVariant *changed_properties, +@@ -637,33 +687,43 @@ on_localed_properties_changed (GDBusProxy *localed_proxy, + { + g_autoptr(GVariant) v = NULL; + +- v = g_dbus_proxy_get_cached_property (localed_proxy, "Locale"); ++ v = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (self->localed), "Locale"); + if (v) { + g_autofree const gchar **strv = NULL; + gsize len; + gint i; +- const gchar *lang, *messages, *time; ++ g_autofree gchar *lang; ++ g_autofree gchar *language; ++ g_autofree gchar *messages; ++ g_autofree gchar *time; + + strv = g_variant_get_strv (v, &len); + +- lang = messages = time = NULL; ++ lang = language = messages = time = NULL; + for (i = 0; strv[i]; i++) { + if (g_str_has_prefix (strv[i], "LANG=")) { +- lang = strv[i] + strlen ("LANG="); ++ lang = strip_quotes (strv[i] + strlen ("LANG=")); ++ } else if (g_str_has_prefix (strv[i], "LANGUAGE=")) { ++ g_autofree gchar *tmp = strip_quotes (strv[i] + strlen ("LANGUAGE=")); ++ g_auto(GStrv) tokens = g_strsplit (tmp, ":", 2); ++ language = g_strdup (tokens[0]); + } else if (g_str_has_prefix (strv[i], "LC_MESSAGES=")) { +- messages = strv[i] + strlen ("LC_MESSAGES="); ++ messages = strip_quotes (strv[i] + strlen ("LC_MESSAGES=")); + } else if (g_str_has_prefix (strv[i], "LC_TIME=")) { +- time = strv[i] + strlen ("LC_TIME="); ++ time = strip_quotes (strv[i] + strlen ("LC_TIME=")); + } + } + if (!lang) { +- lang = setlocale (LC_MESSAGES, NULL); ++ lang = g_strdup ("en_US.UTF-8"); + } +- if (!messages) { +- messages = lang; ++ if (!language) { ++ if (messages) ++ language = g_strdup (messages); ++ else ++ language = g_strdup (lang); + } + g_free (self->system_language); +- self->system_language = g_strdup (messages); ++ self->system_language = g_steal_pointer (&language); + g_free (self->system_region); + self->system_region = g_strdup (time); + +diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c +index 86b040c..6c3ded5 100644 +--- a/panels/user-accounts/cc-user-panel.c ++++ b/panels/user-accounts/cc-user-panel.c +@@ -871,6 +871,8 @@ show_user (ActUser *user, CcUserPanel *self) + gtk_widget_set_sensitive (GTK_WIDGET (self->autologin_switch), get_autologin_possible (user)); + + lang = g_strdup (act_user_get_language (user)); ++ cc_common_language_get_locale (lang, &lang); ++ + if (lang && *lang != '\0') { + name = gnome_get_language_from_locale (lang, NULL); + } else { +@@ -1073,7 +1075,8 @@ language_response (CcUserPanel *self, + GtkDialog *dialog) + { + ActUser *user; +- const gchar *lang, *account_language; ++ const gchar *lang;//, *account_language; ++ gchar *locale; + + if (response_id != GTK_RESPONSE_OK) { + gtk_widget_hide (GTK_WIDGET (dialog)); +@@ -1081,12 +1084,13 @@ language_response (CcUserPanel *self, + } + + user = get_selected_user (self); +- account_language = act_user_get_language (user); ++ //account_language = act_user_get_language (user); ++ cc_common_language_get_locale (act_user_get_language (user), &locale); + + lang = cc_language_chooser_get_language (CC_LANGUAGE_CHOOSER (dialog)); + if (lang) { + g_autofree gchar *name = NULL; +- if (g_strcmp0 (lang, account_language) != 0) { ++ if (g_strcmp0 (lang, locale) != 0) { + act_user_set_language (user, lang); + } + +@@ -1101,10 +1105,13 @@ static void + change_language (CcUserPanel *self) + { + const gchar *current_language; ++ g_autofree gchar *locale = NULL; + ActUser *user; + + user = get_selected_user (self); + current_language = act_user_get_language (user); ++ cc_common_language_get_locale (current_language, &locale); ++ current_language = locale; + + if (self->language_chooser) { + cc_language_chooser_clear_filter (self->language_chooser); diff -pruN 1:43.2-2/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch --- 1:43.2-2/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,2016 @@ +From: Ubuntu Developers +Date: Wed, 15 Jan 2020 16:56:17 +1300 +Subject: ubuntu-panel: Allow tweaking some Ubuntu specific settings + +Expose some of the settings that most users will find useful for our +Ubuntu Dock installation. Those are located in its own panel for now: +* change intellihide true/hide mode +* change dock icon size +* modify placement of the launcher (all monitor, primary or any monitors) +* Configure the desktop icons extension + +These changes are maintained in a single branch at: + https://gitlab.gnome.org/Community/Ubuntu/gnome-control-center/-/commits/ubuntu-panel + +Please provide merge requests there. + +Origin: ubuntu +Forwarded: not-needed +--- + panels/meson.build | 1 + + panels/ubuntu/assets/colors/color.svg.in | 5 + + panels/ubuntu/assets/theme-dark.svg | 1 + + panels/ubuntu/assets/theme-light.svg | 1 + + panels/ubuntu/cc-ubuntu-dock-dialog.c | 103 +++ + panels/ubuntu/cc-ubuntu-dock-dialog.h | 31 + + panels/ubuntu/cc-ubuntu-dock-dialog.ui | 81 ++ + panels/ubuntu/cc-ubuntu-panel.c | 1289 +++++++++++++++++++++++++++ + panels/ubuntu/cc-ubuntu-panel.h | 35 + + panels/ubuntu/cc-ubuntu-panel.ui | 163 ++++ + panels/ubuntu/gnome-ubuntu-panel.desktop.in | 13 + + panels/ubuntu/meson.build | 97 ++ + panels/ubuntu/ubuntu.gresource.xml | 6 + + po/POTFILES.in | 5 + + shell/cc-panel-list.c | 1 + + shell/cc-panel-loader.c | 3 + + 16 files changed, 1835 insertions(+) + create mode 100644 panels/ubuntu/assets/colors/color.svg.in + create mode 100644 panels/ubuntu/assets/theme-dark.svg + create mode 100644 panels/ubuntu/assets/theme-light.svg + create mode 100644 panels/ubuntu/cc-ubuntu-dock-dialog.c + create mode 100644 panels/ubuntu/cc-ubuntu-dock-dialog.h + create mode 100644 panels/ubuntu/cc-ubuntu-dock-dialog.ui + create mode 100644 panels/ubuntu/cc-ubuntu-panel.c + create mode 100644 panels/ubuntu/cc-ubuntu-panel.h + create mode 100644 panels/ubuntu/cc-ubuntu-panel.ui + create mode 100644 panels/ubuntu/gnome-ubuntu-panel.desktop.in + create mode 100644 panels/ubuntu/meson.build + create mode 100644 panels/ubuntu/ubuntu.gresource.xml + +diff --git a/panels/meson.build b/panels/meson.build +index cb732f2..c825ee2 100644 +--- a/panels/meson.build ++++ b/panels/meson.build +@@ -26,6 +26,7 @@ panels = [ + 'search', + 'sharing', + 'sound', ++ 'ubuntu', + 'universal-access', + 'usage', + 'user-accounts', +diff --git a/panels/ubuntu/assets/colors/color.svg.in b/panels/ubuntu/assets/colors/color.svg.in +new file mode 100644 +index 0000000..4c0e136 +--- /dev/null ++++ b/panels/ubuntu/assets/colors/color.svg.in +@@ -0,0 +1,5 @@ ++ ++ ++ ++ ++ +diff --git a/panels/ubuntu/assets/theme-dark.svg b/panels/ubuntu/assets/theme-dark.svg +new file mode 100644 +index 0000000..90a7f86 +--- /dev/null ++++ b/panels/ubuntu/assets/theme-dark.svg +@@ -0,0 +1 @@ ++ +\ No newline at end of file +diff --git a/panels/ubuntu/assets/theme-light.svg b/panels/ubuntu/assets/theme-light.svg +new file mode 100644 +index 0000000..0a8f29f +--- /dev/null ++++ b/panels/ubuntu/assets/theme-light.svg +@@ -0,0 +1 @@ ++ +\ No newline at end of file +diff --git a/panels/ubuntu/cc-ubuntu-dock-dialog.c b/panels/ubuntu/cc-ubuntu-dock-dialog.c +new file mode 100644 +index 0000000..4a64f2d +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-dock-dialog.c +@@ -0,0 +1,103 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* ++ * Copyright (C) 2022 Marco Trevisan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, see . ++ * ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++ ++#include "cc-list-row.h" ++#include "cc-ubuntu-dock-dialog.h" ++ ++struct _CcUbuntuDockDialog { ++ GtkDialog parent; ++ ++ GSettings *settings; ++ ++ CcListRow *volumes_switch; ++ GtkCheckButton *unmounted_check; ++ GtkCheckButton *network_volumes_check; ++ CcListRow *trash_switch; ++}; ++ ++G_DEFINE_TYPE (CcUbuntuDockDialog, cc_ubuntu_dock_dialog, GTK_TYPE_DIALOG) ++ ++static void ++cc_ubuntu_dock_dialog_dispose (GObject *object) ++{ ++ CcUbuntuDockDialog *dialog = CC_UBUNTU_DOCK_DIALOG (object); ++ ++ g_clear_object (&dialog->settings); ++ ++ G_OBJECT_CLASS (cc_ubuntu_dock_dialog_parent_class)->dispose (object); ++} ++ ++static void ++cc_ubuntu_dock_dialog_class_init (CcUbuntuDockDialogClass *klass) ++{ ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->dispose = cc_ubuntu_dock_dialog_dispose; ++ ++ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/ubuntu/cc-ubuntu-dock-dialog.ui"); ++ ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuDockDialog, volumes_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuDockDialog, unmounted_check); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuDockDialog, network_volumes_check); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuDockDialog, trash_switch); ++} ++ ++void ++cc_ubuntu_dock_dialog_init (CcUbuntuDockDialog *dialog) ++{ ++ gtk_widget_init_template (GTK_WIDGET (dialog)); ++} ++ ++CcUbuntuDockDialog * ++cc_ubuntu_dock_dialog_new (GSettings *settings) ++{ ++ CcUbuntuDockDialog *dialog; ++ ++ dialog = g_object_new (CC_TYPE_UBUNTU_DOCK_DIALOG, ++ "use-header-bar", TRUE, ++ NULL); ++ ++ gtk_window_set_title (GTK_WINDOW (dialog), _("Dock")); ++ dialog->settings = g_object_ref (settings); ++ ++ g_settings_bind (dialog->settings, "show-mounts", ++ dialog->volumes_switch, "active", ++ G_SETTINGS_BIND_DEFAULT); ++ ++ g_settings_bind (dialog->settings, "show-mounts-only-mounted", ++ dialog->unmounted_check, "active", ++ G_SETTINGS_BIND_INVERT_BOOLEAN); ++ ++ g_settings_bind (dialog->settings, "show-mounts-network", ++ dialog->network_volumes_check, "active", ++ G_SETTINGS_BIND_DEFAULT); ++ ++ g_settings_bind (dialog->settings, "show-trash", ++ dialog->trash_switch, "active", ++ G_SETTINGS_BIND_DEFAULT); ++ ++ return dialog; ++} +diff --git a/panels/ubuntu/cc-ubuntu-dock-dialog.h b/panels/ubuntu/cc-ubuntu-dock-dialog.h +new file mode 100644 +index 0000000..cd84651 +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-dock-dialog.h +@@ -0,0 +1,31 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* ++ * Copyright (C) 2022 Marco Trevisan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, see . ++ * ++ */ ++ ++#pragma once ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define CC_TYPE_UBUNTU_DOCK_DIALOG (cc_ubuntu_dock_dialog_get_type ()) ++G_DECLARE_FINAL_TYPE (CcUbuntuDockDialog, cc_ubuntu_dock_dialog, CC, UBUNTU_DOCK_DIALOG, GtkDialog) ++ ++CcUbuntuDockDialog *cc_ubuntu_dock_dialog_new (GSettings *settings); ++ ++G_END_DECLS +diff --git a/panels/ubuntu/cc-ubuntu-dock-dialog.ui b/panels/ubuntu/cc-ubuntu-dock-dialog.ui +new file mode 100644 +index 0000000..2b51182 +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-dock-dialog.ui +@@ -0,0 +1,81 @@ ++ ++ ++ ++ +diff --git a/panels/ubuntu/cc-ubuntu-panel.c b/panels/ubuntu/cc-ubuntu-panel.c +new file mode 100644 +index 0000000..5e02160 +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-panel.c +@@ -0,0 +1,1289 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* ++ * Copyright (C) 2017-2022 Canonical Ltd ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, see . ++ * ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++ ++#include "cc-list-row.h" ++#include "cc-ubuntu-panel.h" ++#include "cc-ubuntu-dock-dialog.h" ++#include "cc-ubuntu-resources.h" ++#include "shell/cc-application.h" ++#include "shell/cc-object-storage.h" ++ ++#include "panels/display/cc-display-config-manager-dbus.h" ++#include "panels/display/cc-display-config.h" ++ ++#define DING_SCHEMA "org.gnome.shell.extensions.ding" ++ ++#define MIN_ICONSIZE 16.0 ++#define MAX_ICONSIZE 64.0 ++#define DEFAULT_ICONSIZE 48.0 ++#define ICONSIZE_KEY "dash-max-icon-size" ++ ++#define UBUNTU_DOCK_SCHEMA "org.gnome.shell.extensions.dash-to-dock" ++#define UBUNTU_DOCK_ALL_MONITORS_KEY "multi-monitor" ++#define UBUNTU_DOCK_PREFERRED_MONITOR_KEY "preferred-monitor" ++#define UBUNTU_DOCK_PREFERRED_CONNECTOR_KEY "preferred-monitor-by-connector" ++ ++/* ++ * This allows to migrate settings from 'preferred-monitor' to ++ * 'preferred-monitor-by-connector', and can be removed after 22.04 ++ * simplifying all the logic, by relying on connector names only. ++ */ ++#define UBUNTU_DOCK_MONITOR_INDEX_USE_CONNECTOR -2 ++ ++struct _CcUbuntuPanel { ++ CcPanel parent_instance; ++ ++ AdwPreferencesGroup *ding_preferences_group; ++ GtkCenterBox *no_settings_view; ++ AdwComboRow *ding_icon_size_row; ++ AdwComboRow *ding_icons_new_alignment_row; ++ CcListRow *ding_showhome_switch; ++ AdwPreferencesGroup *dock_preferences_group; ++ CcListRow *dock_autohide_switch; ++ CcListRow *dock_extendheight_switch; ++ AdwComboRow *dock_monitor_row; ++ GListStore *dock_monitors_list; ++ AdwComboRow *dock_position_row; ++ GtkAdjustment *icon_size_adjustment; ++ GtkScale *icon_size_scale; ++ ++ GSettings *ding_settings; ++ GSettings *dock_settings; ++ GSettings *interface_settings; ++ GSettings *gedit_settings; ++ CcDisplayConfigManager *display_config_manager; ++ CcDisplayConfig *display_current_config; ++ GDBusProxy *shell_proxy; ++ ++ gboolean updating; ++}; ++ ++CC_PANEL_REGISTER (CcUbuntuPanel, cc_ubuntu_panel); ++ ++static void monitor_labeler_hide (CcUbuntuPanel *self); ++static void update_dock_monitor_combo_row_selection (CcUbuntuPanel *self); ++ ++static void ++cc_ubuntu_panel_dispose (GObject *object) ++{ ++ CcUbuntuPanel *self = CC_UBUNTU_PANEL (object); ++ ++ monitor_labeler_hide (self); ++ ++ g_clear_object (&self->ding_settings); ++ g_clear_object (&self->dock_settings); ++ g_clear_object (&self->dock_monitors_list); ++ g_clear_object (&self->interface_settings); ++ g_clear_object (&self->gedit_settings); ++ g_clear_object (&self->display_current_config); ++ g_clear_object (&self->display_config_manager); ++ g_clear_object (&self->shell_proxy); ++ ++ G_OBJECT_CLASS (cc_ubuntu_panel_parent_class)->dispose (object); ++} ++ ++static void ++monitor_labeler_hide (CcUbuntuPanel *self) ++{ ++ if (!self->shell_proxy) ++ return; ++ ++ g_dbus_proxy_call (self->shell_proxy, ++ "HideMonitorLabels", ++ NULL, G_DBUS_CALL_FLAGS_NONE, ++ -1, NULL, NULL, NULL); ++} ++ ++static void ++monitor_labeler_show (CcUbuntuPanel *self) ++{ ++ GList *outputs, *l; ++ GVariantBuilder builder; ++ gint number = 0; ++ guint n_monitors = 0; ++ ++ if (!self->shell_proxy || !self->display_current_config) ++ return; ++ ++ outputs = cc_display_config_get_ui_sorted_monitors (self->display_current_config); ++ if (!outputs) ++ return; ++ ++ if (cc_display_config_is_cloning (self->display_current_config)) ++ return monitor_labeler_hide (self); ++ ++ g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE); ++ g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY); ++ ++ for (l = outputs; l != NULL; l = l->next) ++ { ++ CcDisplayMonitor *output = l->data; ++ ++ if (!cc_display_monitor_is_active (output)) ++ continue; ++ ++ number = cc_display_monitor_get_ui_number (output); ++ if (number == 0) ++ continue; ++ ++ g_variant_builder_add (&builder, "{sv}", ++ cc_display_monitor_get_connector_name (output), ++ g_variant_new_int32 (number)); ++ n_monitors++; ++ } ++ ++ g_variant_builder_close (&builder); ++ ++ if (number < 2 || n_monitors < 2) ++ { ++ g_variant_builder_clear (&builder); ++ return monitor_labeler_hide (self); ++ } ++ ++ g_dbus_proxy_call (self->shell_proxy, ++ "ShowMonitorLabels", ++ g_variant_builder_end (&builder), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, NULL, NULL, NULL); ++} ++ ++static void ++ensure_monitor_labels (CcUbuntuPanel *self) ++{ ++ g_autoptr(GList) windows = NULL; ++ GList *w; ++ ++ windows = gtk_window_list_toplevels (); ++ ++ for (w = windows; w; w = w->next) ++ { ++ if (gtk_window_is_active (GTK_WINDOW (w->data))) ++ { ++ monitor_labeler_show (self); ++ break; ++ } ++ } ++ ++ if (!w) ++ monitor_labeler_hide (self); ++} ++ ++static void ++shell_proxy_ready (GObject *source, ++ GAsyncResult *res, ++ CcUbuntuPanel *self) ++{ ++ GDBusProxy *proxy; ++ g_autoptr(GError) error = NULL; ++ ++ proxy = cc_object_storage_create_dbus_proxy_finish (res, &error); ++ if (!proxy) ++ { ++ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ g_warning ("Failed to contact gnome-shell: %s", error->message); ++ return; ++ } ++ ++ self->shell_proxy = proxy; ++ ++ ensure_monitor_labels (self); ++} ++ ++static GList * ++get_valid_monitors (CcUbuntuPanel *self, ++ gint *n_monitors, ++ gint *primary_index) ++{ ++ CcDisplayMonitor *primary_monitor; ++ GList *config_monitors = NULL; ++ GList *valid_monitors, *l; ++ gint n_valid_monitors; ++ ++ config_monitors = cc_display_config_get_monitors (self->display_current_config); ++ primary_monitor = NULL; ++ valid_monitors = NULL; ++ n_valid_monitors = 0; ++ ++ for (l = config_monitors; l != NULL; l = l->next) ++ { ++ CcDisplayMonitor *monitor = l->data; ++ ++ if (!cc_display_monitor_is_active (monitor)) ++ continue; ++ ++ /* The default monitors list uses reversed order, so prepend to ++ * set it back to mutter order */ ++ valid_monitors = g_list_prepend (valid_monitors, monitor); ++ ++ if (cc_display_monitor_is_primary (monitor)) ++ primary_monitor = monitor; ++ ++ n_valid_monitors++; ++ } ++ ++ if (n_monitors) ++ *n_monitors = n_valid_monitors; ++ ++ if (primary_index) ++ *primary_index = g_list_index (valid_monitors, primary_monitor); ++ ++ return valid_monitors; ++} ++ ++static int ++ui_sort_monitor (gconstpointer a, gconstpointer b) ++{ ++ CcDisplayMonitor *monitor_a = (CcDisplayMonitor *) a; ++ CcDisplayMonitor *monitor_b = (CcDisplayMonitor *) b; ++ ++ return cc_display_monitor_get_ui_number (monitor_a) - ++ cc_display_monitor_get_ui_number (monitor_b); ++} ++ ++static GList * ++get_valid_monitors_sorted (CcUbuntuPanel *self, ++ gint *n_monitors, ++ gint *primary_index) ++{ ++ GList *monitors = get_valid_monitors (self, n_monitors, primary_index); ++ ++ return g_list_sort (monitors, ui_sort_monitor); ++} ++ ++static int ++dock_monitor_to_id (gint index, ++ gint primary_monitor, ++ gint n_monitors) ++{ ++ if (index < 0) ++ return -1; ++ ++ /* The The dock uses the Gdk index for monitors, where the primary monitor ++ * always has index 0, so let's follow what dash-to-dock does in docking.js ++ * (as part of _createDocks) */ ++ return (primary_monitor + index) % n_monitors; ++} ++ ++typedef enum ++{ ++ GSD_UBUNTU_DOCK_MONITOR_ALL, ++ GSD_UBUNTU_DOCK_MONITOR_PRIMARY, ++} GsdUbuntuDockMonitor; ++ ++static char * ++get_dock_monitor_value_object_name (GObject *object_value, ++ CcUbuntuPanel *self) ++{ ++ if (GTK_IS_STRING_OBJECT (object_value)) ++ { ++ GtkStringObject *string_object = GTK_STRING_OBJECT (object_value); ++ ++ return g_strdup (gtk_string_object_get_string (string_object)); ++ } ++ ++ if (CC_IS_DISPLAY_MONITOR (object_value)) ++ { ++ CcDisplayMonitor *monitor = CC_DISPLAY_MONITOR (object_value); ++ int monitor_number = cc_display_monitor_get_ui_number (monitor); ++ const char *monitor_name = cc_display_monitor_get_display_name (monitor); ++ ++ if (gtk_widget_get_state_flags (GTK_WIDGET (self)) & GTK_STATE_FLAG_DIR_LTR) ++ return g_strdup_printf ("%d. %s", monitor_number, monitor_name); ++ else ++ return g_strdup_printf ("%s .%d", monitor_name, monitor_number); ++ } ++ ++ g_return_val_if_reached (NULL); ++} ++ ++static GtkStringObject * ++new_take_string_object (char *label) ++{ ++ g_autofree char *string = g_steal_pointer (&label); ++ return gtk_string_object_new (string); ++} ++ ++static void ++populate_dock_monitor_combo_row (CcUbuntuPanel *self) ++{ ++ g_autoptr(CcDisplayMonitor) primary_monitor = NULL; ++ g_autoptr(GList) valid_monitors = NULL; ++ g_autoptr(GtkStringObject) primary_value_object = NULL; ++ g_autoptr(GtkStringObject) all_displays_value_object = NULL; ++ GList *l; ++ gint index; ++ ++ if (self->display_config_manager == NULL) ++ return; ++ ++ g_list_store_remove_all (self->dock_monitors_list); ++ ++ valid_monitors = get_valid_monitors_sorted (self, NULL, NULL); ++ gtk_widget_set_visible (GTK_WIDGET (self->dock_monitor_row), valid_monitors != NULL); ++ ++ if (!valid_monitors) ++ return; ++ ++ all_displays_value_object = gtk_string_object_new (_("All displays")); ++ g_list_store_insert (self->dock_monitors_list, ++ GSD_UBUNTU_DOCK_MONITOR_ALL, ++ all_displays_value_object); ++ ++ for (l = valid_monitors, index = 0; l != NULL; l = l->next, index++) ++ { ++ CcDisplayMonitor *monitor = l->data; ++ ++ if (cc_display_monitor_is_primary (monitor)) ++ g_set_object (&primary_monitor, monitor); ++ ++ g_list_store_append (self->dock_monitors_list, monitor); ++ } ++ ++ if (primary_monitor) ++ { ++ int ui_number = cc_display_monitor_get_ui_number (primary_monitor); ++ ++ if (gtk_widget_get_state_flags (GTK_WIDGET (self)) & GTK_STATE_FLAG_DIR_LTR) ++ { ++ primary_value_object = new_take_string_object ( ++ g_strdup_printf ("%s (%d)", _("Primary Display"), ui_number)); ++ } ++ else ++ { ++ primary_value_object = new_take_string_object ( ++ g_strdup_printf ("(%d) %s", ui_number, _("Primary Display"))); ++ } ++ } ++ else ++ { ++ primary_value_object = gtk_string_object_new (_("Primary Display")); ++ } ++ ++ g_list_store_insert (self->dock_monitors_list, ++ GSD_UBUNTU_DOCK_MONITOR_PRIMARY, ++ primary_value_object); ++} ++ ++static void ++on_screen_changed (CcUbuntuPanel *self) ++{ ++ g_autoptr(CcDisplayConfig) current = NULL; ++ ++ if (self->display_config_manager == NULL || !self->dock_settings) ++ return; ++ ++ current = cc_display_config_manager_get_current (self->display_config_manager); ++ if (current == NULL) ++ return; ++ ++ self->updating = TRUE; ++ ++ g_set_object (&self->display_current_config, current); ++ ++ populate_dock_monitor_combo_row (self); ++ ensure_monitor_labels (self); ++ ++ self->updating = FALSE; ++ ++ update_dock_monitor_combo_row_selection (self); ++} ++ ++static void ++session_bus_ready (GObject *source, ++ GAsyncResult *res, ++ gpointer user_data) ++{ ++ CcUbuntuPanel *self = user_data; ++ GDBusConnection *bus; ++ g_autoptr(GError) error = NULL; ++ ++ bus = g_bus_get_finish (res, &error); ++ if (!bus) ++ { ++ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ g_warning ("Failed to get session bus: %s", error->message); ++ return; ++ } ++ ++ self->display_config_manager = cc_display_config_manager_dbus_new (); ++ g_signal_connect_object (self->display_config_manager, "changed", ++ G_CALLBACK (on_screen_changed), ++ self, ++ G_CONNECT_SWAPPED); ++} ++ ++static void ++icon_size_widget_refresh (CcUbuntuPanel *self) ++{ ++ gint value = g_settings_get_int (self->dock_settings, ICONSIZE_KEY); ++ gtk_adjustment_set_value (self->icon_size_adjustment, (gdouble) value / 2); ++} ++ ++static gchar * ++on_icon_size_format_value (GtkScale *scale, ++ gdouble value, ++ gpointer data) ++{ ++ return g_strdup_printf ("%d", (int)value * 2); ++} ++ ++static void ++on_icon_size_adjustment_value_changed (CcUbuntuPanel *self) ++{ ++ if (!self->dock_settings) ++ return; ++ ++ gint value = (gint)gtk_adjustment_get_value (self->icon_size_adjustment) * 2; ++ if (g_settings_get_int (self->dock_settings, ICONSIZE_KEY) != value) ++ g_settings_set_int (self->dock_settings, ICONSIZE_KEY, value); ++} ++ ++static void ++on_dock_monitor_row_changed (CcUbuntuPanel *self) ++{ ++ gboolean ubuntu_dock_on_all_monitors; ++ g_autofree char *ubuntu_dock_current_connector = NULL; ++ int selected; ++ ++ if (self->updating || !self->dock_settings) ++ return; ++ ++ selected = adw_combo_row_get_selected (self->dock_monitor_row); ++ if (selected < 0) ++ return; ++ ++ ubuntu_dock_on_all_monitors = ++ g_settings_get_boolean (self->dock_settings, UBUNTU_DOCK_ALL_MONITORS_KEY); ++ ubuntu_dock_current_connector = ++ g_settings_get_string (self->dock_settings, UBUNTU_DOCK_PREFERRED_CONNECTOR_KEY); ++ if (selected == GSD_UBUNTU_DOCK_MONITOR_ALL) ++ { ++ if (!ubuntu_dock_on_all_monitors) ++ { ++ g_settings_set_boolean (self->dock_settings, ++ UBUNTU_DOCK_ALL_MONITORS_KEY, ++ TRUE); ++ g_settings_apply (self->dock_settings); ++ } ++ } ++ else ++ { ++ g_autoptr(GSettings) delayed_settings = g_settings_new (UBUNTU_DOCK_SCHEMA); ++ g_settings_delay (delayed_settings); ++ g_autofree char *connector_name = NULL; ++ ++ if (ubuntu_dock_on_all_monitors) ++ g_settings_set_boolean (delayed_settings, UBUNTU_DOCK_ALL_MONITORS_KEY, FALSE); ++ ++ if (selected == GSD_UBUNTU_DOCK_MONITOR_PRIMARY) ++ { ++ connector_name = g_strdup ("primary"); ++ } ++ else ++ { ++ g_autoptr(GObject) value_object = NULL; ++ g_autoptr(CcDisplayMonitor) monitor = NULL; ++ ++ monitor = g_list_model_get_item (G_LIST_MODEL (self->dock_monitors_list), ++ selected); ++ connector_name = g_strdup (cc_display_monitor_get_connector_name (monitor)); ++ } ++ ++ if (g_strcmp0 (ubuntu_dock_current_connector, connector_name) != 0) ++ { ++ g_settings_set_int (delayed_settings, UBUNTU_DOCK_PREFERRED_MONITOR_KEY, ++ UBUNTU_DOCK_MONITOR_INDEX_USE_CONNECTOR); ++ g_settings_set_string (delayed_settings, UBUNTU_DOCK_PREFERRED_CONNECTOR_KEY, ++ connector_name); ++ } ++ ++ g_settings_apply (delayed_settings); ++ } ++} ++ ++static void ++on_dock_behavior_row_activated (CcUbuntuPanel *self) ++{ ++ CcShell *shell = cc_panel_get_shell (CC_PANEL (self)); ++ CcUbuntuDockDialog *dialog; ++ ++ dialog = cc_ubuntu_dock_dialog_new (self->dock_settings); ++ gtk_window_set_transient_for (GTK_WINDOW (dialog), ++ GTK_WINDOW (cc_shell_get_toplevel (shell))); ++ gtk_widget_set_visible (GTK_WIDGET (dialog), TRUE); ++} ++ ++static CcDisplayMonitor * ++get_dock_monitor (CcUbuntuPanel *self) ++{ ++ g_autoptr(GList) monitors = NULL; ++ int index; ++ int n_monitors; ++ int primary_monitor; ++ ++ monitors = get_valid_monitors_sorted (self, &n_monitors, &primary_monitor); ++ index = g_settings_get_int (self->dock_settings, UBUNTU_DOCK_PREFERRED_MONITOR_KEY); ++ ++ if (index == UBUNTU_DOCK_MONITOR_INDEX_USE_CONNECTOR) ++ { ++ g_autofree char *connector = NULL; ++ GList *l; ++ int i; ++ ++ connector = g_settings_get_string (self->dock_settings, ++ UBUNTU_DOCK_PREFERRED_CONNECTOR_KEY); ++ ++ for (l = monitors, i = 0; l; l = l->next, i++) ++ { ++ CcDisplayMonitor *monitor = l->data; ++ const char *monitor_connector = cc_display_monitor_get_connector_name (monitor); ++ if (g_strcmp0 (monitor_connector, connector) == 0) ++ return g_object_ref (monitor); ++ } ++ } ++ ++ if (index < 0 || index >= n_monitors) ++ return NULL; ++ ++ index = dock_monitor_to_id (index, primary_monitor, n_monitors); ++ ++ return g_object_ref (g_list_nth_data (monitors, index)); ++} ++ ++static gboolean ++dock_placement_row_compare (gconstpointer a, gconstpointer b) ++{ ++ GObject *row_object_a = G_OBJECT (a); ++ GObject *row_object_b = G_OBJECT (b); ++ ++ if (row_object_a == NULL || row_object_b == NULL) ++ return row_object_a == row_object_b; ++ ++ if (G_OBJECT_TYPE (row_object_a) != G_OBJECT_TYPE (row_object_b)) ++ return FALSE; ++ ++ if (CC_IS_DISPLAY_MONITOR (row_object_a)) ++ { ++ return cc_display_monitor_get_ui_number (CC_DISPLAY_MONITOR (row_object_a)) == ++ cc_display_monitor_get_ui_number (CC_DISPLAY_MONITOR (row_object_b)); ++ } ++ ++ if (GTK_IS_STRING_OBJECT (row_object_a)) ++ { ++ return g_strcmp0 (gtk_string_object_get_string (GTK_STRING_OBJECT (row_object_a)), ++ gtk_string_object_get_string (GTK_STRING_OBJECT (row_object_b))) == 0; ++ } ++ ++ g_return_val_if_reached (FALSE); ++} ++ ++static void ++update_dock_monitor_combo_row_selection (CcUbuntuPanel *self) ++{ ++ guint selection = GSD_UBUNTU_DOCK_MONITOR_PRIMARY; ++ ++ if (g_settings_get_boolean (self->dock_settings, UBUNTU_DOCK_ALL_MONITORS_KEY)) ++ { ++ selection = GSD_UBUNTU_DOCK_MONITOR_ALL; ++ } ++ else ++ { ++ g_autoptr (CcDisplayMonitor) monitor = get_dock_monitor (self); ++ ++ if (monitor) ++ { ++ if (!g_list_store_find_with_equal_func (self->dock_monitors_list, ++ monitor, ++ dock_placement_row_compare, ++ &selection)) ++ selection = GSD_UBUNTU_DOCK_MONITOR_PRIMARY; ++ } ++ } ++ ++ adw_combo_row_set_selected (self->dock_monitor_row, selection); ++} ++ ++static void ++cc_ubuntu_panel_class_init (CcUbuntuPanelClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); ++ ++ object_class->dispose = cc_ubuntu_panel_dispose; ++ ++ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/ubuntu/cc-ubuntu-panel.ui"); ++ ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, no_settings_view); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, ding_preferences_group); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, ding_icon_size_row); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, ding_icons_new_alignment_row); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, ding_showhome_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, dock_preferences_group); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, dock_autohide_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, dock_extendheight_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, dock_monitor_row); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, dock_position_row); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, icon_size_adjustment); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, icon_size_scale); ++ ++ gtk_widget_class_bind_template_callback (widget_class, on_dock_monitor_row_changed); ++ gtk_widget_class_bind_template_callback (widget_class, on_dock_behavior_row_activated); ++ gtk_widget_class_bind_template_callback (widget_class, on_icon_size_adjustment_value_changed); ++} ++ ++static void ++mapped_cb (CcUbuntuPanel *self) ++{ ++ CcShell *shell; ++ GtkWidget *toplevel; ++ ++ shell = cc_panel_get_shell (CC_PANEL (self)); ++ toplevel = cc_shell_get_toplevel (shell); ++ ++ g_signal_handlers_disconnect_by_func (toplevel, mapped_cb, self); ++ g_signal_connect_object (toplevel, "notify::has-toplevel-focus", ++ G_CALLBACK (ensure_monitor_labels), self, ++ G_CONNECT_SWAPPED); ++} ++ ++typedef enum ++{ ++ GSD_UBUNTU_DOCK_POSITION_TOP, ++ GSD_UBUNTU_DOCK_POSITION_RIGHT, ++ GSD_UBUNTU_DOCK_POSITION_BOTTOM, ++ GSD_UBUNTU_DOCK_POSITION_LEFT, ++ ++ GSD_UBUNTU_DOCK_POSITION_FIRST = GSD_UBUNTU_DOCK_POSITION_RIGHT, ++} GsdUbuntuDockPosition; ++ ++static GsdUbuntuDockPosition ++get_dock_position_for_direction (CcUbuntuPanel *self, ++ GsdUbuntuDockPosition position) ++{ ++ if (gtk_widget_get_state_flags (GTK_WIDGET (self)) & GTK_STATE_FLAG_DIR_RTL) ++ { ++ switch (position) ++ { ++ case GSD_UBUNTU_DOCK_POSITION_RIGHT: ++ position = GSD_UBUNTU_DOCK_POSITION_LEFT; ++ break; ++ case GSD_UBUNTU_DOCK_POSITION_LEFT: ++ position = GSD_UBUNTU_DOCK_POSITION_LEFT; ++ break; ++ default: ++ break; ++ } ++ } ++ ++ return position; ++} ++ ++static const char * ++get_dock_position_string (GsdUbuntuDockPosition position) ++{ ++ switch (position) ++ { ++ case GSD_UBUNTU_DOCK_POSITION_TOP: ++ return "TOP"; ++ case GSD_UBUNTU_DOCK_POSITION_RIGHT: ++ return "RIGHT"; ++ case GSD_UBUNTU_DOCK_POSITION_BOTTOM: ++ return "BOTTOM"; ++ case GSD_UBUNTU_DOCK_POSITION_LEFT: ++ return "LEFT"; ++ default: ++ g_return_val_if_reached ("LEFT"); ++ } ++} ++ ++static GsdUbuntuDockPosition ++get_dock_position_from_string (const char *position) ++{ ++ if (g_str_equal (position, "TOP")) ++ return GSD_UBUNTU_DOCK_POSITION_TOP; ++ ++ if (g_str_equal (position, "RIGHT")) ++ return GSD_UBUNTU_DOCK_POSITION_RIGHT; ++ ++ if (g_str_equal (position, "BOTTOM")) ++ return GSD_UBUNTU_DOCK_POSITION_BOTTOM; ++ ++ if (g_str_equal (position, "LEFT")) ++ return GSD_UBUNTU_DOCK_POSITION_LEFT; ++ ++ g_return_val_if_reached (GSD_UBUNTU_DOCK_POSITION_LEFT); ++} ++ ++static GsdUbuntuDockPosition ++get_dock_position_row_position (CcUbuntuPanel *self, ++ int index) ++{ ++ GListModel *model = adw_combo_row_get_model (self->dock_position_row); ++ g_autoptr(GObject) value_object = g_list_model_get_item (model, index); ++ ++ return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (value_object), "position")); ++} ++ ++static int ++get_dock_position_row_index (CcUbuntuPanel *self, ++ GsdUbuntuDockPosition position) ++{ ++ GListModel *model = adw_combo_row_get_model (self->dock_position_row); ++ guint n_items; ++ guint i; ++ ++ n_items = g_list_model_get_n_items (model); ++ ++ if (position == GSD_UBUNTU_DOCK_POSITION_TOP) ++ return n_items; ++ ++ for (i = 0; i < n_items; i++) ++ { ++ g_autoptr(GObject) value_object = g_list_model_get_item (model, i); ++ GsdUbuntuDockPosition item_position; ++ ++ item_position = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (value_object), "position")); ++ ++ if (item_position == position) ++ return i; ++ } ++ ++ g_return_val_if_reached (n_items); ++} ++ ++static gboolean ++dock_position_get_mapping (GValue *value, ++ GVariant *variant, ++ gpointer user_data) ++{ ++ CcUbuntuPanel *self = user_data; ++ GsdUbuntuDockPosition position; ++ ++ position = get_dock_position_from_string (g_variant_get_string (variant, NULL)); ++ position = get_dock_position_for_direction (self, position); ++ ++ if (G_VALUE_TYPE (value) == G_TYPE_UINT) ++ { ++ g_value_set_uint (value, get_dock_position_row_index (self, position)); ++ return TRUE; ++ } ++ else if (G_VALUE_TYPE (value) == G_TYPE_STRING) ++ { ++ g_value_set_string (value, get_dock_position_string (position)); ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static GVariant * ++dock_position_set_mapping (const GValue *value, ++ const GVariantType *type, ++ gpointer user_data) ++{ ++ CcUbuntuPanel *self = user_data; ++ GsdUbuntuDockPosition position; ++ ++ position = get_dock_position_row_position (self, g_value_get_uint (value)); ++ position = get_dock_position_for_direction (self, position); ++ ++ return g_variant_new_string (get_dock_position_string (position)); ++} ++ ++static void ++populate_dock_position_row (AdwComboRow *combo_row) ++{ ++ g_autoptr (GtkStringList) string_list = NULL; ++ struct { ++ char *name; ++ GsdUbuntuDockPosition position; ++ } positions[] = { ++ { ++ NC_("Position on screen for the Ubuntu dock", "Left"), ++ GSD_UBUNTU_DOCK_POSITION_LEFT, ++ }, ++ { ++ NC_("Position on screen for the Ubuntu dock", "Bottom"), ++ GSD_UBUNTU_DOCK_POSITION_BOTTOM, ++ }, ++ { ++ NC_("Position on screen for the Ubuntu dock", "Right"), ++ GSD_UBUNTU_DOCK_POSITION_RIGHT, ++ }, ++ }; ++ guint i; ++ ++ string_list = gtk_string_list_new (NULL); ++ for (i = 0; i < G_N_ELEMENTS (positions); i++) ++ { ++ g_autoptr (GObject) value_object = NULL; ++ ++ gtk_string_list_append (string_list, g_dpgettext2 (NULL, "Position on screen for the Ubuntu dock", positions[i].name)); ++ value_object = g_list_model_get_item (G_LIST_MODEL (string_list), i); ++ g_object_set_data (value_object, "position", ++ GUINT_TO_POINTER (positions[i].position)); ++ } ++ ++ adw_combo_row_set_model (combo_row, G_LIST_MODEL (string_list)); ++} ++ ++typedef enum ++{ ++ UBUNTU_DING_ICONS_SIZE_SMALL, ++ UBUNTU_DING_ICONS_SIZE_STANDARD, ++ UBUNTU_DING_ICONS_SIZE_LARGE, ++ UBUNTU_DING_ICONS_SIZE_TINY, ++} UbuntuDingIconsSize; ++ ++static const char * ++get_ding_size_string (UbuntuDingIconsSize size) ++{ ++ switch (size) ++ { ++ case UBUNTU_DING_ICONS_SIZE_TINY: ++ return "tiny"; ++ case UBUNTU_DING_ICONS_SIZE_SMALL: ++ return "small"; ++ case UBUNTU_DING_ICONS_SIZE_STANDARD: ++ return "standard"; ++ case UBUNTU_DING_ICONS_SIZE_LARGE: ++ return "large"; ++ default: ++ g_return_val_if_reached ("standard"); ++ } ++} ++ ++static UbuntuDingIconsSize ++get_ding_size_from_string (const char *size) ++{ ++ if (g_str_equal (size, "tiny")) ++ return UBUNTU_DING_ICONS_SIZE_TINY; ++ ++ if (g_str_equal (size, "small")) ++ return UBUNTU_DING_ICONS_SIZE_SMALL; ++ ++ if (g_str_equal (size, "standard")) ++ return UBUNTU_DING_ICONS_SIZE_STANDARD; ++ ++ if (g_str_equal (size, "large")) ++ return UBUNTU_DING_ICONS_SIZE_LARGE; ++ ++ g_return_val_if_reached (UBUNTU_DING_ICONS_SIZE_STANDARD); ++} ++ ++static int ++get_ding_size_row_index (CcUbuntuPanel *self, ++ UbuntuDingIconsSize size) ++{ ++ GListModel *model = adw_combo_row_get_model (self->ding_icon_size_row); ++ guint n_items; ++ guint i; ++ ++ n_items = g_list_model_get_n_items (model); ++ ++ for (i = 0; i < n_items; i++) ++ { ++ g_autoptr(GObject) value_object = g_list_model_get_item (model, i); ++ UbuntuDingIconsSize item_size; ++ ++ item_size = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (value_object), "size")); ++ ++ if (item_size == size) ++ return i; ++ } ++ ++ g_return_val_if_reached (0); ++} ++ ++static gboolean ++ding_size_get_mapping (GValue *value, ++ GVariant *variant, ++ gpointer user_data) ++{ ++ CcUbuntuPanel *self = user_data; ++ UbuntuDingIconsSize size = 0; ++ ++ size = get_ding_size_from_string (g_variant_get_string (variant, NULL)); ++ ++ if (G_VALUE_TYPE (value) == G_TYPE_UINT) ++ { ++ g_value_set_uint (value, get_ding_size_row_index (self, size)); ++ return TRUE; ++ } ++ else if (G_VALUE_TYPE (value) == G_TYPE_STRING) ++ { ++ g_value_set_string (value, get_ding_size_string (size)); ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static GVariant * ++ding_size_set_mapping (const GValue *value, ++ const GVariantType *type, ++ gpointer user_data) ++{ ++ UbuntuDingIconsSize size = g_value_get_uint (value); ++ ++ return g_variant_new_string (get_ding_size_string (size)); ++} ++ ++static void ++populate_ding_size_row (AdwComboRow *combo_row) ++{ ++ g_autoptr (GtkStringList) string_list = NULL; ++ struct { ++ char *name; ++ UbuntuDingIconsSize size; ++ } sizes[] = { ++ { ++ NC_("Size of the desktop icons", "Small"), ++ UBUNTU_DING_ICONS_SIZE_SMALL, ++ }, ++ { ++ NC_("Size of the desktop icons", "Normal"), ++ UBUNTU_DING_ICONS_SIZE_STANDARD, ++ }, ++ { ++ NC_("Size of the desktop icons", "Large"), ++ UBUNTU_DING_ICONS_SIZE_LARGE, ++ }, ++ { ++ NC_("Size of the desktop icons", "Tiny"), ++ UBUNTU_DING_ICONS_SIZE_TINY, ++ }, ++ }; ++ guint i; ++ ++ string_list = gtk_string_list_new (NULL); ++ for (i = 0; i < G_N_ELEMENTS (sizes); i++) ++ { ++ g_autoptr (GObject) value_object = NULL; ++ ++ gtk_string_list_append (string_list, g_dpgettext2 (NULL, "Size of the desktop icons", sizes[i].name)); ++ value_object = g_list_model_get_item (G_LIST_MODEL (string_list), i); ++ g_object_set_data (value_object, "size", ++ GUINT_TO_POINTER (sizes[i].size)); ++ } ++ ++ adw_combo_row_set_model (combo_row, G_LIST_MODEL (string_list)); ++} ++ ++typedef enum ++{ ++ UBUNTU_DING_START_CORNER_TOP_LEFT, ++ UBUNTU_DING_START_CORNER_TOP_RIGHT, ++ UBUNTU_DING_START_CORNER_BOTTOM_LEFT, ++ UBUNTU_DING_START_CORNER_BOTTOM_RIGHT, ++} UbuntuDingStartCorner; ++ ++static const char * ++get_ding_start_corner_string (UbuntuDingStartCorner corner) ++{ ++ switch (corner) ++ { ++ case UBUNTU_DING_START_CORNER_TOP_LEFT: ++ return "top-left"; ++ case UBUNTU_DING_START_CORNER_TOP_RIGHT: ++ return "top-right"; ++ case UBUNTU_DING_START_CORNER_BOTTOM_LEFT: ++ return "bottom-left"; ++ case UBUNTU_DING_START_CORNER_BOTTOM_RIGHT: ++ return "bottom-right"; ++ default: ++ g_return_val_if_reached ("standard"); ++ } ++} ++ ++static UbuntuDingStartCorner ++get_ding_start_corner_from_string (const char *corner) ++{ ++ if (g_str_equal (corner, "top-left")) ++ return UBUNTU_DING_START_CORNER_TOP_LEFT; ++ ++ if (g_str_equal (corner, "top-right")) ++ return UBUNTU_DING_START_CORNER_TOP_RIGHT; ++ ++ if (g_str_equal (corner, "bottom-left")) ++ return UBUNTU_DING_START_CORNER_BOTTOM_LEFT; ++ ++ if (g_str_equal (corner, "bottom-right")) ++ return UBUNTU_DING_START_CORNER_BOTTOM_RIGHT; ++ ++ g_warning("Value is %s", corner); ++ ++ g_return_val_if_reached (UBUNTU_DING_START_CORNER_BOTTOM_RIGHT); ++} ++ ++static int ++ding_start_corner_get_row_index (CcUbuntuPanel *self, ++ UbuntuDingStartCorner corner) ++{ ++ GListModel *model = adw_combo_row_get_model (self->ding_icons_new_alignment_row); ++ guint n_items; ++ guint i; ++ ++ n_items = g_list_model_get_n_items (model); ++ ++ for (i = 0; i < n_items; i++) ++ { ++ g_autoptr(GObject) value_object = g_list_model_get_item (model, i); ++ UbuntuDingStartCorner item_corner; ++ ++ item_corner = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (value_object), "corner")); ++ ++ if (item_corner == corner) ++ return i; ++ } ++ ++ g_return_val_if_reached (0); ++} ++ ++static gboolean ++ding_start_corner_get_mapping (GValue *value, ++ GVariant *variant, ++ gpointer user_data) ++{ ++ CcUbuntuPanel *self = user_data; ++ UbuntuDingStartCorner corner = 0; ++ ++ corner = get_ding_start_corner_from_string (g_variant_get_string (variant, NULL)); ++ ++ if (G_VALUE_TYPE (value) == G_TYPE_UINT) ++ { ++ g_value_set_uint (value, ding_start_corner_get_row_index (self, corner)); ++ return TRUE; ++ } ++ else if (G_VALUE_TYPE (value) == G_TYPE_STRING) ++ { ++ g_value_set_string (value, get_ding_start_corner_string (corner)); ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static GVariant * ++ding_start_corner_set_mapping (const GValue *value, ++ const GVariantType *type, ++ gpointer user_data) ++{ ++ UbuntuDingStartCorner corner = g_value_get_uint (value); ++ ++ return g_variant_new_string (get_ding_start_corner_string (corner)); ++} ++ ++static void ++populate_ding_start_corner_row (AdwComboRow *combo_row) ++{ ++ g_autoptr (GtkStringList) string_list = NULL; ++ struct { ++ char *name; ++ UbuntuDingStartCorner corner; ++ } corners[] = { ++ { ++ NC_("Alignment of new desktop icons", "Top Left"), ++ UBUNTU_DING_START_CORNER_TOP_LEFT, ++ }, ++ { ++ NC_("Alignment of new desktop icons", "Top Right"), ++ UBUNTU_DING_START_CORNER_TOP_RIGHT, ++ }, ++ { ++ NC_("Alignment of new desktop icons", "Bottom Left"), ++ UBUNTU_DING_START_CORNER_BOTTOM_LEFT, ++ }, ++ { ++ NC_("Alignment of new desktop icons", "Bottom Right"), ++ UBUNTU_DING_START_CORNER_BOTTOM_RIGHT, ++ }, ++ }; ++ guint i; ++ ++ string_list = gtk_string_list_new (NULL); ++ for (i = 0; i < G_N_ELEMENTS (corners); i++) ++ { ++ g_autoptr(GObject) value_object = NULL; ++ ++ gtk_string_list_append (string_list, g_dpgettext2 (NULL, "Alignment of new desktop icons", corners[i].name)); ++ value_object = g_list_model_get_item (G_LIST_MODEL (string_list), i); ++ g_object_set_data (value_object, "corner", ++ GUINT_TO_POINTER (corners[i].corner)); ++ } ++ ++ adw_combo_row_set_model (combo_row, G_LIST_MODEL (string_list)); ++} ++ ++static void ++cc_ubuntu_panel_init (CcUbuntuPanel *self) ++{ ++ GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default (); ++ g_autoptr(GSettingsSchema) schema = NULL; ++ ++ g_resources_register (cc_ubuntu_get_resource ()); ++ ++ gtk_widget_init_template (GTK_WIDGET (self)); ++ ++ /* Only load if we ding installed */ ++ schema = g_settings_schema_source_lookup (schema_source, DING_SCHEMA, TRUE); ++ if (schema) ++ { ++ self->ding_settings = g_settings_new_full (schema, NULL, NULL); ++ ++ populate_ding_size_row (self->ding_icon_size_row); ++ g_settings_bind_with_mapping (self->ding_settings, "icon-size", ++ self->ding_icon_size_row, "selected", ++ G_SETTINGS_BIND_DEFAULT, ++ ding_size_get_mapping, ++ ding_size_set_mapping, ++ self, NULL); ++ ++ populate_ding_start_corner_row (self->ding_icons_new_alignment_row); ++ g_settings_bind_with_mapping (self->ding_settings, "start-corner", ++ self->ding_icons_new_alignment_row, "selected", ++ G_SETTINGS_BIND_DEFAULT, ++ ding_start_corner_get_mapping, ++ ding_start_corner_set_mapping, ++ self, NULL); ++ ++ g_settings_bind (self->ding_settings, "show-home", ++ self->ding_showhome_switch, "active", ++ G_SETTINGS_BIND_DEFAULT); ++ } ++ else ++ { ++ g_warning ("No Ding is installed here. Please fix your installation."); ++ gtk_widget_set_visible (GTK_WIDGET (self->ding_preferences_group), FALSE); ++ } ++ ++ /* Only load if we have ubuntu dock or dash to dock installed */ ++ schema = g_settings_schema_source_lookup (schema_source, UBUNTU_DOCK_SCHEMA, TRUE); ++ if (schema) ++ { ++ GtkExpression *expression; ++ ++ self->dock_settings = g_settings_new_full (schema, NULL, NULL); ++ self->dock_monitors_list = g_list_store_new (G_TYPE_OBJECT); ++ ++ expression = gtk_cclosure_expression_new (G_TYPE_STRING, ++ NULL, 0, NULL, ++ G_CALLBACK (get_dock_monitor_value_object_name), ++ self, NULL); ++ adw_combo_row_set_expression (self->dock_monitor_row, expression); ++ ++ self->updating = TRUE; ++ adw_combo_row_set_model (self->dock_monitor_row, ++ G_LIST_MODEL (self->dock_monitors_list)); ++ self->updating = FALSE; ++ ++ populate_dock_position_row (self->dock_position_row); ++ ++ g_signal_connect_object (self->dock_settings, ++ "changed::" ICONSIZE_KEY, ++ G_CALLBACK (icon_size_widget_refresh), ++ self, G_CONNECT_SWAPPED); ++ g_signal_connect_object (self->dock_settings, ++ "changed::" UBUNTU_DOCK_ALL_MONITORS_KEY, ++ G_CALLBACK (update_dock_monitor_combo_row_selection), ++ self, G_CONNECT_SWAPPED); ++ g_signal_connect_object (self->dock_settings, ++ "changed::" UBUNTU_DOCK_PREFERRED_MONITOR_KEY, ++ G_CALLBACK (update_dock_monitor_combo_row_selection), ++ self, G_CONNECT_SWAPPED); ++ g_signal_connect_object (self->dock_settings, ++ "changed::" UBUNTU_DOCK_PREFERRED_CONNECTOR_KEY, ++ G_CALLBACK (update_dock_monitor_combo_row_selection), ++ self, G_CONNECT_SWAPPED); ++ g_settings_bind_with_mapping (self->dock_settings, "dock-position", ++ self->dock_position_row, "selected", ++ G_SETTINGS_BIND_DEFAULT, ++ dock_position_get_mapping, ++ dock_position_set_mapping, ++ self, NULL); ++ g_settings_bind (self->dock_settings, "dock-fixed", ++ self->dock_autohide_switch, "active", ++ G_SETTINGS_BIND_INVERT_BOOLEAN); ++ g_settings_bind (self->dock_settings, "extend-height", ++ self->dock_extendheight_switch, "active", ++ G_SETTINGS_BIND_DEFAULT); ++ ++ /* Icon size change - we halve the sizes so we can only get even values */ ++ gtk_adjustment_set_value (self->icon_size_adjustment, DEFAULT_ICONSIZE / 2); ++ gtk_adjustment_set_lower (self->icon_size_adjustment, MIN_ICONSIZE / 2); ++ gtk_adjustment_set_upper (self->icon_size_adjustment, MAX_ICONSIZE / 2); ++ gtk_scale_add_mark (self->icon_size_scale, DEFAULT_ICONSIZE / 2, GTK_POS_BOTTOM, NULL); ++ gtk_scale_set_format_value_func (self->icon_size_scale, ++ on_icon_size_format_value, ++ NULL, NULL); ++ ++ icon_size_widget_refresh (self); ++ ++ g_bus_get (G_BUS_TYPE_SESSION, NULL, session_bus_ready, self); ++ } ++ else ++ { ++ g_warning ("No Ubuntu Dock is installed here. Panel disabled. Please fix your installation."); ++ gtk_widget_set_visible (GTK_WIDGET (self->dock_preferences_group), FALSE); ++ } ++ ++ if (!gtk_widget_is_visible (GTK_WIDGET (self->dock_preferences_group)) && ++ !gtk_widget_is_visible (GTK_WIDGET (self->ding_preferences_group))) ++ { ++ gtk_widget_set_visible (GTK_WIDGET (self->no_settings_view), TRUE); ++ return; ++ } ++ ++ cc_object_storage_create_dbus_proxy (G_BUS_TYPE_SESSION, ++ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | ++ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS | ++ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, ++ "org.gnome.Shell", ++ "/org/gnome/Shell", ++ "org.gnome.Shell", ++ cc_panel_get_cancellable (CC_PANEL (self)), ++ (GAsyncReadyCallback) shell_proxy_ready, ++ self); ++ ++ g_signal_connect (self, "map", G_CALLBACK (mapped_cb), NULL); ++} ++ ++void ++cc_ubuntu_panel_static_init_func (void) ++{ ++ CcApplication *application; ++ const gchar *desktop_list; ++ g_auto(GStrv) desktops = NULL; ++ ++ desktop_list = g_getenv ("XDG_CURRENT_DESKTOP"); ++ if (desktop_list != NULL) ++ desktops = g_strsplit (desktop_list, ":", -1); ++ ++ if (desktops == NULL || !g_strv_contains ((const gchar * const *) desktops, "ubuntu")) { ++ application = CC_APPLICATION (g_application_get_default ()); ++ cc_shell_model_set_panel_visibility (cc_application_get_model (application), ++ "ubuntu", ++ CC_PANEL_HIDDEN); ++ } ++} +diff --git a/panels/ubuntu/cc-ubuntu-panel.h b/panels/ubuntu/cc-ubuntu-panel.h +new file mode 100644 +index 0000000..b13f611 +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-panel.h +@@ -0,0 +1,35 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* ++ * Copyright (C) 2017 Canonical Ltd ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, see . ++ * ++ */ ++ ++#ifndef _CC_UBUNTU_PANEL_H_ ++#define _CC_UBUNTU_PANEL_H_ ++ ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define CC_TYPE_UBUNTU_PANEL (cc_ubuntu_panel_get_type ()) ++G_DECLARE_FINAL_TYPE (CcUbuntuPanel, cc_ubuntu_panel, CC, UBUNTU_PANEL, CcPanel) ++ ++void cc_ubuntu_panel_static_init_func (void); ++ ++G_END_DECLS ++ ++#endif /* _CC_EDIT_DIALOG_H_ */ +diff --git a/panels/ubuntu/cc-ubuntu-panel.ui b/panels/ubuntu/cc-ubuntu-panel.ui +new file mode 100644 +index 0000000..0840525 +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-panel.ui +@@ -0,0 +1,163 @@ ++ ++ ++ ++ ++ 1 ++ 4 ++ ++ ++ +diff --git a/panels/ubuntu/gnome-ubuntu-panel.desktop.in b/panels/ubuntu/gnome-ubuntu-panel.desktop.in +new file mode 100644 +index 0000000..ee93bc0 +--- /dev/null ++++ b/panels/ubuntu/gnome-ubuntu-panel.desktop.in +@@ -0,0 +1,13 @@ ++[Desktop Entry] ++Name=Ubuntu Desktop ++Comment=Ubuntu Desktop Appearance Settings ++Exec=gnome-control-center ubuntu ++Icon=preferences-ubuntu-panel ++Terminal=false ++Type=Application ++NoDisplay=true ++StartupNotify=true ++Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings; ++OnlyShowIn=ubuntu; ++# Translators: those are keywords for the ubuntu control-center panel ++Keywords=Dock;Launcher;Theme;Ubuntu;Dark;icons;Yaru;Accent; +diff --git a/panels/ubuntu/meson.build b/panels/ubuntu/meson.build +new file mode 100644 +index 0000000..529be08 +--- /dev/null ++++ b/panels/ubuntu/meson.build +@@ -0,0 +1,97 @@ ++fs = import('fs') ++ ++panels_list += cappletname ++desktop = 'gnome-@0@-panel.desktop'.format(cappletname) ++ ++i18n.merge_file( ++ type: 'desktop', ++ input: desktop + '.in', ++ output: desktop, ++ po_dir: po_dir, ++ install: true, ++ install_dir: control_center_desktopdir ++) ++ ++sources = files( ++ 'cc-ubuntu-panel.c', ++ 'cc-ubuntu-dock-dialog.c', ++) ++ ++colors = { ++ 'default': '#E95420', ++ 'bark': '#787859', ++ 'sage': '#657B69', ++ 'olive': '#4B8501', ++ 'viridian': '#03875B', ++ 'prussiangreen': '#308280', ++ 'blue': '#0073E5', ++ 'purple': '#7764D8', ++ 'magenta': '#B34CB3', ++ 'red': '#DA3450', ++} ++ ++gresource_xml_contents = [] ++resource_generated_data = [] ++resource_data = files( ++ 'assets/theme-dark.svg', ++ 'assets/theme-light.svg', ++ 'cc-ubuntu-panel.ui', ++ 'cc-ubuntu-dock-dialog.ui', ++) ++ ++foreach file: resource_data ++ file_path = '@0@'.format(file) ++ gresource_xml_contents += '@2@'.format( ++ (meson.project_source_root() / file_path).replace(meson.current_source_dir() + '/', ''), ++ fs.name(file).endswith('.ui') or fs.name(file).endswith('.svg') ? 'xml-stripblanks' : '', ++ meson.project_source_root() / file_path, ++ ) ++endforeach ++ ++foreach color, code: colors ++ asset_name = color + '.svg' ++ asset_path = 'assets' / 'colors' ++ color_asset = custom_target( ++ asset_name, ++ input: asset_path / 'color.svg.in', ++ depfile: '@INPUT@', ++ output: asset_name, ++ command: [ ++ 'sed', ++ 's/#00ff00/@0@/g'.format(code), ++ '@INPUT@', ++ ], ++ capture: true, ++ ) ++ ++ gresource_xml_contents += ( ++ '@1@'.format( ++ asset_path / asset_name, color_asset.full_path())) ++ resource_generated_data += color_asset ++endforeach ++ ++gresource_xml = configure_file( ++ configuration: { ++ 'GENERATED_FILES': '\n'.join(gresource_xml_contents) ++ }, ++ input: cappletname + '.gresource.xml', ++ output: cappletname + '.generated.gresource.xml', ++) ++ ++sources += gnome.compile_resources( ++ 'cc-' + cappletname + '-resources', ++ gresource_xml, ++ c_name: 'cc_' + cappletname, ++ dependencies: resource_data + resource_generated_data, ++ export: true ++) ++ ++cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) ++ ++panels_libs += static_library( ++ cappletname, ++ sources: sources, ++ include_directories: [top_inc, common_inc], ++ dependencies: common_deps, ++ c_args: cflags ++) +diff --git a/panels/ubuntu/ubuntu.gresource.xml b/panels/ubuntu/ubuntu.gresource.xml +new file mode 100644 +index 0000000..a636e9c +--- /dev/null ++++ b/panels/ubuntu/ubuntu.gresource.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ @GENERATED_FILES@ ++ ++ +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 2fb23da..c511375 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -212,6 +212,11 @@ panels/thunderbolt/cc-bolt-device-entry.c + panels/thunderbolt/cc-bolt-panel.c + panels/thunderbolt/cc-bolt-panel.ui + panels/thunderbolt/gnome-thunderbolt-panel.desktop.in ++panels/ubuntu/cc-ubuntu-panel.c ++panels/ubuntu/cc-ubuntu-panel.ui ++panels/ubuntu/cc-ubuntu-dock-dialog.c ++panels/ubuntu/cc-ubuntu-dock-dialog.ui ++panels/ubuntu/gnome-ubuntu-panel.desktop.in + panels/universal-access/cc-cursor-size-dialog.ui + panels/universal-access/cc-ua-hearing-page.ui + panels/universal-access/cc-ua-mouse-page.ui +diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c +index e122d94..8e8d052 100644 +--- a/shell/cc-panel-list.c ++++ b/shell/cc-panel-list.c +@@ -392,6 +392,7 @@ static const gchar * const panel_order[] = { + "mobile-broadband", + "bluetooth", + "background", ++ "ubuntu", + "notifications", + "search", + "multitasking", +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 5a70523..eb90fe6 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -61,6 +61,7 @@ extern GType cc_sound_panel_get_type (void); + extern GType cc_bolt_panel_get_type (void); + #endif /* BUILD_THUNDERBOLT */ + extern GType cc_ua_panel_get_type (void); ++extern GType cc_ubuntu_panel_get_type(void); + extern GType cc_user_panel_get_type (void); + #ifdef BUILD_WACOM + extern GType cc_wacom_panel_get_type (void); +@@ -68,6 +69,7 @@ extern GType cc_wacom_panel_get_type (void); + #ifdef BUILD_WWAN + extern GType cc_wwan_panel_get_type (void); + #endif /* BUILD_WWAN */ ++extern GType cc_ubuntu_panel_static_init_func (void); + extern GType cc_location_panel_get_type (void); + extern GType cc_firmware_security_panel_get_type (void); + extern GType cc_camera_panel_get_type (void); +@@ -134,6 +136,7 @@ static CcPanelLoaderVtable default_panels[] = + PANEL_TYPE("search", cc_search_panel_get_type, NULL), + PANEL_TYPE("sharing", cc_sharing_panel_get_type, NULL), + PANEL_TYPE("sound", cc_sound_panel_get_type, NULL), ++ PANEL_TYPE("ubuntu", cc_ubuntu_panel_get_type, cc_ubuntu_panel_static_init_func), + #ifdef BUILD_THUNDERBOLT + PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, cc_thunderbolt_panel_static_init_func), + #endif diff -pruN 1:43.2-2/debian/patches/ubuntu/applications-Launch-snap-store-if-it-is-installed.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/applications-Launch-snap-store-if-it-is-installed.patch --- 1:43.2-2/debian/patches/ubuntu/applications-Launch-snap-store-if-it-is-installed.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/applications-Launch-snap-store-if-it-is-installed.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,56 @@ +From: Robert Ancell +Date: Mon, 6 Apr 2020 10:30:27 +1200 +Subject: applications: Launch snap-store if it is installed + +--- + panels/applications/cc-applications-panel.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c +index 9d0ab57..799634f 100644 +--- a/panels/applications/cc-applications-panel.c ++++ b/panels/applications/cc-applications-panel.c +@@ -157,6 +157,13 @@ gnome_software_is_installed (void) + return path != NULL; + } + ++static gboolean ++snap_store_is_installed (void) ++{ ++ g_autofree gchar *path = g_find_program_in_path ("snap-store"); ++ return path != NULL; ++} ++ + /* Callbacks */ + + static gboolean +@@ -176,6 +183,9 @@ open_software_cb (CcApplicationsPanel *self) + { + const gchar *argv[] = { "gnome-software", "--details", "appid", NULL }; + ++ if (!gnome_software_is_installed ()) ++ argv[0] = "snap-store"; ++ + if (self->current_app_id == NULL) + argv[1] = NULL; + else +@@ -1422,7 +1432,8 @@ update_panel (CcApplicationsPanel *self, + + adw_window_title_set_title (self->header_title, g_app_info_get_display_name (info)); + gtk_stack_set_visible_child (self->stack, self->settings_box); +- gtk_widget_set_visible (GTK_WIDGET (self->view_details_button), gnome_software_is_installed ()); ++ gtk_widget_set_visible (GTK_WIDGET (self->view_details_button), ++ gnome_software_is_installed () || snap_store_is_installed ()); + + g_clear_pointer (&self->current_app_id, g_free); + g_clear_pointer (&self->current_portal_app_id, g_free); +@@ -1835,7 +1846,8 @@ cc_applications_panel_init (CcApplicationsPanel *self) + + gtk_widget_init_template (GTK_WIDGET (self)); + +- gtk_widget_set_visible (GTK_WIDGET (self->install_button), gnome_software_is_installed ()); ++ gtk_widget_set_visible (GTK_WIDGET (self->install_button), ++ gnome_software_is_installed () || snap_store_is_installed ()); + + g_signal_connect_object (self->sidebar_listbox, "row-activated", + G_CALLBACK (row_activated_cb), self, G_CONNECT_SWAPPED); diff -pruN 1:43.2-2/debian/patches/ubuntu/background-Allow-configuring-the-ubuntu-accent-color.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/background-Allow-configuring-the-ubuntu-accent-color.patch --- 1:43.2-2/debian/patches/ubuntu/background-Allow-configuring-the-ubuntu-accent-color.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/background-Allow-configuring-the-ubuntu-accent-color.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,1040 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Mon, 27 Jun 2022 19:34:40 +0200 +Subject: background: Allow configuring the ubuntu accent color + +Move the ubuntu colors configuration to a single widget +(CcUbuntuColorsRow) so that it can be easily included in other widgets +with minimal changes. +We keep resources and the widget itself compiled together with the ubuntu +panel, so that there's no need to change multiple panels build scripts, +given that these are per-process anyways. +--- + panels/background/cc-background-panel.c | 12 + + panels/background/cc-background-panel.ui | 4 + + panels/ubuntu/cc-ubuntu-colors-row.c | 538 +++++++++++++++++++++++++++++++ + panels/ubuntu/cc-ubuntu-colors-row.css | 24 ++ + panels/ubuntu/cc-ubuntu-colors-row.h | 34 ++ + panels/ubuntu/cc-ubuntu-colors-row.ui | 289 +++++++++++++++++ + panels/ubuntu/meson.build | 3 + + po/POTFILES.in | 2 + + 8 files changed, 906 insertions(+) + create mode 100644 panels/ubuntu/cc-ubuntu-colors-row.c + create mode 100644 panels/ubuntu/cc-ubuntu-colors-row.css + create mode 100644 panels/ubuntu/cc-ubuntu-colors-row.h + create mode 100644 panels/ubuntu/cc-ubuntu-colors-row.ui + +diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c +index f748e9a..db2dbd6 100644 +--- a/panels/background/cc-background-panel.c ++++ b/panels/background/cc-background-panel.c +@@ -35,6 +35,8 @@ + #include "cc-background-resources.h" + #include "cc-background-xml.h" + ++#include "panels/ubuntu/cc-ubuntu-colors-row.h" ++ + #define WP_PATH_ID "org.gnome.desktop.background" + #define WP_LOCK_PATH_ID "org.gnome.desktop.screensaver" + #define WP_URI_KEY "picture-uri" +@@ -67,6 +69,8 @@ struct _CcBackgroundPanel + CcBackgroundPreview *dark_preview; + GtkToggleButton *default_toggle; + GtkToggleButton *dark_toggle; ++ ++ CcUbuntuColorsRow *ubuntu_colors; + }; + + CC_PANEL_REGISTER (CcBackgroundPanel, cc_background_panel) +@@ -103,6 +107,8 @@ reload_color_scheme_toggles (CcBackgroundPanel *self) + gtk_toggle_button_set_active (self->default_toggle, FALSE); + gtk_toggle_button_set_active (self->dark_toggle, FALSE); + } ++ ++ cc_ubuntu_colors_row_set_color_scheme (self->ubuntu_colors, scheme); + } + + static void +@@ -380,6 +386,7 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass) + + g_type_ensure (CC_TYPE_BACKGROUND_CHOOSER); + g_type_ensure (CC_TYPE_BACKGROUND_PREVIEW); ++ g_type_ensure (CC_TYPE_UBUNTU_COLORS_ROW); + + panel_class->get_help_uri = cc_background_panel_get_help_uri; + +@@ -393,6 +400,7 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass) + gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, dark_preview); + gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, default_toggle); + gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, dark_toggle); ++ gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, ubuntu_colors); + + gtk_widget_class_bind_template_callback (widget_class, on_color_scheme_toggle_active_cb); + gtk_widget_class_bind_template_callback (widget_class, on_chooser_background_chosen_cb); +@@ -451,5 +459,9 @@ cc_background_panel_init (CcBackgroundPanel *panel) + got_transition_proxy_cb, + panel); + ++ g_signal_connect_object (panel->ubuntu_colors, "changed", ++ G_CALLBACK (transition_screen), ++ panel, G_CONNECT_SWAPPED); ++ + load_custom_css (panel); + } +diff --git a/panels/background/cc-background-panel.ui b/panels/background/cc-background-panel.ui +index 33a8638..89a5ef5 100644 +--- a/panels/background/cc-background-panel.ui ++++ b/panels/background/cc-background-panel.ui +@@ -90,6 +90,10 @@ + + + ++ ++ ++ ++ + + + +diff --git a/panels/ubuntu/cc-ubuntu-colors-row.c b/panels/ubuntu/cc-ubuntu-colors-row.c +new file mode 100644 +index 0000000..2d64912 +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-colors-row.c +@@ -0,0 +1,538 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* ++ * Copyright (C) 2022 Canonical Ltd ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, see . ++ * ++ * Author: Marco Trevisan ++ * ++ */ ++ ++#include "config.h" ++ ++#include ++ ++#include "cc-ubuntu-colors-row.h" ++#include "cc-ubuntu-resources.h" ++ ++#include "gdesktop-enums.h" ++ ++#define MIN_ICONSIZE 16.0 ++#define MAX_ICONSIZE 64.0 ++#define DEFAULT_ICONSIZE 48.0 ++#define ICONSIZE_KEY "dash-max-icon-size" ++ ++#define UBUNTU_DOCK_SCHEMA "org.gnome.shell.extensions.dash-to-dock" ++#define UBUNTU_DOCK_ALL_MONITORS_KEY "multi-monitor" ++#define UBUNTU_DOCK_PREFERRED_MONITOR_KEY "preferred-monitor" ++#define UBUNTU_DOCK_PREFERRED_CONNECTOR_KEY "preferred-monitor-by-connector" ++ ++/* ++ * This allows to migrate settings from 'preferred-monitor' to ++ * 'preferred-monitor-by-connector', and can be removed after 22.04 ++ * simplifying all the logic, by relying on connector names only. ++ */ ++#define UBUNTU_DOCK_MONITOR_INDEX_USE_CONNECTOR -2 ++ ++#define INTERFACE_SCHEMA "org.gnome.desktop.interface" ++#define GTK_THEME_KEY "gtk-theme" ++#define CURSOR_THEME_KEY "cursor-theme" ++#define ICON_THEME_KEY "icon-theme" ++ ++#define GEDIT_PREFRENCES_SCHEMA "org.gnome.gedit.preferences.editor" ++#define GEDIT_THEME_KEY "scheme" ++ ++#define DEFAULT_ACCENT_COLOR "default" ++ ++struct _CcUbuntuColorsRow { ++ AdwActionRow parent_instance; ++ ++ gboolean startup; ++ ++ GtkFlowBox *color_box; ++ GtkFlowBoxChild *accent_bark; ++ GtkFlowBoxChild *accent_blue; ++ GtkFlowBoxChild *accent_olive; ++ GtkFlowBoxChild *accent_default; ++ GtkFlowBoxChild *accent_magenta; ++ GtkFlowBoxChild *accent_purple; ++ GtkFlowBoxChild *accent_prussiangreen; ++ GtkFlowBoxChild *accent_sage; ++ GtkFlowBoxChild *accent_red; ++ GtkFlowBoxChild *accent_viridian; ++ ++ GSettings *interface_settings; ++ GSettings *gedit_settings; ++ ++ GDesktopColorScheme color_scheme; ++}; ++ ++G_DEFINE_FINAL_TYPE (CcUbuntuColorsRow, cc_ubuntu_colors_row, ADW_TYPE_ACTION_ROW) ++ ++enum ++{ ++ CHANGED, ++ N_SIGNALS, ++}; ++ ++static guint signals[N_SIGNALS]; ++ ++static GQuark accent_quark (void); ++G_DEFINE_QUARK (accent-quark, accent); ++ ++static void ++on_selected_color_changed (CcUbuntuColorsRow *self) ++{ ++ GtkWidget *accent_color; ++ g_autoptr(GString) gtk_theme = NULL; ++ g_autoptr(GString) icon_theme = NULL; ++ g_autoptr(GString) gedit_theme = NULL; ++ g_autofree char *current_gtk_theme = NULL; ++ g_autofree char *current_icon_theme = NULL; ++ ++ gtk_theme = g_string_new ("Yaru"); ++ icon_theme = g_string_new ("Yaru"); ++ gedit_theme = g_string_new ("Yaru"); ++ ++ for (accent_color = gtk_widget_get_first_child (GTK_WIDGET (self->color_box)); ++ accent_color != NULL; ++ accent_color = gtk_widget_get_next_sibling (accent_color)) ++ { ++ const char *color = g_object_get_qdata (G_OBJECT (accent_color), accent_quark ()); ++ ++ if (!gtk_widget_is_visible (accent_color)) ++ continue; ++ ++ if (color && gtk_flow_box_child_is_selected (GTK_FLOW_BOX_CHILD (accent_color))) ++ { ++ if (g_str_equal (color, DEFAULT_ACCENT_COLOR)) ++ break; ++ ++ g_string_append_printf (gtk_theme, "-%s", color); ++ g_string_append_printf (icon_theme, "-%s", color); ++ break; ++ } ++ } ++ ++ if (accent_color == NULL) ++ { ++ /* No selection, do not change anything */ ++ return; ++ } ++ ++ if (self->color_scheme == G_DESKTOP_COLOR_SCHEME_PREFER_DARK) ++ { ++ g_string_append (gtk_theme, "-dark"); ++ g_string_append (gedit_theme, "-dark"); ++ } ++ ++ current_gtk_theme = g_settings_get_string (self->interface_settings, GTK_THEME_KEY); ++ ++ if (g_strcmp0 (current_gtk_theme, gtk_theme->str)) ++ { ++ g_signal_emit (self, signals[CHANGED], 0); ++ g_settings_set_string (self->interface_settings, GTK_THEME_KEY, gtk_theme->str); ++ } ++ ++ current_icon_theme = g_settings_get_string (self->interface_settings, ICON_THEME_KEY); ++ ++ if (!current_icon_theme || !self->startup || ++ g_str_has_prefix (current_icon_theme, "Yaru")) ++ g_settings_set_string (self->interface_settings, ICON_THEME_KEY, icon_theme->str); ++ ++ if (self->gedit_settings) ++ { ++ g_autoptr(GVariant) gedit_user_value = NULL; ++ const char *gedit_theme_name = NULL; ++ ++ gedit_user_value = g_settings_get_user_value (self->gedit_settings, ++ GEDIT_THEME_KEY); ++ ++ if (gedit_user_value) ++ gedit_theme_name = g_variant_get_string (gedit_user_value, NULL); ++ ++ if (!gedit_theme_name || *gedit_theme_name == '\0' || ++ g_str_has_prefix (gedit_theme_name, "Yaru")) ++ { ++ /* Only change the gedit setting if user is using a Yaru theme, or unset */ ++ g_settings_set_string (self->gedit_settings, GEDIT_THEME_KEY, ++ gedit_theme->str); ++ } ++ } ++} ++ ++static void ++on_interface_settings_changed (CcUbuntuColorsRow *self) ++{ ++ GtkWidget *color_item; ++ g_autofree gchar *gtk_theme = NULL; ++ g_autofree gchar *cursor_theme = NULL; ++ g_autofree gchar *icon_theme = NULL; ++ g_auto(GStrv) parts = NULL; ++ const char *accent_color = DEFAULT_ACCENT_COLOR; ++ gboolean is_dark = FALSE; ++ ++ gtk_theme = g_settings_get_string (self->interface_settings, GTK_THEME_KEY); ++ cursor_theme = g_settings_get_string (self->interface_settings, CURSOR_THEME_KEY); ++ icon_theme = g_settings_get_string (self->interface_settings, ICON_THEME_KEY); ++ ++ if (!g_str_has_prefix (gtk_theme, "Yaru")) ++ { ++ g_warning ("No yaru theme selected!"); ++ ++ gtk_flow_box_unselect_all (self->color_box); ++ return; ++ } ++ ++ is_dark = g_str_has_suffix (gtk_theme, "-dark"); ++ parts = g_strsplit (gtk_theme, "-", 3); ++ ++ switch (g_strv_length (parts)) ++ { ++ case 3: ++ g_return_if_fail (is_dark); ++ accent_color = parts[1]; ++ break; ++ case 2: ++ if (!is_dark) ++ accent_color = parts[1]; ++ break; ++ } ++ ++ if (!is_dark && self->color_scheme == G_DESKTOP_COLOR_SCHEME_PREFER_DARK) ++ is_dark = TRUE; ++ else if (is_dark && self->color_scheme != G_DESKTOP_COLOR_SCHEME_PREFER_DARK) ++ is_dark = FALSE; ++ ++ for (color_item = gtk_widget_get_first_child (GTK_WIDGET (self->color_box)); ++ color_item != NULL; ++ color_item = gtk_widget_get_next_sibling (color_item)) ++ { ++ GtkFlowBoxChild *item = GTK_FLOW_BOX_CHILD (color_item); ++ const char *color = g_object_get_qdata (G_OBJECT (item), accent_quark ()); ++ ++ if (!gtk_widget_is_visible (color_item)) ++ continue; ++ ++ if (g_strcmp0 (color, accent_color) == 0) ++ { ++ gtk_flow_box_select_child (self->color_box, item); ++ break; ++ } ++ } ++} ++ ++static gchar * ++get_theme_dir (void) ++{ ++ const gchar *var; ++ ++ var = g_getenv ("GTK_DATA_PREFIX"); ++ if (var == NULL) ++ var = "/usr"; ++ ++ return g_build_filename (var, "share", "themes", NULL); ++} ++ ++ ++#if (GTK_MINOR_VERSION % 2) ++#define MINOR (GTK_MINOR_VERSION + 1) ++#else ++#define MINOR GTK_MINOR_VERSION ++#endif ++ ++ ++static gchar * ++find_theme_dir (const gchar *dir, ++ const gchar *subdir, ++ const gchar *name, ++ const gchar *variant) ++{ ++ g_autofree gchar *file = NULL; ++ g_autofree gchar *base = NULL; ++ gchar *path; ++ gint i; ++ ++ if (variant) ++ file = g_strconcat ("gtk-", variant, ".css", NULL); ++ else ++ file = g_strdup ("gtk.css"); ++ ++ if (subdir) ++ base = g_build_filename (dir, subdir, name, NULL); ++ else ++ base = g_build_filename (dir, name, NULL); ++ ++ for (i = MINOR; i >= 0; i = i - 2) { ++ g_autofree gchar *subsubdir = NULL; ++ ++ if (i < 14) ++ i = 0; ++ ++ subsubdir = g_strdup_printf ("gtk-4.%d", i); ++ path = g_build_filename (base, subsubdir, file, NULL); ++ ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ break; ++ ++ g_free (path); ++ path = NULL; ++ } ++ ++ return path; ++} ++ ++#undef MINOR ++ ++static gchar * ++find_theme (const gchar *name, ++ const gchar *variant) ++{ ++ g_autofree gchar *dir = NULL; ++ const gchar *const *dirs; ++ gchar *path; ++ gint i; ++ ++ /* First look in the user's data directory */ ++ path = find_theme_dir (g_get_user_data_dir (), "themes", name, variant); ++ if (path) ++ return path; ++ ++ /* Next look in the user's home directory */ ++ path = find_theme_dir (g_get_home_dir (), ".themes", name, variant); ++ if (path) ++ return path; ++ ++ /* Look in system data directories */ ++ dirs = g_get_system_data_dirs (); ++ for (i = 0; dirs[i]; i++) { ++ path = find_theme_dir (dirs[i], "themes", name, variant); ++ if (path) ++ return path; ++ } ++ ++ /* Finally, try in the default theme directory */ ++ dir = get_theme_dir (); ++ path = find_theme_dir (dir, NULL, name, variant); ++ ++ return path; ++} ++ ++/* Courtesy of libhandy... */ ++static gboolean ++check_theme_exists (const gchar *name, ++ const gchar *variant) ++{ ++ g_autofree gchar *resource_path = NULL; ++ g_autofree gchar *path = NULL; ++ ++ /* try loading the resource for the theme. This is mostly meant for built-in ++ * themes. ++ */ ++ if (variant) ++ resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s/gtk-%s.css", name, variant); ++ else ++ resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s/gtk.css", name); ++ ++ if (g_resources_get_info (resource_path, 0, NULL, NULL, NULL)) ++ return TRUE; ++ ++ g_clear_pointer (&resource_path, g_free); ++ ++ if (variant) ++ resource_path = g_strdup_printf ("/com/ubuntu/themes/%s/4.0/gtk-%s.css", name, variant); ++ else ++ resource_path = g_strdup_printf ("/com/ubuntu/themes/%s/4.0/gtk.css", name); ++ ++ if (g_resources_get_info (resource_path, 0, NULL, NULL, NULL)) ++ return TRUE; ++ ++ /* Next try looking for files in the various theme directories. */ ++ path = find_theme (name, variant); ++ ++ return path != NULL; ++} ++ ++static void ++check_theme_accents_availability (CcUbuntuColorsRow *self) ++{ ++ GtkWidget *accent_color; ++ g_autoptr (GList) colors = NULL; ++ gint available_accents = 0; ++ ++ if (!check_theme_exists ("Yaru", NULL)) ++ g_critical ("No Yaru theme found"); ++ ++ if (!check_theme_exists ("Yaru", "dark")) ++ g_critical ("No Yaru-dark theme found"); ++ ++ for (accent_color = gtk_widget_get_first_child (GTK_WIDGET (self->color_box)); ++ accent_color != NULL; ++ accent_color = gtk_widget_get_next_sibling (accent_color)) ++ { ++ GtkFlowBoxChild *item = GTK_FLOW_BOX_CHILD (accent_color); ++ const char *accent = g_object_get_qdata (G_OBJECT (item), accent_quark ()); ++ g_autofree char *theme_name = NULL; ++ ++ if (g_strcmp0 (accent, DEFAULT_ACCENT_COLOR) == 0) ++ continue; ++ ++ theme_name = g_strdup_printf("Yaru-%s", accent); ++ ++ if (check_theme_exists (theme_name, NULL) && check_theme_exists (theme_name, "dark")) ++ available_accents++; ++ else ++ gtk_widget_set_visible (GTK_WIDGET (item), FALSE); ++ } ++ ++ if (!available_accents) ++ gtk_widget_set_visible (GTK_WIDGET (self), FALSE); ++} ++ ++static void ++load_custom_css (CcUbuntuColorsRow *self) ++{ ++ g_autoptr(GtkCssProvider) provider = NULL; ++ ++ /* use custom CSS */ ++ provider = gtk_css_provider_new (); ++ gtk_css_provider_load_from_resource (provider, ++ "/org/gnome/control-center/ubuntu/cc-ubuntu-colors-row.css"); ++ gtk_style_context_add_provider_for_display (gdk_display_get_default (), ++ GTK_STYLE_PROVIDER (provider), ++ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++} ++ ++static void ++cc_ubuntu_colors_row_init (CcUbuntuColorsRow *self) ++{ ++ GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default (); ++ g_autoptr(GSettingsSchema) schema = NULL; ++ const gchar *desktop_list; ++ g_auto(GStrv) desktops = NULL; ++ ++ desktop_list = g_getenv ("XDG_CURRENT_DESKTOP"); ++ if (desktop_list != NULL) ++ desktops = g_strsplit (desktop_list, ":", -1); ++ ++ if (desktops == NULL || ++ !g_strv_contains ((const gchar * const *) desktops, "ubuntu")) ++ { ++ gtk_widget_set_visible (GTK_WIDGET (self), FALSE); ++ return; ++ } ++ ++ self->startup = TRUE; ++ ++ g_resources_register (cc_ubuntu_get_resource ()); ++ ++ gtk_widget_init_template (GTK_WIDGET (self)); ++ ++ g_object_set_qdata (G_OBJECT (self->accent_bark), accent_quark (), "bark"); ++ g_object_set_qdata (G_OBJECT (self->accent_blue), accent_quark (), "blue"); ++ g_object_set_qdata (G_OBJECT (self->accent_magenta), accent_quark (), "magenta"); ++ g_object_set_qdata (G_OBJECT (self->accent_olive), accent_quark (), "olive"); ++ g_object_set_qdata (G_OBJECT (self->accent_default), accent_quark (), "default"); ++ g_object_set_qdata (G_OBJECT (self->accent_purple), accent_quark (), "purple"); ++ g_object_set_qdata (G_OBJECT (self->accent_prussiangreen), accent_quark (), "prussiangreen"); ++ g_object_set_qdata (G_OBJECT (self->accent_red), accent_quark (), "red"); ++ g_object_set_qdata (G_OBJECT (self->accent_sage), accent_quark (), "sage"); ++ g_object_set_qdata (G_OBJECT (self->accent_viridian), accent_quark (), "viridian"); ++ check_theme_accents_availability (self); ++ ++ self->interface_settings = g_settings_new (INTERFACE_SCHEMA); ++ g_signal_connect_object (self->interface_settings, "changed::" GTK_THEME_KEY, ++ G_CALLBACK (on_interface_settings_changed), self, ++ G_CONNECT_SWAPPED); ++ g_signal_connect_object (self->interface_settings, "changed::" CURSOR_THEME_KEY, ++ G_CALLBACK (on_interface_settings_changed), self, ++ G_CONNECT_SWAPPED); ++ g_signal_connect_object (self->interface_settings, "changed::" ICON_THEME_KEY, ++ G_CALLBACK (on_interface_settings_changed), self, ++ G_CONNECT_SWAPPED); ++ ++ schema = g_settings_schema_source_lookup (schema_source, GEDIT_PREFRENCES_SCHEMA, TRUE); ++ if (schema) ++ { ++ self->gedit_settings = g_settings_new (GEDIT_PREFRENCES_SCHEMA); ++ g_signal_connect_object (self->gedit_settings, "changed::" GEDIT_THEME_KEY, ++ G_CALLBACK (on_interface_settings_changed), self, G_CONNECT_SWAPPED); ++ } ++ else ++ { ++ g_warning ("No gedit is installed here. Colors won't be updated. Please fix your installation."); ++ } ++ ++ load_custom_css (self); ++ on_interface_settings_changed (self); ++ ++ self->startup = FALSE; ++} ++ ++static void ++cc_ubuntu_colors_row_dispose (GObject *object) ++{ ++ CcUbuntuColorsRow *self = CC_UBUNTU_COLORS_ROW (object); ++ ++ g_clear_object (&self->interface_settings); ++ g_clear_object (&self->gedit_settings); ++ ++ G_OBJECT_CLASS (cc_ubuntu_colors_row_parent_class)->dispose (object); ++} ++ ++static void ++cc_ubuntu_colors_row_class_init (CcUbuntuColorsRowClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); ++ ++ object_class->dispose = cc_ubuntu_colors_row_dispose; ++ ++ signals[CHANGED] = g_signal_new ("changed", ++ CC_TYPE_UBUNTU_COLORS_ROW, ++ G_SIGNAL_RUN_FIRST, ++ 0, NULL, NULL, NULL, ++ G_TYPE_NONE, ++ 0); ++ ++ gtk_widget_class_set_template_from_resource (widget_class, ++ "/org/gnome/control-center/ubuntu/cc-ubuntu-colors-row.ui"); ++ ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, color_box); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_bark); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_blue); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_olive); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_default); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_magenta); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_purple); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_prussiangreen); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_red); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_sage); ++ gtk_widget_class_bind_template_child (widget_class, CcUbuntuColorsRow, accent_viridian); ++ ++ gtk_widget_class_bind_template_callback (widget_class, on_selected_color_changed); ++} ++ ++void ++cc_ubuntu_colors_row_set_color_scheme (CcUbuntuColorsRow *self, ++ GDesktopColorScheme color_scheme) ++{ ++ if (self->color_scheme == color_scheme) ++ return; ++ ++ self->color_scheme = color_scheme; ++ ++ if (self->interface_settings) ++ on_interface_settings_changed (self); ++} +diff --git a/panels/ubuntu/cc-ubuntu-colors-row.css b/panels/ubuntu/cc-ubuntu-colors-row.css +new file mode 100644 +index 0000000..cd9f62b +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-colors-row.css +@@ -0,0 +1,24 @@ ++.ubuntu-colors flowboxchild.ubuntu-color { ++ border-radius: 9999px; ++ background-color: transparent; ++} ++ ++.ubuntu-colors flowboxchild.ubuntu-color:selected { ++ background-color: alpha(@theme_selected_bg_color, 0.75); ++} ++ ++.ubuntu-colors flowboxchild.ubuntu-color box { ++ background-color: transparent; ++} ++ ++.ubuntu-colors flowboxchild.ubuntu-color:selected box { ++ background-color: mix(@view_bg_color, @card_bg_color, 0.25); ++} ++ ++.ubuntu-colors box.ubuntu-color { ++ border-radius: 9999px; ++} ++ ++.ubuntu-colors picture.thumbnail { ++ border-radius: 9999px; ++} +diff --git a/panels/ubuntu/cc-ubuntu-colors-row.h b/panels/ubuntu/cc-ubuntu-colors-row.h +new file mode 100644 +index 0000000..07cedee +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-colors-row.h +@@ -0,0 +1,34 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* ++ * Copyright (C) 2022 Canonical Ltd ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, see . ++ * ++ */ ++ ++#pragma once ++ ++#include ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define CC_TYPE_UBUNTU_COLORS_ROW (cc_ubuntu_colors_row_get_type ()) ++G_DECLARE_FINAL_TYPE (CcUbuntuColorsRow, cc_ubuntu_colors_row, CC, UBUNTU_COLORS_ROW, AdwActionRow) ++ ++void cc_ubuntu_colors_row_set_color_scheme (CcUbuntuColorsRow *colors_row, ++ GDesktopColorScheme color_scheme); ++ ++G_END_DECLS +diff --git a/panels/ubuntu/cc-ubuntu-colors-row.ui b/panels/ubuntu/cc-ubuntu-colors-row.ui +new file mode 100644 +index 0000000..5f760f2 +--- /dev/null ++++ b/panels/ubuntu/cc-ubuntu-colors-row.ui +@@ -0,0 +1,289 @@ ++ ++ ++ ++ +diff --git a/panels/ubuntu/meson.build b/panels/ubuntu/meson.build +index 529be08..d7f73e6 100644 +--- a/panels/ubuntu/meson.build ++++ b/panels/ubuntu/meson.build +@@ -13,6 +13,7 @@ i18n.merge_file( + ) + + sources = files( ++ 'cc-ubuntu-colors-row.c', + 'cc-ubuntu-panel.c', + 'cc-ubuntu-dock-dialog.c', + ) +@@ -35,6 +36,8 @@ resource_generated_data = [] + resource_data = files( + 'assets/theme-dark.svg', + 'assets/theme-light.svg', ++ 'cc-ubuntu-colors-row.css', ++ 'cc-ubuntu-colors-row.ui', + 'cc-ubuntu-panel.ui', + 'cc-ubuntu-dock-dialog.ui', + ) +diff --git a/po/POTFILES.in b/po/POTFILES.in +index c511375..6b4c652 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -216,6 +216,8 @@ panels/ubuntu/cc-ubuntu-panel.c + panels/ubuntu/cc-ubuntu-panel.ui + panels/ubuntu/cc-ubuntu-dock-dialog.c + panels/ubuntu/cc-ubuntu-dock-dialog.ui ++panels/ubuntu/cc-ubuntu-colors-row.c ++panels/ubuntu/cc-ubuntu-colors-row.ui + panels/ubuntu/gnome-ubuntu-panel.desktop.in + panels/universal-access/cc-cursor-size-dialog.ui + panels/universal-access/cc-ua-hearing-page.ui diff -pruN 1:43.2-2/debian/patches/ubuntu/connectivity-add-network-connectivity-checking-toggle.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/connectivity-add-network-connectivity-checking-toggle.patch --- 1:43.2-2/debian/patches/ubuntu/connectivity-add-network-connectivity-checking-toggle.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/connectivity-add-network-connectivity-checking-toggle.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,350 @@ +From: James Henstridge +Date: Wed, 9 Aug 2017 22:30:21 +0800 +Subject: connectivity: add network connectivity checking toggle + +NetworkManager supports toggling the periodic network check, +a check that by itself can be a security threat since it leaks +information about the host. + +This patch adds a periodic network check toggle to the Privacy +panel. + +https://bugzilla.gnome.org/show_bug.cgi?id=737362 +--- + panels/connectivity/cc-connectivity-panel.c | 131 +++++++++++++++++++++ + panels/connectivity/cc-connectivity-panel.h | 28 +++++ + panels/connectivity/cc-connectivity-panel.ui | 21 ++++ + panels/connectivity/connectivity.gresource.xml | 6 + + .../gnome-connectivity-panel.desktop.in | 15 +++ + panels/connectivity/meson.build | 38 ++++++ + panels/meson.build | 1 + + po/POTFILES.in | 2 + + shell/cc-panel-loader.c | 2 + + 9 files changed, 244 insertions(+) + create mode 100644 panels/connectivity/cc-connectivity-panel.c + create mode 100644 panels/connectivity/cc-connectivity-panel.h + create mode 100644 panels/connectivity/cc-connectivity-panel.ui + create mode 100644 panels/connectivity/connectivity.gresource.xml + create mode 100644 panels/connectivity/gnome-connectivity-panel.desktop.in + create mode 100644 panels/connectivity/meson.build + +diff --git a/panels/connectivity/cc-connectivity-panel.c b/panels/connectivity/cc-connectivity-panel.c +new file mode 100644 +index 0000000..6abb6e8 +--- /dev/null ++++ b/panels/connectivity/cc-connectivity-panel.c +@@ -0,0 +1,131 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- ++ * ++ * Copyright (C) 2020 Canonical Ltd ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see . ++ */ ++ ++#include ++ ++#ifdef HAVE_NETWORK_MANAGER ++# include ++#endif ++ ++#include "shell/cc-object-storage.h" ++ ++#include "cc-connectivity-panel.h" ++#include "cc-connectivity-resources.h" ++ ++#include ++ ++struct _CcConnectivityPanel ++{ ++ CcPanel parent_instance; ++ ++ GtkWidget *connectivity_switch; ++ ++#ifdef HAVE_NETWORK_MANAGER ++ GCancellable *cancellable; ++ NMClient *nm_client; ++#endif ++}; ++ ++CC_PANEL_REGISTER (CcConnectivityPanel, cc_connectivity_panel) ++ ++static void ++setup_nm_client (CcConnectivityPanel *self, ++ NMClient *client) ++{ ++ self->nm_client = client; ++ ++ g_object_bind_property (self->nm_client, NM_CLIENT_CONNECTIVITY_CHECK_AVAILABLE, ++ self->connectivity_switch, "sensitive", ++ G_BINDING_SYNC_CREATE); ++ ++ g_object_bind_property (self->nm_client, NM_CLIENT_CONNECTIVITY_CHECK_ENABLED, ++ self->connectivity_switch, "active", ++ G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); ++} ++ ++static void ++nm_client_ready_cb (GObject *source_object, ++ GAsyncResult *res, ++ gpointer user_data) ++{ ++ CcConnectivityPanel *self; ++ NMClient *client; ++ g_autoptr(GError) error = NULL; ++ ++ client = nm_client_new_finish (res, &error); ++ if (!client) ++ { ++ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ g_warning ("Failed to create NetworkManager client: %s", ++ error->message); ++ return; ++ } ++ ++ self = user_data; ++ ++ /* Setup the client */ ++ setup_nm_client (self, client); ++ ++ /* Store the object in the cache too */ ++ cc_object_storage_add_object (CC_OBJECT_NMCLIENT, client); ++} ++ ++static void ++cc_connectivity_panel_dispose (GObject *object) ++{ ++ CcConnectivityPanel *self = CC_CONNECTIVITY_PANEL (object); ++ ++ g_cancellable_cancel (self->cancellable); ++ ++#ifdef HAVE_NETWORK_MANAGER ++ g_clear_object (&self->nm_client); ++#endif ++ ++ G_OBJECT_CLASS (cc_connectivity_panel_parent_class)->dispose (object); ++} ++ ++static void ++cc_connectivity_panel_class_init (CcConnectivityPanelClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); ++ ++ object_class->dispose = cc_connectivity_panel_dispose; ++ ++ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/connectivity/cc-connectivity-panel.ui"); ++ ++ gtk_widget_class_bind_template_child (widget_class, CcConnectivityPanel, connectivity_switch); ++} ++ ++static void ++cc_connectivity_panel_init (CcConnectivityPanel *self) ++{ ++ g_resources_register (cc_connectivity_get_resource ()); ++ ++ gtk_widget_init_template (GTK_WIDGET (self)); ++ ++ self->cancellable = g_cancellable_new (); ++ ++#ifdef HAVE_NETWORK_MANAGER ++ /* Create and store a NMClient instance if it doesn't exist yet */ ++ if (cc_object_storage_has_object (CC_OBJECT_NMCLIENT)) ++ setup_nm_client (self, cc_object_storage_get_object (CC_OBJECT_NMCLIENT)); ++ else ++ nm_client_new_async (self->cancellable, nm_client_ready_cb, self); ++#endif ++} +diff --git a/panels/connectivity/cc-connectivity-panel.h b/panels/connectivity/cc-connectivity-panel.h +new file mode 100644 +index 0000000..1a21b5b +--- /dev/null ++++ b/panels/connectivity/cc-connectivity-panel.h +@@ -0,0 +1,28 @@ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- ++ * ++ * Copyright (C) 2020 Canonical Ltd ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see . ++ */ ++ ++#pragma once ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define CC_TYPE_CONNECTIVITY_PANEL (cc_connectivity_panel_get_type ()) ++G_DECLARE_FINAL_TYPE (CcConnectivityPanel, cc_connectivity_panel, CC, CONNECTIVITY_PANEL, CcPanel) ++ ++G_END_DECLS +diff --git a/panels/connectivity/cc-connectivity-panel.ui b/panels/connectivity/cc-connectivity-panel.ui +new file mode 100644 +index 0000000..709dc2d +--- /dev/null ++++ b/panels/connectivity/cc-connectivity-panel.ui +@@ -0,0 +1,21 @@ ++ ++ ++ ++ +diff --git a/panels/connectivity/connectivity.gresource.xml b/panels/connectivity/connectivity.gresource.xml +new file mode 100644 +index 0000000..e102045 +--- /dev/null ++++ b/panels/connectivity/connectivity.gresource.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ cc-connectivity-panel.ui ++ ++ +diff --git a/panels/connectivity/gnome-connectivity-panel.desktop.in b/panels/connectivity/gnome-connectivity-panel.desktop.in +new file mode 100644 +index 0000000..b36f569 +--- /dev/null ++++ b/panels/connectivity/gnome-connectivity-panel.desktop.in +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Name=Connectivity ++Comment=Protect connectivity feature ++Exec=gnome-control-center connectivity ++# FIXME ++# Translators: Do NOT translate or transliterate this text (this is an icon file name)! ++Icon=network-workgroup ++Terminal=false ++Type=Application ++NoDisplay=true ++StartupNotify=true ++Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings; ++OnlyShowIn=GNOME;Unity; ++# Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! ++Keywords=network;privacy; +diff --git a/panels/connectivity/meson.build b/panels/connectivity/meson.build +new file mode 100644 +index 0000000..94c0d23 +--- /dev/null ++++ b/panels/connectivity/meson.build +@@ -0,0 +1,38 @@ ++panels_list += cappletname ++desktop = 'gnome-@0@-panel.desktop'.format(cappletname) ++ ++i18n.merge_file( ++ type: 'desktop', ++ input: desktop + '.in', ++ output: desktop, ++ po_dir: po_dir, ++ install: true, ++ install_dir: control_center_desktopdir ++) ++ ++sources = files('cc-connectivity-panel.c') ++ ++resource_data = files('cc-connectivity-panel.ui') ++ ++sources += gnome.compile_resources( ++ 'cc-' + cappletname + '-resources', ++ cappletname + '.gresource.xml', ++ c_name: 'cc_' + cappletname, ++ dependencies: resource_data, ++ export: true ++) ++ ++deps = common_deps ++if host_is_linux ++ deps += network_manager_deps ++endif ++ ++cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) ++ ++panels_libs += static_library( ++ cappletname, ++ sources: sources, ++ include_directories: [top_inc, common_inc], ++ dependencies: deps, ++ c_args: cflags ++) +diff --git a/panels/meson.build b/panels/meson.build +index c825ee2..100bce5 100644 +--- a/panels/meson.build ++++ b/panels/meson.build +@@ -5,6 +5,7 @@ panels = [ + 'background', + 'camera', + 'color', ++ 'connectivity', + 'datetime', + 'default-apps', + 'diagnostics', +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 6b4c652..9c4737e 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -32,6 +32,8 @@ panels/common/cc-time-editor.ui + panels/common/cc-time-entry.c + panels/common/cc-util.c + panels/common/hostname-helper.c ++panels/connectivity/cc-connectivity-panel.ui ++panels/connectivity/gnome-connectivity-panel.desktop.in + panels/datetime/cc-datetime-panel.c + panels/datetime/cc-datetime-panel.ui + panels/datetime/cc-tz-dialog.ui +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index eb90fe6..5814def 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -37,6 +37,7 @@ extern GType cc_background_panel_get_type (void); + extern GType cc_bluetooth_panel_get_type (void); + #endif /* BUILD_BLUETOOTH */ + extern GType cc_color_panel_get_type (void); ++extern GType cc_connectivity_panel_get_type (void); + extern GType cc_date_time_panel_get_type (void); + extern GType cc_default_apps_panel_get_type (void); + extern GType cc_display_panel_get_type (void); +@@ -111,6 +112,7 @@ static CcPanelLoaderVtable default_panels[] = + #endif + PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), + PANEL_TYPE("color", cc_color_panel_get_type, NULL), ++ PANEL_TYPE("connectivity", cc_connectivity_panel_get_type, NULL), + PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL), + PANEL_TYPE("default-apps", cc_default_apps_panel_get_type, NULL), + PANEL_TYPE("diagnostics", cc_diagnostics_panel_get_type, cc_diagnostics_panel_static_init_func), diff -pruN 1:43.2-2/debian/patches/ubuntu/diagnostics-Add-Whoopsie-support.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/diagnostics-Add-Whoopsie-support.patch --- 1:43.2-2/debian/patches/ubuntu/diagnostics-Add-Whoopsie-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/diagnostics-Add-Whoopsie-support.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,397 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Sat, 4 Jun 2022 14:57:01 +0200 +Subject: diagnostics: Add Whoopsie support + +--- + meson.build | 9 + + meson_options.txt | 1 + + panels/diagnostics/cc-diagnostics-panel.c | 224 +++++++++++++++++++++ + panels/diagnostics/cc-diagnostics-panel.ui | 10 +- + .../diagnostics/gnome-diagnostics-panel.desktop.in | 2 +- + panels/diagnostics/meson.build | 7 +- + 6 files changed, 250 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 66aa643..f213066 100644 +--- a/meson.build ++++ b/meson.build +@@ -224,6 +224,14 @@ endif + config_h.set('HAVE_MALCONTENT', enable_malcontent, + description: 'Define to 1 if malcontent support is enabled') + ++# Whoopsie (Ubuntu error reporting service) ++enable_whoopsie = get_option('whoopsie') ++if enable_whoopsie ++ whoopsie_dep = dependency('libwhoopsie-preferences') ++endif ++config_h.set('HAVE_WHOOPSIE', enable_whoopsie, ++ description: 'Define to 1 if Whoopsie is enabled') ++ + if host_is_linux + # network manager + mm_dep = dependency('mm-glib', version: '>= 0.7') +@@ -323,4 +331,5 @@ summary({ + 'IBus': enable_ibus, + 'Snap': enable_snap, + 'Malcontent': enable_malcontent, ++ 'Whoopsie': enable_whoopsie, + }, section: 'Optional Dependencies') +diff --git a/meson_options.txt b/meson_options.txt +index 8ee7b6e..beebcf2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -8,3 +8,4 @@ option('profile', type: 'combo', choices: ['default','development'], value: 'def + option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support') + option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel') + option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant') ++option('whoopsie', type: 'boolean', value: false, description: 'build with Whoopsie support') +diff --git a/panels/diagnostics/cc-diagnostics-panel.c b/panels/diagnostics/cc-diagnostics-panel.c +index 9aeca6e..4b4d4cf 100644 +--- a/panels/diagnostics/cc-diagnostics-panel.c ++++ b/panels/diagnostics/cc-diagnostics-panel.c +@@ -18,6 +18,8 @@ + * Author: Matthias Clasen + */ + ++#include ++ + #include "cc-diagnostics-panel.h" + #include "cc-diagnostics-resources.h" + #include "cc-util.h" +@@ -26,6 +28,10 @@ + #include + #include + ++#ifdef HAVE_WHOOPSIE ++# include ++#endif ++ + struct _CcDiagnosticsPanel + { + CcPanel parent_instance; +@@ -34,6 +40,13 @@ struct _CcDiagnosticsPanel + GtkSwitch *abrt_switch; + + GSettings *privacy_settings; ++ ++#ifdef HAVE_WHOOPSIE ++ AdwActionRow *abrt_row; ++ AdwComboRow *whoopsie_combo_row; ++ WhoopsiePreferences *whoopsie; ++ GCancellable *cancellable; ++#endif + }; + + CC_PANEL_REGISTER (CcDiagnosticsPanel, cc_diagnostics_panel) +@@ -68,9 +81,190 @@ abrt_vanished_cb (GDBusConnection *connection, + gpointer user_data) + { + g_debug ("ABRT vanished"); ++#ifndef HAVE_WHOOPSIE + set_panel_visibility (CC_PANEL_VISIBLE_IN_SEARCH); ++#endif ++} ++ ++#ifdef HAVE_WHOOPSIE ++typedef enum ++{ ++ WHOOPSIE_BUTTON_SETTING_NEVER, ++ WHOOPSIE_BUTTON_SETTING_AUTO, ++ WHOOPSIE_BUTTON_SETTING_MANUAL, ++} WhoopsieButtonSettingType; ++ ++static void ++whoopsie_set_report_crashes_done (GObject *source_object, ++ GAsyncResult *res, ++ gpointer user_data) ++{ ++ CcDiagnosticsPanel *self = user_data; ++ g_autoptr(GError) error = NULL; ++ ++ if (!whoopsie_preferences_call_set_report_crashes_finish (self->whoopsie, res, &error)) ++ { ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ return; ++ ++ g_warning ("Failed to toggle crash reporting: %s", error->message); ++ } + } + ++static void ++whoopsie_set_report_crashes_mode_done (GObject *source_object, ++ GAsyncResult *res, ++ gpointer user_data) ++{ ++ CcDiagnosticsPanel *self = user_data; ++ g_autoptr(GError) error = NULL; ++ ++ if (!whoopsie_preferences_call_set_automatically_report_crashes_finish (self->whoopsie, res, &error)) ++ { ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ return; ++ ++ g_warning ("Failed to toggle crash reporting mode: %s", error->message); ++ } ++} ++ ++static void ++whoopsie_combo_row_changed_cb (CcDiagnosticsPanel *self) ++{ ++ g_autoptr (GObject) item = NULL; ++ GListModel *model; ++ gint selected_index; ++ gint value; ++ ++ model = adw_combo_row_get_model (self->whoopsie_combo_row); ++ selected_index = adw_combo_row_get_selected (self->whoopsie_combo_row); ++ if (selected_index == -1) ++ return; ++ ++ item = g_list_model_get_item (model, selected_index); ++ value = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (item), "value")); ++ ++ whoopsie_preferences_call_set_report_crashes (self->whoopsie, ++ value != WHOOPSIE_BUTTON_SETTING_NEVER, ++ self->cancellable, ++ whoopsie_set_report_crashes_done, ++ self); ++ ++ whoopsie_preferences_call_set_automatically_report_crashes (self->whoopsie, ++ value == WHOOPSIE_BUTTON_SETTING_AUTO, ++ self->cancellable, ++ whoopsie_set_report_crashes_mode_done, ++ self); ++} ++ ++static void ++set_value_for_combo_row (AdwComboRow *combo_row, gint value) ++{ ++ g_autoptr (GObject) new_item = NULL; ++ GListModel *model; ++ guint i; ++ ++ /* try to make the UI match the setting */ ++ model = adw_combo_row_get_model (combo_row); ++ for (i = 0; i < g_list_model_get_n_items (model); i++) ++ { ++ g_autoptr (GObject) item = g_list_model_get_item (model, i); ++ gint value_tmp = GPOINTER_TO_UINT (g_object_get_data (item, "value")); ++ if (value_tmp == value) ++ { ++ adw_combo_row_set_selected (combo_row, i); ++ return; ++ } ++ } ++} ++ ++static void ++whoopsie_properties_changed (CcDiagnosticsPanel *self) ++{ ++ WhoopsieButtonSettingType value = WHOOPSIE_BUTTON_SETTING_NEVER; ++ ++ if (whoopsie_preferences_get_automatically_report_crashes (self->whoopsie)) ++ value = WHOOPSIE_BUTTON_SETTING_AUTO; ++ else if (whoopsie_preferences_get_report_crashes (self->whoopsie)) ++ value = WHOOPSIE_BUTTON_SETTING_MANUAL; ++ ++ g_signal_handlers_block_by_func (self->whoopsie_combo_row, whoopsie_combo_row_changed_cb, self); ++ set_value_for_combo_row (self->whoopsie_combo_row, value); ++ g_signal_handlers_unblock_by_func (self->whoopsie_combo_row, whoopsie_combo_row_changed_cb, self); ++} ++ ++static void ++populate_whoopsie_button_row (AdwComboRow *combo_row) ++{ ++ g_autoptr (GtkStringList) string_list = NULL; ++ struct { ++ char *name; ++ WhoopsieButtonSettingType value; ++ } actions[] = { ++ { NC_("Whoopsie error reporting", "Never"), WHOOPSIE_BUTTON_SETTING_NEVER }, ++ { NC_("Whoopsie error reporting", "Automatic"), WHOOPSIE_BUTTON_SETTING_AUTO }, ++ { NC_("Whoopsie error reporting", "Manual"), WHOOPSIE_BUTTON_SETTING_MANUAL }, ++ }; ++ guint item_index = 0; ++ guint i; ++ ++ string_list = gtk_string_list_new (NULL); ++ for (i = 0; i < G_N_ELEMENTS (actions); i++) ++ { ++ g_autoptr (GObject) item = NULL; ++ ++ gtk_string_list_append (string_list, _(actions[i].name)); ++ ++ item = g_list_model_get_item (G_LIST_MODEL (string_list), item_index++); ++ g_object_set_data (item, "value", GUINT_TO_POINTER (actions[i].value)); ++ } ++ ++ adw_combo_row_set_model (combo_row, G_LIST_MODEL (string_list)); ++} ++ ++static void ++on_new_whoopsie_proxy_cb (GObject *object, ++ GAsyncResult *res, ++ gpointer data) ++{ ++ CcDiagnosticsPanel *self = data; ++ g_autoptr(GError) error = NULL; ++ ++ self->whoopsie = whoopsie_preferences_proxy_new_for_bus_finish (res, &error); ++ ++ if (error) ++ { ++ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ g_warning ("Failed to get whoopsie proxy: %s", error->message); ++ ++ gtk_widget_set_visible (GTK_WIDGET (self->whoopsie_combo_row), FALSE); ++ gtk_widget_set_visible (GTK_WIDGET (self->abrt_row), TRUE); ++ return; ++ } ++ ++ g_debug ("Whoopsie available"); ++ gtk_widget_set_visible (GTK_WIDGET (self->whoopsie_combo_row), TRUE); ++ gtk_widget_set_sensitive (GTK_WIDGET (self->whoopsie_combo_row), TRUE); ++ ++ ++ g_signal_handlers_block_by_func (self->whoopsie_combo_row, ++ whoopsie_combo_row_changed_cb, self); ++ populate_whoopsie_button_row (self->whoopsie_combo_row); ++ g_signal_handlers_unblock_by_func (self->whoopsie_combo_row, ++ whoopsie_combo_row_changed_cb, self); ++ ++ g_signal_connect_object (self->whoopsie, "g-properties-changed", ++ G_CALLBACK (whoopsie_properties_changed), ++ self, G_CONNECT_SWAPPED); ++ ++ whoopsie_properties_changed (self); ++} ++#else ++static void ++whoopsie_combo_row_changed_cb (CcDiagnosticsPanel *self) ++{} ++#endif ++ + void + cc_diagnostics_panel_static_init_func (void) + { +@@ -82,7 +276,9 @@ cc_diagnostics_panel_static_init_func (void) + NULL, + NULL); + ++#ifndef HAVE_WHOOPSIE + set_panel_visibility (CC_PANEL_VISIBLE_IN_SEARCH); ++#endif + } + + static void +@@ -92,6 +288,12 @@ cc_diagnostics_panel_finalize (GObject *object) + + g_clear_object (&self->privacy_settings); + ++#if HAVE_WHOOPISE ++ g_cancellable_cancel (self->cancellable); ++ g_clear_object (&self->cancellable); ++ g_clear_object (&self->whoopsie); ++#endif ++ + G_OBJECT_CLASS (cc_diagnostics_panel_parent_class)->finalize (object); + } + +@@ -107,6 +309,12 @@ cc_diagnostics_panel_class_init (CcDiagnosticsPanelClass *klass) + + gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, diagnostics_group); + gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, abrt_switch); ++ ++#ifdef HAVE_WHOOPSIE ++ gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, abrt_row); ++ gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, whoopsie_combo_row); ++#endif ++ gtk_widget_class_bind_template_callback (widget_class, whoopsie_combo_row_changed_cb); + } + + static void +@@ -127,6 +335,22 @@ cc_diagnostics_panel_init (CcDiagnosticsPanel *self) + self->abrt_switch, "active", + G_SETTINGS_BIND_DEFAULT); + ++#ifdef HAVE_WHOOPSIE ++ /* check for whoopsie */ ++ self->cancellable = g_cancellable_new (); ++ whoopsie_preferences_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_NONE, ++ "com.ubuntu.WhoopsiePreferences", ++ "/com/ubuntu/WhoopsiePreferences", ++ self->cancellable, ++ on_new_whoopsie_proxy_cb, ++ self); ++ ++ gtk_widget_set_visible (GTK_WIDGET (self->whoopsie_combo_row), TRUE); ++ gtk_widget_set_visible (GTK_WIDGET (self->abrt_row), FALSE); ++ gtk_widget_set_sensitive (GTK_WIDGET (self->whoopsie_combo_row), FALSE); ++#endif ++ + os_name = g_get_os_info (G_OS_INFO_KEY_NAME); + if (!os_name) + os_name = g_strdup ("GNOME"); +diff --git a/panels/diagnostics/cc-diagnostics-panel.ui b/panels/diagnostics/cc-diagnostics-panel.ui +index a08a4ca..7a0a3f9 100644 +--- a/panels/diagnostics/cc-diagnostics-panel.ui ++++ b/panels/diagnostics/cc-diagnostics-panel.ui +@@ -7,7 +7,7 @@ + + Problem Reporting + +- ++ + _Automatic Problem Reporting + True + abrt_switch +@@ -21,6 +21,14 @@ + + + ++ ++ ++ False ++ Send error reports to Canonical ++ True ++ ++ ++ + + + +diff --git a/panels/diagnostics/gnome-diagnostics-panel.desktop.in b/panels/diagnostics/gnome-diagnostics-panel.desktop.in +index dbdbfd5..2fa1121 100644 +--- a/panels/diagnostics/gnome-diagnostics-panel.desktop.in ++++ b/panels/diagnostics/gnome-diagnostics-panel.desktop.in +@@ -12,4 +12,4 @@ StartupNotify=true + Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings; + OnlyShowIn=GNOME;Unity; + # Translators: Search terms to find the Diagnostics panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +-Keywords=diagnostics;crash; ++Keywords=diagnostics;crash;error;bug;whoopsie;launchpad;issue; +diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build +index a17f0b8..64418e1 100644 +--- a/panels/diagnostics/meson.build ++++ b/panels/diagnostics/meson.build +@@ -22,13 +22,18 @@ sources += gnome.compile_resources( + export: true + ) + ++deps = common_deps ++if enable_whoopsie ++ deps += whoopsie_dep ++endif ++ + cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) + + panels_libs += static_library( + cappletname, + sources: sources, + include_directories: [top_inc, common_inc], +- dependencies: common_deps, ++ dependencies: deps, + c_args: cflags + ) + diff -pruN 1:43.2-2/debian/patches/ubuntu/Disable-non-working-camera-microphones-panels.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Disable-non-working-camera-microphones-panels.patch --- 1:43.2-2/debian/patches/ubuntu/Disable-non-working-camera-microphones-panels.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Disable-non-working-camera-microphones-panels.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,38 @@ +From: Robert Ancell +Date: Thu, 30 Jan 2020 10:16:06 +1300 +Subject: Disable non working camera/microphones panels + +Upstream: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/381 +https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/741 +https://gitlab.gnome.org/GNOME/cheese/-/issues/95 + +Even with improved text from the original implementation, the panel +doesn't seem to work with Snap apps. I disabled the camera and microphone +here and the Zoom snap still works and it isn't listed as an app +"requesting permission". +--- + shell/cc-panel-loader.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 5814def..fe0baf7 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -110,7 +110,7 @@ static CcPanelLoaderVtable default_panels[] = + #ifdef BUILD_BLUETOOTH + PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type, NULL), + #endif +- PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), ++ //PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), + PANEL_TYPE("color", cc_color_panel_get_type, NULL), + PANEL_TYPE("connectivity", cc_connectivity_panel_get_type, NULL), + PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL), +@@ -121,7 +121,7 @@ static CcPanelLoaderVtable default_panels[] = + PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL), + PANEL_TYPE("location", cc_location_panel_get_type, NULL), + PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func), +- PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL), ++ // PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL), + PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL), + PANEL_TYPE("multitasking", cc_multitasking_panel_get_type, NULL), + #ifdef BUILD_NETWORK diff -pruN 1:43.2-2/debian/patches/ubuntu/display-Allow-fractional-scaling-to-be-enabled.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/display-Allow-fractional-scaling-to-be-enabled.patch --- 1:43.2-2/debian/patches/ubuntu/display-Allow-fractional-scaling-to-be-enabled.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/display-Allow-fractional-scaling-to-be-enabled.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,622 @@ +From: Robert Ancell +Date: Sun, 15 Mar 2020 09:07:51 +0100 +Subject: display: Allow fractional scaling to be enabled + +--- + panels/display/cc-display-config-dbus.c | 60 ++++++++ + panels/display/cc-display-config.c | 244 ++++++++++++++++++++++++++++++++ + panels/display/cc-display-config.h | 11 ++ + panels/display/cc-display-settings.c | 28 +++- + panels/display/cc-display-settings.ui | 9 ++ + 5 files changed, 351 insertions(+), 1 deletion(-) + +diff --git a/panels/display/cc-display-config-dbus.c b/panels/display/cc-display-config-dbus.c +index eea7d43..e054d00 100644 +--- a/panels/display/cc-display-config-dbus.c ++++ b/panels/display/cc-display-config-dbus.c +@@ -994,6 +994,8 @@ struct _CcDisplayConfigDBus + gboolean supports_changing_layout_mode; + gboolean global_scale_required; + CcDisplayLayoutMode layout_mode; ++ gint legacy_ui_scale; ++ char *renderer; + + GList *monitors; + CcDisplayMonitorDBus *primary; +@@ -1160,6 +1162,9 @@ cc_display_config_dbus_equal (CcDisplayConfig *pself, + g_return_val_if_fail (pself, FALSE); + g_return_val_if_fail (pother, FALSE); + ++ if (self->layout_mode != other->layout_mode) ++ return FALSE; ++ + cc_display_config_dbus_ensure_non_offset_coords (self); + cc_display_config_dbus_ensure_non_offset_coords (other); + +@@ -1458,6 +1463,29 @@ cc_display_config_dbus_is_layout_logical (CcDisplayConfig *pself) + self->layout_mode == CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL; + } + ++static void ++cc_display_config_dbus_set_layout_logical (CcDisplayConfig *pself, ++ gboolean logical) ++{ ++ CcDisplayConfigDBus *self = CC_DISPLAY_CONFIG_DBUS (pself); ++ ++ if (!self->supports_changing_layout_mode) ++ return; ++ ++ if (!logical) ++ { ++ self->layout_mode = CC_DISPLAY_LAYOUT_MODE_PHYSICAL; ++ return; ++ } ++ ++ if (g_str_equal (self->renderer, "native") || g_str_equal (self->renderer, "kms")) ++ self->layout_mode = CC_DISPLAY_LAYOUT_MODE_LOGICAL; ++ else if (g_str_equal (self->renderer, "xrandr")) ++ self->layout_mode = CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL; ++ else ++ g_return_if_reached (); ++} ++ + static gboolean + cc_display_config_dbus_layout_use_ui_scale (CcDisplayConfig *pself) + { +@@ -1465,6 +1493,20 @@ cc_display_config_dbus_layout_use_ui_scale (CcDisplayConfig *pself) + return self->layout_mode == CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL; + } + ++static gint ++cc_display_config_dbus_get_legacy_ui_scale (CcDisplayConfig *pself) ++{ ++ CcDisplayConfigDBus *self = CC_DISPLAY_CONFIG_DBUS (pself); ++ return self->legacy_ui_scale; ++} ++ ++static const char * ++cc_display_config_dbus_get_renderer (CcDisplayConfig *pself) ++{ ++ CcDisplayConfigDBus *self = CC_DISPLAY_CONFIG_DBUS (pself); ++ return self->renderer; ++} ++ + static gboolean + is_scale_allowed_by_active_monitors (CcDisplayConfigDBus *self, + CcDisplayMode *mode, +@@ -1632,6 +1674,11 @@ cc_display_config_dbus_init (CcDisplayConfigDBus *self) + self->global_scale_required = FALSE; + self->layout_mode = CC_DISPLAY_LAYOUT_MODE_LOGICAL; + self->logical_monitors = g_hash_table_new (NULL, NULL); ++ ++ if (g_getenv ("WAYLAND_DISPLAY")) ++ self->renderer = g_strdup ("native"); ++ else if (g_getenv ("DISPLAY")) ++ self->renderer = g_strdup ("xrandr"); + } + + static void +@@ -1818,6 +1865,15 @@ cc_display_config_dbus_constructed (GObject *object) + { + g_variant_get (v, "b", &self->global_scale_required); + } ++ else if (g_str_equal (s, "legacy-ui-scaling-factor")) ++ { ++ g_variant_get (v, "i", &self->legacy_ui_scale); ++ } ++ else if (g_str_equal (s, "renderer")) ++ { ++ g_clear_pointer (&self->renderer, g_free); ++ g_variant_get (v, "s", &self->renderer); ++ } + else if (g_str_equal (s, "layout-mode")) + { + guint32 u = 0; +@@ -1921,6 +1977,7 @@ cc_display_config_dbus_finalize (GObject *object) + + g_clear_list (&self->monitors, g_object_unref); + g_clear_pointer (&self->logical_monitors, g_hash_table_destroy); ++ g_clear_pointer (&self->renderer, g_free); + + G_OBJECT_CLASS (cc_display_config_dbus_parent_class)->finalize (object); + } +@@ -1946,11 +2003,14 @@ cc_display_config_dbus_class_init (CcDisplayConfigDBusClass *klass) + parent_class->set_cloning = cc_display_config_dbus_set_cloning; + parent_class->generate_cloning_modes = cc_display_config_dbus_generate_cloning_modes; + parent_class->is_layout_logical = cc_display_config_dbus_is_layout_logical; ++ parent_class->set_layout_logical = cc_display_config_dbus_set_layout_logical; + parent_class->is_scaled_mode_valid = cc_display_config_dbus_is_scaled_mode_valid; + parent_class->set_minimum_size = cc_display_config_dbus_set_minimum_size; + parent_class->get_panel_orientation_managed = + cc_display_config_dbus_get_panel_orientation_managed; + parent_class->layout_use_ui_scale = cc_display_config_dbus_layout_use_ui_scale; ++ parent_class->get_legacy_ui_scale = cc_display_config_dbus_get_legacy_ui_scale; ++ parent_class->get_renderer = cc_display_config_dbus_get_renderer; + + pspec = g_param_spec_variant ("state", + "GVariant", +diff --git a/panels/display/cc-display-config.c b/panels/display/cc-display-config.c +index 4c21aa8..5743869 100644 +--- a/panels/display/cc-display-config.c ++++ b/panels/display/cc-display-config.c +@@ -17,6 +17,11 @@ + * + */ + ++#define MUTTER_SCHEMA "org.gnome.mutter" ++#define MUTTER_EXPERIMENTAL_FEATURES_KEY "experimental-features" ++#define MUTTER_FEATURE_FRACTIONAL_SCALING_X11 "x11-randr-fractional-scaling" ++#define MUTTER_FEATURE_FRACTIONAL_SCALING_WAYLAND "scale-monitor-framebuffer" ++ + #include + #include + #include "cc-display-config.h" +@@ -443,6 +448,10 @@ cc_display_monitor_set_ui_info (CcDisplayMonitor *self, gint ui_number, gchar *u + + struct _CcDisplayConfigPrivate { + GList *ui_sorted_monitors; ++ ++ GSettings *mutter_settings; ++ gboolean fractional_scaling; ++ gboolean fractional_scaling_pending_disable; + }; + typedef struct _CcDisplayConfigPrivate CcDisplayConfigPrivate; + +@@ -450,6 +459,68 @@ G_DEFINE_TYPE_WITH_PRIVATE (CcDisplayConfig, + cc_display_config, + G_TYPE_OBJECT) + ++static const char * ++get_fractional_scaling_key (CcDisplayConfig *self) ++{ ++ const char *renderer = cc_display_config_get_renderer (self); ++ ++ if (!renderer) ++ g_return_val_if_reached (MUTTER_FEATURE_FRACTIONAL_SCALING_WAYLAND); ++ ++ if (g_str_equal (renderer, "xrandr")) ++ return MUTTER_FEATURE_FRACTIONAL_SCALING_X11; ++ ++ if (g_str_equal (renderer, "native") || g_str_equal (renderer, "kms")) ++ return MUTTER_FEATURE_FRACTIONAL_SCALING_WAYLAND; ++ ++ g_return_val_if_reached (NULL); ++} ++ ++static gboolean ++get_fractional_scaling_active (CcDisplayConfig *self) ++{ ++ const char *renderer = cc_display_config_get_renderer (self); ++ ++ if (renderer && g_str_equal (renderer, "xrandr") && ++ !cc_display_config_layout_use_ui_scale (self)) ++ return FALSE; ++ ++ return cc_display_config_is_layout_logical (self); ++} ++ ++static void ++set_fractional_scaling_active (CcDisplayConfig *self, ++ gboolean enable) ++{ ++ CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self); ++ g_auto(GStrv) existing_features = NULL; ++ gboolean have_fractional_scaling = FALSE; ++ g_autoptr(GVariantBuilder) builder = NULL; ++ const char *key = get_fractional_scaling_key (self); ++ ++ /* Add or remove the fractional scaling feature from mutter */ ++ existing_features = g_settings_get_strv (priv->mutter_settings, ++ MUTTER_EXPERIMENTAL_FEATURES_KEY); ++ builder = g_variant_builder_new (G_VARIANT_TYPE ("as")); ++ for (int i = 0; existing_features[i] != NULL; i++) ++ { ++ if (g_strcmp0 (existing_features[i], key) == 0) ++ { ++ if (enable) ++ have_fractional_scaling = TRUE; ++ else ++ continue; ++ } ++ ++ g_variant_builder_add (builder, "s", existing_features[i]); ++ } ++ if (enable && !have_fractional_scaling && key) ++ g_variant_builder_add (builder, "s", key); ++ ++ g_settings_set_value (priv->mutter_settings, MUTTER_EXPERIMENTAL_FEATURES_KEY, ++ g_variant_builder_end (builder)); ++} ++ + static void + cc_display_config_init (CcDisplayConfig *self) + { +@@ -487,6 +558,10 @@ cc_display_config_constructed (GObject *object) + + ui_number += 1; + } ++ ++ /* No need to connect to the setting, as we'll get notified by mutter */ ++ priv->mutter_settings = g_settings_new (MUTTER_SCHEMA); ++ priv->fractional_scaling = get_fractional_scaling_active (self); + } + + static void +@@ -496,6 +571,7 @@ cc_display_config_finalize (GObject *object) + CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self); + + g_list_free (priv->ui_sorted_monitors); ++ g_clear_object (&priv->mutter_settings); + + G_OBJECT_CLASS (cc_display_config_parent_class)->finalize (object); + } +@@ -587,9 +663,16 @@ gboolean + cc_display_config_equal (CcDisplayConfig *self, + CcDisplayConfig *other) + { ++ CcDisplayConfigPrivate *spriv = cc_display_config_get_instance_private (self); ++ CcDisplayConfigPrivate *opriv = cc_display_config_get_instance_private (other); ++ + g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (self), FALSE); + g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (other), FALSE); + ++ if (spriv->fractional_scaling_pending_disable != ++ opriv->fractional_scaling_pending_disable) ++ return FALSE; ++ + return CC_DISPLAY_CONFIG_GET_CLASS (self)->equal (self, other); + } + +@@ -597,6 +680,8 @@ gboolean + cc_display_config_apply (CcDisplayConfig *self, + GError **error) + { ++ CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self); ++ + if (!CC_IS_DISPLAY_CONFIG (self)) + { + g_warning ("Cannot apply invalid configuration"); +@@ -607,6 +692,12 @@ cc_display_config_apply (CcDisplayConfig *self, + return FALSE; + } + ++ if (priv->fractional_scaling_pending_disable) ++ { ++ set_fractional_scaling_active (self, FALSE); ++ priv->fractional_scaling_pending_disable = FALSE; ++ } ++ + return CC_DISPLAY_CONFIG_GET_CLASS (self)->apply (self, error); + } + +@@ -639,6 +730,14 @@ cc_display_config_is_layout_logical (CcDisplayConfig *self) + return CC_DISPLAY_CONFIG_GET_CLASS (self)->is_layout_logical (self); + } + ++void ++cc_display_config_set_layout_logical (CcDisplayConfig *self, ++ gboolean logical) ++{ ++ g_return_if_fail (CC_IS_DISPLAY_CONFIG (self)); ++ return CC_DISPLAY_CONFIG_GET_CLASS (self)->set_layout_logical (self, logical); ++} ++ + void + cc_display_config_set_minimum_size (CcDisplayConfig *self, + int width, +@@ -648,13 +747,37 @@ cc_display_config_set_minimum_size (CcDisplayConfig *self, + CC_DISPLAY_CONFIG_GET_CLASS (self)->set_minimum_size (self, width, height); + } + ++gint ++cc_display_config_get_legacy_ui_scale (CcDisplayConfig *self) ++{ ++ return CC_DISPLAY_CONFIG_GET_CLASS (self)->get_legacy_ui_scale (self); ++} ++ ++const char * ++cc_display_config_get_renderer (CcDisplayConfig *self) ++{ ++ return CC_DISPLAY_CONFIG_GET_CLASS (self)->get_renderer (self); ++} ++ ++static gboolean ++scale_value_is_fractional (double scale) ++{ ++ return (int) scale != scale; ++} ++ + gboolean + cc_display_config_is_scaled_mode_valid (CcDisplayConfig *self, + CcDisplayMode *mode, + double scale) + { ++ CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self); ++ + g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (self), FALSE); + g_return_val_if_fail (CC_IS_DISPLAY_MODE (mode), FALSE); ++ ++ if (priv->fractional_scaling_pending_disable && scale_value_is_fractional (scale)) ++ return FALSE; ++ + return CC_DISPLAY_CONFIG_GET_CLASS (self)->is_scaled_mode_valid (self, mode, scale); + } + +@@ -689,3 +812,124 @@ cc_display_config_get_maximum_scaling (CcDisplayConfig *self) + + return max_scale; + } ++ ++static gboolean ++set_monitors_scaling_to_preferred_integers (CcDisplayConfig *self) ++{ ++ GList *l; ++ gboolean any_changed = FALSE; ++ ++ for (l = cc_display_config_get_monitors (self); l; l = l->next) ++ { ++ CcDisplayMonitor *monitor = l->data; ++ gdouble monitor_scale = cc_display_monitor_get_scale (monitor); ++ ++ if (scale_value_is_fractional (monitor_scale)) ++ { ++ CcDisplayMode *preferred_mode; ++ double preferred_scale; ++ double *saved_scale; ++ ++ preferred_mode = cc_display_monitor_get_preferred_mode (monitor); ++ preferred_scale = cc_display_mode_get_preferred_scale (preferred_mode); ++ cc_display_monitor_set_scale (monitor, preferred_scale); ++ any_changed = TRUE; ++ ++ saved_scale = g_new (double, 1); ++ *saved_scale = monitor_scale; ++ g_object_set_data_full (G_OBJECT (monitor), ++ "previous-fractional-scale", ++ saved_scale, g_free); ++ } ++ else ++ { ++ g_signal_emit_by_name (monitor, "scale"); ++ } ++ } ++ ++ return any_changed; ++} ++ ++static void ++reset_monitors_scaling_to_selected_values (CcDisplayConfig *self) ++{ ++ GList *l; ++ ++ for (l = cc_display_config_get_monitors (self); l; l = l->next) ++ { ++ CcDisplayMonitor *monitor = l->data; ++ gdouble *saved_scale; ++ ++ saved_scale = g_object_get_data (G_OBJECT (monitor), ++ "previous-fractional-scale"); ++ ++ if (saved_scale) ++ { ++ cc_display_monitor_set_scale (monitor, *saved_scale); ++ g_object_set_data (G_OBJECT (monitor), "previous-fractional-scale", NULL); ++ } ++ else ++ { ++ g_signal_emit_by_name (monitor, "scale"); ++ } ++ } ++} ++ ++void ++cc_display_config_set_fractional_scaling (CcDisplayConfig *self, ++ gboolean enabled) ++{ ++ CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self); ++ ++ if (priv->fractional_scaling == enabled) ++ return; ++ ++ priv->fractional_scaling = enabled; ++ ++ if (!cc_display_config_layout_use_ui_scale (self)) ++ cc_display_config_set_layout_logical (self, enabled); ++ ++ if (priv->fractional_scaling) ++ { ++ if (priv->fractional_scaling_pending_disable) ++ { ++ priv->fractional_scaling_pending_disable = FALSE; ++ reset_monitors_scaling_to_selected_values (self); ++ } ++ ++ if (!get_fractional_scaling_active (self)) ++ set_fractional_scaling_active (self, enabled); ++ } ++ else ++ { ++ priv->fractional_scaling_pending_disable = TRUE; ++ ++ if (!set_monitors_scaling_to_preferred_integers (self)) ++ { ++ gboolean disable_now = FALSE; ++ ++ if (cc_display_config_layout_use_ui_scale (self)) ++ { ++ disable_now = ++ G_APPROX_VALUE (cc_display_config_get_legacy_ui_scale (self), ++ cc_display_config_get_maximum_scaling (self), ++ DBL_EPSILON); ++ } ++ ++ if (disable_now) ++ { ++ priv->fractional_scaling_pending_disable = FALSE; ++ reset_monitors_scaling_to_selected_values (self); ++ set_fractional_scaling_active (self, enabled); ++ } ++ } ++ } ++} ++ ++gboolean ++cc_display_config_get_fractional_scaling (CcDisplayConfig *self) ++{ ++ CcDisplayConfigPrivate *priv = cc_display_config_get_instance_private (self); ++ ++ return priv->fractional_scaling; ++} +diff --git a/panels/display/cc-display-config.h b/panels/display/cc-display-config.h +index c136f57..e206a02 100644 +--- a/panels/display/cc-display-config.h ++++ b/panels/display/cc-display-config.h +@@ -167,6 +167,8 @@ struct _CcDisplayConfigClass + gboolean clone); + GList* (*generate_cloning_modes) (CcDisplayConfig *self); + gboolean (*is_layout_logical) (CcDisplayConfig *self); ++ void (*set_layout_logical) (CcDisplayConfig *self, ++ gboolean enabled); + void (*set_minimum_size) (CcDisplayConfig *self, + int width, + int height); +@@ -175,6 +177,8 @@ struct _CcDisplayConfigClass + double scale); + gboolean (* get_panel_orientation_managed) (CcDisplayConfig *self); + gboolean (*layout_use_ui_scale) (CcDisplayConfig *self); ++ gint (*get_legacy_ui_scale) (CcDisplayConfig *self); ++ const char * (*get_renderer) (CcDisplayConfig *self); + }; + + +@@ -195,6 +199,8 @@ void cc_display_config_set_mode_on_all_outputs (CcDisplayConfig *co + CcDisplayMode *mode); + + gboolean cc_display_config_is_layout_logical (CcDisplayConfig *self); ++void cc_display_config_set_layout_logical (CcDisplayConfig *self, ++ gboolean logical); + void cc_display_config_set_minimum_size (CcDisplayConfig *self, + int width, + int height); +@@ -204,8 +210,13 @@ gboolean cc_display_config_is_scaled_mode_valid (CcDisplayConfig + gboolean cc_display_config_get_panel_orientation_managed + (CcDisplayConfig *self); + gboolean cc_display_config_layout_use_ui_scale (CcDisplayConfig *self); ++gint cc_display_config_get_legacy_ui_scale (CcDisplayConfig *self); ++const char* cc_display_config_get_renderer (CcDisplayConfig *self); + + double cc_display_config_get_maximum_scaling (CcDisplayConfig *self); ++void cc_display_config_set_fractional_scaling (CcDisplayConfig *self, ++ gboolean enabled); ++gboolean cc_display_config_get_fractional_scaling (CcDisplayConfig *self); + + const char* cc_display_monitor_get_display_name (CcDisplayMonitor *monitor); + gboolean cc_display_monitor_is_active (CcDisplayMonitor *monitor); +diff --git a/panels/display/cc-display-settings.c b/panels/display/cc-display-settings.c +index 7c33f49..885942f 100644 +--- a/panels/display/cc-display-settings.c ++++ b/panels/display/cc-display-settings.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include "cc-list-row.h" + #include "cc-display-settings.h" + #include "cc-display-config.h" + +@@ -55,6 +56,7 @@ struct _CcDisplaySettings + GtkWidget *scale_bbox; + GtkWidget *scale_buttons_row; + GtkWidget *scale_combo_row; ++ GtkWidget *scale_fractional_row; + GtkWidget *underscanning_row; + GtkWidget *underscanning_switch; + }; +@@ -77,7 +79,6 @@ static void on_scale_btn_active_changed_cb (GtkWidget *widget, + GParamSpec *pspec, + CcDisplaySettings *self); + +- + static gboolean + should_show_rotation (CcDisplaySettings *self) + { +@@ -254,6 +255,7 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self) + gtk_widget_set_visible (self->resolution_row, FALSE); + gtk_widget_set_visible (self->scale_combo_row, FALSE); + gtk_widget_set_visible (self->scale_buttons_row, FALSE); ++ gtk_widget_set_visible (self->scale_fractional_row, FALSE); + gtk_widget_set_visible (self->underscanning_row, FALSE); + + return G_SOURCE_REMOVE; +@@ -462,6 +464,11 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self) + } + cc_display_settings_refresh_layout (self, self->folded); + ++ gtk_widget_set_visible (self->scale_fractional_row, TRUE); ++ g_object_set (G_OBJECT (self->scale_fractional_row), "active", ++ cc_display_config_get_fractional_scaling (self->config), ++ NULL); ++ + gtk_widget_set_visible (self->underscanning_row, + cc_display_monitor_supports_underscanning (self->selected_output) && + !cc_display_config_is_cloning (self->config)); +@@ -757,6 +764,7 @@ cc_display_settings_class_init (CcDisplaySettingsClass *klass) + gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, scale_bbox); + gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, scale_buttons_row); + gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, scale_combo_row); ++ gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, scale_fractional_row); + gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, underscanning_row); + gtk_widget_class_bind_template_child (widget_class, CcDisplaySettings, underscanning_switch); + +@@ -768,6 +776,19 @@ cc_display_settings_class_init (CcDisplaySettingsClass *klass) + gtk_widget_class_bind_template_callback (widget_class, on_underscanning_switch_active_changed_cb); + } + ++static void ++on_scale_fractional_toggled (CcDisplaySettings *self) ++{ ++ gboolean active; ++ ++ active = cc_list_row_get_active (CC_LIST_ROW (self->scale_fractional_row)); ++ ++ if (self->config) ++ cc_display_config_set_fractional_scaling (self->config, active); ++ ++ g_signal_emit_by_name (G_OBJECT (self), "updated", self->selected_output); ++} ++ + static void + cc_display_settings_init (CcDisplaySettings *self) + { +@@ -803,6 +824,11 @@ cc_display_settings_init (CcDisplaySettings *self) + adw_combo_row_set_model (ADW_COMBO_ROW (self->resolution_row), + G_LIST_MODEL (self->resolution_list)); + ++ g_signal_connect_object (self->scale_fractional_row, ++ "notify::active", ++ G_CALLBACK (on_scale_fractional_toggled), ++ self, G_CONNECT_SWAPPED); ++ + self->updating = FALSE; + } + +diff --git a/panels/display/cc-display-settings.ui b/panels/display/cc-display-settings.ui +index 64c44d1..badd4e9 100644 +--- a/panels/display/cc-display-settings.ui ++++ b/panels/display/cc-display-settings.ui +@@ -95,6 +95,15 @@ + + + ++ ++ ++ 100 ++ True ++ Fractional Scaling ++ May increase power usage, lower speed, or reduce display sharpness. ++ True ++ ++ + + + diff -pruN 1:43.2-2/debian/patches/ubuntu/display-Support-UI-scaled-logical-monitor-mode.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/display-Support-UI-scaled-logical-monitor-mode.patch --- 1:43.2-2/debian/patches/ubuntu/display-Support-UI-scaled-logical-monitor-mode.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/display-Support-UI-scaled-logical-monitor-mode.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,270 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Wed, 27 Mar 2019 05:42:41 +0100 +Subject: display: Support UI scaled logical monitor mode + +When this mode is selected we need to assume that all the monitors are scaled +by their scaling and the global UI scale. + +Origin: https://gitlab.gnome.org/3v1n0/gnome-control-center/commits/layout-global-scale +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1820850 +Forwarded: No, MPs will follow shortly +--- + panels/display/cc-display-arrangement.c | 25 ++++++++++++++++---- + panels/display/cc-display-config-dbus.c | 41 ++++++++++++++++++++++++++++++--- + panels/display/cc-display-config.c | 26 +++++++++++++++++++++ + panels/display/cc-display-config.h | 4 ++++ + 4 files changed, 88 insertions(+), 8 deletions(-) + +diff --git a/panels/display/cc-display-arrangement.c b/panels/display/cc-display-arrangement.c +index ae3541e..0928caa 100644 +--- a/panels/display/cc-display-arrangement.c ++++ b/panels/display/cc-display-arrangement.c +@@ -99,6 +99,7 @@ apply_rotation_to_geometry (CcDisplayMonitor *output, + static void + get_scaled_geometry (CcDisplayConfig *config, + CcDisplayMonitor *output, ++ double max_scale, + int *x, + int *y, + int *w, +@@ -117,6 +118,10 @@ get_scaled_geometry (CcDisplayConfig *config, + if (cc_display_config_is_layout_logical (config)) + { + double scale = cc_display_monitor_get_scale (output); ++ ++ if (cc_display_config_layout_use_ui_scale (config)) ++ scale /= ceil (max_scale); ++ + *w = round (*w / scale); + *h = round (*h / scale); + } +@@ -134,6 +139,7 @@ get_bounding_box (CcDisplayConfig *config, + gint *max_h) + { + GList *outputs, *l; ++ gdouble max_scale; + + g_assert (x1 && y1 && x2 && y2); + +@@ -141,6 +147,7 @@ get_bounding_box (CcDisplayConfig *config, + *x2 = *y2 = G_MININT; + *max_w = 0; + *max_h = 0; ++ max_scale = cc_display_config_get_maximum_scaling (config); + + outputs = cc_display_config_get_monitors (config); + for (l = outputs; l; l = l->next) +@@ -151,7 +158,7 @@ get_bounding_box (CcDisplayConfig *config, + if (!cc_display_monitor_is_useful (output)) + continue; + +- get_scaled_geometry (config, output, &x, &y, &w, &h); ++ get_scaled_geometry (config, output, max_scale, &x, &y, &w, &h); + + *x1 = MIN (*x1, x); + *y1 = MIN (*y1, y); +@@ -171,8 +178,10 @@ monitor_get_drawing_rect (CcDisplayArrangement *self, + gint *y2) + { + gdouble x, y; ++ gdouble max_scale; + +- get_scaled_geometry (self->config, output, x1, y1, x2, y2); ++ max_scale = cc_display_config_get_maximum_scaling (self->config); ++ get_scaled_geometry (self->config, output, max_scale, x1, y1, x2, y2); + + /* get_scaled_geometry returns the width and height */ + *x2 = *x1 + *x2; +@@ -325,10 +334,12 @@ find_best_snapping (CcDisplayConfig *config, + GList *outputs, *l; + gint x1, y1, x2, y2; + gint w, h; ++ double max_scale; + + g_assert (snap_data != NULL); + +- get_scaled_geometry (config, snap_output, &x1, &y1, &w, &h); ++ max_scale = cc_display_config_get_maximum_scaling (config); ++ get_scaled_geometry (config, snap_output, max_scale, &x1, &y1, &w, &h); + x2 = x1 + w; + y2 = y1 + h; + +@@ -344,6 +355,7 @@ find_best_snapping (CcDisplayConfig *config, + gint left_snap_pos; + gint right_snap_pos; + gdouble dist_x, dist_y; ++ gdouble max_scale; + gdouble tmp; + + if (output == snap_output) +@@ -352,7 +364,8 @@ find_best_snapping (CcDisplayConfig *config, + if (!cc_display_monitor_is_useful (output)) + continue; + +- get_scaled_geometry (config, output, &_x1, &_y1, &_w, &_h); ++ max_scale = cc_display_config_get_maximum_scaling (config); ++ get_scaled_geometry (config, output, max_scale, &_x1, &_y1, &_w, &_h); + _x2 = _x1 + _w; + _y2 = _y1 + _h; + +@@ -955,6 +968,7 @@ cc_display_config_snap_output (CcDisplayConfig *config, + { + SnapData snap_data; + gint x, y, w, h; ++ gdouble max_scale; + + if (!cc_display_monitor_is_useful (output)) + return; +@@ -962,7 +976,8 @@ cc_display_config_snap_output (CcDisplayConfig *config, + if (cc_display_config_count_useful_monitors (config) <= 1) + return; + +- get_scaled_geometry (config, output, &x, &y, &w, &h); ++ max_scale = cc_display_config_get_maximum_scaling (config); ++ get_scaled_geometry (config, output, max_scale, &x, &y, &w, &h); + + snap_data.snapped = SNAP_DIR_NONE; + snap_data.mon_x = x; +diff --git a/panels/display/cc-display-config-dbus.c b/panels/display/cc-display-config-dbus.c +index c3b269d..eea7d43 100644 +--- a/panels/display/cc-display-config-dbus.c ++++ b/panels/display/cc-display-config-dbus.c +@@ -965,7 +965,8 @@ cc_display_monitor_dbus_new (GVariant *variant, + typedef enum _CcDisplayLayoutMode + { + CC_DISPLAY_LAYOUT_MODE_LOGICAL = 1, +- CC_DISPLAY_LAYOUT_MODE_PHYSICAL = 2 ++ CC_DISPLAY_LAYOUT_MODE_PHYSICAL = 2, ++ CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL = 3 + } CcDisplayLayoutMode; + + typedef enum _CcDisplayConfigMethod +@@ -1453,7 +1454,15 @@ cc_display_config_dbus_is_layout_logical (CcDisplayConfig *pself) + { + CcDisplayConfigDBus *self = CC_DISPLAY_CONFIG_DBUS (pself); + +- return self->layout_mode == CC_DISPLAY_LAYOUT_MODE_LOGICAL; ++ return self->layout_mode == CC_DISPLAY_LAYOUT_MODE_LOGICAL || ++ self->layout_mode == CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL; ++} ++ ++static gboolean ++cc_display_config_dbus_layout_use_ui_scale (CcDisplayConfig *pself) ++{ ++ CcDisplayConfigDBus *self = CC_DISPLAY_CONFIG_DBUS (pself); ++ return self->layout_mode == CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL; + } + + static gboolean +@@ -1814,7 +1823,7 @@ cc_display_config_dbus_constructed (GObject *object) + guint32 u = 0; + g_variant_get (v, "u", &u); + if (u >= CC_DISPLAY_LAYOUT_MODE_LOGICAL && +- u <= CC_DISPLAY_LAYOUT_MODE_PHYSICAL) ++ u <= CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL) + self->layout_mode = u; + } + } +@@ -1941,6 +1950,7 @@ cc_display_config_dbus_class_init (CcDisplayConfigDBusClass *klass) + parent_class->set_minimum_size = cc_display_config_dbus_set_minimum_size; + parent_class->get_panel_orientation_managed = + cc_display_config_dbus_get_panel_orientation_managed; ++ parent_class->layout_use_ui_scale = cc_display_config_dbus_layout_use_ui_scale; + + pspec = g_param_spec_variant ("state", + "GVariant", +@@ -2001,6 +2011,26 @@ logical_monitor_is_rotated (CcDisplayLogicalMonitor *lm) + } + } + ++static double ++get_maximum_scale (CcDisplayConfig *config) ++{ ++ GList *outputs, *l; ++ double max_scale = 1.0; ++ outputs = cc_display_config_get_monitors (config); ++ ++ for (l = outputs; l; l = l->next) ++ { ++ CcDisplayMonitor *output = l->data; ++ ++ if (!cc_display_monitor_is_useful (output)) ++ continue; ++ ++ max_scale = MAX (max_scale, cc_display_monitor_get_scale (output)); ++ } ++ ++ return max_scale; ++} ++ + static int + logical_monitor_width (CcDisplayLogicalMonitor *lm) + { +@@ -2019,6 +2049,11 @@ logical_monitor_width (CcDisplayLogicalMonitor *lm) + + if (monitor->config->layout_mode == CC_DISPLAY_LAYOUT_MODE_LOGICAL) + return round (width / lm->scale); ++ if (monitor->config->layout_mode == CC_DISPLAY_LAYOUT_MODE_GLOBAL_UI_LOGICAL) ++ { ++ double max_scale = get_maximum_scale(CC_DISPLAY_CONFIG (monitor->config)); ++ return round ((width * ceil (max_scale)) / lm->scale); ++ } + else + return width; + } +diff --git a/panels/display/cc-display-config.c b/panels/display/cc-display-config.c +index b7532f9..4c21aa8 100644 +--- a/panels/display/cc-display-config.c ++++ b/panels/display/cc-display-config.c +@@ -663,3 +663,29 @@ cc_display_config_get_panel_orientation_managed (CcDisplayConfig *self) + { + return CC_DISPLAY_CONFIG_GET_CLASS (self)->get_panel_orientation_managed (self); + } ++ ++gboolean ++cc_display_config_layout_use_ui_scale (CcDisplayConfig *self) ++{ ++ return CC_DISPLAY_CONFIG_GET_CLASS (self)->layout_use_ui_scale (self); ++} ++ ++double ++cc_display_config_get_maximum_scaling (CcDisplayConfig *self) ++{ ++ GList *outputs, *l; ++ double max_scale = 1.0; ++ outputs = cc_display_config_get_monitors (self); ++ ++ for (l = outputs; l; l = l->next) ++ { ++ CcDisplayMonitor *output = l->data; ++ ++ if (!cc_display_monitor_is_useful (output)) ++ continue; ++ ++ max_scale = MAX (max_scale, cc_display_monitor_get_scale (output)); ++ } ++ ++ return max_scale; ++} +diff --git a/panels/display/cc-display-config.h b/panels/display/cc-display-config.h +index 1241adc..c136f57 100644 +--- a/panels/display/cc-display-config.h ++++ b/panels/display/cc-display-config.h +@@ -174,6 +174,7 @@ struct _CcDisplayConfigClass + CcDisplayMode *mode, + double scale); + gboolean (* get_panel_orientation_managed) (CcDisplayConfig *self); ++ gboolean (*layout_use_ui_scale) (CcDisplayConfig *self); + }; + + +@@ -202,6 +203,9 @@ gboolean cc_display_config_is_scaled_mode_valid (CcDisplayConfig + double scale); + gboolean cc_display_config_get_panel_orientation_managed + (CcDisplayConfig *self); ++gboolean cc_display_config_layout_use_ui_scale (CcDisplayConfig *self); ++ ++double cc_display_config_get_maximum_scaling (CcDisplayConfig *self); + + const char* cc_display_monitor_get_display_name (CcDisplayMonitor *monitor); + gboolean cc_display_monitor_is_active (CcDisplayMonitor *monitor); diff -pruN 1:43.2-2/debian/patches/ubuntu/info-overview-Show-updates-in-software-propeties-instead-.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/info-overview-Show-updates-in-software-propeties-instead-.patch --- 1:43.2-2/debian/patches/ubuntu/info-overview-Show-updates-in-software-propeties-instead-.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/info-overview-Show-updates-in-software-propeties-instead-.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,51 @@ +From: Robert Ancell +Date: Mon, 3 Feb 2020 14:23:34 +1300 +Subject: info-overview: Show updates in software propeties instead of GNOME + Software + +--- + panels/info-overview/cc-info-overview-panel.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c +index 148025f..21a684e 100644 +--- a/panels/info-overview/cc-info-overview-panel.c ++++ b/panels/info-overview/cc-info-overview-panel.c +@@ -800,6 +800,13 @@ does_gnome_software_allow_updates (void) + return g_settings_get_boolean (settings, "allow-updates"); + } + ++static gboolean ++does_software_properties_exist (void) ++{ ++ g_autofree gchar *path = g_find_program_in_path ("software-properties-gtk"); ++ return path != NULL; ++} ++ + static gboolean + does_gnome_software_exist (void) + { +@@ -821,11 +828,10 @@ cc_info_panel_open_software_update (CcInfoOverviewPanel *self) + gboolean ret; + char *argv[3]; + +- if (does_gnome_software_exist ()) ++ if (does_software_properties_exist ()) + { +- argv[0] = "gnome-software"; +- argv[1] = "--mode=updates"; +- argv[2] = NULL; ++ argv[0] = "software-properties-gtk"; ++ argv[1] = NULL; + } + else + { +@@ -928,7 +934,7 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + + g_resources_register (cc_info_overview_get_resource ()); + +- if ((!does_gnome_software_exist () || !does_gnome_software_allow_updates ()) && !does_gpk_update_viewer_exist ()) ++ if (!does_software_properties_exist () && (!does_gnome_software_exist () || !does_gnome_software_allow_updates ()) && !does_gpk_update_viewer_exist ()) + gtk_widget_set_visible (GTK_WIDGET (self->software_updates_row), FALSE); + + info_overview_panel_setup_overview (self); diff -pruN 1:43.2-2/debian/patches/ubuntu/keyboard-Add-launch-terminal-shortcut.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/keyboard-Add-launch-terminal-shortcut.patch --- 1:43.2-2/debian/patches/ubuntu/keyboard-Add-launch-terminal-shortcut.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/keyboard-Add-launch-terminal-shortcut.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,21 @@ +From: Ubuntu Developers +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: keyboard: Add launch terminal shortcut + +--- + panels/keyboard/01-launchers.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/panels/keyboard/01-launchers.xml.in b/panels/keyboard/01-launchers.xml.in +index 67c8325..dd0292d 100644 +--- a/panels/keyboard/01-launchers.xml.in ++++ b/panels/keyboard/01-launchers.xml.in +@@ -9,6 +9,8 @@ + + + ++ ++ + + + diff -pruN 1:43.2-2/debian/patches/ubuntu/lock-Add-Lock-Screen-on-Suspend-option.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/lock-Add-Lock-Screen-on-Suspend-option.patch --- 1:43.2-2/debian/patches/ubuntu/lock-Add-Lock-Screen-on-Suspend-option.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/lock-Add-Lock-Screen-on-Suspend-option.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,96 @@ +From: Tim Lunn +Date: Mon, 3 Jun 2013 17:27:45 +1000 +Subject: lock: Add "Lock Screen on Suspend" option + +https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/938076 +--- + panels/screen/cc-screen-panel.c | 22 ++++++++++++++++++++++ + panels/screen/cc-screen-panel.ui | 14 ++++++++++++++ + 2 files changed, 36 insertions(+) + +diff --git a/panels/screen/cc-screen-panel.c b/panels/screen/cc-screen-panel.c +index 3c6f35b..d3ad034 100644 +--- a/panels/screen/cc-screen-panel.c ++++ b/panels/screen/cc-screen-panel.c +@@ -54,6 +54,9 @@ struct _CcScreenPanel + GtkSwitch *privacy_screen_switch; + GtkSwitch *show_notifications_switch; + GtkSwitch *usb_protection_switch; ++ ++ AdwPreferencesGroup *lock_on_suspend_row; ++ GtkSwitch *lock_on_suspend_switch; + }; + + CC_PANEL_REGISTER (CcScreenPanel, cc_screen_panel) +@@ -279,6 +282,8 @@ cc_screen_panel_class_init (CcScreenPanelClass *klass) + gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, show_notifications_switch); + gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, usb_protection_row); + gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, usb_protection_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, lock_on_suspend_row); ++ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, lock_on_suspend_switch); + + gtk_widget_class_bind_template_callback (widget_class, lock_after_name_cb); + gtk_widget_class_bind_template_callback (widget_class, on_blank_screen_delay_changed_cb); +@@ -321,6 +326,7 @@ update_display_config (CcScreenPanel *self) + static void + cc_screen_panel_init (CcScreenPanel *self) + { ++ g_autoptr(GSettingsSchema) schema = NULL; + guint value; + + g_resources_register (cc_screen_get_resource ()); +@@ -334,6 +340,8 @@ cc_screen_panel_init (CcScreenPanel *self) + self->notification_settings = g_settings_new ("org.gnome.desktop.notifications"); + self->session_settings = g_settings_new ("org.gnome.desktop.session"); + ++ g_object_get (self->lock_settings, "settings-schema", &schema, NULL); ++ + g_settings_bind (self->lock_settings, + "lock-enabled", + self->automatic_screen_lock_switch, +@@ -354,6 +362,20 @@ cc_screen_panel_init (CcScreenPanel *self) + "active", + G_SETTINGS_BIND_DEFAULT); + ++ if (g_settings_schema_has_key (schema, "ubuntu-lock-on-suspend")) ++ { ++ g_settings_bind (self->lock_settings, ++ "ubuntu-lock-on-suspend", ++ self->lock_on_suspend_switch, ++ "active", ++ G_SETTINGS_BIND_DEFAULT); ++ } ++ else ++ { ++ g_warning ("No ubuntu-lock-on-suspend settings key found"); ++ gtk_widget_set_visible (GTK_WIDGET (self->lock_on_suspend_row), FALSE); ++ } ++ + value = g_settings_get_uint (self->session_settings, "idle-delay"); + set_blank_screen_delay_value (self, value); + +diff --git a/panels/screen/cc-screen-panel.ui b/panels/screen/cc-screen-panel.ui +index 6b68189..44c3f3b 100644 +--- a/panels/screen/cc-screen-panel.ui ++++ b/panels/screen/cc-screen-panel.ui +@@ -80,6 +80,20 @@ + + + ++ ++ ++ ++ Lock Screen on Suspend ++ lock_on_suspend_switch ++ true ++ ++ ++ center ++ ++ ++ ++ ++ + + + diff -pruN 1:43.2-2/debian/patches/ubuntu/Modify-Mulitasking-assets-for-accent-colors.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Modify-Mulitasking-assets-for-accent-colors.patch --- 1:43.2-2/debian/patches/ubuntu/Modify-Mulitasking-assets-for-accent-colors.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/Modify-Mulitasking-assets-for-accent-colors.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,160 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Sat, 4 Jun 2022 04:34:55 +0200 +Subject: Modify Mulitasking assets for accent-colors + +- Modified multitaksing-assets to use @theme_selected_bg_color. +- added load_custom_css from ubuntu-panel to cc-multitasking-panel.c. +- added style multitasking-assets to ubuntu/appearance.css and cc-multitasking-panel.ui. +--- + panels/multitasking/assets/active-screen-edges-rtl.svg | 2 +- + panels/multitasking/assets/active-screen-edges.svg | 2 +- + panels/multitasking/assets/hot-corner-rtl.svg | 2 +- + panels/multitasking/assets/hot-corner.svg | 2 +- + .../multitasking/assets/workspaces-primary-display.svg | 6 +++++- + panels/multitasking/assets/workspaces-span-displays.svg | 6 +++++- + panels/multitasking/cc-multitasking-panel.c | 17 +++++++++++++++++ + panels/multitasking/cc-multitasking-panel.ui | 13 ++++++++++++- + 8 files changed, 43 insertions(+), 7 deletions(-) + +diff --git a/panels/multitasking/assets/active-screen-edges-rtl.svg b/panels/multitasking/assets/active-screen-edges-rtl.svg +index 4c2bd1a..346a900 100644 +--- a/panels/multitasking/assets/active-screen-edges-rtl.svg ++++ b/panels/multitasking/assets/active-screen-edges-rtl.svg +@@ -1 +1 @@ +- +\ No newline at end of file ++ +\ No newline at end of file +diff --git a/panels/multitasking/assets/active-screen-edges.svg b/panels/multitasking/assets/active-screen-edges.svg +index bc249ab..6191d5f 100644 +--- a/panels/multitasking/assets/active-screen-edges.svg ++++ b/panels/multitasking/assets/active-screen-edges.svg +@@ -1 +1 @@ +- +\ No newline at end of file ++ +\ No newline at end of file +diff --git a/panels/multitasking/assets/hot-corner-rtl.svg b/panels/multitasking/assets/hot-corner-rtl.svg +index 4eb3aba..908b8d9 100644 +--- a/panels/multitasking/assets/hot-corner-rtl.svg ++++ b/panels/multitasking/assets/hot-corner-rtl.svg +@@ -1 +1 @@ +- +\ No newline at end of file ++ +\ No newline at end of file +diff --git a/panels/multitasking/assets/hot-corner.svg b/panels/multitasking/assets/hot-corner.svg +index 66cee2a..4b3f506 100644 +--- a/panels/multitasking/assets/hot-corner.svg ++++ b/panels/multitasking/assets/hot-corner.svg +@@ -1 +1 @@ +- +\ No newline at end of file ++ +\ No newline at end of file +diff --git a/panels/multitasking/assets/workspaces-primary-display.svg b/panels/multitasking/assets/workspaces-primary-display.svg +index 3a3bed7..8ee8a39 100644 +--- a/panels/multitasking/assets/workspaces-primary-display.svg ++++ b/panels/multitasking/assets/workspaces-primary-display.svg +@@ -1 +1,5 @@ +- +\ No newline at end of file ++ ++ ++ ++ ++ +diff --git a/panels/multitasking/assets/workspaces-span-displays.svg b/panels/multitasking/assets/workspaces-span-displays.svg +index 571ee10..8e9eb01 100644 +--- a/panels/multitasking/assets/workspaces-span-displays.svg ++++ b/panels/multitasking/assets/workspaces-span-displays.svg +@@ -1 +1,5 @@ +- +\ No newline at end of file ++ ++ ++ ++ ++ +diff --git a/panels/multitasking/cc-multitasking-panel.c b/panels/multitasking/cc-multitasking-panel.c +index bcefb6d..28a3c99 100644 +--- a/panels/multitasking/cc-multitasking-panel.c ++++ b/panels/multitasking/cc-multitasking-panel.c +@@ -71,6 +71,21 @@ keep_dock_settings_in_sync (CcMultitaskingPanel *self) + } + } + ++static void ++load_custom_css (CcMultitaskingPanel *self) ++{ ++ g_autoptr(GtkCssProvider) provider = NULL; ++ ++ /* use custom CSS */ ++ provider = gtk_css_provider_new (); ++ gtk_css_provider_load_from_data (provider, ++ "picture.multitasking-assets { background: @theme_selected_bg_color; }", ++ -1); ++ gtk_style_context_add_provider_for_display (gdk_display_get_default (), ++ GTK_STYLE_PROVIDER (provider), ++ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++} ++ + /* GObject overrides */ + + static void +@@ -219,4 +234,6 @@ cc_multitasking_panel_init (CcMultitaskingPanel *self) + "active", + G_SETTINGS_BIND_DEFAULT); + } ++ ++ load_custom_css (self); + } +diff --git a/panels/multitasking/cc-multitasking-panel.ui b/panels/multitasking/cc-multitasking-panel.ui +index 1a8b587..320def6 100644 +--- a/panels/multitasking/cc-multitasking-panel.ui ++++ b/panels/multitasking/cc-multitasking-panel.ui +@@ -1,4 +1,3 @@ +- + + diff -pruN 1:43.2-2/debian/patches/ubuntu/notifications-Handle-.desktop-files-that-got-renamed.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/notifications-Handle-.desktop-files-that-got-renamed.patch --- 1:43.2-2/debian/patches/ubuntu/notifications-Handle-.desktop-files-that-got-renamed.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/notifications-Handle-.desktop-files-that-got-renamed.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,32 @@ +From: Ubuntu Developers +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: notifications: Handle .desktop files that got renamed + +upstream, those use NoDisplay but the panel doesn't respect that key, +skip known buggy entries for file-roller and nautilus +Origin: ubuntu +Bug-Ubuntu: https://launchpad.net/bugs/1716267 +Forwarded: not-needed +--- + panels/notifications/cc-notifications-panel.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/panels/notifications/cc-notifications-panel.c b/panels/notifications/cc-notifications-panel.c +index a1000d8..4493f83 100644 +--- a/panels/notifications/cc-notifications-panel.c ++++ b/panels/notifications/cc-notifications-panel.c +@@ -360,6 +360,14 @@ process_app_info (CcNotificationsPanel *panel, + guint i; + + app_id = app_info_get_id (app_info); ++ ++ /* Ignore compatibility desktops (lp: #1716267) */ ++ if (g_strcmp0 (app_id, "file-roller") == 0) ++ return; ++ ++ if (g_strcmp0 (app_id, "nautilus") == 0) ++ return; ++ + g_strcanon (app_id, + "0123456789" + "abcdefghijklmnopqrstuvwxyz" diff -pruN 1:43.2-2/debian/patches/ubuntu/online-accounts-Hide-window-after-adding-an-online-accoun.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/online-accounts-Hide-window-after-adding-an-online-accoun.patch --- 1:43.2-2/debian/patches/ubuntu/online-accounts-Hide-window-after-adding-an-online-accoun.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/online-accounts-Hide-window-after-adding-an-online-accoun.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,32 @@ +From: Andrea Azzarone +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: online-accounts: Hide window after adding an online account from + another app + +Some applications (e.g. gnome-calendar, gnome-todo, etc.) use gnome-control-center +to allow the user to add online accounts. This patch makes sure that g-c-c main window +is closed after the user interacted with the new-account dialog. + +Bug-Ubuntu: https://launchpad.net/bugs/1754651 +Forwarded: no +Last-Update: 2018-03-09 +--- + panels/online-accounts/cc-online-accounts-panel.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c +index f4d1a92..9b848dd 100644 +--- a/panels/online-accounts/cc-online-accounts-panel.c ++++ b/panels/online-accounts/cc-online-accounts-panel.c +@@ -803,7 +803,10 @@ cc_online_accounts_panel_set_property (GObject *object, + } + + if (g_strcmp0 (first_arg, "add") == 0) +- command_add (CC_ONLINE_ACCOUNTS_PANEL (object), parameters); ++ { ++ command_add (CC_ONLINE_ACCOUNTS_PANEL (object), parameters); ++ g_application_quit (g_application_get_default ()); ++ } + else if (first_arg != NULL) + select_account_by_id (CC_ONLINE_ACCOUNTS_PANEL (object), first_arg); + diff -pruN 1:43.2-2/debian/patches/ubuntu/printers-Temporarily-add-an-additional-advanced-printer-b.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/printers-Temporarily-add-an-additional-advanced-printer-b.patch --- 1:43.2-2/debian/patches/ubuntu/printers-Temporarily-add-an-additional-advanced-printer-b.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/printers-Temporarily-add-an-additional-advanced-printer-b.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,96 @@ +From: Ubuntu Developers +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: printers: Temporarily add an additional advanced printer button. + +The printers panel doesn't support printer sharing and other features. +Workaround it for now by adding in multiple places an advanced printer +button starting system-config-printer to avoid doubling the panel in Settings. +Origin: ubuntu + +Bug-Ubuntu: https://launchpad.net/bugs/1706524a +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=692532 +--- + panels/printers/cc-printers-panel.c | 24 ++++++++++++++++++++++++ + panels/printers/printers.ui | 13 +++++++++++++ + 2 files changed, 37 insertions(+) + +diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c +index 8727b17..00729c0 100644 +--- a/panels/printers/cc-printers-panel.c ++++ b/panels/printers/cc-printers-panel.c +@@ -25,6 +25,7 @@ + #include "pp-printer.h" + + #include ++#include + #include + #include + #include +@@ -993,6 +994,25 @@ printer_add_cb (CcPrintersPanel *self) + gtk_widget_show (GTK_WIDGET (self->pp_new_printer_dialog)); + } + ++static void ++show_system_config_printer (void) ++{ ++ g_autoptr(GAppInfo) app_info = NULL; ++ g_autoptr(GdkAppLaunchContext) ctx = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ app_info = G_APP_INFO (g_desktop_app_info_new ("system-config-printer.desktop")); ++ ++ if (app_info == NULL) { ++ g_warning ("Failed to launch system-config-printer: couldn't create GDesktopAppInfo"); ++ return; ++ } ++ ++ ctx = gdk_display_get_app_launch_context (gdk_display_get_default ()); ++ if (!g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (ctx), &error)) ++ g_warning ("Failed to launch system-config-printer: %s", error->message); ++} ++ + static void + update_sensitivity (gpointer user_data) + { +@@ -1253,6 +1273,10 @@ cc_printers_panel_init (CcPrintersPanel *self) + self->notification = (GtkRevealer*) + gtk_builder_get_object (self->builder, "notification"); + ++ widget = (GtkWidget*) gtk_builder_get_object (self->builder, "system-config-printer-button1"); ++ g_signal_connect_swapped (widget, "clicked", ++ G_CALLBACK (show_system_config_printer), NULL); ++ + widget = (GtkWidget*) + gtk_builder_get_object (self->builder, "notification-undo-button"); + g_signal_connect_object (widget, "clicked", G_CALLBACK (on_printer_deletion_undone), self, G_CONNECT_SWAPPED); +diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui +index 123795f..4c79a70 100644 +--- a/panels/printers/printers.ui ++++ b/panels/printers/printers.ui +@@ -117,6 +117,7 @@ + True + + ++ vertical + + + GTK_SELECTION_NONE +@@ -127,6 +128,18 @@ + + + ++ ++ ++ ++ Additional Printer Settings… ++ True ++ True ++ False ++ end ++ 60 ++ 24 ++ ++ + + + diff -pruN 1:43.2-2/debian/patches/ubuntu/region-Add-Language-Selector-button.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/region-Add-Language-Selector-button.patch --- 1:43.2-2/debian/patches/ubuntu/region-Add-Language-Selector-button.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/region-Add-Language-Selector-button.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,83 @@ +From: Jeremy Bicha +Date: Thu, 14 Sep 2017 09:23:42 -0400 +Subject: region: Add Language Selector button + +Workaround for https://launchpad.net/bugs/1631750 +--- + panels/region/cc-region-panel.c | 21 +++++++++++++++++++++ + panels/region/cc-region-panel.ui | 23 +++++++++++++++++++++++ + 2 files changed, 44 insertions(+) + +diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c +index 0849045..00190f5 100644 +--- a/panels/region/cc-region-panel.c ++++ b/panels/region/cc-region-panel.c +@@ -560,6 +560,26 @@ setup_language_section (CcRegionPanel *self) + update_region_from_setting (self); + } + ++ ++static void ++show_language_support (CcRegionPanel *self) ++{ ++ g_autoptr(GAppInfo) app_info = NULL; ++ g_autoptr(GdkAppLaunchContext) ctx = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ app_info = G_APP_INFO (g_desktop_app_info_new ("gnome-language-selector.desktop")); ++ ++ if (app_info == NULL) { ++ g_warning ("Failed to launch language-selector: couldn't create GDesktopAppInfo"); ++ return; ++ } ++ ++ ctx = gdk_display_get_app_launch_context (gdk_display_get_default ()); ++ if (!g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (ctx), &error)) ++ g_warning ("Failed to launch language-selector: %s", error->message); ++} ++ + static void + update_login_region (CcRegionPanel *self) + { +@@ -848,6 +868,7 @@ cc_region_panel_class_init (CcRegionPanelClass * klass) + gtk_widget_class_bind_template_callback (widget_class, on_user_formats_row_activated_cb); + gtk_widget_class_bind_template_callback (widget_class, on_user_language_row_activated_cb); + gtk_widget_class_bind_template_callback (widget_class, restart_now); ++ gtk_widget_class_bind_template_callback (widget_class, show_language_support); + } + + static void +diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui +index 79d31d1..49accb1 100644 +--- a/panels/region/cc-region-panel.ui ++++ b/panels/region/cc-region-panel.ui +@@ -46,6 +46,29 @@ + + + ++ ++ ++ System ++ ++ ++ ++ True ++ Manage Installed Languages ++ True ++ ++ ++ ++ ++ center ++ go-next-symbolic ++ ++ ++ ++ ++ ++ ++ ++ + + + Your Account diff -pruN 1:43.2-2/debian/patches/ubuntu/shell-Change-the-default-height-so-all-category-are-on-sc.patch 1:44~alpha-0ubuntu1/debian/patches/ubuntu/shell-Change-the-default-height-so-all-category-are-on-sc.patch --- 1:43.2-2/debian/patches/ubuntu/shell-Change-the-default-height-so-all-category-are-on-sc.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/debian/patches/ubuntu/shell-Change-the-default-height-so-all-category-are-on-sc.patch 2023-01-13 16:48:57.000000000 +0000 @@ -0,0 +1,23 @@ +From: Ubuntu Developers +Date: Mon, 19 Aug 2019 16:17:20 +0100 +Subject: shell: Change the default height so all category are on screen + +Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1728450 +Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=789372 +--- + shell/cc-window.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell/cc-window.ui b/shell/cc-window.ui +index 07e1848..21a2fc3 100644 +--- a/shell/cc-window.ui ++++ b/shell/cc-window.ui +@@ -2,7 +2,7 @@ + + - - - False - True - 1 - 24 - True - Rename Device - - - - - 18 - 12 - 12 - 18 - vertical - - - 18 - True - 35 - 0.0 - The device name is used to identify this device when it is viewed over the network, or when pairing Bluetooth devices. - - - - - - Device name - device_name_description - - - - - - - - - - - - True - _Rename - - - - - - - True - _Cancel - - - - - rename_button - cancel_button - - - - - 0 - - diff -pruN 1:43.2-2/panels/info-overview/gnome-info-overview-panel.desktop.in 1:44~alpha-0ubuntu1/panels/info-overview/gnome-info-overview-panel.desktop.in --- 1:43.2-2/panels/info-overview/gnome-info-overview-panel.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/info-overview/gnome-info-overview-panel.desktop.in 2023-01-09 20:06:57.000000000 +0000 @@ -0,0 +1,18 @@ +[Desktop Entry] +Name=About +Comment=View information about your system +Exec=gnome-control-center info-overview +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=org.gnome.Settings-about-symbolic +Terminal=false +Type=Application +NoDisplay=true +StartupNotify=true +Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings; +OnlyShowIn=GNOME;Unity; +# Translators: Search terms to find the About panel. +# Do NOT translate or localize the semicolons! +# The list MUST also end with a semicolon! +# "Preferred Applications" is the old name for the preference, so make +# sure that you use the same "translation" for those keywords +Keywords=device;system;information;hostname;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun; diff -pruN 1:43.2-2/panels/info-overview/gnome-info-overview-panel.desktop.in.in 1:44~alpha-0ubuntu1/panels/info-overview/gnome-info-overview-panel.desktop.in.in --- 1:43.2-2/panels/info-overview/gnome-info-overview-panel.desktop.in.in 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/info-overview/gnome-info-overview-panel.desktop.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -[Desktop Entry] -Name=About -Comment=View information about your system -Exec=gnome-control-center info-overview -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=org.gnome.Settings-about-symbolic -Terminal=false -Type=Application -NoDisplay=true -StartupNotify=true -Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings; -OnlyShowIn=GNOME;Unity; -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-control-center -X-GNOME-Bugzilla-Component=info -X-GNOME-Bugzilla-Version=@VERSION@ -# Translators: Search terms to find the About panel. -# Do NOT translate or localize the semicolons! -# The list MUST also end with a semicolon! -# "Preferred Applications" is the old name for the preference, so make -# sure that you use the same "translation" for those keywords -Keywords=device;system;information;hostname;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun; diff -pruN 1:43.2-2/panels/info-overview/info-cleanup.c 1:44~alpha-0ubuntu1/panels/info-overview/info-cleanup.c --- 1:43.2-2/panels/info-overview/info-cleanup.c 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/info-overview/info-cleanup.c 2023-01-09 20:06:57.000000000 +0000 @@ -37,6 +37,7 @@ prettify_info (const char *info) int i; static const ReplaceStrings rs[] = { { "Mesa DRI ", ""}, + { "Mesa Intel", "Intel"}, { "[(]R[)]", "\302\256"}, { "[(](tm|TM)[)]", "\342\204\242"}, { "(ATI|EPYC|AMD FX|Radeon|Ryzen|Threadripper|GeForce RTX) ", "\\1\342\204\242 "}, diff -pruN 1:43.2-2/panels/info-overview/meson.build 1:44~alpha-0ubuntu1/panels/info-overview/meson.build --- 1:43.2-2/panels/info-overview/meson.build 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/info-overview/meson.build 2023-01-09 20:06:57.000000000 +0000 @@ -1,15 +1,9 @@ panels_list += cappletname desktop = 'gnome-@0@-panel.desktop'.format(cappletname) -desktop_in = configure_file( - input: desktop + '.in.in', - output: desktop + '.in', - configuration: desktop_conf -) - i18n.merge_file( type: 'desktop', - input: desktop_in, + input: desktop + '.in', output: desktop, po_dir: po_dir, install: true, @@ -59,6 +53,14 @@ print_renderer_deps = [ ] executable( + 'test-info-cleanup', + [ 'info-cleanup.c', 'test-info-cleanup.c' ], + include_directories: [ top_inc ], + dependencies: [ print_renderer_deps ], + c_args: cflags, +) + +executable( 'gnome-control-center-print-renderer', 'gnome-control-center-print-renderer.c', include_directories: [ top_inc ], diff -pruN 1:43.2-2/panels/info-overview/test-info-cleanup.c 1:44~alpha-0ubuntu1/panels/info-overview/test-info-cleanup.c --- 1:43.2-2/panels/info-overview/test-info-cleanup.c 1970-01-01 00:00:00.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/info-overview/test-info-cleanup.c 2023-01-09 20:06:57.000000000 +0000 @@ -0,0 +1,18 @@ +#include +#include + +int main (int argc, char **argv) +{ + g_autofree char *str = NULL; + + setlocale (LC_ALL, ""); + + if (argc != 2) { + g_print ("Usage: %s DEVICE-NAME\n", argv[0]); + return 1; + } + + str = info_cleanup (argv[1]); + g_print ("%s ➯ %s\n", argv[1], str); + return 0; +} diff -pruN 1:43.2-2/panels/keyboard/cc-input-chooser.c 1:44~alpha-0ubuntu1/panels/keyboard/cc-input-chooser.c --- 1:43.2-2/panels/keyboard/cc-input-chooser.c 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-input-chooser.c 2023-01-09 20:06:57.000000000 +0000 @@ -149,7 +149,7 @@ padded_label_new (const gchar *te set_row_widget_margins (label); gtk_box_append (GTK_BOX (widget), label); if (dim_label) - gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); + gtk_widget_add_css_class (label, "dim-label"); if (direction == ROW_TRAVEL_DIRECTION_FORWARD) { diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-item.c 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-item.c --- 1:43.2-2/panels/keyboard/cc-keyboard-item.c 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-item.c 2023-01-09 20:06:57.000000000 +0000 @@ -26,9 +26,12 @@ #include #include +#include "cc-util.h" +#include "keyboard-shortcuts.h" #include "cc-keyboard-item.h" #define CUSTOM_KEYS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding" +#define SHORTCUT_DELIMITERS "+ " struct _CcKeyboardItem { @@ -359,6 +362,126 @@ cc_keyboard_item_new (CcKeyboardItemType return CC_KEYBOARD_ITEM (object); } +/* Copied from cc-keyboard-shortcut-dialog.c */ +static gboolean +strv_contains_prefix_or_match (char **strv, + const char *prefix) +{ + const struct { + const gchar *key; + const gchar *untranslated; + const gchar *synonym; + } key_aliases[] = + { + { "ctrl", "Ctrl", "ctrl" }, + { "win", "Super", "super" }, + { "option", NULL, "alt" }, + { "command", NULL, "super" }, + { "apple", NULL, "super" }, + }; + + for (guint i = 0; strv[i]; i++) + { + if (g_str_has_prefix (strv[i], prefix)) + return TRUE; + } + + for (guint i = 0; i < G_N_ELEMENTS (key_aliases); i++) + { + g_autofree char *alias = NULL; + const char *synonym; + + if (!g_str_has_prefix (key_aliases[i].key, prefix)) + continue; + + if (key_aliases[i].untranslated) + { + const char *translated_label; + + /* Steal GTK+'s translation */ + translated_label = g_dpgettext2 ("gtk40", "keyboard label", key_aliases[i].untranslated); + alias = g_utf8_strdown (translated_label, -1); + } + + synonym = key_aliases[i].synonym; + + /* If a translation or synonym of the key is in the accelerator, and we typed + * the key, also consider that a prefix */ + if ((alias && g_strv_contains ((const char * const *) strv, alias)) || + (synonym && g_strv_contains ((const char * const *) strv, synonym))) + return TRUE; + } + + return FALSE; +} + +/* Copied from cc-keyboard-shortcut-dialog.c */ +static gboolean +search_match_shortcut (CcKeyboardItem *item, + const char *search) +{ + g_auto(GStrv) shortcut_tokens = NULL, search_tokens = NULL; + g_autofree char *normalized_accel = NULL; + g_autofree char *accel = NULL; + GList *key_combos; + CcKeyCombo *combo; + gboolean match = TRUE; + + key_combos = cc_keyboard_item_get_key_combos (item); + for (GList *l = key_combos; l != NULL; l = l->next) + { + combo = l->data; + + if (is_empty_binding (combo)) + continue; + + accel = convert_keysym_state_to_string (combo); + normalized_accel = cc_util_normalize_casefold_and_unaccent (accel); + + shortcut_tokens = g_strsplit_set (normalized_accel, SHORTCUT_DELIMITERS, -1); + search_tokens = g_strsplit_set (search, SHORTCUT_DELIMITERS, -1); + + for (guint i = 0; search_tokens[i]; i++) + { + match = match && strv_contains_prefix_or_match (shortcut_tokens, search_tokens[i]); + + if (!match) + break; + } + + if (match) + return TRUE; + } + + return FALSE; +} + +gboolean +cc_keyboard_item_matches_string (CcKeyboardItem *self, + GStrv search_terms) +{ + g_autofree char *name = NULL; + + g_return_val_if_fail (CC_IS_KEYBOARD_ITEM (self), FALSE); + + if (!search_terms || !*search_terms || !self->description) + return TRUE; + + name = cc_util_normalize_casefold_and_unaccent (self->description); + + for (guint i = 0; search_terms[i]; i++) + { + gboolean match; + + match = strstr (name, search_terms[i]) || search_match_shortcut (self, search_terms[i]); + + if (!match) + return FALSE; + } + + return TRUE; +} + static guint * get_above_tab_keysyms (void) { @@ -517,6 +640,9 @@ binding_changed (CcKeyboardItem *item, item->editable = g_settings_is_writable (item->settings, item->key); g_object_notify (G_OBJECT (item), "key-combos"); + g_object_notify (G_OBJECT (item), "is-value-default"); + if (item->reverse_item) + g_object_notify (G_OBJECT (item->reverse_item), "is-value-default"); } gboolean diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-item.h 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-item.h --- 1:43.2-2/panels/keyboard/cc-keyboard-item.h 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-item.h 2023-01-09 20:06:57.000000000 +0000 @@ -51,6 +51,9 @@ typedef struct CcKeyboardItem* cc_keyboard_item_new (CcKeyboardItemType type); +gboolean cc_keyboard_item_matches_string (CcKeyboardItem *self, + GStrv search_terms); + gboolean cc_keyboard_item_load_from_gsettings_path (CcKeyboardItem *item, const char *path, gboolean reset); diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-manager.c 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-manager.c --- 1:43.2-2/panels/keyboard/cc-keyboard-manager.c 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-manager.c 2023-01-09 20:06:57.000000000 +0000 @@ -54,6 +54,7 @@ enum SHORTCUT_ADDED, SHORTCUT_CHANGED, SHORTCUT_REMOVED, + SHORTCUTS_LOADED, LAST_SIGNAL }; @@ -262,6 +263,8 @@ add_shortcuts (CcKeyboardManager *self) can_continue = gtk_tree_model_iter_next (sections_model, §ions_iter); } + + g_signal_emit (self, signals[SHORTCUTS_LOADED], 0); } static void @@ -819,6 +822,17 @@ cc_keyboard_manager_class_init (CcKeyboa G_TYPE_NONE, 1, CC_TYPE_KEYBOARD_ITEM); + + /** + * CcKeyboardManager:shortcuts-loaded: + * + * Emitted after all shortcuts are loaded. + */ + signals[SHORTCUTS_LOADED] = g_signal_new ("shortcuts-loaded", + CC_TYPE_KEYBOARD_MANAGER, + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, NULL, + G_TYPE_NONE, 0); } static void diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-panel.c 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-panel.c --- 1:43.2-2/panels/keyboard/cc-keyboard-panel.c 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-panel.c 2023-01-09 20:06:57.000000000 +0000 @@ -31,6 +31,7 @@ #include "cc-keyboard-shortcut-dialog.h" #include "cc-input-list-box.h" #include "cc-xkb-modifier-dialog.h" +#include "cc-list-row.h" #include "keyboard-shortcuts.h" @@ -44,10 +45,8 @@ struct _CcKeyboardPanel GSettings *input_source_settings; AdwPreferencesGroup *input_switch_group; - AdwActionRow *alt_chars_row; - AdwActionRow *compose_row; - GtkWidget *value_alternate_chars; - GtkWidget *value_compose; + CcListRow *alt_chars_row; + CcListRow *compose_row; AdwActionRow *common_shortcuts_row; }; @@ -105,9 +104,9 @@ special_chars_activated (AdwActionRow window = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self)))); - if (row == self->alt_chars_row) + if (row == (gpointer)self->alt_chars_row) modifier = &LV3_MODIFIER; - else if (row == self->compose_row) + else if (row == (gpointer)self->compose_row) modifier = &COMPOSE_MODIFIER; else return; @@ -191,8 +190,6 @@ cc_keyboard_panel_class_init (CcKeyboard gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, same_source); gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, alt_chars_row); gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, compose_row); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, value_alternate_chars); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, value_compose); gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, common_shortcuts_row); gtk_widget_class_bind_template_callback (widget_class, special_chars_activated); @@ -247,8 +244,8 @@ cc_keyboard_panel_init (CcKeyboardPanel /* "Type Special Characters" section */ g_settings_bind_with_mapping (self->input_source_settings, "xkb-options", - self->value_alternate_chars, - "label", + self->alt_chars_row, + "secondary-label", G_SETTINGS_BIND_GET, xcb_modifier_transform_binding_to_label, NULL, @@ -256,8 +253,8 @@ cc_keyboard_panel_init (CcKeyboardPanel NULL); g_settings_bind_with_mapping (self->input_source_settings, "xkb-options", - self->value_compose, - "label", + self->compose_row, + "secondary-label", G_SETTINGS_BIND_GET, xcb_modifier_transform_binding_to_label, NULL, diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-panel.ui 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-panel.ui --- 1:43.2-2/panels/keyboard/cc-keyboard-panel.ui 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-panel.ui 2023-01-09 20:06:57.000000000 +0000 @@ -59,36 +59,20 @@ Special Character Entry Methods for entering symbols and letter variants using the keyboard. - + Alternate Characters Key True + True + Right Alt - - - Right Alt - - - - - go-next-symbolic - - - + Compose Key + True True - - - - - - - go-next-symbolic - - @@ -97,15 +81,11 @@ Keyboard Shortcuts - + View and Customize Shortcuts True + True - - - go-next-symbolic - - diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-shortcut-dialog.c 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-shortcut-dialog.c --- 1:43.2-2/panels/keyboard/cc-keyboard-shortcut-dialog.c 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-shortcut-dialog.c 2023-01-09 20:06:57.000000000 +0000 @@ -3,6 +3,7 @@ * Copyright (C) 2010 Intel, Inc * Copyright (C) 2016 Endless, Inc * Copyright (C) 2020 System76, Inc. + * Copyright (C) 2022 Purism SPC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +21,7 @@ * Author: Thomas Wood * Georges Basile Stavracas Neto * Ian Douglas Scott + * Mohammed Sadiq * * SPDX-License-Identifier: GPL-2.0-or-later */ @@ -32,369 +34,297 @@ #include "cc-keyboard-item.h" #include "cc-keyboard-manager.h" #include "cc-keyboard-shortcut-editor.h" +#include "cc-keyboard-shortcut-group.h" #include "cc-keyboard-shortcut-row.h" #include "cc-list-row.h" #include "cc-util.h" #include "keyboard-shortcuts.h" -#define SHORTCUT_DELIMITERS "+ " - -typedef struct { - gchar *section_title; - gchar *section_id; - guint modified_count; - GtkLabel *modified_label; -} SectionRowData; - -typedef struct { - CcKeyboardItem *item; - gchar *section_title; - gchar *section_id; - SectionRowData *section_data; -} ShortcutRowData; - struct _CcKeyboardShortcutDialog { - GtkDialog parent_instance; + AdwWindow parent_instance; - GtkSizeGroup *accelerator_sizegroup; - GtkWidget *back_button; - GtkListBoxRow *custom_shortcut_add_row; - guint custom_shortcut_count; - GtkWidget *empty_custom_shortcuts_placeholder; - GtkWidget *empty_search_placeholder; - GtkHeaderBar *headerbar; - GtkStack *header_stack; - GtkWidget *reset_all_button; - GtkWidget *section_box; - GtkSearchEntry *search_entry; - GtkListBox *section_listbox; - GtkListBoxRow *section_row; - GtkWidget *shortcut_box; - GtkListBox *shortcut_listbox; - GtkStack *stack; - - CcKeyboardManager *manager; - GtkWidget *shortcut_editor; - GHashTable *sections; + AdwHeaderBar *header_bar; + GtkButton *back_button; + GtkButton *reset_all_button; + GtkSearchEntry *search_entry; + + AdwLeaflet *main_leaflet; + GtkBox *main_box; + GtkStack *section_stack; + AdwPreferencesPage *section_list_page; + GtkListBox *section_list_box; + AdwPreferencesPage *search_result_page; + AdwStatusPage *empty_results_page; + + GtkStack *shortcut_list_stack; + AdwPreferencesPage *empty_subpage_results_page; + + AdwStatusPage *empty_custom_shortcut_page; + GtkSizeGroup *accelerator_size_group; + + /* A GListStore of sections containing a GListStore of CcKeyboardItem */ + GListStore *sections; + GListStore *visible_section; + GtkFlattenListModel *filtered_shortcuts; + + CcKeyboardManager *manager; + GtkWidget *shortcut_editor; + GStrv search_terms; }; -G_DEFINE_TYPE (CcKeyboardShortcutDialog, cc_keyboard_shortcut_dialog, GTK_TYPE_DIALOG) -static gboolean -is_matched_shortcut_present (GtkListBox *listbox, - gpointer user_data); +G_DEFINE_TYPE (CcKeyboardShortcutDialog, cc_keyboard_shortcut_dialog, ADW_TYPE_WINDOW) + -static SectionRowData* -section_row_data_new (const gchar *section_id, - const gchar *section_title, - GtkLabel *modified_label) +static GListStore * +keyboard_shortcut_get_section_store (CcKeyboardShortcutDialog *self, + const char *section_id, + const char *section_title) { - SectionRowData *data; + g_autoptr(GListStore) section = NULL; + GtkWidget *group; + guint n_items; - data = g_new0 (SectionRowData, 1); - data->section_id = g_strdup (section_id); - data->section_title = g_strdup (section_title); - data->modified_count = 0; - data->modified_label = modified_label; + g_assert (CC_IS_KEYBOARD_SHORTCUT_DIALOG (self)); + g_assert (section_id && *section_id); - return data; -} + n_items = g_list_model_get_n_items (G_LIST_MODEL (self->sections)); -static void -section_row_data_free (SectionRowData *data) -{ - g_free (data->section_id); - g_free (data->section_title); - g_free (data); -} + for (guint i = 0; i < n_items; i++) + { + g_autoptr(GObject) item = NULL; + const char *item_section_id; -static ShortcutRowData* -shortcut_row_data_new (CcKeyboardItem *item, - const gchar *section_id, - const gchar *section_title, - SectionRowData *section_data) -{ - ShortcutRowData *data; + item = g_list_model_get_item (G_LIST_MODEL (self->sections), i); + item_section_id = g_object_get_data (item, "id"); + + if (g_str_equal (item_section_id, section_id)) + return G_LIST_STORE (item); + } + + /* Found no matching section, so create one */ + section = g_list_store_new (CC_TYPE_KEYBOARD_ITEM); + g_object_set_data_full (G_OBJECT (section), "id", g_strdup (section_id), g_free); + g_object_set_data_full (G_OBJECT (section), "title", g_strdup (section_title), g_free); - data = g_new0 (ShortcutRowData, 1); - data->item = g_object_ref (item); - data->section_id = g_strdup (section_id); - data->section_title = g_strdup (section_title); - data->section_data = section_data; + /* This group shall be shown in the search results page */ + group = cc_keyboard_shortcut_group_new (G_LIST_MODEL (section), + section_id, section_title, + self->manager, + CC_KEYBOARD_SHORTCUT_EDITOR (self->shortcut_editor), + self->accelerator_size_group); + g_object_set_data (G_OBJECT (section), "search-group", group); - return data; + /* This group shall be shown when a section title row is activated */ + group = cc_keyboard_shortcut_group_new (G_LIST_MODEL (section), + section_id, NULL, + self->manager, + CC_KEYBOARD_SHORTCUT_EDITOR (self->shortcut_editor), + self->accelerator_size_group); + g_object_set_data (G_OBJECT (section), "group", group); + + g_list_store_append (self->sections, section); + + return section; } static void -shortcut_row_data_free (ShortcutRowData *data) +shortcut_added_cb (CcKeyboardShortcutDialog *self, + CcKeyboardItem *item, + const char *section_id, + const char *section_title) { - g_object_unref (data->item); - g_free (data->section_id); - g_free (data->section_title); - g_free (data); + GListStore *section; + + section = keyboard_shortcut_get_section_store (self, section_id, section_title); + g_object_set_data (G_OBJECT (item), "section", section); + g_list_store_append (section, item); } -static GtkListBoxRow* -add_section (CcKeyboardShortcutDialog *self, - const gchar *section_id, - const gchar *section_title) +static void +shortcut_removed_cb (CcKeyboardShortcutDialog *self, + CcKeyboardItem *item) { - GtkWidget *icon, *modified_label, *row; - - icon = gtk_image_new_from_icon_name ("go-next-symbolic"); - gtk_widget_add_css_class (icon, "dim-label"); + GListStore *section; + guint position; - modified_label = gtk_label_new (NULL); - gtk_widget_add_css_class (modified_label, "dim-label"); + section = g_object_get_data (G_OBJECT (item), "section"); + g_return_if_fail (section); - row = adw_action_row_new (); - gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), TRUE); - adw_preferences_row_set_title (ADW_PREFERENCES_ROW (row), _(section_title)); - //TODO gtk_container_add (GTK_CONTAINER (row), modified_label); - //TODO gtk_container_add (GTK_CONTAINER (row), icon); - - g_object_set_data_full (G_OBJECT (row), - "data", - section_row_data_new (section_id, section_title, GTK_LABEL (modified_label)), - (GDestroyNotify)section_row_data_free); - - g_hash_table_insert (self->sections, g_strdup (section_id), row); - gtk_list_box_append (self->section_listbox, row); - - return GTK_LIST_BOX_ROW (row); + if (g_list_store_find (section, item, &position)) + g_list_store_remove (section, position); } static void -set_custom_shortcut_placeholder_visibility (CcKeyboardShortcutDialog *self) +shortuct_custom_items_changed (CcKeyboardShortcutDialog *self) { - SectionRowData *section_data; - gboolean is_custom_shortcuts = FALSE; + GListStore *section; + + g_assert (CC_IS_KEYBOARD_SHORTCUT_DIALOG (self)); + + section = keyboard_shortcut_get_section_store (self, "custom", "Custom Shortcuts"); - if (self->section_row != NULL) + if (self->visible_section == section) { - section_data = g_object_get_data (G_OBJECT (self->section_row), "data"); - is_custom_shortcuts = (strcmp (section_data->section_id, "custom") == 0); + GtkWidget *page; + guint n_items; - gtk_stack_set_transition_type (self->stack, GTK_STACK_TRANSITION_TYPE_CROSSFADE); - if (is_custom_shortcuts && (self->custom_shortcut_count == 0)) - gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->empty_custom_shortcuts_placeholder)); + n_items = g_list_model_get_n_items (G_LIST_MODEL (section)); + + if (n_items) + page = GTK_WIDGET (self->shortcut_list_stack); else - gtk_stack_set_visible_child (self->stack, self->shortcut_box); - } -} - -static void -add_item (CcKeyboardShortcutDialog *self, - CcKeyboardItem *item, - const gchar *section_id, - const gchar *section_title) -{ - GtkWidget *row; - GtkListBoxRow *section_row; - SectionRowData *section_data; - - section_row = g_hash_table_lookup (self->sections, section_id); - if (section_row == NULL) - section_row = add_section (self, section_id, section_title); - - section_data = g_object_get_data (G_OBJECT (section_row), "data"); - - row = GTK_WIDGET (cc_keyboard_shortcut_row_new (item, - self->manager, - CC_KEYBOARD_SHORTCUT_EDITOR (self->shortcut_editor), - self->accelerator_sizegroup)); - - g_object_set_data_full (G_OBJECT (row), - "data", - shortcut_row_data_new (item, section_id, section_title, section_data), - (GDestroyNotify)shortcut_row_data_free); + page = GTK_WIDGET (self->empty_custom_shortcut_page); - if (strcmp (section_id, "custom") == 0) - { - self->custom_shortcut_count++; - set_custom_shortcut_placeholder_visibility (self); + adw_leaflet_set_visible_child (self->main_leaflet, page); + gtk_widget_set_visible (GTK_WIDGET (self->search_entry), n_items > 0); } - - gtk_list_box_append (self->shortcut_listbox, row); } -static void -remove_item (CcKeyboardShortcutDialog *self, - CcKeyboardItem *item) +static int +compare_sections_title (gconstpointer a, + gconstpointer b, + gpointer user_data) { - GtkWidget *child; + GObject *obj_a, *obj_b; - for (child = gtk_widget_get_first_child (GTK_WIDGET (self->shortcut_listbox)); - child; - child = gtk_widget_get_next_sibling (child)) - { - ShortcutRowData *row_data; + const char *title_a, *title_b, *id_a, *id_b; - if (!GTK_IS_LIST_BOX_ROW (child)) - continue; + obj_a = G_OBJECT (a); + obj_b = G_OBJECT (b); - row_data = g_object_get_data (G_OBJECT (child), "data"); + id_a = g_object_get_data (obj_a, "id"); + id_b = g_object_get_data (obj_b, "id"); - if (row_data && row_data->item == item) - { - if (strcmp (row_data->section_id, "custom") == 0) - { - self->custom_shortcut_count--; - set_custom_shortcut_placeholder_visibility (self); - } + /* Always place custom row as the last item */ + if (g_str_equal (id_a, "custom")) + return 1; - gtk_list_box_remove (self->shortcut_listbox, child); - break; - } - } + if (g_str_equal (id_b, "custom")) + return -1; + + title_a = _(g_object_get_data (obj_a, "title")); + title_b = _(g_object_get_data (obj_b, "title")); + + return g_strcmp0 (title_a, title_b); } static void -update_modified_counts (CcKeyboardShortcutDialog *self) +shortcut_search_result_changed_cb (CcKeyboardShortcutDialog *self) { - SectionRowData *section_data; - ShortcutRowData *shortcut_data; - g_autofree gchar *modified_text = NULL; - GtkWidget *child; - - for (child = gtk_widget_get_first_child (GTK_WIDGET (self->section_listbox)); - child; - child = gtk_widget_get_next_sibling (child)) - { - if (!GTK_IS_LIST_BOX_ROW (child)) - continue; + GListModel *model; + GtkWidget *page; + guint n_items; - section_data = g_object_get_data (G_OBJECT (child), "data"); - section_data->modified_count = 0; - } + g_assert (CC_IS_KEYBOARD_SHORTCUT_DIALOG (self)); - for (child = gtk_widget_get_first_child (GTK_WIDGET (self->shortcut_listbox)); - child; - child = gtk_widget_get_next_sibling (child)) - { - if (!GTK_IS_LIST_BOX_ROW (child)) - continue; + /* If a section is already shown, it is handled in search change callback */ + if (self->visible_section) + return; - if (GTK_LIST_BOX_ROW (child) == self->custom_shortcut_add_row) - continue; - shortcut_data = g_object_get_data (G_OBJECT (child), "data"); - if (!cc_keyboard_item_is_value_default (shortcut_data->item)) - shortcut_data->section_data->modified_count++; - } + model = G_LIST_MODEL (self->filtered_shortcuts); + n_items = g_list_model_get_n_items (model); - for (child = gtk_widget_get_first_child (GTK_WIDGET (self->section_listbox)); - child; - child = gtk_widget_get_next_sibling (child)) - { - if (!GTK_IS_LIST_BOX_ROW (child)) - continue; + if (n_items == 0) + page = GTK_WIDGET (self->empty_results_page); + else if (self->search_terms) + page = GTK_WIDGET (self->search_result_page); + else + page = GTK_WIDGET (self->section_list_page); - section_data = g_object_get_data (G_OBJECT (child), "data"); - if (section_data->modified_count > 0) - { - modified_text = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, - "%d modified", - "%d modified", - section_data->modified_count), - section_data->modified_count); - gtk_label_set_text (section_data->modified_label, modified_text); - } - else - { - gtk_label_set_text (section_data->modified_label, ""); - } - } + gtk_stack_set_visible_child (self->section_stack, page); } +/* All items have loaded, now sort the groups and add them to the page */ static void -show_section_list (CcKeyboardShortcutDialog *self) +shortcuts_loaded_cb (CcKeyboardShortcutDialog *self) { - if (self->section_row != NULL) - gtk_stack_set_transition_type (self->stack, GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT); - else - gtk_stack_set_transition_type (self->stack, GTK_STACK_TRANSITION_TYPE_NONE); - self->section_row = NULL; + g_autoptr(GPtrArray) filtered_items = NULL; + g_autoptr(GPtrArray) widgets = NULL; + GListStore *filtered_lists; + GListStore *custom_store; + guint n_items; - gtk_stack_set_visible_child (self->stack, self->section_box); - gtk_window_set_title (GTK_WINDOW (self), _("Keyboard Shortcuts")); - gtk_editable_set_text (GTK_EDITABLE (self->search_entry), ""); - gtk_stack_set_visible_child (self->header_stack, self->reset_all_button); - gtk_widget_set_visible (GTK_WIDGET (self->search_entry), TRUE); + /* Ensure that custom shorcuts section exists */ + custom_store = keyboard_shortcut_get_section_store (self, "custom", "Custom Shortcuts"); + n_items = g_list_model_get_n_items (G_LIST_MODEL (self->sections)); + widgets = g_ptr_array_new (); + filtered_items = g_ptr_array_new (); + filtered_lists = g_list_store_new (G_TYPE_LIST_MODEL); - update_modified_counts (self); -} + g_signal_connect_object (custom_store, "items-changed", + G_CALLBACK (shortuct_custom_items_changed), + self, G_CONNECT_SWAPPED); -static void -show_shortcut_list (CcKeyboardShortcutDialog *self) -{ - SectionRowData *section_data; - gchar *title; - gboolean is_custom_shortcuts = FALSE; + g_list_store_sort (self->sections, compare_sections_title, NULL); - title = _("Keyboard Shortcuts"); - gtk_stack_set_transition_type (self->stack, GTK_STACK_TRANSITION_TYPE_NONE); - if (self->section_row != NULL) + for (guint i = 0; i < n_items; i++) { - section_data = g_object_get_data (G_OBJECT (self->section_row), "data"); - title = _(section_data->section_title); - is_custom_shortcuts = (strcmp (section_data->section_id, "custom") == 0); - gtk_stack_set_transition_type (self->stack, GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT); + g_autoptr(GObject) item = NULL; + CcKeyboardShortcutGroup *group; + GListModel *model; + GtkWidget *page; + + item = g_list_model_get_item (G_LIST_MODEL (self->sections), i); + group = g_object_get_data (item, "search-group"); + g_ptr_array_add (widgets, group); + + model = cc_keyboard_shortcut_group_get_model (group); + g_ptr_array_add (filtered_items, model); + + /* Populate shortcut section page */ + group = g_object_get_data (item, "group"); + page = adw_preferences_page_new (); + g_object_set_data (item, "page", page); + adw_preferences_page_add (ADW_PREFERENCES_PAGE (page), ADW_PREFERENCES_GROUP (group)); + gtk_stack_add_child (self->shortcut_list_stack, page); } - gtk_list_box_invalidate_filter (self->shortcut_listbox); - if (is_custom_shortcuts && (self->custom_shortcut_count == 0)) - gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->empty_custom_shortcuts_placeholder)); - else - gtk_stack_set_visible_child (self->stack, self->shortcut_box); + /* Populate search results page */ + for (guint i = 0; i < widgets->len; i++) + adw_preferences_page_add (self->search_result_page, widgets->pdata[i]); - gtk_window_set_title (GTK_WINDOW (self), title); - set_custom_shortcut_placeholder_visibility (self); - gtk_stack_set_visible_child (self->header_stack, self->back_button); - gtk_widget_set_visible (GTK_WIDGET (self->search_entry), self->section_row == NULL); + /* Keep track of search results so as to update empty state */ + g_list_store_splice (filtered_lists, 0, 0, filtered_items->pdata, filtered_items->len); + self->filtered_shortcuts = gtk_flatten_list_model_new (G_LIST_MODEL (filtered_lists)); + g_signal_connect_object (self->filtered_shortcuts, "items-changed", + G_CALLBACK (shortcut_search_result_changed_cb), + self, G_CONNECT_SWAPPED); } -static void -add_custom_shortcut_clicked_cb (CcKeyboardShortcutDialog *self) +static GtkWidget * +shortcut_dialog_row_new (gpointer item, + gpointer user_data) { - CcKeyboardShortcutEditor *editor; + GtkWidget *row, *group; + const char *title; - editor = CC_KEYBOARD_SHORTCUT_EDITOR (self->shortcut_editor); + group = g_object_get_data (item, "search-group"); + title = g_object_get_data (item, "title"); + row = g_object_new (CC_TYPE_LIST_ROW, NULL); - cc_keyboard_shortcut_editor_set_mode (editor, CC_SHORTCUT_EDITOR_CREATE); - cc_keyboard_shortcut_editor_set_item (editor, NULL); + g_object_set_data (G_OBJECT (row), "section", item); + cc_list_row_set_show_arrow (CC_LIST_ROW (row), TRUE); + gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), TRUE); + adw_preferences_row_set_title (ADW_PREFERENCES_ROW (row), _(title)); - gtk_widget_show (self->shortcut_editor); -} + g_object_bind_property (group, "modified-text", + row, "secondary-label", + G_BINDING_SYNC_CREATE); -static void -section_row_activated (GtkWidget *button, - GtkListBoxRow *row, - CcKeyboardShortcutDialog *self) -{ - self->section_row = row; - show_shortcut_list (self); + return row; } static void -shortcut_row_activated (GtkWidget *button, - GtkListBoxRow *row, - CcKeyboardShortcutDialog *self) +add_custom_shortcut_clicked_cb (CcKeyboardShortcutDialog *self) { CcKeyboardShortcutEditor *editor; - if (row == self->custom_shortcut_add_row) - { - add_custom_shortcut_clicked_cb (self); - return; - } - editor = CC_KEYBOARD_SHORTCUT_EDITOR (self->shortcut_editor); - ShortcutRowData *data = g_object_get_data (G_OBJECT (row), "data"); - - cc_keyboard_shortcut_editor_set_mode (editor, CC_SHORTCUT_EDITOR_EDIT); - cc_keyboard_shortcut_editor_set_item (editor, data->item); + cc_keyboard_shortcut_editor_set_mode (editor, CC_SHORTCUT_EDITOR_CREATE); + cc_keyboard_shortcut_editor_set_item (editor, NULL); gtk_widget_show (self->shortcut_editor); } @@ -402,27 +332,11 @@ shortcut_row_activated (GtkWidget static void back_button_clicked_cb (CcKeyboardShortcutDialog *self) { - show_section_list (self); -} - -static void -reset_shortcut (CcKeyboardShortcutDialog *self, - GtkWidget *row) -{ - ShortcutRowData *data; - - if (row == GTK_WIDGET (self->custom_shortcut_add_row)) - return; - - data = g_object_get_data (G_OBJECT (row), "data"); - - /* Don't reset custom shortcuts */ - if (cc_keyboard_item_get_item_type (data->item) == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH) - return; + gtk_editable_set_text (GTK_EDITABLE (self->search_entry), ""); + gtk_widget_show (GTK_WIDGET (self->search_entry)); - /* cc_keyboard_manager_reset_shortcut() already resets conflicting shortcuts, - * so no other check is needed here. */ - cc_keyboard_manager_reset_shortcut (self->manager, data->item); + self->visible_section = NULL; + adw_leaflet_navigate (self->main_leaflet, ADW_NAVIGATION_DIRECTION_BACK); } static void @@ -430,25 +344,35 @@ on_reset_all_dialog_response_cb (GtkDial gint response, CcKeyboardShortcutDialog *self) { + guint n_items, j_items; + + if (response != GTK_RESPONSE_ACCEPT) + return; - if (response == GTK_RESPONSE_ACCEPT) + n_items = g_list_model_get_n_items (G_LIST_MODEL (self->sections)); + + for (guint i = 0; i < n_items; i++) { - GtkWidget *child; + g_autoptr(GListModel) section = NULL; + + section = g_list_model_get_item (G_LIST_MODEL (self->sections), i); + j_items = g_list_model_get_n_items (section); - for (child = gtk_widget_get_first_child (GTK_WIDGET (self->shortcut_listbox)); - child; - child = gtk_widget_get_next_sibling (child)) + for (guint j = 0; j < j_items; j++) { - if (!GTK_IS_LIST_BOX_ROW (child)) - continue; - if (GTK_LIST_BOX_ROW (child) == self->custom_shortcut_add_row) - continue; - reset_shortcut (self, child); + g_autoptr(CcKeyboardItem) item = NULL; + + item = g_list_model_get_item (section, j); + + /* Don't reset custom shortcuts */ + if (cc_keyboard_item_get_item_type (item) == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH) + return; + + /* cc_keyboard_manager_reset_shortcut() already resets conflicting shortcuts, + * so no other check is needed here. */ + cc_keyboard_manager_reset_shortcut (self->manager, item); } } - - gtk_window_destroy (GTK_WINDOW (dialog)); - update_modified_counts (self); } static void @@ -483,284 +407,95 @@ reset_all_clicked_cb (CcKeyboardShortcut } static void -search_entry_cb (CcKeyboardShortcutDialog *self) +shortcut_dialog_visible_child_changed_cb (CcKeyboardShortcutDialog *self) { - gboolean is_shortcut = is_matched_shortcut_present (self->shortcut_listbox, self); - const gchar *search_text = gtk_editable_get_text (GTK_EDITABLE (self->search_entry)); - - if (!is_shortcut) - gtk_stack_set_visible_child (self->stack, self->empty_search_placeholder); - else if (g_utf8_strlen (search_text, -1) == 0 && self->section_row == NULL) - show_section_list (self); - else if (gtk_stack_get_visible_child (self->stack) != self->shortcut_box) - show_shortcut_list (self); - else - gtk_list_box_invalidate_filter (self->shortcut_listbox); -} - -static gboolean -strv_contains_prefix_or_match (gchar **strv, - const gchar *prefix) -{ - const struct { - const gchar *key; - const gchar *untranslated; - const gchar *synonym; - } key_aliases[] = - { - { "ctrl", "Ctrl", "ctrl" }, - { "win", "Super", "super" }, - { "option", NULL, "alt" }, - { "command", NULL, "super" }, - { "apple", NULL, "super" }, - }; - - for (guint i = 0; strv[i]; i++) - { - if (g_str_has_prefix (strv[i], prefix)) - return TRUE; - } - - for (guint i = 0; i < G_N_ELEMENTS (key_aliases); i++) - { - g_autofree gchar *alias = NULL; - const gchar *synonym; - - if (!g_str_has_prefix (key_aliases[i].key, prefix)) - continue; - - if (key_aliases[i].untranslated) - { - const gchar *translated_label; - - /* Steal GTK+'s translation */ - translated_label = g_dpgettext2 ("gtk40", "keyboard label", key_aliases[i].untranslated); - alias = g_utf8_strdown (translated_label, -1); - } - - synonym = key_aliases[i].synonym; + gpointer visible_child; + const char *title; + gboolean show_back; - /* If a translation or synonym of the key is in the accelerator, and we typed - * the key, also consider that a prefix */ - if ((alias && g_strv_contains ((const gchar * const *) strv, alias)) || - (synonym && g_strv_contains ((const gchar * const *) strv, synonym))) - { - return TRUE; - } - } - - return FALSE; -} - -static gboolean -search_match_shortcut (CcKeyboardItem *item, - const gchar *search) -{ - g_auto(GStrv) shortcut_tokens = NULL, search_tokens = NULL; - g_autofree gchar *normalized_accel = NULL; - g_autofree gchar *accel = NULL; - gboolean match; - GList *key_combos; - CcKeyCombo *combo; + visible_child = adw_leaflet_get_visible_child (self->main_leaflet); + show_back = visible_child != self->main_box; - key_combos = cc_keyboard_item_get_key_combos (item); - for (GList *l = key_combos; l != NULL; l = l->next) - { - combo = l->data; - - if (is_empty_binding (combo)) - continue; - - match = TRUE; - accel = convert_keysym_state_to_string (combo); - normalized_accel = cc_util_normalize_casefold_and_unaccent (accel); - - shortcut_tokens = g_strsplit_set (normalized_accel, SHORTCUT_DELIMITERS, -1); - search_tokens = g_strsplit_set (search, SHORTCUT_DELIMITERS, -1); - - for (guint i = 0; search_tokens[i] != NULL; i++) - { - const gchar *token; - - /* Strip leading and trailing whitespaces */ - token = g_strstrip (search_tokens[i]); - - if (g_utf8_strlen (token, -1) == 0) - continue; - - match = match && strv_contains_prefix_or_match (shortcut_tokens, token); - - if (!match) - break; - } - - if (match) - return TRUE; - } - - return FALSE; -} - -static gint -section_sort_function (GtkListBoxRow *a, - GtkListBoxRow *b, - gpointer user_data) -{ - SectionRowData *a_data, *b_data; + gtk_widget_set_visible (GTK_WIDGET (self->back_button), show_back); - a_data = g_object_get_data (G_OBJECT (a), "data"); - b_data = g_object_get_data (G_OBJECT (b), "data"); - - /* Put custom shortcuts below everything else */ - if (g_strcmp0 (a_data->section_id, "custom") == 0) - return 1; + if (self->visible_section) + title = g_object_get_data (G_OBJECT (self->visible_section), "title"); + else + title = "Keyboard Shortcuts"; - return g_strcmp0 (a_data->section_title, b_data->section_title); + gtk_window_set_title (GTK_WINDOW (self), _(title)); } -static gint -shortcut_sort_function (GtkListBoxRow *a, - GtkListBoxRow *b, - gpointer user_data) +static void +shortcut_search_entry_changed_cb (CcKeyboardShortcutDialog *self) { - CcKeyboardShortcutDialog *self = user_data; - ShortcutRowData *a_data, *b_data; - gint retval; + g_autofree char *search = NULL; + const char *search_text; + guint n_items; - if (a == self->custom_shortcut_add_row) - return 1; - else if (b == self->custom_shortcut_add_row) - return -1; + g_assert (CC_IS_KEYBOARD_SHORTCUT_DIALOG (self)); - a_data = g_object_get_data (G_OBJECT (a), "data"); - b_data = g_object_get_data (G_OBJECT (b), "data"); + n_items = g_list_model_get_n_items (G_LIST_MODEL (self->sections)); + search_text = gtk_editable_get_text (GTK_EDITABLE (self->search_entry)); + search = cc_util_normalize_casefold_and_unaccent (search_text); - retval = g_strcmp0 (a_data->section_title, b_data->section_title); + g_clear_pointer (&self->search_terms, g_strfreev); + if (search && *search && *search != ' ') + self->search_terms = g_strsplit (search, " ", -1); - if (retval != 0) - return retval; + /* "Reset all..." button should be sensitive only if the search is not active */ + gtk_widget_set_sensitive (GTK_WIDGET (self->reset_all_button), !self->search_terms); - return g_strcmp0 (cc_keyboard_item_get_description (a_data->item), cc_keyboard_item_get_description (b_data->item)); -} - -static gboolean -shortcut_filter_function (GtkListBoxRow *row, - gpointer userdata) -{ - CcKeyboardShortcutDialog *self = userdata; - SectionRowData *section_data; - ShortcutRowData *data; - CcKeyboardItem *item; - gboolean retval; - g_autofree gchar *search = NULL; - g_autofree gchar *name = NULL; - g_auto(GStrv) terms = NULL; - gboolean is_custom_shortcuts = FALSE; - const gchar *search_text; - - if (self->section_row != NULL) - { - section_data = g_object_get_data (G_OBJECT (self->section_row), "data"); - is_custom_shortcuts = (strcmp (section_data->section_id, "custom") == 0); - - data = g_object_get_data (G_OBJECT (row), "data"); - if (data && strcmp (data->section_id, section_data->section_id) != 0) - return FALSE; - } + /* If we already showing a section, filter that group only */ + if (self->visible_section) + { + CcKeyboardShortcutGroup *group; + GtkWidget *child; + gboolean is_empty; - if (row == self->custom_shortcut_add_row) - return is_custom_shortcuts; + group = g_object_get_data (G_OBJECT (self->visible_section), "group"); + child = g_object_get_data (G_OBJECT (self->visible_section), "page"); + cc_keyboard_shortcut_group_set_filter (group, self->search_terms); + g_object_get (group, "empty", &is_empty, NULL); - search_text = gtk_editable_get_text (GTK_EDITABLE (self->search_entry)); - if (g_utf8_strlen (search_text, -1) == 0) - return TRUE; + if (is_empty) + child = GTK_WIDGET (self->empty_subpage_results_page); - data = g_object_get_data (G_OBJECT (row), "data"); - item = data->item; - name = cc_util_normalize_casefold_and_unaccent (cc_keyboard_item_get_description (item)); - search = cc_util_normalize_casefold_and_unaccent (search_text); - terms = g_strsplit (search, " ", -1); + gtk_stack_set_visible_child (self->shortcut_list_stack, child); + return; + } - for (guint i = 0; terms && terms[i]; i++) + for (guint i = 0; i < n_items; i++) { - retval = strstr (name, terms[i]) || search_match_shortcut (item, terms[i]); - if (!retval) - break; - } + g_autoptr(GObject) item = NULL; + CcKeyboardShortcutGroup *group; - return retval; -} + item = g_list_model_get_item (G_LIST_MODEL (self->sections), i); + group = g_object_get_data (item, "search-group"); -static gboolean -is_matched_shortcut_present (GtkListBox* listbox, - gpointer user_data) -{ - for (gint i = 0; ; i++) - { - GtkListBoxRow *current = gtk_list_box_get_row_at_index (listbox, i); - if (!current) - return FALSE; - if (shortcut_filter_function (current, user_data)) - return TRUE; + cc_keyboard_shortcut_group_set_filter (group, self->search_terms); } + + shortcut_search_result_changed_cb (self); } static void -shortcut_header_function (GtkListBoxRow *row, - GtkListBoxRow *before, - gpointer user_data) +shortcut_section_row_activated_cb (CcKeyboardShortcutDialog *self, + GtkListBoxRow *row) { - CcKeyboardShortcutDialog *self = user_data; - gboolean add_header; - ShortcutRowData *data, *before_data; + GListStore *section; + GtkWidget *page; - data = g_object_get_data (G_OBJECT (row), "data"); + g_assert (CC_IS_KEYBOARD_SHORTCUT_DIALOG (self)); + g_assert (GTK_IS_LIST_BOX_ROW (row)); - if (row == self->custom_shortcut_add_row) - { + section = g_object_get_data (G_OBJECT (row), "section"); + self->visible_section = section; - add_header = FALSE; - } - else if (before && before != self->custom_shortcut_add_row) - { - before_data = g_object_get_data (G_OBJECT (before), "data"); - add_header = g_strcmp0 (before_data->section_id, data->section_id) != 0; - } - else - { - add_header = TRUE; - } - - if (self->section_row != NULL) - add_header = FALSE; - - if (add_header) - { - GtkWidget *box, *label, *separator; - g_autofree gchar *markup = NULL; - - box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - if (!before) - gtk_widget_set_margin_top (box, 6); - - markup = g_strdup_printf ("%s", _(data->section_title)); - label = g_object_new (GTK_TYPE_LABEL, - "label", markup, - "use-markup", TRUE, - "xalign", 0.0, - "margin-start", 6, - NULL); - gtk_box_append (GTK_BOX (box), label); - - separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_append (GTK_BOX (box), separator); - - gtk_list_box_row_set_header (row, box); - } - else - { - gtk_list_box_row_set_header (row, NULL); - } + page = g_object_get_data (G_OBJECT (section), "page"); + gtk_stack_set_visible_child (self->shortcut_list_stack, page); + adw_leaflet_set_visible_child (self->main_leaflet, GTK_WIDGET (self->shortcut_list_stack)); + shortuct_custom_items_changed (self); } static void @@ -780,8 +515,13 @@ cc_keyboard_shortcut_dialog_finalize (GO CcKeyboardShortcutDialog *self = CC_KEYBOARD_SHORTCUT_DIALOG (object); g_clear_object (&self->manager); - g_clear_pointer (&self->sections, g_hash_table_destroy); + g_clear_object (&self->sections); + g_clear_pointer (&self->search_terms, g_strfreev); + g_clear_object (&self->sections); + g_clear_object (&self->filtered_shortcuts); g_clear_pointer ((GtkWindow**)&self->shortcut_editor, gtk_window_destroy); + + G_OBJECT_CLASS (cc_keyboard_shortcut_dialog_parent_class)->finalize (object); } static void @@ -793,85 +533,88 @@ cc_keyboard_shortcut_dialog_class_init ( object_class->constructed = cc_keyboard_shortcut_dialog_constructed; object_class->finalize = cc_keyboard_shortcut_dialog_finalize; - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/keyboard/cc-keyboard-shortcut-dialog.ui"); + gtk_widget_class_set_template_from_resource (widget_class, + "/org/gnome/control-center/" + "keyboard/cc-keyboard-shortcut-dialog.ui"); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, accelerator_sizegroup); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, header_bar); gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, back_button); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, custom_shortcut_add_row); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, empty_custom_shortcuts_placeholder); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, empty_search_placeholder); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, headerbar); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, header_stack); gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, reset_all_button); gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, search_entry); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, section_listbox); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, section_box); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, shortcut_listbox); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, shortcut_box); - gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, stack); + + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, main_leaflet); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, main_box); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, section_stack); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, section_list_page); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, section_list_box); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, search_result_page); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, empty_results_page); + + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, shortcut_list_stack); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, empty_subpage_results_page); + + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, empty_custom_shortcut_page); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutDialog, accelerator_size_group); gtk_widget_class_bind_template_callback (widget_class, add_custom_shortcut_clicked_cb); gtk_widget_class_bind_template_callback (widget_class, back_button_clicked_cb); gtk_widget_class_bind_template_callback (widget_class, reset_all_clicked_cb); - gtk_widget_class_bind_template_callback (widget_class, search_entry_cb); - gtk_widget_class_bind_template_callback (widget_class, section_row_activated); - gtk_widget_class_bind_template_callback (widget_class, shortcut_row_activated); + gtk_widget_class_bind_template_callback (widget_class, shortcut_dialog_visible_child_changed_cb); + gtk_widget_class_bind_template_callback (widget_class, shortcut_search_entry_changed_cb); + gtk_widget_class_bind_template_callback (widget_class, shortcut_section_row_activated_cb); } static void cc_keyboard_shortcut_dialog_init (CcKeyboardShortcutDialog *self) { + g_autoptr(GtkCssProvider) provider = NULL; + GdkDisplay *display; + gtk_widget_init_template (GTK_WIDGET (self)); + provider = gtk_css_provider_new (); + gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider), + ".shortcut-list undershoot.top {" + " box-shadow: inset 0 1px @borders;" + "}", -1); + display = gdk_display_get_default (); + gtk_style_context_add_provider_for_display (display, + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + gtk_search_entry_set_key_capture_widget (self->search_entry, GTK_WIDGET (self)); + shortcut_dialog_visible_child_changed_cb (self); self->manager = cc_keyboard_manager_new (); self->shortcut_editor = cc_keyboard_shortcut_editor_new (self->manager); + shortcut_dialog_visible_child_changed_cb (self); - self->sections = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - self->section_row = NULL; + self->sections = g_list_store_new (G_TYPE_LIST_STORE); g_signal_connect_object (self->manager, "shortcut-added", - G_CALLBACK (add_item), - self, - G_CONNECT_SWAPPED); - + G_CALLBACK (shortcut_added_cb), + self, G_CONNECT_SWAPPED); g_signal_connect_object (self->manager, "shortcut-removed", - G_CALLBACK (remove_item), - self, - G_CONNECT_SWAPPED); + G_CALLBACK (shortcut_removed_cb), + self, G_CONNECT_SWAPPED); + g_signal_connect_object (self->manager, + "shortcuts-loaded", + G_CALLBACK (shortcuts_loaded_cb), + self, G_CONNECT_SWAPPED); - add_section(self, "custom", "Custom Shortcuts"); cc_keyboard_manager_load_shortcuts (self->manager); - gtk_list_box_set_sort_func (GTK_LIST_BOX (self->section_listbox), - section_sort_function, - self, - NULL); - - gtk_list_box_set_filter_func (self->shortcut_listbox, - shortcut_filter_function, - self, - NULL); - gtk_list_box_set_header_func (self->shortcut_listbox, - shortcut_header_function, - self, - NULL); - gtk_list_box_set_sort_func (GTK_LIST_BOX (self->shortcut_listbox), - shortcut_sort_function, - self, - NULL); - - show_section_list (self); + gtk_list_box_bind_model (self->section_list_box, + G_LIST_MODEL (self->sections), + shortcut_dialog_row_new, + self, NULL); } GtkWidget* cc_keyboard_shortcut_dialog_new (void) { - return g_object_new (CC_TYPE_KEYBOARD_SHORTCUT_DIALOG, - "use-header-bar", 1, - NULL); + return g_object_new (CC_TYPE_KEYBOARD_SHORTCUT_DIALOG, NULL); } diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-shortcut-dialog.h 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-shortcut-dialog.h --- 1:43.2-2/panels/keyboard/cc-keyboard-shortcut-dialog.h 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-shortcut-dialog.h 2023-01-09 20:06:57.000000000 +0000 @@ -22,14 +22,14 @@ #pragma once -#include +#include G_BEGIN_DECLS #define CC_TYPE_KEYBOARD_SHORTCUT_DIALOG (cc_keyboard_shortcut_dialog_get_type ()) -G_DECLARE_FINAL_TYPE (CcKeyboardShortcutDialog, cc_keyboard_shortcut_dialog, CC, KEYBOARD_SHORTCUT_DIALOG, GtkDialog) +G_DECLARE_FINAL_TYPE (CcKeyboardShortcutDialog, cc_keyboard_shortcut_dialog, CC, KEYBOARD_SHORTCUT_DIALOG, AdwWindow) GtkWidget* cc_keyboard_shortcut_dialog_new (void); -G_END_DECLS \ No newline at end of file +G_END_DECLS diff -pruN 1:43.2-2/panels/keyboard/cc-keyboard-shortcut-dialog.ui 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-shortcut-dialog.ui --- 1:43.2-2/panels/keyboard/cc-keyboard-shortcut-dialog.ui 2022-12-23 11:11:35.000000000 +0000 +++ 1:44~alpha-0ubuntu1/panels/keyboard/cc-keyboard-shortcut-dialog.ui 2023-01-09 20:06:57.000000000 +0000 @@ -1,227 +1,166 @@ - -