aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-09-16 12:46:09 +0200
committerBart Ribbers <bribbers@disroot.org>2021-10-14 13:45:35 +0200
commit418838d3954e158bdc7fd6b326f123aa254c9733 (patch)
treeda25d6842e9dde7a4482a4f6bc9829a1a31bb263
parente6e05919c3569995f5b6e3bb81a13c164599eb60 (diff)
downloadaports-418838d3954e158bdc7fd6b326f123aa254c9733.tar.gz
aports-418838d3954e158bdc7fd6b326f123aa254c9733.tar.bz2
aports-418838d3954e158bdc7fd6b326f123aa254c9733.tar.xz
community/plasma: upgrade to 5.23.0
-rw-r--r--community/bluedevil/APKBUILD4
-rw-r--r--community/breeze-grub/APKBUILD4
-rw-r--r--community/breeze-gtk/APKBUILD4
-rw-r--r--community/breeze-plymouth/APKBUILD6
-rw-r--r--community/breeze/APKBUILD4
-rw-r--r--community/discover/0002-Make-building-updates-KCM-optional.patch30
-rw-r--r--community/discover/APKBUILD6
-rw-r--r--community/drkonqi/APKBUILD4
-rw-r--r--community/kactivitymanagerd/APKBUILD4
-rw-r--r--community/kde-cli-tools/APKBUILD4
-rw-r--r--community/kde-gtk-config/APKBUILD4
-rw-r--r--community/kdecoration/APKBUILD4
-rw-r--r--community/kdeplasma-addons/APKBUILD4
-rw-r--r--community/kgamma5/APKBUILD4
-rw-r--r--community/khotkeys/APKBUILD4
-rw-r--r--community/kinfocenter/APKBUILD4
-rw-r--r--community/kmenuedit/APKBUILD4
-rw-r--r--community/kscreen/APKBUILD4
-rw-r--r--community/kscreenlocker/APKBUILD4
-rw-r--r--community/ksshaskpass/APKBUILD4
-rw-r--r--community/kwallet-pam/APKBUILD4
-rw-r--r--community/kwayland-integration/APKBUILD5
-rw-r--r--community/kwayland-server/APKBUILD4
-rw-r--r--community/kwin/APKBUILD4
-rw-r--r--community/kwrited/APKBUILD4
-rw-r--r--community/layer-shell-qt/APKBUILD4
-rw-r--r--community/libkscreen/APKBUILD5
-rw-r--r--community/libksysguard/APKBUILD6
-rw-r--r--community/milou/APKBUILD4
-rw-r--r--community/oxygen/APKBUILD4
-rw-r--r--community/plasma-browser-integration/APKBUILD4
-rw-r--r--community/plasma-desktop/APKBUILD4
-rw-r--r--community/plasma-disks/APKBUILD4
-rw-r--r--community/plasma-firewall/APKBUILD4
-rw-r--r--community/plasma-integration/APKBUILD4
-rw-r--r--community/plasma-nano/APKBUILD4
-rw-r--r--community/plasma-nm/APKBUILD4
-rw-r--r--community/plasma-pa/APKBUILD4
-rw-r--r--community/plasma-phone-components/0001-Port-to-the-new-org.kde.KWin.ScreenShots2-interface.patch449
-rw-r--r--community/plasma-phone-components/APKBUILD12
-rw-r--r--community/plasma-sdk/APKBUILD4
-rw-r--r--community/plasma-systemmonitor/APKBUILD4
-rw-r--r--community/plasma-thunderbolt/APKBUILD4
-rw-r--r--community/plasma-vault/APKBUILD4
-rw-r--r--community/plasma-workspace-wallpapers/APKBUILD4
-rw-r--r--community/plasma-workspace/0001-Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch35
-rw-r--r--community/plasma-workspace/APKBUILD13
-rw-r--r--community/plasma/APKBUILD2
-rw-r--r--community/plymouth-kcm/APKBUILD4
-rw-r--r--community/polkit-kde-agent-1/APKBUILD4
-rw-r--r--community/powerdevil/APKBUILD4
-rw-r--r--community/qqc2-breeze-style/0001-Remove-x1.5-mobile-icon-sizing.patch42
-rw-r--r--community/qqc2-breeze-style/0002-Use-kcoreaddons-macro-for-kirigami-plugin.patch45
-rw-r--r--community/qqc2-breeze-style/0003-Always-build-kirigami-plugin.patch37
-rw-r--r--community/qqc2-breeze-style/0004-Do-not-create-an-extra-KIconLoader-just-for-custom-palettes.patch57
-rw-r--r--community/qqc2-breeze-style/0005-Port-to-the-new-C++-units-plugin-in-Kirigami.patch3786
-rw-r--r--community/qqc2-breeze-style/APKBUILD19
-rw-r--r--community/sddm-kcm/APKBUILD4
-rw-r--r--community/systemsettings/APKBUILD4
-rw-r--r--community/xdg-desktop-portal-kde/APKBUILD4
60 files changed, 115 insertions, 4612 deletions
diff --git a/community/bluedevil/APKBUILD b/community/bluedevil/APKBUILD
index bffa8ab8a4..1b0c0d3d74 100644
--- a/community/bluedevil/APKBUILD
+++ b/community/bluedevil/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=bluedevil
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Integrate the Bluetooth technology within KDE workspace and applications"
# armhf blocked by qt5-qtdeclarative
@@ -58,5 +58,5 @@ package() {
}
sha512sums="
-bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab bluedevil-5.22.5.tar.xz
+24bbc722c50762a57e56804d956e912e8f0eed39322b55ef828709f68076c26373af7284e276927c135d11d9cdb5402fdf26feb2308568d7d2c0d3157f3d3026 bluedevil-5.23.0.tar.xz
"
diff --git a/community/breeze-grub/APKBUILD b/community/breeze-grub/APKBUILD
index 9177e1343f..9aecb2188e 100644
--- a/community/breeze-grub/APKBUILD
+++ b/community/breeze-grub/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=breeze-grub
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Breeze theme for GRUB"
arch="noarch !s390x !armhf" # armhf blocked by extra-cmake-modules
@@ -30,5 +30,5 @@ package() {
cp -r breeze "$pkgdir"/usr/share/grub/themes
}
sha512sums="
-09071d7256c0ce21c13e13803aadcf044af2ea54f69335c3d7cb773d2e45d71932de9e3d2f8e662b6d5ffead9a216e8c6f1a6c298fb99893d2a1ae27eccc74d2 breeze-grub-5.22.5.tar.xz
+a207594fd0e85e5d3b29053a4cfc702fb172b513e13bfa997cf9aeb0c9be35abbddfad5ac6367a21b88c2264078cc298af77d8169b05359a267de0a5bdbfa3c3 breeze-grub-5.23.0.tar.xz
"
diff --git a/community/breeze-gtk/APKBUILD b/community/breeze-gtk/APKBUILD
index 64c28d87eb..e2551e39ca 100644
--- a/community/breeze-gtk/APKBUILD
+++ b/community/breeze-gtk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=breeze-gtk
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="A GTK Theme Built to Match KDE's Breeze"
# armhf blocked by extra-cmake-modules
@@ -41,5 +41,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-91ae3512ce71f04a7694e439b763b99faf10ca43af1b68790ae6822b481e43a769254add15fab01d9b45a5306a50ea5d59493638df9d6ca526dd8c2d54126c9d breeze-gtk-5.22.5.tar.xz
+2b14f570615ec48458b7d2acf997d2aa94a29128135162ed89e288b72f24f28be9245b10ae5975c9c223e203ced681c681cdaf4c364c0566492f1f68165f025f breeze-gtk-5.23.0.tar.xz
"
diff --git a/community/breeze-plymouth/APKBUILD b/community/breeze-plymouth/APKBUILD
index 87374fbdb3..04622836fc 100644
--- a/community/breeze-plymouth/APKBUILD
+++ b/community/breeze-plymouth/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=breeze-plymouth
-pkgver=5.22.5
-pkgrel=1
+pkgver=5.23.0
+pkgrel=0
arch="all !armhf" # armhf blocked by extra-cmake-modules
url="https://kde.org/"
pkgdesc="Breeze theme for Plymouth"
@@ -33,5 +33,5 @@ package() {
}
sha512sums="
-be27a707952da3573562a04aa9fac4f31f7e125ad068aab9a216af51df7b53eea830fc3998113f9a9cebb7d9f915e00391c9012791e51d15482048d7eff3e016 breeze-plymouth-5.22.5.tar.xz
+00e37619dacbe007de505708e6afa2cf879a2b01555c8afe90554f7cee92367673453b192b7f9adcb7ad593e20326915e98480962b317a6ccf2046a9c2cefcaa breeze-plymouth-5.23.0.tar.xz
"
diff --git a/community/breeze/APKBUILD b/community/breeze/APKBUILD
index 723ab2d151..c60e4a0363 100644
--- a/community/breeze/APKBUILD
+++ b/community/breeze/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=breeze
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Artwork, styles and assets for the Breeze visual style for the Plasma Desktop"
# armhf blocked by qt5-qtdeclarative
@@ -46,5 +46,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d breeze-5.22.5.tar.xz
+efc23e6610bc091c9cc38b34a8838624e119839ae8c061df987c98981edf6db0ffc4f47c0dd0c72d2b89c335cb9507a1d76c1c86c5749fd26d75043d92c67612 breeze-5.23.0.tar.xz
"
diff --git a/community/discover/0002-Make-building-updates-KCM-optional.patch b/community/discover/0002-Make-building-updates-KCM-optional.patch
deleted file mode 100644
index 20bcf64078..0000000000
--- a/community/discover/0002-Make-building-updates-KCM-optional.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 725ae1f2b9d4a8995881faafb323c541ff6d3c1b Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Thu, 1 Jul 2021 22:24:40 +0200
-Subject: [PATCH] Make building updates KCM optional
-
-Some distros (such as Arch) don't support offline updates or automatic updates, so the options in the KCM are misleading and can cause unexpected behavior.
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa27fc77..26387b2f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,11 @@ add_subdirectory(libdiscover)
- add_subdirectory(discover)
- add_subdirectory(exporter)
- add_subdirectory(update)
--add_subdirectory(kcm)
-+
-+option(WITH_KCM "Build and install the updates KCM" ON)
-+if(WITH_KCM)
-+ add_subdirectory(kcm)
-+endif()
-
- option(WITH_NOTIFIER "Build and install the notifier plasmoid" ON)
- if(WITH_NOTIFIER)
---
-GitLab
-
diff --git a/community/discover/APKBUILD b/community/discover/APKBUILD
index 12b062fdfb..c56cfe6fd5 100644
--- a/community/discover/APKBUILD
+++ b/community/discover/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=discover
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
# armhf blocked by qt5-qtdeclarative
# s390x, mips64 and riscv64 blocked by polkit -> kio
@@ -48,7 +48,6 @@ esac
source="
https://download.kde.org/$_rel/plasma/$pkgver/discover-$pkgver.tar.xz
0001-Add-support-for-Alpine-Linux-apk-backend.patch
- 0002-Make-building-updates-KCM-optional.patch
alpine-appstream-data.json
alpine-linux-logo-icon.png
"
@@ -128,9 +127,8 @@ backend_fwupd() {
}
sha512sums="
-7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912 discover-5.22.5.tar.xz
+57d36fc8c3ff6f32a312cc5970c7e89ff98f3f41da70fe09934ca0bea1a6fbbd6651e0ed33c9500b9213c7ee46dd50dcb8f31483525596edf281765763c56db9 discover-5.23.0.tar.xz
40019b59c8ad5523ccf64313bf03efb354e8c81074733e62b6a778a3c0dbb699f5d6ba3ee8c950b484fee40bf21c82a5608aa2b0e30bad989fdcf557aa68b583 0001-Add-support-for-Alpine-Linux-apk-backend.patch
-f5ce169e35e0971f76bcf1232f9300a1ff9cfddff470778d9e499aab3f7ec851b2a9fc2583517a3e47538fee8a0443548802d31ca14ed556a90f5281500c8d09 0002-Make-building-updates-KCM-optional.patch
f9f73888f8e20b317987da55028bd578de854fb34293466d1bc5deb82e32dc164916f724411de64a42235ecda37205d3f1ba26621ed7ab710b94273acce34aa3 alpine-appstream-data.json
0766668630cb14f58c840ebdda8b76bd1dec98b4dd61469677d4ad6eb4966809a25dbec2a846502cad0391df5b6ca9d692bb857a6fa203b61a52e6ac044cfbf4 alpine-linux-logo-icon.png
"
diff --git a/community/drkonqi/APKBUILD b/community/drkonqi/APKBUILD
index 326ad1f69a..a3df5eb8fa 100644
--- a/community/drkonqi/APKBUILD
+++ b/community/drkonqi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=drkonqi
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="The KDE crash handler"
# armhf blocked by extra-cmake-modules
@@ -56,5 +56,5 @@ package() {
}
sha512sums="
-a37679bc7d365fe194ba80d1254631aba3cd5811c2a4b97c1327f7f5e91f2e095b83b326f1a4dd0a85976e98f7392ae78db03ee383cea10d37ab5a0a25a3cb48 drkonqi-5.22.5.tar.xz
+34a6a28c110ac624175fb97b49447616ab4f5e2b0c74a3f5285524945d5ebe444b8dd49c50c4553f82aa0bbdfc25276c0e03690f8240e6db05ceaab6a234401d drkonqi-5.23.0.tar.xz
"
diff --git a/community/kactivitymanagerd/APKBUILD b/community/kactivitymanagerd/APKBUILD
index 83ba4dea91..806962b0db 100644
--- a/community/kactivitymanagerd/APKBUILD
+++ b/community/kactivitymanagerd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kactivitymanagerd
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="System service to manage user's activities and track the usage patterns"
# armhf blocked by qt5-qtdeclarative
@@ -51,5 +51,5 @@ package() {
rm -r "$pkgdir"/usr/lib/systemd
}
sha512sums="
-00f5a071fbfb7dc4bd2dfea3c811f359a416310385a2d1e107ba8b7bce8449676c39ebd6cd02f2cc22776fde3f2d0ff9d6ff635bd0a3c408a0ee17e31bfb02b0 kactivitymanagerd-5.22.5.tar.xz
+2bf99af6f2b594edd415fd0729803917e00f0c43ac27934de0f30d57bf25cf6c7de85d161c359aaddbe60e63afd9dc1dbb1ddaee253554d146a7dce026197c75 kactivitymanagerd-5.23.0.tar.xz
"
diff --git a/community/kde-cli-tools/APKBUILD b/community/kde-cli-tools/APKBUILD
index 10e5a8dd50..c82c966c63 100644
--- a/community/kde-cli-tools/APKBUILD
+++ b/community/kde-cli-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kde-cli-tools
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Tools based on KDE Frameworks 5 to better interact with the system"
# armhf blocked by extra-cmake-modules
@@ -58,5 +58,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-bbaca46ea389148f994ceef0ef0c55623ff739b3119fe6eaf967b315d3086a4e06c6c44aa065d44bfeaaf6768355774fc7b9398ea9f0ce4ec5d9fe386bc41fb9 kde-cli-tools-5.22.5.tar.xz
+7463e306781127c6645beb91e78487bc178850d94816d9e63b9664b7b274d8c47600d412589637f469401779bc4d840c0d2cdc33f462c254c91215b331b4ef6d kde-cli-tools-5.23.0.tar.xz
"
diff --git a/community/kde-gtk-config/APKBUILD b/community/kde-gtk-config/APKBUILD
index c44a6075cb..bd9c1b1257 100644
--- a/community/kde-gtk-config/APKBUILD
+++ b/community/kde-gtk-config/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kde-gtk-config
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="GTK2 and GTK3 Configurator for KDE"
# armhf blocked by qt5-qtdeclarative
@@ -51,5 +51,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490 kde-gtk-config-5.22.5.tar.xz
+ccf390219a6338fb6dd56e5131e1fa40dc978ea321cdf65d24dc171c5f308f9707127605bfdf1ac43652c509456cea00458ef8c00e77bcd660c5aec0194ace62 kde-gtk-config-5.23.0.tar.xz
"
diff --git a/community/kdecoration/APKBUILD b/community/kdecoration/APKBUILD
index 67c7658d94..04b5226a5b 100644
--- a/community/kdecoration/APKBUILD
+++ b/community/kdecoration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kdecoration
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Plugin based library to create window decorations"
arch="all !armhf"
@@ -40,5 +40,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-cbb707cda299d8f2938c63a382e1ea65853754a130711ac4df16300d16b7d215a1d7150faabae04c32ac8e79218739cb9493fc481921b65a0c188ae66ebd7beb kdecoration-5.22.5.tar.xz
+9d5a182a36f4ebac996b7e9faf4cb15c6fff7971397a7a2784ac103bacda46f091334cb9bedc8c16a4687219fbf3191d5bf07a440154e97f445259498fb60478 kdecoration-5.23.0.tar.xz
"
diff --git a/community/kdeplasma-addons/APKBUILD b/community/kdeplasma-addons/APKBUILD
index ea582fe836..8aa28f0eeb 100644
--- a/community/kdeplasma-addons/APKBUILD
+++ b/community/kdeplasma-addons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kdeplasma-addons
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="All kind of addons to improve your Plasma experience"
# armhf blocked by qt5-qtdeclarative
@@ -63,5 +63,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803 kdeplasma-addons-5.22.5.tar.xz
+170deb1579581bdf560f8ec31a98aba77a0774b4aca0eac83ea000780c48679c84a58ba8c1026d10f7046b3a2231b12f93f82b58ef77ebc62faaa6b734a4b56e kdeplasma-addons-5.23.0.tar.xz
"
diff --git a/community/kgamma5/APKBUILD b/community/kgamma5/APKBUILD
index 801cbd47f2..3ea1fe3ff7 100644
--- a/community/kgamma5/APKBUILD
+++ b/community/kgamma5/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kgamma5
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Adjust your monitor's gamma settings"
# armhf blocked by extra-cmake-modules
@@ -43,5 +43,5 @@ package() {
}
sha512sums="
-c04e2c291cc0dd0c5edda07cc4b6c921ba1f297899cde95399e0d4039cea2a9c5bc2b2da319de227793e8a40bcabba496848f0559730a6105d215abfe8ee6069 kgamma5-5.22.5.tar.xz
+968189e9d323e487a06596cb4f23df4b53d789b25e11bafc5f7cb07641455c100a04b0981e6bb9335682ad53dcd1ac07eafdc6fc0f0615a2dfdcc0aff104c9f2 kgamma5-5.23.0.tar.xz
"
diff --git a/community/khotkeys/APKBUILD b/community/khotkeys/APKBUILD
index 6201024951..61a0678423 100644
--- a/community/khotkeys/APKBUILD
+++ b/community/khotkeys/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=khotkeys
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
# armhf blocked by extra-cmake-modules
# s390x, mips64 and riscv64 blocked by libksysguard
@@ -51,5 +51,5 @@ package() {
}
sha512sums="
-de66cb92986c025ba0fd2b70eab65dcf25057e1a4afcd3616b7063047d0e41f2d80b780ab6a2d564e22be7bd4f9532e0c37c62c5e54bb6d9587ea95c363402d6 khotkeys-5.22.5.tar.xz
+6381c1d5e5cb82133428df57c396cafe63f43408967d7bcd2db50e9eadf39a17d7bfd01219ce741ce15b338023b3b01fd25353f628941902331e790532c1c44c khotkeys-5.23.0.tar.xz
"
diff --git a/community/kinfocenter/APKBUILD b/community/kinfocenter/APKBUILD
index 323a142e5c..2ad34fdb20 100644
--- a/community/kinfocenter/APKBUILD
+++ b/community/kinfocenter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kinfocenter
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="A utility that provides information about a computer system"
# armhf blocked by extra-cmake-modules
@@ -60,5 +60,5 @@ package() {
}
sha512sums="
-7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560 kinfocenter-5.22.5.tar.xz
+034b4faacacd2bb34e1f65d7058dfdff224848d04cf5330ad3a55ee33fd6ac4bb15bcb984c789ee51579e81006ff1eb4c54f168de105246732c292b4596958c7 kinfocenter-5.23.0.tar.xz
"
diff --git a/community/kmenuedit/APKBUILD b/community/kmenuedit/APKBUILD
index fbc5ed0f5e..5a4394879f 100644
--- a/community/kmenuedit/APKBUILD
+++ b/community/kmenuedit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kmenuedit
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KDE menu editor"
# armhf blocked by qt5-qtdeclarative
@@ -49,5 +49,5 @@ package() {
}
sha512sums="
-f7516303c45e1f48a3b329ef3df23a33011ed5be57307811f8b9ef6d92c4cf82793bbb1fabd69db0ad8c2c7005f8c453391ae18dc27439fc3d4e1510e36b0049 kmenuedit-5.22.5.tar.xz
+2d3490f2f28fae2723d3045849d119d2356d386513ee19c0aa31b7c8fe872b23bd4aac38d255e8b7a72bca385dd74e8be8e89da3fb8fdc5054cb81dc5ad521af kmenuedit-5.23.0.tar.xz
"
diff --git a/community/kscreen/APKBUILD b/community/kscreen/APKBUILD
index cf46547785..cf2a39bda9 100644
--- a/community/kscreen/APKBUILD
+++ b/community/kscreen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kscreen
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KDE's screen management software"
# armhf blocked by qt5-qtdeclarative
@@ -55,5 +55,5 @@ package() {
}
sha512sums="
-c2be9546bdc00f83fe501a9cbd7b900b4201804edcda94d0632b8a09514821b52a57bf4c8db6111a6c1d54a6806a173d09d983b2e8d035cc98b57638a011920e kscreen-5.22.5.tar.xz
+db7eda9e3b4944a93d1d04664a8d6833886e29596ced4b1b8eb451b051e7387384eefbc9739b40d3261aa2aaf8aeadc1586f8b1e624a784990e5a4d57f1a2474 kscreen-5.23.0.tar.xz
"
diff --git a/community/kscreenlocker/APKBUILD b/community/kscreenlocker/APKBUILD
index 6ca140b77b..8e798396ad 100644
--- a/community/kscreenlocker/APKBUILD
+++ b/community/kscreenlocker/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kscreenlocker
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Library and components for secure lock screen architecture"
# armhf blocked by extra-cmake-modules
@@ -71,7 +71,7 @@ package() {
}
sha512sums="
-e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9 kscreenlocker-5.22.5.tar.xz
+ddc7571bcaf18b047ca666fadafebe5d6b8d23684b57a4531b631fd23ba70b5ad858cd05039ec3cb8f8976a096ebdb8729fc6695515491c272457feb3a1c5925 kscreenlocker-5.23.0.tar.xz
56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam
565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam
"
diff --git a/community/ksshaskpass/APKBUILD b/community/ksshaskpass/APKBUILD
index aec1b9ef3c..5df4e7c8d6 100644
--- a/community/ksshaskpass/APKBUILD
+++ b/community/ksshaskpass/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=ksshaskpass
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="ssh-add helper that uses kwallet and kpassworddialog"
# armhf blocked by qt5-qtdeclarative
@@ -44,5 +44,5 @@ package() {
}
sha512sums="
-35f430882aa735f1b9d7a1874f83fa67074cfb720bbba377d0b38baab2f3eaeddc1598f6f7b9c79479b95d22fdc661d7dfd6835b98a78ea159c68d64abc81a67 ksshaskpass-5.22.5.tar.xz
+4357356ef7a4e81202d9fa7d0e0978ec3be6315c7fd8d46ac081534d9a22f5313c85c028453797158079cde16ba4ca23ba8010c7a606789e0d18f063d6d96ff9 ksshaskpass-5.23.0.tar.xz
"
diff --git a/community/kwallet-pam/APKBUILD b/community/kwallet-pam/APKBUILD
index 2470d9f8f2..2a05518a0b 100644
--- a/community/kwallet-pam/APKBUILD
+++ b/community/kwallet-pam/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kwallet-pam
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KWallet PAM integration"
# armhf blocked by extra-cmake-modules
@@ -37,5 +37,5 @@ package() {
}
sha512sums="
-230135ee7aadbbc9f08695afa87fd7d8f0e3dca5da40f94bea92ad83a8a2ccc86efb7d593730079a0affc91f28383d089a08fd2b4db57961ba7c5b3a009a6038 kwallet-pam-5.22.5.tar.xz
+377592c2cce24140b06f7540b14ae870b9080ffd9a458bc72a5ed5d70d4a8a782494af3acad3bee148377f7f369526e8293342d4de388975011f7026f6c22c97 kwallet-pam-5.23.0.tar.xz
"
diff --git a/community/kwayland-integration/APKBUILD b/community/kwayland-integration/APKBUILD
index 1255813c21..fc5a23fbb8 100644
--- a/community/kwayland-integration/APKBUILD
+++ b/community/kwayland-integration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bhushan Shah <bshah@kde.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kwayland-integration
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KWayland integration"
url="https://kde.org/plasma-desktop/"
@@ -15,6 +15,7 @@ makedepends="
kwayland-dev
kwindowsystem-dev
qt5-qtbase-dev
+ wayland-protocols
"
case "$pkgver" in
@@ -37,5 +38,5 @@ package() {
}
sha512sums="
-456b745e493965781178e1cd2fe64b8833294800ea152f5f95d00e1e2c221f97c2a29b91498573bc25710e3ad42482e46a4f0f33d5a57ce8ed1454a65fba81a9 kwayland-integration-5.22.5.tar.xz
+edc7507d6ea4594bb8449c1cce4f88e1d663b0e36449230369088d354f4d56e3c02f7db166dc98f357667fd53664ff314badef550b17428ca109e5036894b890 kwayland-integration-5.23.0.tar.xz
"
diff --git a/community/kwayland-server/APKBUILD b/community/kwayland-server/APKBUILD
index 6644cc6de5..4ab2438b13 100644
--- a/community/kwayland-server/APKBUILD
+++ b/community/kwayland-server/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kwayland-server
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Wayland Server Components built on KDE Frameworks"
arch="all !armhf" # armhf blocked by qt5-qtdeclarative
@@ -41,5 +41,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-2fbbd025622fe01b57099a418e2b42d567d1874ac7e04ee21b19f471ce7a89a9feb7ccd79269dfa2b55d043d234bf0454368fd304039d9a3e056602d1f6c0dd0 kwayland-server-5.22.5.tar.xz
+b3b50d37f441e1a6b5be73b69aad1407c391874fcec2f16a8d5318160112b5a6958072e0dcce79d6dabf63915f97ea47e15837ca156ad42d7ccb50013b140d98 kwayland-server-5.23.0.tar.xz
"
diff --git a/community/kwin/APKBUILD b/community/kwin/APKBUILD
index 64453512a1..7bda528b9d 100644
--- a/community/kwin/APKBUILD
+++ b/community/kwin/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kwin
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="An easy to use, but flexible, composited Window Manager"
# armhf blocked by qt5-qtdeclarative
@@ -107,5 +107,5 @@ package() {
setcap -r "$pkgdir"/usr/bin/kwin_wayland
}
sha512sums="
-4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2 kwin-5.22.5.tar.xz
+46f6fe40d3d93fb0a8f7a2495e4fa3dbbfb9842a569def0227d49815b9af3853be76fd7bf56c77d42134d209d588f6d3ab7baf2dfb0cbed906372c368ae12bdb kwin-5.23.0.tar.xz
"
diff --git a/community/kwrited/APKBUILD b/community/kwrited/APKBUILD
index a5bd817ee9..63d5fa1e31 100644
--- a/community/kwrited/APKBUILD
+++ b/community/kwrited/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kwrited
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KDE daemon listening for wall and write messages"
arch="all !armhf" # qt5-qtdeclarative-dev unavilable on armhf
@@ -37,5 +37,5 @@ package() {
}
sha512sums="
-2988b0cd5f287503367d48f43ac31e454d5545476bc6763360b111f945d6b3ebffc1a55f8746493c70e9443c6d04d1c41f25a0484932de2edb12a54ab54f117c kwrited-5.22.5.tar.xz
+c06d94803bcf1af981b2d840d1504d5b2df0c37649c9257a7d72ee703da88fec4e8fe021149dccee54bd87c14a294485bc4b5f58c079a5aadd303cca87e48cf4 kwrited-5.23.0.tar.xz
"
diff --git a/community/layer-shell-qt/APKBUILD b/community/layer-shell-qt/APKBUILD
index 7ea1e8de87..c5047eae09 100644
--- a/community/layer-shell-qt/APKBUILD
+++ b/community/layer-shell-qt/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=layer-shell-qt
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Qt component to allow applications to make use of the Wayland wl-layer-shell protocol"
# armhf blocked by extra-cmake-modules
@@ -43,5 +43,5 @@ package() {
}
sha512sums="
-5bb85f73d68eb47b9fcad18e5d52ce22bddb73a486710dc2b47e5eb5f3ffee9674969505e55bdedbae19669c9568f9b4276a739aa1cde326c7795a199e6776d2 layer-shell-qt-5.22.5.tar.xz
+4cd5f4d37e42e66f287805540b799130e0fb8547e9b308e81dadcc2314b4b427b0dc3d9a9dc83d410691e166f89a2ee4ec9635394624d397f199728e27c5f7e4 layer-shell-qt-5.23.0.tar.xz
"
diff --git a/community/libkscreen/APKBUILD b/community/libkscreen/APKBUILD
index 1a0d9406a6..4b2160cab8 100644
--- a/community/libkscreen/APKBUILD
+++ b/community/libkscreen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libkscreen
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KDE screen management software"
arch="all !armhf" # armhf blocked by extra-cmake-modules
@@ -16,6 +16,7 @@ makedepends="$depends_dev
doxygen
extra-cmake-modules
graphviz
+ plasma-wayland-protocols
qt5-qttools-dev
"
@@ -45,5 +46,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-3b6ccc3ebc813345dec6955ce95bb8601879614a89fc8b319da2430d261dfa0d326c64a19d3e01fc9c3379f3b876c56fc3da4ade5709aaa0f31217dd04d9a226 libkscreen-5.22.5.tar.xz
+2ae61597668377b8f6c37f3a48baff775ed557ad02f3ca71fa2939f05fa0b5d765a801232fec34647658d21b9127f78e07c76b596ce4e8c5bab7e78d7b21eb50 libkscreen-5.23.0.tar.xz
"
diff --git a/community/libksysguard/APKBUILD b/community/libksysguard/APKBUILD
index 6a0082fa4a..6529011c78 100644
--- a/community/libksysguard/APKBUILD
+++ b/community/libksysguard/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libksysguard
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KDE system monitor library"
# armhf blocked by extra-cmake-modules
@@ -23,8 +23,10 @@ depends_dev="
kservice-dev
kwidgetsaddons-dev
kwindowsystem-dev
+ libcap-dev
libnl3-dev
libpcap-dev
+ lm-sensors-dev
plasma-framework-dev
qt5-qttools-dev
qt5-qtwebchannel-dev
@@ -62,5 +64,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80 libksysguard-5.22.5.tar.xz
+e63f63945a2c0170c1d603ac143fa92265e6a081c3525165b4ab5dea11e0a6d456e945eb35e348444c24eef2f48c695b54867708777757db39dfb2aee5a43ea1 libksysguard-5.23.0.tar.xz
"
diff --git a/community/milou/APKBUILD b/community/milou/APKBUILD
index e36e901dfd..ef156ea193 100644
--- a/community/milou/APKBUILD
+++ b/community/milou/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=milou
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="A dedicated search application built on top of Baloo"
# armhf blocked by qt5-qtdeclarative
@@ -46,5 +46,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-9be952458c3e5c6b0cf99fde2c6dd810f109af5c6c1fecf0419b615ebeaf5c2794301ed7d96e234a4b111fb8e5d63e11e9848f7112bc16580fda7ef107b81d60 milou-5.22.5.tar.xz
+5f4873e9c6530ec0fa0bb6dc75a2999c66ca70e357f6337692a5e89ba47d4e18fdd6cafc3018be52919bb1307b14e7acca88e636915295686f00c15c2d1425c8 milou-5.23.0.tar.xz
"
diff --git a/community/oxygen/APKBUILD b/community/oxygen/APKBUILD
index 5d0f5ede8b..8a71105793 100644
--- a/community/oxygen/APKBUILD
+++ b/community/oxygen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=oxygen
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Artwork, styles and assets for the Oxygen visual style for the Plasma Desktop"
# armhf blocked by extra-cmake-modules
@@ -56,5 +56,5 @@ sounds() {
amove usr/share/sounds
}
sha512sums="
-5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1 oxygen-5.22.5.tar.xz
+c7cf4cf0d1c7b7235106ba2c51d474fe71a4686bc2802e8d2b7b35c887817f0a9d0d1f5bd7e0d5ec1e90800741ec0171b9df5293864345b226fae55a2d1035ad oxygen-5.23.0.tar.xz
"
diff --git a/community/plasma-browser-integration/APKBUILD b/community/plasma-browser-integration/APKBUILD
index 6a8673373e..ef7fa772ee 100644
--- a/community/plasma-browser-integration/APKBUILD
+++ b/community/plasma-browser-integration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-browser-integration
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Components necessary to integrate browsers into the Plasma Desktop"
# armhf blocked by extra-cmake-modules
@@ -50,5 +50,5 @@ package() {
}
sha512sums="
-8cc29cc51c6cce4dd31677cff8851d58eb0dded0d41c52e0fa488a6f5a803c46b0f29ae02642707a039a283e19ea49fe2dac36604202282f6a62cd0f8716940a plasma-browser-integration-5.22.5.tar.xz
+477f710b65ad0de8ccddd1bb910451b3d183a31785792bc4500de71670fcacc2fc264991a165240654f76724279c62c12d3e1b187e8604a05e6adc0ec7ba38fd plasma-browser-integration-5.23.0.tar.xz
"
diff --git a/community/plasma-desktop/APKBUILD b/community/plasma-desktop/APKBUILD
index 6f8ee30607..ce8b0029a3 100644
--- a/community/plasma-desktop/APKBUILD
+++ b/community/plasma-desktop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-desktop
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="KDE Plasma Desktop"
# armhf blocked by qt5-qtdeclarative
@@ -100,5 +100,5 @@ knetattach() {
DESTDIR="$subpkgdir" make install
}
sha512sums="
-9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac plasma-desktop-5.22.5.tar.xz
+f7d74842874475741709d7fe76a8fe7fe7d98692e2864b8c008b2e3c59a29f9fe70f21cf16163e2ad14600060e835246e5cbf86676430b6c0bac1eebcf72686e plasma-desktop-5.23.0.tar.xz
"
diff --git a/community/plasma-disks/APKBUILD b/community/plasma-disks/APKBUILD
index 9346604267..35cb018a5d 100644
--- a/community/plasma-disks/APKBUILD
+++ b/community/plasma-disks/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-disks
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Monitors S.M.A.R.T. capable devices for imminent failure"
# armhf blocked by qt5-qtdeclarative
@@ -52,5 +52,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-a49644a696d00ff84e150e68297a574b5d33190f0ecf407dc741d60f3243fb02507133bcb2e3e7bd1fc860f466a48988ac861e2b518b5a60cad9bc9f51490a1a plasma-disks-5.22.5.tar.xz
+d76fa1411d10d27c8f086be0cf7567c6b7759416432f37380ecd230f9dc803b002d557bfc6db4f5b44c0b91192c465f6799df501bcf08a9bd18f838acfde1571 plasma-disks-5.23.0.tar.xz
"
diff --git a/community/plasma-firewall/APKBUILD b/community/plasma-firewall/APKBUILD
index d839ae0076..40a8a232f1 100644
--- a/community/plasma-firewall/APKBUILD
+++ b/community/plasma-firewall/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-firewall
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Control Panel for your system firewall"
# armhf blocked by qt5-qtdeclarative
@@ -49,5 +49,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901 plasma-firewall-5.22.5.tar.xz
+9b8e4cc523c6f72033c7a85bc968d591d26b26a89f96efd9d84bed8942991215a5e52eddc3205797310f831c948a125e930a4868cbfdc9fd546c93752a25b1d0 plasma-firewall-5.23.0.tar.xz
"
diff --git a/community/plasma-integration/APKBUILD b/community/plasma-integration/APKBUILD
index 400a117743..28ff5816b5 100644
--- a/community/plasma-integration/APKBUILD
+++ b/community/plasma-integration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-integration
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Qt Platform Theme integration plugins for the Plasma workspaces"
# armhf blocked by qt5-qtdeclarative
@@ -60,5 +60,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-5da783bc3e32de5e68fb065f7dc014f92216821942b6f2c016fe494915fed1edaaaf88c26cd2a830fa306459e03d63d73dfbc805a845a0ac1f215128aa18df3c plasma-integration-5.22.5.tar.xz
+65cf1d5b733e8b1a77be57c58984ee472d0a5b0db37bc02559d90a96ded2a949ed2eb1ec39db9e12ff6797efa4a8b363fc23c6a899e2b5ffd5c7378fe5429629 plasma-integration-5.23.0.tar.xz
"
diff --git a/community/plasma-nano/APKBUILD b/community/plasma-nano/APKBUILD
index 1b8a7c2f24..e3a714104e 100644
--- a/community/plasma-nano/APKBUILD
+++ b/community/plasma-nano/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-nano
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="A minimal Plasma shell package intended for embedded devices"
# armhf blocked by extra-cmake-modules
@@ -43,5 +43,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-f835af755cd28f71be89994c8490f600ff5162e0e1aca16b2e2e31e3e84638f7fc96a6773e8ee310e7d31bbec06a91561ccc5c0a875dda91f4455164b7316701 plasma-nano-5.22.5.tar.xz
+a7dbde921c2d79717df368cd2f5d8b843b3b36fb90b0ae4a032db5f5c6cdd5ef119c5a04be3149318e04ba8735fb89ed2810bc1f51a62af2a50fb3d78dfbb07f plasma-nano-5.23.0.tar.xz
"
diff --git a/community/plasma-nm/APKBUILD b/community/plasma-nm/APKBUILD
index 99edb4994a..acd9539c0d 100644
--- a/community/plasma-nm/APKBUILD
+++ b/community/plasma-nm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-nm
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Plasma applet written in QML for managing network connections"
# armhf blocked by qt5-qtdeclarative
@@ -73,5 +73,5 @@ mobile() {
amove usr/share/kservices5/wifisettings.desktop
}
sha512sums="
-802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94 plasma-nm-5.22.5.tar.xz
+d97480995ac6d9f7304b8cd7d740d402b236f0a2ffd9b159d37b1a6aec225038d30ee3b785fff3ab3355852d94a2e2124da49103efa7563a5aa62c980390be01 plasma-nm-5.23.0.tar.xz
"
diff --git a/community/plasma-pa/APKBUILD b/community/plasma-pa/APKBUILD
index 5cf52e7577..921f264584 100644
--- a/community/plasma-pa/APKBUILD
+++ b/community/plasma-pa/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-pa
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Plasma applet for audio volume management using PulseAudio"
# armhf blocked by qt5-qtdeclarative
@@ -50,5 +50,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-4082096d532ddeba6b9cd117a7588fb5b62739ce7265b70ad5834cbd30dab140ccb8b3146f9264dd01a664bfc72071bd42cdd23c24b08fd7f89919d939eb4ba9 plasma-pa-5.22.5.tar.xz
+02dc7f16bf5c664536ee82ba5aecde8c4fd07b6fa73e92c8619a7a2e7a4311546a13f987f0e92f45c9b863bc2cbf61e1465d081ebaff39f74006e3fcee54ec64 plasma-pa-5.23.0.tar.xz
"
diff --git a/community/plasma-phone-components/0001-Port-to-the-new-org.kde.KWin.ScreenShots2-interface.patch b/community/plasma-phone-components/0001-Port-to-the-new-org.kde.KWin.ScreenShots2-interface.patch
deleted file mode 100644
index 9b8654a4db..0000000000
--- a/community/plasma-phone-components/0001-Port-to-the-new-org.kde.KWin.ScreenShots2-interface.patch
+++ /dev/null
@@ -1,449 +0,0 @@
-From 989d6fdc1dbf399d3daafa3c53327288a9cc7d01 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 23 Jul 2021 03:30:16 +0200
-Subject: [PATCH] Port to the new org.kde.KWin.ScreenShots2 interface
-
-Fixes https://invent.kde.org/plasma/plasma-phone-components/-/issues/85
----
- containments/panel/CMakeLists.txt | 2 +-
- .../panel/dbus/org.kde.KWin.ScreenShot2.xml | 184 ++++++++++++++++++
- containments/panel/phonepanel.cpp | 152 ++++++++-------
- containments/panel/phonepanel.h | 5 +-
- 4 files changed, 274 insertions(+), 69 deletions(-)
- create mode 100644 containments/panel/dbus/org.kde.KWin.ScreenShot2.xml
-
-diff --git a/containments/panel/CMakeLists.txt b/containments/panel/CMakeLists.txt
-index 8758686..b482ac4 100644
---- a/containments/panel/CMakeLists.txt
-+++ b/containments/panel/CMakeLists.txt
-@@ -1,4 +1,4 @@
--qt5_add_dbus_interfaces(DBUS_SRCS dbus/org.kde.KWin.Screenshot.xml
-+qt5_add_dbus_interfaces(DBUS_SRCS dbus/org.kde.KWin.ScreenShot2.xml
- dbus/org.kde.KScreen.xml)
-
- set(phonepanel_SRCS
-diff --git a/containments/panel/dbus/org.kde.KWin.ScreenShot2.xml b/containments/panel/dbus/org.kde.KWin.ScreenShot2.xml
-new file mode 100644
-index 0000000..34c03b2
---- /dev/null
-+++ b/containments/panel/dbus/org.kde.KWin.ScreenShot2.xml
-@@ -0,0 +1,184 @@
-+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-+<!--
-+ SPDX-FileCopyrightText: 2021 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-+
-+ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-+-->
-+<node name="/org/kde/KWin/ScreenShot2">
-+ <!--
-+ org.kde.KWin.ScreenShot2:
-+ @short_description: Screen shot interface
-+
-+ This interface provides a way to request a screenshot of a rectangular area,
-+ a screen, or a window.
-+ -->
-+ <interface name="org.kde.KWin.ScreenShot2">
-+ <!--
-+ CaptureWindow:
-+ @handle: The unique handle that identified the window
-+ @options: Optional vardict with screenshot options
-+ @pipe: The pipe file descriptor where the screenshot will be written
-+
-+ Take a screenshot of the specified window. The application that
-+ requests the screenshot must have the org.kde.KWin.ScreenShot2
-+ interface listed in the X-KDE-DBUS-Restricted-Interfaces desktop
-+ file entry.
-+
-+ Available @options include:
-+
-+ * "include-cursor" (b): Whether the cursor should be included.
-+ Defaults to false
-+ * "include-decoration" (b): Whether the decoration should be included.
-+ Defaults to false
-+ * "native-resolution" (b): Whether the screenshot should be in
-+ native size. Defaults to false
-+
-+ The following results get returned via the @results vardict:
-+
-+ * "type" (s): The type of the image written to the pipe. Currently,
-+ the only supported type is "raw"
-+ * "width" (u): The width of the image. Available only if the image
-+ type is "raw"
-+ * "height" (u): The height of the image. Available only if the image
-+ type is "raw"
-+ * "stride" (u): The number of bytes per row. Available only if the
-+ image type is "raw"
-+ * "format" (u): The image format, as defined in QImage::Format.
-+ Available only if the image type is "raw"
-+ -->
-+ <method name="CaptureWindow">
-+ <arg name="handle" type="s" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap" />
-+ <arg name="options" type="a{sv}" direction="in" />
-+ <arg name="pipe" type="h" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
-+ <arg name="results" type="a{sv}" direction="out" />
-+ </method>
-+
-+ <!--
-+ CaptureArea:
-+ @x: The x coordinate of the upper left corner of the area
-+ @y: The y coordinate of the upper left corner of the area
-+ @width: The width of the screenshot area
-+ @height: The height of the screenshot area
-+ @options: Optional vardict with screenshot options
-+ @pipe: The pipe file descriptor where the screenshot will be written
-+
-+ Take a screenshot of the specified rectangular area. The application
-+ that requests the screenshot must have the org.kde.KWin.ScreenShot2
-+ interface listed in the X-KDE-DBUS-Restricted-Interfaces desktop file
-+ entry.
-+
-+ Available @options include:
-+
-+ * "include-cursor" (b): Whether the cursor should be included.
-+ Defaults to false
-+ * "native-resolution" (b): Whether the screenshot should be in
-+ native size. Defaults to false
-+
-+ The following results get returned via the @results vardict:
-+
-+ * "type" (s): The type of the image written to the pipe. Currently,
-+ the only supported type is "raw"
-+ * "width" (u): The width of the image. Available only if the image
-+ type is "raw"
-+ * "height" (u): The height of the image. Available only if the image
-+ type is "raw"
-+ * "stride" (u): The number of bytes per row. Available only if the
-+ image type is "raw"
-+ * "format" (u): The image format, as defined in QImage::Format.
-+ Available only if the image type is "raw"
-+ -->
-+ <method name="CaptureArea">
-+ <arg name="x" type="i" direction="in" />
-+ <arg name="y" type="i" direction="in" />
-+ <arg name="width" type="u" direction="in" />
-+ <arg name="height" type="u" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QVariantMap" />
-+ <arg name="options" type="a{sv}" direction="in" />
-+ <arg name="pipe" type="h" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
-+ <arg name="results" type="a{sv}" direction="out" />
-+ </method>
-+
-+ <!--
-+ CaptureScreen:
-+ @name: The name of the screen assigned by the compositor
-+ @options: Optional vardict with screenshot options
-+ @pipe: The pipe file descriptor where the screenshot will be written
-+
-+ Take a screenshot of the specified monitor. The application that
-+ requests the screenshot must have the org.kde.KWin.ScreenShot2
-+ interface listed in the X-KDE-DBUS-Restricted-Interfaces desktop file
-+ entry.
-+
-+ Available @options include:
-+
-+ * "include-cursor" (b): Whether the cursor should be included.
-+ Defaults to false
-+ * "native-resolution" (b): Whether the screenshot should be in
-+ native size. Defaults to false
-+
-+ The following results get returned via the @results vardict:
-+
-+ * "type" (s): The type of the image written to the pipe. Currently,
-+ the only supported type is "raw"
-+ * "width" (u): The width of the image. Available only if the image
-+ type is "raw"
-+ * "height" (u): The height of the image. Available only if the image
-+ type is "raw"
-+ * "stride" (u): The number of bytes per row. Available only if the
-+ image type is "raw"
-+ * "format" (u): The image format, as defined in QImage::Format.
-+ Available only if the image type is "raw"
-+ -->
-+ <method name="CaptureScreen">
-+ <arg name="name" type="s" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap" />
-+ <arg name="options" type="a{sv}" direction="in" />
-+ <arg name="pipe" type="h" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
-+ <arg name="results" type="a{sv}" direction="out" />
-+ </method>
-+
-+ <!--
-+ CaptureInteractive:
-+ @kind: 0 - window, 1 - screen
-+ @options: Optional vardict with screenshot options
-+ @pipe: The pipe file descriptor where the screenshot will be written
-+
-+ Take a screenshot of a screen or a window as selected by the user.
-+
-+ Available @options include:
-+
-+ * "include-cursor" (b): Whether the cursor should be included.
-+ Defaults to false
-+ * "include-decoration" (b): Whether the decoration should be included.
-+ Defaults to false
-+ * "native-resolution" (b): Whether the screenshot should be in
-+ native size. Defaults to false
-+
-+ The following results get returned via the @results vardict:
-+
-+ * "type" (s): The type of the image written to the pipe. Currently,
-+ the only supported type is "raw"
-+ * "width" (u): The width of the image. Available only if the image
-+ type is "raw"
-+ * "height" (u): The height of the image. Available only if the image
-+ type is "raw"
-+ * "stride" (u): The number of bytes per row. Available only if the
-+ image type is "raw"
-+ * "format" (u): The image format, as defined in QImage::Format.
-+ Available only if the image type is "raw"
-+ -->
-+ <method name="CaptureInteractive">
-+ <arg name="kind" type="u" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap" />
-+ <arg name="options" type="a{sv}" direction="in" />
-+ <arg name="pipe" type="h" direction="in" />
-+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
-+ <arg name="results" type="a{sv}" direction="out" />
-+ </method>
-+ </interface>
-+</node>
-diff --git a/containments/panel/phonepanel.cpp b/containments/panel/phonepanel.cpp
-index 06aab12..35a72a8 100644
---- a/containments/panel/phonepanel.cpp
-+++ b/containments/panel/phonepanel.cpp
-@@ -19,6 +19,7 @@
- #include <QDateTime>
- #include <QDebug>
- #include <QFile>
-+#include <QGuiApplication>
- #include <QProcess>
- #include <QScreen>
- #include <QStandardPaths>
-@@ -30,44 +31,45 @@ constexpr int SCREENSHOT_DELAY = 200;
-
- /* -- Static Helpers --------------------------------------------------------------------------- */
-
--static int readData(int theFile, QByteArray &theDataOut)
-+static QImage allocateImage(const QVariantMap &metadata)
- {
-- // implementation based on QtWayland file qwaylanddataoffer.cpp
-- char lBuffer[4096];
-- int lRetryCount = 0;
-- ssize_t lBytesRead = 0;
--
-- do {
-- // give user 30 sec to click a window, afterwards considered as error
-- while (true) {
-- lBytesRead = QT_READ(theFile, lBuffer, sizeof lBuffer);
-- if (lBytesRead == -1 && (errno == EAGAIN) && ++lRetryCount < 30000) {
-- usleep(1000);
-- } else {
-- break;
-- }
-- }
-+ bool ok;
-
-- if (lBytesRead > 0) {
-- theDataOut.append(lBuffer, lBytesRead);
-- }
-- } while (lBytesRead > 0);
-- return lBytesRead;
-+ const uint width = metadata.value(QStringLiteral("width")).toUInt(&ok);
-+ if (!ok) {
-+ return QImage();
-+ }
-+
-+ const uint height = metadata.value(QStringLiteral("height")).toUInt(&ok);
-+ if (!ok) {
-+ return QImage();
-+ }
-+
-+ const uint format = metadata.value(QStringLiteral("format")).toUInt(&ok);
-+ if (!ok) {
-+ return QImage();
-+ }
-+
-+ return QImage(width, height, QImage::Format(format));
- }
-
--static QImage readImage(int thePipeFd)
-+static QImage readImage(int fileDescriptor, const QVariantMap &metadata)
- {
-- QByteArray lContent;
-- if (readData(thePipeFd, lContent) != 0) {
-- close(thePipeFd);
-+ QFile file;
-+ if (!file.open(fileDescriptor, QFileDevice::ReadOnly, QFileDevice::AutoCloseHandle)) {
-+ close(fileDescriptor);
- return QImage();
- }
-- close(thePipeFd);
-
-- QDataStream lDataStream(lContent);
-- QImage lImage;
-- lDataStream >> lImage;
-- return lImage;
-+ QImage result = allocateImage(metadata);
-+ if (result.isNull()) {
-+ return QImage();
-+ }
-+
-+ QDataStream stream(&file);
-+ stream.readRawData(reinterpret_cast<char *>(result.bits()), result.sizeInBytes());
-+
-+ return result;
- }
-
- PhonePanel::PhonePanel(QObject *parent, const QVariantList &args)
-@@ -75,7 +77,10 @@ PhonePanel::PhonePanel(QObject *parent, const QVariantList &args)
- {
- // setHasConfigurationInterface(true);
- m_kscreenInterface = new org::kde::KScreen(QStringLiteral("org.kde.kded5"), QStringLiteral("/modules/kscreen"), QDBusConnection::sessionBus(), this);
-- m_screenshotInterface = new org::kde::kwin::Screenshot(QStringLiteral("org.kde.KWin"), QStringLiteral("/Screenshot"), QDBusConnection::sessionBus(), this);
-+ m_screenshotInterface = new OrgKdeKWinScreenShot2Interface(QStringLiteral("org.kde.KWin.ScreenShot2"),
-+ QStringLiteral("/org/kde/KWin/ScreenShot2"),
-+ QDBusConnection::sessionBus(),
-+ this);
-
- m_localeConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::SimpleConfig);
- m_localeConfigWatcher = KConfigWatcher::create(m_localeConfig);
-@@ -142,55 +147,70 @@ void PhonePanel::setAutoRotate(bool value)
- }
- }
-
--void PhonePanel::takeScreenshot()
-+void PhonePanel::handleMetaDataReceived(const QVariantMap &metadata, int fd)
- {
-- QString filePath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
-- if (filePath.isEmpty()) {
-- qWarning() << "Couldn't find a writable location for the screenshot!";
-- return;
-- }
-- QDir picturesDir(filePath);
-- if (!picturesDir.mkpath(QStringLiteral("Screenshots"))) {
-- qWarning() << "Couldn't create folder at" << picturesDir.path() + QStringLiteral("/Screenshots") << "to take screenshot.";
-+ const QString type = metadata.value(QStringLiteral("type")).toString();
-+ if (type != QLatin1String("raw")) {
-+ qWarning() << "Unsupported metadata type:" << type;
- return;
- }
-- filePath += QStringLiteral("/Screenshots/Screenshot_%1.png").arg(QDateTime::currentDateTime().toString(QStringLiteral("yyyyMMdd_hhmmss")));
-
-+ auto watcher = new QFutureWatcher<QImage>(this);
-+ connect(watcher, &QFutureWatcher<QImage>::finished, this, [watcher]() {
-+ watcher->deleteLater();
-+
-+ QString filePath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
-+ if (filePath.isEmpty()) {
-+ qWarning() << "Couldn't find a writable location for the screenshot!";
-+ return;
-+ }
-+ QDir picturesDir(filePath);
-+ if (!picturesDir.mkpath(QStringLiteral("Screenshots"))) {
-+ qWarning() << "Couldn't create folder at" << picturesDir.path() + QStringLiteral("/Screenshots") << "to take screenshot.";
-+ return;
-+ }
-+ filePath += QStringLiteral("/Screenshots/Screenshot_%1.png").arg(QDateTime::currentDateTime().toString(QStringLiteral("yyyyMMdd_hhmmss")));
-+ const auto m_result = watcher->result();
-+ if (m_result.isNull() || !m_result.save(filePath)) {
-+ qWarning() << "Screenshot failed";
-+ } else {
-+ KNotification *notif = new KNotification("captured");
-+ notif->setComponentName(QStringLiteral("plasma_phone_components"));
-+ notif->setTitle(i18n("New Screenshot"));
-+ notif->setUrls({filePath});
-+ notif->setText(i18n("New screenshot saved to %1", filePath));
-+ notif->sendEvent();
-+ }
-+ });
-+ watcher->setFuture(QtConcurrent::run(readImage, fd, metadata));
-+}
-+
-+void PhonePanel::takeScreenshot()
-+{
- // wait ~200 ms to wait for rest of animations
- QTimer::singleShot(SCREENSHOT_DELAY, [=]() {
- int lPipeFds[2];
-- if (pipe2(lPipeFds, O_CLOEXEC | O_NONBLOCK) != 0) {
-+ if (pipe2(lPipeFds, O_CLOEXEC) != 0) {
- qWarning() << "Could not take screenshot";
- return;
- }
-- // Take fullscreen screenshot, and no pointer
-- QDBusPendingCall pcall = m_screenshotInterface->screenshotFullscreen(QDBusUnixFileDescriptor(lPipeFds[1]), false, true);
-- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
-- QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [](QDBusPendingCallWatcher *watcher) {
-- if (watcher->isError()) {
-- const auto error = watcher->error();
-- qWarning() << "Error calling KWin DBus interface:" << error.name() << error.message();
-- }
-+
-+ // We don't have access to the ScreenPool so we'll just take the first screen
-+ auto pendingCall = m_screenshotInterface->CaptureScreen(qGuiApp->screens().constFirst()->name(), {}, QDBusUnixFileDescriptor(lPipeFds[1]));
-+ close(lPipeFds[1]);
-+ auto pipeFileDescriptor = lPipeFds[0];
-+
-+ auto watcher = new QDBusPendingCallWatcher(pendingCall, this);
-+ connect(watcher, &QDBusPendingCallWatcher::finished, this, [this, watcher, pipeFileDescriptor]() {
- watcher->deleteLater();
-- });
-- const auto lWatcher = new QFutureWatcher<QImage>(this);
-- QObject::connect(lWatcher, &QFutureWatcher<QImage>::finished, this, [lWatcher, filePath]() {
-- lWatcher->deleteLater();
-- const QImage lImage = lWatcher->result();
-- qDebug() << lImage;
-- if (!lImage.save(filePath, "PNG")) {
-- qWarning() << "Failed to save screenshot to" << filePath;
-+ const QDBusPendingReply<QVariantMap> reply = *watcher;
-+
-+ if (reply.isError()) {
-+ qWarning() << "Screenshot request failed:" << reply.error().message();
- } else {
-- KNotification *notif = new KNotification("captured");
-- notif->setComponentName(QStringLiteral("plasma_phone_components"));
-- notif->setTitle(i18n("New Screenshot"));
-- notif->setUrls({filePath});
-- notif->setText(i18n("New screenshot saved to %1", filePath));
-- notif->sendEvent();
-+ handleMetaDataReceived(reply, pipeFileDescriptor);
- }
- });
-- lWatcher->setFuture(QtConcurrent::run(readImage, lPipeFds[0]));
-- close(lPipeFds[1]);
- });
- }
-
-diff --git a/containments/panel/phonepanel.h b/containments/panel/phonepanel.h
-index 59b9351..6e7e04a 100644
---- a/containments/panel/phonepanel.h
-+++ b/containments/panel/phonepanel.h
-@@ -13,7 +13,7 @@
- #include <KSharedConfig>
-
- #include "kscreeninterface.h"
--#include "screenshotinterface.h"
-+#include "screenshot2interface.h"
-
- class PhonePanel : public Plasma::Containment
- {
-@@ -44,13 +44,14 @@ signals:
- void isSystem24HourFormatChanged();
-
- private:
-+ void handleMetaDataReceived(const QVariantMap &metadata, int fd);
- bool m_running = false;
-
- KConfigWatcher::Ptr m_localeConfigWatcher;
- KSharedConfig::Ptr m_localeConfig;
-
- org::kde::KScreen *m_kscreenInterface;
-- org::kde::kwin::Screenshot *m_screenshotInterface;
-+ OrgKdeKWinScreenShot2Interface *m_screenshotInterface;
- };
-
- #endif
diff --git a/community/plasma-phone-components/APKBUILD b/community/plasma-phone-components/APKBUILD
index 59b9c762d9..1297321504 100644
--- a/community/plasma-phone-components/APKBUILD
+++ b/community/plasma-phone-components/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-phone-components
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Modules providing phone functionality for Plasma"
# armhf blocked by extra-cmake-modules
@@ -13,9 +13,7 @@ depends="
breeze-icons
dbus-x11
kactivities
- libqofono
maliit-keyboard
- ofono
plasma-nano
plasma-nm-mobile
plasma-pa
@@ -50,6 +48,7 @@ makedepends="
kwindowsystem-dev
kxmlgui-dev
libphonenumber-dev
+ modemmanager-qt-dev
plasma-framework-dev
qt5-qtdeclarative-dev
solid-dev
@@ -61,9 +60,7 @@ case "$pkgver" in
*.90*) _rel=unstable;;
*) _rel=stable;;
esac
-source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-phone-components-$pkgver.tar.xz
- 0001-Port-to-the-new-org.kde.KWin.ScreenShots2-interface.patch
- "
+source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-phone-components-$pkgver.tar.xz"
options="!check" # No tests
build() {
@@ -84,6 +81,5 @@ package() {
}
sha512sums="
-cf13a61ea92a0e9c06d0b631e4fe188b7374cea87ec00a1c51cde1fdaa018c64dc84505ccf2241b809da5b4f14ad4379b8326488b0d27182301678733408da96 plasma-phone-components-5.22.5.tar.xz
-71ccae9954583c9d7e2dd9a697f33d6bd4d999ac4b25132f6c26e4c2bcb2358917712c7de93a2a987971389975d36db056d807511ea60b7567bee1cb9dda9de0 0001-Port-to-the-new-org.kde.KWin.ScreenShots2-interface.patch
+b17936e7e468fade49e655ec18166c864e3b4caed4d5430f708152679624d8ca5043776f5b790a5b5f4e62c54e39534769de20df942163b55278c1fcbc2fffa6 plasma-phone-components-5.23.0.tar.xz
"
diff --git a/community/plasma-sdk/APKBUILD b/community/plasma-sdk/APKBUILD
index 45128532bb..4872b69462 100644
--- a/community/plasma-sdk/APKBUILD
+++ b/community/plasma-sdk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-sdk
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Applications useful for Plasma Development"
# armhf blocked by qt5-qtdeclarative
@@ -63,5 +63,5 @@ package() {
}
sha512sums="
-893bf785994537068efe5f8c854c2bd9a650849029822a5790b3874e2137eeac4f587185e571471494a47551c60e8b395520e125b8e2f511f36f6f483867671e plasma-sdk-5.22.5.tar.xz
+9218fa1b75f53a08434fc8cc8d06a5f7b01d87efc7322b997f4074b3e05d1500840fc4752b19f941ccbfb4b18341013976c0d06d84a6532cf3549456085b50f1 plasma-sdk-5.23.0.tar.xz
"
diff --git a/community/plasma-systemmonitor/APKBUILD b/community/plasma-systemmonitor/APKBUILD
index 89059c55ac..22e376df30 100644
--- a/community/plasma-systemmonitor/APKBUILD
+++ b/community/plasma-systemmonitor/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-systemmonitor
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="An application for monitoring system resources"
# armhf blocked by extra-cmake-modules
@@ -51,5 +51,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c plasma-systemmonitor-5.22.5.tar.xz
+fbd59ce8071c73fc4e45d020bbea517676b5460aa333eb20831e0f2e7868b51628818d73aa6de227eb521f3cfa4c97c601f187cac606503393d5806a2dbb1c9f plasma-systemmonitor-5.23.0.tar.xz
"
diff --git a/community/plasma-thunderbolt/APKBUILD b/community/plasma-thunderbolt/APKBUILD
index 75d11bf900..066579f89c 100644
--- a/community/plasma-thunderbolt/APKBUILD
+++ b/community/plasma-thunderbolt/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-thunderbolt
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
# armhf blocked by qt5-qtdeclarative
# s390x, mips64 and riscv64 blocked by bolt -> polkit
@@ -49,5 +49,5 @@ package() {
}
sha512sums="
-abc492c6a69cd3a2efa82c798d9a5e178f08fac098cd68055308f5bb4459e16914210e119e50838dd5af8d2240ead47e1dcfb06cb49a9a8d4e4ee6c0ba386581 plasma-thunderbolt-5.22.5.tar.xz
+91cdb56346f80bb7f0d30efc7a532893a3a2ba0fa1ab425bbc17bc282a73b8c8ffeee16701477e4d8ba81c008a6342d82fb6b93fb55807e534e8c0946bab78b6 plasma-thunderbolt-5.23.0.tar.xz
"
diff --git a/community/plasma-vault/APKBUILD b/community/plasma-vault/APKBUILD
index a096fb0898..04d5d8e461 100644
--- a/community/plasma-vault/APKBUILD
+++ b/community/plasma-vault/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-vault
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Plasma applet and services for creating encrypted vaults"
# armhf blocked by extra-cmake-modules
@@ -46,5 +46,5 @@ package() {
}
sha512sums="
-360bfe2ceab0f6318dff866af9a1445ea7f43bffc0471cee50d2283bc125062cbea5974a88db537384a5b5bfd28e679be3c50f95afe4b53c9f7c8a6ab6756cf0 plasma-vault-5.22.5.tar.xz
+c4afaf69e4f3cd9cab4a816a758b161d5d552ac1e539093ac69c4df76c64636e72ae410d229588f82733c40b6562ffa9646899eb4c12e5c1988ff101319bcb24 plasma-vault-5.23.0.tar.xz
"
diff --git a/community/plasma-workspace-wallpapers/APKBUILD b/community/plasma-workspace-wallpapers/APKBUILD
index 98887f92b9..3730dc3f04 100644
--- a/community/plasma-workspace-wallpapers/APKBUILD
+++ b/community/plasma-workspace-wallpapers/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-workspace-wallpapers
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Wallpapers for the Plasma Workspace"
arch="noarch !armhf" # armhf blocked by extra-cmake-modules
@@ -29,5 +29,5 @@ package() {
}
sha512sums="
-851e81e901fb50fc1c65c0863570b4c13c41ab3b4eef0fa862e60813ea6c316daa629464184cbc7f76f4ab4fd7422abe5ee1931f46ec968b9176bfe7f72aef19 plasma-workspace-wallpapers-5.22.5.tar.xz
+12a6bccb4e68ec34ef68ad30fd074bdc01446bc4dee3cc1c1207c846caf36b3ba45e3e0e3b22642a6296f7424c6af2816593fe55790f0e4cc25d8d794efd76bd plasma-workspace-wallpapers-5.23.0.tar.xz
"
diff --git a/community/plasma-workspace/0001-Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch b/community/plasma-workspace/0001-Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch
deleted file mode 100644
index 13e4bf256d..0000000000
--- a/community/plasma-workspace/0001-Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6379d1ec8d4a1fce141280eead930a6cdd9282d1 Mon Sep 17 00:00:00 2001
-From: Peifeng Yu <7437103@gmail.com>
-Date: Mon, 6 Sep 2021 05:24:15 +0000
-Subject: [PATCH] Call UnInhibit with correct signature in powermanagement
- dataengine
-
----
- dataengines/powermanagement/powermanagementjob.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dataengines/powermanagement/powermanagementjob.cpp b/dataengines/powermanagement/powermanagementjob.cpp
-index 90051cf33..dc7883d10 100644
---- a/dataengines/powermanagement/powermanagementjob.cpp
-+++ b/dataengines/powermanagement/powermanagementjob.cpp
-@@ -104,7 +104,7 @@ void PowerManagementJob::start()
- QStringLiteral("/org/freedesktop/PowerManagement/Inhibit"),
- QStringLiteral("org.freedesktop.PowerManagement.Inhibit"),
- QStringLiteral("UnInhibit"));
-- msg << parameters().value(QStringLiteral("cookie")).toInt();
-+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
- QDBusReply<void> reply = QDBusConnection::sessionBus().call(msg);
- setResult(reply.isValid());
- return;
-@@ -122,7 +122,7 @@ void PowerManagementJob::start()
- QStringLiteral("/ScreenSaver"),
- QStringLiteral("org.freedesktop.ScreenSaver"),
- QStringLiteral("UnInhibit"));
-- msg << parameters().value(QStringLiteral("cookie")).toInt();
-+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
- QDBusReply<uint> reply = QDBusConnection::sessionBus().call(msg);
- setResult(reply.isValid());
- return;
---
-GitLab
-
diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD
index a5ff3ee9dd..c0555f0a5a 100644
--- a/community/plasma-workspace/APKBUILD
+++ b/community/plasma-workspace/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-workspace
-pkgver=5.22.5
-pkgrel=1
+pkgver=5.23.0
+pkgrel=0
pkgdesc="KDE Plasma Workspace"
# armhf blocked by kirigami2
# s390x, mips64 and riscv64 blocked by polkit -> kio-extras
@@ -77,11 +77,9 @@ case "$pkgver" in
*.90*) _rel=unstable;;
*) _rel=stable;;
esac
-source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
- 0001-Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch
- "
+source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang"
-replaces="plasma-desktop<5.22"
+replaces="plasma-desktop<5.22 breeze<5.22.90"
build() {
cmake -B build \
@@ -108,6 +106,5 @@ package() {
rm -r "$pkgdir"/usr/lib/systemd
}
sha512sums="
-753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47 plasma-workspace-5.22.5.tar.xz
-dcb2041cd5a3272b253ac5239d130453fdf13dd0820e413d38149e008c7d2ea0114e0fa4e0a6f33fd3f3d44250e27f7f2ec0fbe14cb6d3cc854526d27bfd0207 0001-Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch
+db11e9425fd90efe50cbe1d59ee863b1d06345a6bb476bf75ac731008970fbb2a92e058c6db5c9f83b084e10953ad3eb333472c5b2596170b6f38475e60dc2c9 plasma-workspace-5.23.0.tar.xz
"
diff --git a/community/plasma/APKBUILD b/community/plasma/APKBUILD
index a0956aa4b2..49d0e90c68 100644
--- a/community/plasma/APKBUILD
+++ b/community/plasma/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Plasma (Base) meta package"
url="https://kde.org/plasma-desktop"
diff --git a/community/plymouth-kcm/APKBUILD b/community/plymouth-kcm/APKBUILD
index d900bf99ae..23f75b2a73 100644
--- a/community/plymouth-kcm/APKBUILD
+++ b/community/plymouth-kcm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plymouth-kcm
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
# armhf blocked by extra-cmake-modules
# s390x, mips64 and riscv64 blocked by polkit -> kio
@@ -50,5 +50,5 @@ package() {
}
sha512sums="
-eb18fa7d6c4c0df765679db000c82d95c72346a812005a743b83491ce476fdb790e302ce074568420041b3f9dc23c0fde21dcffa8dfaed02ce0725b831961ba3 plymouth-kcm-5.22.5.tar.xz
+55b5727b10bf5feca0e87fe644439c0bb4cb69c8d0a9e885a6b131cb96ea3fd904c426e8fb395407774e3caf411943420320baa3c21e18b494653b6723601a6b plymouth-kcm-5.23.0.tar.xz
"
diff --git a/community/polkit-kde-agent-1/APKBUILD b/community/polkit-kde-agent-1/APKBUILD
index bdd99ead7d..cbccb1e645 100644
--- a/community/polkit-kde-agent-1/APKBUILD
+++ b/community/polkit-kde-agent-1/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=polkit-kde-agent-1
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Daemon providing a polkit authentication UI for KDE"
# armhf blocked by extra-cmake-modules
@@ -47,5 +47,5 @@ package() {
}
sha512sums="
-418bee7d6f32577a68e7a7a2f3db0bf54eb213bead9852356cd813c1a64ce64e9cd217f7b9b13c8872a797c4a629eaffa7d2f1ea4ff471b70567de1f6ac808fa polkit-kde-agent-1-5.22.5.tar.xz
+3236ae603147348ace30c50d851cd2a3942cee33c3013f69d749da2616c290f533dd9c5de899d6cf9d51c40862d7cc9d99155a690d1c0e3116db281bd427de76 polkit-kde-agent-1-5.23.0.tar.xz
"
diff --git a/community/powerdevil/APKBUILD b/community/powerdevil/APKBUILD
index 0aa03c612b..9b7f35cd4e 100644
--- a/community/powerdevil/APKBUILD
+++ b/community/powerdevil/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=powerdevil
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Manages the power consumption settings of a Plasma Shell"
# armhf blocked by extra-cmake-modules
@@ -69,5 +69,5 @@ package() {
}
sha512sums="
-9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318 powerdevil-5.22.5.tar.xz
+e049e3765407d3e4cb2ecc27b7f2cd7419d042be187f4b2f047f131d8d9d204be0e2d109ad8d8a1afb71d468853e32d769536d584b6f894d9bfb2b79fc7f7a40 powerdevil-5.23.0.tar.xz
"
diff --git a/community/qqc2-breeze-style/0001-Remove-x1.5-mobile-icon-sizing.patch b/community/qqc2-breeze-style/0001-Remove-x1.5-mobile-icon-sizing.patch
deleted file mode 100644
index c18885e31e..0000000000
--- a/community/qqc2-breeze-style/0001-Remove-x1.5-mobile-icon-sizing.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From dcfd65fd5a2fb5d1cc74c961b26e46fcb35cb5f3 Mon Sep 17 00:00:00 2001
-From: Devin Lin <espidev@gmail.com>
-Date: Sat, 19 Jun 2021 11:58:12 -0400
-Subject: [PATCH] Remove x1.5 mobile icon sizing
-
----
- style/kirigami/Units.qml | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/style/kirigami/Units.qml b/style/kirigami/Units.qml
-index bcd944a..7359590 100644
---- a/style/kirigami/Units.qml
-+++ b/style/kirigami/Units.qml
-@@ -51,19 +51,12 @@ QtObject {
- property int tiny: fontMetrics.roundedIconSize(8 * devicePixelRatio)
- property int tinySmall: fontMetrics.roundedIconSize(12 * devicePixelRatio)
- // Breeze
-- property int small: fontMetrics.roundedIconSize(16 * devicePixelRatio * (QtQuickControlsPrivate.Settings.isMobile ? 1.5 : 1))
-- property int smallMedium: fontMetrics.roundedIconSize(22 * devicePixelRatio * (QtQuickControlsPrivate.Settings.isMobile ? 1.5 : 1))
-- property int medium: fontMetrics.roundedIconSize(32 * devicePixelRatio * (QtQuickControlsPrivate.Settings.isMobile ? 1.5 : 1))
-- property int large: fontMetrics.roundedIconSize(48 * devicePixelRatio * (QtQuickControlsPrivate.Settings.isMobile ? 1.5 : 1))
-- property int huge: fontMetrics.roundedIconSize(64 * devicePixelRatio * (QtQuickControlsPrivate.Settings.isMobile ? 1.5 : 1))
-- property int enormous: 128 * devicePixelRatio * (QtQuickControlsPrivate.Settings.isMobile ? 1.5 : 1)
-- // TODO: Using larger sizes on mobile because that's what Kirigami normally does. Maybe don't do this in the future.
-- //property int small: fontMetrics.roundedIconSize(16 * devicePixelRatio)
-- //property int smallMedium: fontMetrics.roundedIconSize(22 * devicePixelRatio)
-- //property int medium: fontMetrics.roundedIconSize(32 * devicePixelRatio)
-- //property int large: fontMetrics.roundedIconSize(48 * devicePixelRatio)
-- //property int huge: fontMetrics.roundedIconSize(64 * devicePixelRatio)
-- //property int enormous: 128 * devicePixelRatio
-+ property int small: fontMetrics.roundedIconSize(16 * devicePixelRatio)
-+ property int smallMedium: fontMetrics.roundedIconSize(22 * devicePixelRatio)
-+ property int medium: fontMetrics.roundedIconSize(32 * devicePixelRatio)
-+ property int large: fontMetrics.roundedIconSize(48 * devicePixelRatio)
-+ property int huge: fontMetrics.roundedIconSize(64 * devicePixelRatio)
-+ property int enormous: 128 * devicePixelRatio
- }
-
- //BEGIN Breeze Units
---
-GitLab
-
diff --git a/community/qqc2-breeze-style/0002-Use-kcoreaddons-macro-for-kirigami-plugin.patch b/community/qqc2-breeze-style/0002-Use-kcoreaddons-macro-for-kirigami-plugin.patch
deleted file mode 100644
index 5a07e9007c..0000000000
--- a/community/qqc2-breeze-style/0002-Use-kcoreaddons-macro-for-kirigami-plugin.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 57e914c6c0193ba2324874ff4baac13f337c212e Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 22 Jun 2021 23:10:15 +0200
-Subject: [PATCH] Use kcoreaddons macro for kirigami plugin
-
-the macro has some special handling for deploying to Android
----
- CMakeLists.txt | 2 +-
- kirigami-plasmadesktop-integration/CMakeLists.txt | 6 +-----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0859143..6d624d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ if (NOT ANDROID)
- find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
- endif()
-
--find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS GuiAddons Config Kirigami2)
-+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS GuiAddons Config Kirigami2 CoreAddons)
-
- # IconThemes and ConfigWidgets are optional
- find_package(KF5IconThemes ${KF5_DEP_VERSION})
-diff --git a/kirigami-plasmadesktop-integration/CMakeLists.txt b/kirigami-plasmadesktop-integration/CMakeLists.txt
-index c5a5145..2e10b4c 100644
---- a/kirigami-plasmadesktop-integration/CMakeLists.txt
-+++ b/kirigami-plasmadesktop-integration/CMakeLists.txt
-@@ -5,8 +5,7 @@ set(org.kde.breeze_SRCS
- kirigamiplasmafactory.cpp
- )
-
--
--add_library(org.kde.breeze MODULE ${org.kde.breeze_SRCS})
-+kcoreaddons_add_plugin(org.kde.breeze SOURCES ${org.kde.breeze_SRCS} INSTALL_NAMESPACE "kf5/kirigami" JSON kirigamiplasmaintegration.json)
-
- target_link_libraries(org.kde.breeze
- PUBLIC
-@@ -20,6 +19,3 @@ target_link_libraries(org.kde.breeze
- KF5::ConfigWidgets
- KF5::IconThemes
- )
--
--install(TARGETS org.kde.breeze DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kirigami)
--
diff --git a/community/qqc2-breeze-style/0003-Always-build-kirigami-plugin.patch b/community/qqc2-breeze-style/0003-Always-build-kirigami-plugin.patch
deleted file mode 100644
index ca0cb4415c..0000000000
--- a/community/qqc2-breeze-style/0003-Always-build-kirigami-plugin.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cf3b0bbf50382ae75989f0144bebf43b2ed694a9 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Wed, 23 Jun 2021 18:21:25 +0200
-Subject: [PATCH] Always build kirigami plugin
-
-The style uses separatorColor which is defined in the kirigami plugin. Therefore the style requires the plugin and we need to ensure that it's always built
----
- CMakeLists.txt | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f131a3d..73602cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,11 +38,7 @@ include(KDEGitCommitHooks)
- #TODO: Clean up dependencies. I was experimenting.
- find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Qml Quick QuickControls2 QuickTemplates2 DBus)
-
--find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS GuiAddons Config Kirigami2 CoreAddons)
--
--# IconThemes and ConfigWidgets are optional
--find_package(KF5IconThemes ${KF5_DEP_VERSION})
--find_package(KF5ConfigWidgets ${KF5_DEP_VERSION})
-+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS GuiAddons Config Kirigami2 CoreAddons ConfigWidgets IconThemes)
-
- if (NOT APPLE AND NOT WIN32)
- find_package(X11)
-@@ -95,9 +91,7 @@ add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054900)
-
- add_subdirectory(style)
-
--if (KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND)
- add_subdirectory(kirigami-plasmadesktop-integration)
--endif(KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND)
-
- # FIXME: this assumes there will always be a QQC2 release for each Qt release, needs
- # something to discover what's the latest qqc2 version available
diff --git a/community/qqc2-breeze-style/0004-Do-not-create-an-extra-KIconLoader-just-for-custom-palettes.patch b/community/qqc2-breeze-style/0004-Do-not-create-an-extra-KIconLoader-just-for-custom-palettes.patch
deleted file mode 100644
index bbff9618bc..0000000000
--- a/community/qqc2-breeze-style/0004-Do-not-create-an-extra-KIconLoader-just-for-custom-palettes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From cef3b1f0a6b1965d8f0402b9d515ce7ffa2ce3bd Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 6 Jul 2021 03:13:27 +0200
-Subject: [PATCH] Do not create an extra KIconLoader just for custom palettes
-
-Instead use the global one.
-
-Creating a KIconLoader is rather expensive and we were doing it twice
-only for setting custom palettes.
----
- .../plasmadesktoptheme.cpp | 25 ++++++++++---------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-index 2881281..d45827e 100644
---- a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-+++ b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-@@ -18,16 +18,7 @@
- #include <QQmlEngine>
- #include <QQuickRenderControl>
- #include <QQuickWindow>
--
--class IconLoaderSingleton
--{
--public:
-- IconLoaderSingleton() = default;
--
-- KIconLoader self;
--};
--
--Q_GLOBAL_STATIC(IconLoaderSingleton, privateIconLoaderSelf)
-+#include <QScopeGuard>
-
- class StyleSingleton : public QObject
- {
-@@ -273,9 +264,19 @@ QIcon PlasmaDesktopTheme::iconFromTheme(const QString &name, const QColor &custo
- }
- }
-
-- privateIconLoaderSelf->self.setCustomPalette(pal);
-+ bool hadPalette = KIconLoader::global()->hasCustomPalette();
-+ QPalette olderPalette = KIconLoader::global()->customPalette();
-+
-+ auto cleanup = qScopeGuard([&] {
-+ if (hadPalette) {
-+ KIconLoader::global()->setCustomPalette(olderPalette);
-+ } else {
-+ KIconLoader::global()->resetPalette();
-+ }
-+ });
-
-- return KDE::icon(name, &privateIconLoaderSelf->self);
-+ KIconLoader::global()->setCustomPalette(pal);
-+ return KDE::icon(name, KIconLoader::global());
- }
-
- void PlasmaDesktopTheme::syncColors()
diff --git a/community/qqc2-breeze-style/0005-Port-to-the-new-C++-units-plugin-in-Kirigami.patch b/community/qqc2-breeze-style/0005-Port-to-the-new-C++-units-plugin-in-Kirigami.patch
deleted file mode 100644
index c89aa90a45..0000000000
--- a/community/qqc2-breeze-style/0005-Port-to-the-new-C++-units-plugin-in-Kirigami.patch
+++ /dev/null
@@ -1,3786 +0,0 @@
-From b6524b613d43e0ee42205d6ce82148dd1d341e41 Mon Sep 17 00:00:00 2001
-From: Arjen Hiemstra <ahiemstra@heimr.nl>
-Date: Wed, 11 Aug 2021 17:00:51 +0200
-Subject: [PATCH] Port to the new C++ units plugin in Kirigami
-
-This adds a C++ Kirigami Units instance. It also moves the Units.qml
-file that from the Kirigami directory to the impl directory, adjusts it
-to be based on Kirigami.Units and then adjusts all files to make use of
-the Units in impl. This is done to avoid having to add all the custom
-properties to the C++ plugin.
----
- .../CMakeLists.txt | 1 +
- .../kirigamiplasmafactory.cpp | 9 +-
- .../kirigamiplasmafactory.h | 3 +-
- kirigami-plasmadesktop-integration/units.cpp | 58 ++++++++++
- kirigami-plasmadesktop-integration/units.h | 30 +++++
- style/impl/BackgroundGradient.qml | 6 +-
- style/impl/ButtonBackground.qml | 12 +-
- style/impl/CMakeLists.txt | 4 +-
- style/impl/CheckIndicator.qml | 16 +--
- style/impl/ComboBoxBackground.qml | 12 +-
- style/impl/CursorDelegate.qml | 6 +-
- style/impl/CursorHandle.qml | 10 +-
- style/impl/DelegateBackground.qml | 12 +-
- style/impl/FocusRect.qml | 4 +-
- style/impl/IconLabelContent.qml | 10 +-
- style/impl/IconLabelShortcutContent.qml | 2 +
- style/impl/InlineIconLabelContent.qml | 4 +-
- style/impl/LargeShadow.qml | 6 +-
- style/impl/ListViewHighlight.qml | 8 +-
- style/impl/MediumShadow.qml | 6 +-
- style/impl/MenuItemBackground.qml | 12 +-
- style/impl/OverlayDimBackground.qml | 4 +-
- style/impl/OverlayModalBackground.qml | 4 +-
- style/impl/RadioIndicator.qml | 12 +-
- style/impl/ScrollHandle.qml | 10 +-
- style/impl/SliderGroove.qml | 46 ++++----
- style/impl/SliderHandle.qml | 12 +-
- style/impl/SmallShadow.qml | 6 +-
- style/impl/SpinBoxIndicator.qml | 22 ++--
- style/impl/SwitchIndicator.qml | 14 ++-
- style/impl/TextEditBackground.qml | 10 +-
- style/{kirigami => impl}/Units.qml | 105 +++++++-----------
- style/impl/qmldir | 3 +-
- style/qtquickcontrols/BusyIndicator.qml | 18 +--
- style/qtquickcontrols/Button.qml | 21 ++--
- style/qtquickcontrols/CheckBox.qml | 17 +--
- style/qtquickcontrols/CheckDelegate.qml | 21 ++--
- style/qtquickcontrols/ComboBox.qml | 27 ++---
- style/qtquickcontrols/DelayButton.qml | 21 ++--
- style/qtquickcontrols/Dial.qml | 20 ++--
- style/qtquickcontrols/Dialog.qml | 20 ++--
- style/qtquickcontrols/DialogButtonBox.qml | 10 +-
- style/qtquickcontrols/Drawer.qml | 10 +-
- style/qtquickcontrols/Frame.qml | 8 +-
- style/qtquickcontrols/GroupBox.qml | 6 +-
- style/qtquickcontrols/ItemDelegate.qml | 19 ++--
- style/qtquickcontrols/Menu.qml | 21 ++--
- style/qtquickcontrols/MenuBarItem.qml | 12 +-
- style/qtquickcontrols/MenuItem.qml | 24 ++--
- .../MobileTextActionsToolBar.qml | 4 +-
- style/qtquickcontrols/PageIndicator.qml | 10 +-
- style/qtquickcontrols/Pane.qml | 4 +-
- style/qtquickcontrols/Popup.qml | 22 ++--
- style/qtquickcontrols/ProgressBar.qml | 14 +--
- style/qtquickcontrols/RadioButton.qml | 16 +--
- style/qtquickcontrols/RadioDelegate.qml | 20 ++--
- style/qtquickcontrols/RangeSlider.qml | 10 +-
- style/qtquickcontrols/RoundButton.qml | 14 +--
- style/qtquickcontrols/ScrollBar.qml | 7 +-
- style/qtquickcontrols/ScrollIndicator.qml | 7 +-
- style/qtquickcontrols/Slider.qml | 8 +-
- style/qtquickcontrols/SpinBox.qml | 16 +--
- style/qtquickcontrols/SwipeDelegate.qml | 19 ++--
- style/qtquickcontrols/Switch.qml | 16 +--
- style/qtquickcontrols/SwitchDelegate.qml | 20 ++--
- style/qtquickcontrols/TabBar.qml | 4 +-
- style/qtquickcontrols/TabButton.qml | 30 ++---
- style/qtquickcontrols/TextArea.qml | 14 +--
- style/qtquickcontrols/TextField.qml | 16 +--
- style/qtquickcontrols/ToolBar.qml | 8 +-
- style/qtquickcontrols/ToolButton.qml | 18 +--
- style/qtquickcontrols/ToolSeparator.qml | 4 +-
- style/qtquickcontrols/ToolTip.qml | 26 ++---
- style/qtquickcontrols/qmldir | 2 -
- 74 files changed, 618 insertions(+), 465 deletions(-)
- create mode 100644 kirigami-plasmadesktop-integration/units.cpp
- create mode 100644 kirigami-plasmadesktop-integration/units.h
- rename style/{kirigami => impl}/Units.qml (71%)
-
-diff --git a/kirigami-plasmadesktop-integration/CMakeLists.txt b/kirigami-plasmadesktop-integration/CMakeLists.txt
-index 2201c98..8d53dd8 100644
---- a/kirigami-plasmadesktop-integration/CMakeLists.txt
-+++ b/kirigami-plasmadesktop-integration/CMakeLists.txt
-@@ -3,6 +3,7 @@
- set(org.kde.breeze_SRCS
- plasmadesktoptheme.cpp
- kirigamiplasmafactory.cpp
-+ units.cpp
- )
-
- kcoreaddons_add_plugin(org.kde.breeze SOURCES ${org.kde.breeze_SRCS} INSTALL_NAMESPACE "kf5/kirigami" JSON kirigamiplasmaintegration.json)
-diff --git a/kirigami-plasmadesktop-integration/kirigamiplasmafactory.cpp b/kirigami-plasmadesktop-integration/kirigamiplasmafactory.cpp
-index abd3393..0353e82 100644
---- a/kirigami-plasmadesktop-integration/kirigamiplasmafactory.cpp
-+++ b/kirigami-plasmadesktop-integration/kirigamiplasmafactory.cpp
-@@ -6,9 +6,10 @@
-
- #include "kirigamiplasmafactory.h"
- #include "plasmadesktoptheme.h"
-+#include "units.h"
-
- KirigamiPlasmaFactory::KirigamiPlasmaFactory(QObject *parent)
-- : Kirigami::KirigamiPluginFactory(parent)
-+ : Kirigami::KirigamiPluginFactoryV2(parent)
- {
- }
-
-@@ -20,4 +21,10 @@ Kirigami::PlatformTheme *KirigamiPlasmaFactory::createPlatformTheme(QObject *par
- return new PlasmaDesktopTheme(parent);
- }
-
-+Kirigami::Units *KirigamiPlasmaFactory::createUnits(QObject *parent)
-+{
-+ Q_ASSERT(parent);
-+ return new Units(parent);
-+}
-+
- #include "moc_kirigamiplasmafactory.cpp"
-diff --git a/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h b/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h
-index 9ed009a..31ca760 100644
---- a/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h
-+++ b/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h
-@@ -10,7 +10,7 @@
- #include <Kirigami2/KirigamiPluginFactory>
- #include <QObject>
-
--class KirigamiPlasmaFactory : public Kirigami::KirigamiPluginFactory
-+class KirigamiPlasmaFactory : public Kirigami::KirigamiPluginFactoryV2
- {
- Q_OBJECT
-
-@@ -23,6 +23,7 @@ public:
- ~KirigamiPlasmaFactory() override;
-
- Kirigami::PlatformTheme *createPlatformTheme(QObject *parent) override;
-+ Kirigami::Units *createUnits(QObject *parent) override;
- };
-
- #endif // KIRIGAMIPLASMAFACTORY_H
-diff --git a/kirigami-plasmadesktop-integration/units.cpp b/kirigami-plasmadesktop-integration/units.cpp
-new file mode 100644
-index 0000000..63a74fb
---- /dev/null
-+++ b/kirigami-plasmadesktop-integration/units.cpp
-@@ -0,0 +1,58 @@
-+/*
-+ SPDX-FileCopyrightText: 2013 Marco Martin <mart@kde.org>
-+ SPDX-FileCopyrightText: 2014 Sebastian Kügler <sebas@kde.org>
-+ SPDX-FileCopyrightText: 2014 David Edmundson <davidedmunsdon@kde.org>
-+ SPDX-FileCopyrightText: 2021 Jonah Brüchert <jbb@kaidan.im>
-+ SPDX-FileCopyrightText: 2021 Arjen Hiemstra <ahiemstra@heimr.nl>
-+
-+ SPDX-License-Identifier: LGPL-2.0-or-later
-+
-+*/
-+
-+#include "units.h"
-+
-+#include <KConfigGroup>
-+#include <KSharedConfig>
-+
-+#include <cmath>
-+
-+constexpr int defaultLongDuration = 200;
-+
-+Units::Units(QObject *parent)
-+ : Kirigami::Units(parent)
-+ , m_animationSpeedWatcher(KConfigWatcher::create(KSharedConfig::openConfig()))
-+{
-+ connect(m_animationSpeedWatcher.data(), &KConfigWatcher::configChanged, this, [this](const KConfigGroup &group, const QByteArrayList &names) {
-+ if (group.name() == QLatin1String("KDE") && names.contains(QByteArrayLiteral("AnimationDurationFactor"))) {
-+ updateAnimationSpeed();
-+ }
-+ });
-+
-+ updateAnimationSpeed();
-+
-+ setGridUnit(gridUnit() + std::fmod(gridUnit(), 2));
-+ setSmallSpacing(4);
-+ setLargeSpacing(8);
-+}
-+
-+// Copy from plasma-framework/src/declarativeimports/core/units.cpp, since we don't want to depend on plasma-framework here
-+void Units::updateAnimationSpeed()
-+{
-+ KConfigGroup generalCfg = KConfigGroup(KSharedConfig::openConfig(), QStringLiteral("KDE"));
-+ const qreal animationSpeedModifier = qMax(0.0, generalCfg.readEntry("AnimationDurationFactor", 1.0));
-+
-+ // Read the old longDuration value for compatibility
-+ KConfigGroup cfg = KConfigGroup(KSharedConfig::openConfig(QStringLiteral("plasmarc")), QStringLiteral("Units"));
-+ int longDuration = cfg.readEntry("longDuration", defaultLongDuration);
-+
-+ longDuration = qRound(longDuration * animationSpeedModifier);
-+
-+ // Animators with a duration of 0 do not fire reliably
-+ // see Bug 357532 and QTBUG-39766
-+ longDuration = qMax(1, longDuration);
-+
-+ setVeryShortDuration(longDuration / 4);
-+ setShortDuration(longDuration / 2);
-+ setLongDuration(longDuration);
-+ setVeryLongDuration(longDuration * 2);
-+}
-diff --git a/kirigami-plasmadesktop-integration/units.h b/kirigami-plasmadesktop-integration/units.h
-new file mode 100644
-index 0000000..c22def0
---- /dev/null
-+++ b/kirigami-plasmadesktop-integration/units.h
-@@ -0,0 +1,30 @@
-+/*
-+ SPDX-FileCopyrightText: 2021 Jonah Brüchert <jbb@kaidan.im>
-+ SPDX-FileCopyrightText: 2021 Arjen Hiemstra <ahiemstra@heimr.nl>
-+
-+ SPDX-License-Identifier: LGPL-2.0-or-later
-+*/
-+
-+#ifndef UNITS_H
-+#define UNITS_H
-+
-+#include <QObject>
-+
-+#include <Kirigami2/Units>
-+
-+#include <KConfigWatcher>
-+
-+class Units : public Kirigami::Units
-+{
-+ Q_OBJECT
-+
-+public:
-+ explicit Units(QObject *parent = nullptr);
-+
-+ void updateAnimationSpeed();
-+
-+private:
-+ KConfigWatcher::Ptr m_animationSpeedWatcher;
-+};
-+
-+#endif
-diff --git a/style/impl/BackgroundGradient.qml b/style/impl/BackgroundGradient.qml
-index 035b997..69d2a29 100644
---- a/style/impl/BackgroundGradient.qml
-+++ b/style/impl/BackgroundGradient.qml
-@@ -5,9 +5,11 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Loader {
- id: root
-- property real radius: Kirigami.Units.smallRadius
-+ property real radius: Impl.Units.smallRadius
- active: visible
- anchors.fill: parent
- sourceComponent: Component {
-@@ -28,7 +30,7 @@ Loader {
- opacity: parent.opacity
- Behavior on opacity {
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-diff --git a/style/impl/ButtonBackground.qml b/style/impl/ButtonBackground.qml
-index c3ac481..4629201 100644
---- a/style/impl/ButtonBackground.qml
-+++ b/style/impl/ButtonBackground.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- // TODO: Maybe use a loader here one day. Make sure nothing breaks.
- // Kirigami ShadowedRectangle doesn't have a gradient property, which could be an issue in some cases
- Kirigami.ShadowedRectangle {
-@@ -31,7 +33,7 @@ Kirigami.ShadowedRectangle {
- property bool highlightBackground: control.down || control.checked
- property bool highlightBorder: control.enabled && control.down || control.checked || control.highlighted || control.visualFocus || control.hovered
-
-- radius: Kirigami.Units.smallRadius
-+ radius: Impl.Units.smallRadius
- corners {
- topLeftRadius: leftRadius
- topRightRadius: rightRadius
-@@ -40,7 +42,7 @@ Kirigami.ShadowedRectangle {
- }
-
- implicitWidth: implicitHeight
-- implicitHeight: Kirigami.Units.mediumControlHeight
-+ implicitHeight: Impl.Units.mediumControlHeight
-
- visible: !control.flat || control.editable || control.down || control.checked || control.highlighted || control.visualFocus || control.hovered
-
-@@ -62,20 +64,20 @@ Kirigami.ShadowedRectangle {
- return Kirigami.Theme.separatorColor
- }
- }
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- }
-
- Behavior on color {
- enabled: highlightBackground
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
- Behavior on border.color {
- enabled: highlightBorder
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-diff --git a/style/impl/CMakeLists.txt b/style/impl/CMakeLists.txt
-index 0ff78ca..a1f2a03 100644
---- a/style/impl/CMakeLists.txt
-+++ b/style/impl/CMakeLists.txt
-@@ -5,7 +5,9 @@ file(GLOB qmlfiles
- CONFIGURE_DEPENDS
- "*.qml"
- )
--install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/breeze/impl)
-+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2/org.kde.breeze/impl)
- install(FILES ${qmlfiles} DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2/org.kde.breeze/impl)
-+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigami.2/styles/org.kde.breeze/impl)
- install(FILES ${qmlfiles} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigami.2/styles/org.kde.breeze/impl)
-+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/breeze/impl)
- install(FILES ${qmlfiles} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/breeze/impl)
-diff --git a/style/impl/CheckIndicator.qml b/style/impl/CheckIndicator.qml
-index 4252d51..e91d801 100644
---- a/style/impl/CheckIndicator.qml
-+++ b/style/impl/CheckIndicator.qml
-@@ -7,12 +7,14 @@ import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
- import org.kde.breeze 1.0
-
-+import "." as Impl
-+
- Rectangle {
- id: root
-
- property T.AbstractButton control: root.parent
- property int checkState: control.checkState
-- property int symbolSize: Kirigami.Units.symbolSize(Math.min(width, height))
-+ property int symbolSize: Impl.Units.symbolSize(Math.min(width, height))
- property bool mirrored: control.mirrored
- readonly property bool controlHasContent: control.contentItem && control.contentItem.width > 0
-
-@@ -25,16 +27,16 @@ Rectangle {
- y: control.topPadding + (control.availableHeight - height) / 2
-
- implicitWidth: implicitHeight
-- implicitHeight: Kirigami.Units.inlineControlHeight
-+ implicitHeight: Impl.Units.inlineControlHeight
-
- Kirigami.Theme.colorSet: Kirigami.Theme.Button
- Kirigami.Theme.inherit: false
- color: highlightBackground ? Kirigami.Theme.alternateBackgroundColor : Kirigami.Theme.backgroundColor
-
-- radius: Kirigami.Units.smallRadius
-+ radius: Impl.Units.smallRadius
-
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: highlightBorder ?
- Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
- //Kirigami.ColorUtils.tintWithAlpha(root.color, Kirigami.Theme.textColor, 0.3)
-@@ -43,14 +45,14 @@ Rectangle {
- Behavior on color {
- enabled: highlightBackground
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
- Behavior on border.color {
- enabled: highlightBorder
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -147,7 +149,7 @@ Rectangle {
- property: "width"
- from: checkmark.width
- to: 0
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- //Intentionally not using an easing curve
- }
-
-diff --git a/style/impl/ComboBoxBackground.qml b/style/impl/ComboBoxBackground.qml
-index 339dd25..1a02d96 100644
---- a/style/impl/ComboBoxBackground.qml
-+++ b/style/impl/ComboBoxBackground.qml
-@@ -14,6 +14,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Rectangle {
- id: mainBackground
-
-@@ -29,7 +31,7 @@ Rectangle {
- property bool highlightBorder: control.down || control.visualFocus || control.hovered
-
- implicitWidth: 200
-- implicitHeight: Kirigami.Units.mediumControlHeight
-+ implicitHeight: Impl.Units.mediumControlHeight
-
- visible: !control.flat || control.editable || control.down || control.visualFocus || control.hovered
-
-@@ -46,25 +48,25 @@ Rectangle {
- border {
- color: highlightBorder ?
- Kirigami.Theme.focusColor : Kirigami.Theme.buttonSeparatorColor
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- }
-
- Behavior on color {
- enabled: highlightBackground
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
- Behavior on border.color {
- enabled: highlightBorder
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-
-- radius: Kirigami.Units.smallRadius
-+ radius: Impl.Units.smallRadius
-
- SmallShadow {
- id: shadow
-diff --git a/style/impl/CursorDelegate.qml b/style/impl/CursorDelegate.qml
-index da94ed1..eb480fb 100644
---- a/style/impl/CursorDelegate.qml
-+++ b/style/impl/CursorDelegate.qml
-@@ -8,6 +8,8 @@ import QtQuick.Window 2.15
- import QtQuick.Templates 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Item {
- id: root
- property alias target: root.parent
-@@ -57,14 +59,14 @@ Item {
- SmoothedAnimation {
- velocity: 200
- reversingMode: SmoothedAnimation.Immediate
-- duration: Kirigami.Settings.tabletMode ? Kirigami.Units.shortDuration : 0//Kirigami.Units.veryShortDuration
-+ duration: Kirigami.Settings.tabletMode ? Impl.Units.shortDuration : 0//Impl.Units.veryShortDuration
- }
- }
- Behavior on y {
- SmoothedAnimation {
- velocity: 200
- reversingMode: SmoothedAnimation.Immediate
-- duration: Kirigami.Settings.tabletMode ? Kirigami.Units.shortDuration : 0//Kirigami.Units.veryShortDuration
-+ duration: Kirigami.Settings.tabletMode ? Impl.Units.shortDuration : 0//Impl.Units.veryShortDuration
- }
- }
- */
-diff --git a/style/impl/CursorHandle.qml b/style/impl/CursorHandle.qml
-index 864184f..fa0751d 100644
---- a/style/impl/CursorHandle.qml
-+++ b/style/impl/CursorHandle.qml
-@@ -8,6 +8,8 @@ import QtQuick.Window 2.15
- import QtQuick.Templates 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Loader {
- id: root
- property Item target
-@@ -31,7 +33,7 @@ Loader {
-
- //opacity: target.activeFocus ? 1 : 0
- implicitHeight: {
-- let h = Kirigami.Units.gridUnit
-+ let h = Impl.Units.gridUnit
- return h - (h % 2 == 0 ? 1 : 0)
- }
- implicitWidth: implicitHeight
-@@ -60,7 +62,7 @@ Loader {
- id: inner
- visible: target.selectionStart !== target.selectionEnd && (handle.y < selectionStartY || handle.y < selectionEndY)
- anchors.fill: parent
-- anchors.margins: Kirigami.Units.smallBorder
-+ anchors.margins: Impl.Units.smallBorder
- color: target.selectedTextColor
- radius: height/2
- Rectangle {
-@@ -102,7 +104,7 @@ Loader {
- SmoothedAnimation {
- velocity: 200
- reversingMode: SmoothedAnimation.Immediate
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- Behavior on y {
-@@ -110,7 +112,7 @@ Loader {
- SmoothedAnimation {
- velocity: 200
- reversingMode: SmoothedAnimation.Immediate
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
-
-diff --git a/style/impl/DelegateBackground.qml b/style/impl/DelegateBackground.qml
-index d13e892..6d579fc 100644
---- a/style/impl/DelegateBackground.qml
-+++ b/style/impl/DelegateBackground.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- // TODO: I'm currently unsatisfied with the appearance of this
- Loader {
- id: root
-@@ -28,9 +30,9 @@ Loader {
- return normalColor
- }
- }
-- property real radius: Kirigami.Units.smallRadius
-+ property real radius: Impl.Units.smallRadius
- property QtObject border: QtObject {
-- property real width: highlightBorder ? Kirigami.Units.smallBorder : 0
-+ property real width: highlightBorder ? Impl.Units.smallBorder : 0
- property color color: Kirigami.Theme.focusColor
- }
-
-@@ -43,7 +45,7 @@ Loader {
- Kirigami.ShadowedRectangle {
- id: mainBackground
-
-- implicitHeight: Kirigami.Units.mediumControlHeight
-+ implicitHeight: Impl.Units.mediumControlHeight
-
- radius: root.radius
-
-@@ -57,7 +59,7 @@ Loader {
- Behavior on color {
- enabled: control.down
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- onRunningChanged: root.backgroundAnimationRunning = running
- }
-@@ -65,7 +67,7 @@ Loader {
- Behavior on border.color {
- enabled: highlightBorder
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- onRunningChanged: root.borderAnimationRunning = running
- }
-diff --git a/style/impl/FocusRect.qml b/style/impl/FocusRect.qml
-index 070a3d6..8160232 100644
---- a/style/impl/FocusRect.qml
-+++ b/style/impl/FocusRect.qml
-@@ -5,6 +5,8 @@
- import QtQuick 2.6
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Loader {
- id: root
- property real baseRadius: 0
-@@ -25,7 +27,7 @@ Loader {
- Kirigami.Theme.focusColor.b,
- 0.42
- )
-- border.width: Kirigami.Units.mediumBorder/2
-+ border.width: Impl.Units.mediumBorder/2
-
- Rectangle {
- id: outerRing
-diff --git a/style/impl/IconLabelContent.qml b/style/impl/IconLabelContent.qml
-index 1f64320..e7b3ec3 100644
---- a/style/impl/IconLabelContent.qml
-+++ b/style/impl/IconLabelContent.qml
-@@ -7,6 +7,8 @@ import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
- import org.kde.breeze 1.0
-
-+import "." as Impl
-+
- IconLabelLayout {
- id: root
- // NOTE: Remember to use root.mirrored, not control.mirrored in this file
-@@ -73,7 +75,7 @@ IconLabelLayout {
- Behavior on opacity {
- enabled: firstLayoutCompleted
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- }
-@@ -91,19 +93,19 @@ IconLabelLayout {
- Behavior on x {
- enabled: firstLayoutCompleted
- XAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- Behavior on y {
- enabled: firstLayoutCompleted
- YAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- Behavior on opacity {
- enabled: firstLayoutCompleted
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- }
-diff --git a/style/impl/IconLabelShortcutContent.qml b/style/impl/IconLabelShortcutContent.qml
-index 7346ddc..80690ce 100644
---- a/style/impl/IconLabelShortcutContent.qml
-+++ b/style/impl/IconLabelShortcutContent.qml
-@@ -7,6 +7,8 @@ import QtQuick.Layouts 1.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- IconLabelContent {
- id: root
-
-diff --git a/style/impl/InlineIconLabelContent.qml b/style/impl/InlineIconLabelContent.qml
-index 4c2c849..ebc4c17 100644
---- a/style/impl/InlineIconLabelContent.qml
-+++ b/style/impl/InlineIconLabelContent.qml
-@@ -5,6 +5,8 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- IconLabelContent {
- id: root
- Rectangle {
-@@ -12,7 +14,7 @@ IconLabelContent {
- x: root.labelRect.x
- y: root.labelRect.y + root.labelRect.height - height
- width: root.labelRect.width//root.hasIcon && root.hasLabel ? root.availableWidth - root.icon.width - root.spacing : root.availableWidth
-- height: Kirigami.Units.focusUnderlineThickness
-+ height: Impl.Units.focusUnderlineThickness
- visible: control.visualFocus
- color: Kirigami.Theme.focusColor
- }
-diff --git a/style/impl/LargeShadow.qml b/style/impl/LargeShadow.qml
-index 45f5eaf..0a46255 100644
---- a/style/impl/LargeShadow.qml
-+++ b/style/impl/LargeShadow.qml
-@@ -5,9 +5,11 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Loader {
- id: root
-- property real radius: Kirigami.Units.smallRadius
-+ property real radius: Impl.Units.smallRadius
- anchors.fill: parent
- z: -1
- active: visible && !Kirigami.Theme.lowPowerHardware
-@@ -24,7 +26,7 @@ Loader {
- opacity: parent.opacity
- Behavior on opacity {
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-diff --git a/style/impl/ListViewHighlight.qml b/style/impl/ListViewHighlight.qml
-index f7971c6..a359f83 100644
---- a/style/impl/ListViewHighlight.qml
-+++ b/style/impl/ListViewHighlight.qml
-@@ -5,12 +5,14 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Kirigami.ShadowedRectangle {
- id: root
- property int currentIndex: -1
- property int count: 0
-- readonly property real topRadius: root.currentIndex == 0 ? Kirigami.Units.smallRadius : 0
-- readonly property real bottomRadius: root.currentIndex == Math.max(root.count-1, 0) ? Kirigami.Units.smallRadius : 0
-+ readonly property real topRadius: root.currentIndex == 0 ? Impl.Units.smallRadius : 0
-+ readonly property real bottomRadius: root.currentIndex == Math.max(root.count-1, 0) ? Impl.Units.smallRadius : 0
-
- Kirigami.Theme.colorSet: Kirigami.Theme.Selection
- Kirigami.Theme.inherit: false
-@@ -24,7 +26,7 @@ Kirigami.ShadowedRectangle {
-
- color: Kirigami.Theme.alternateBackgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: Kirigami.Theme.focusColor
- }
- }
-diff --git a/style/impl/MediumShadow.qml b/style/impl/MediumShadow.qml
-index 1acd771..42342b7 100644
---- a/style/impl/MediumShadow.qml
-+++ b/style/impl/MediumShadow.qml
-@@ -5,9 +5,11 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Loader {
- id: root
-- property real radius: Kirigami.Units.smallRadius
-+ property real radius: Impl.Units.smallRadius
- anchors.fill: parent
- z: -1
- active: visible && !Kirigami.Theme.lowPowerHardware
-@@ -24,7 +26,7 @@ Loader {
- opacity: parent.opacity
- Behavior on opacity {
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-diff --git a/style/impl/MenuItemBackground.qml b/style/impl/MenuItemBackground.qml
-index 27b8ed6..8664df1 100644
---- a/style/impl/MenuItemBackground.qml
-+++ b/style/impl/MenuItemBackground.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Loader {
- id: root
- property T.MenuItem control: root.parent
-@@ -30,9 +32,9 @@ Loader {
- return normalColor
- }
- }
-- property real radius: Kirigami.Units.smallRadius
-+ property real radius: Impl.Units.smallRadius
- property QtObject border: QtObject {
-- property real width: highlightBackground ? Kirigami.Units.smallBorder : 0
-+ property real width: highlightBackground ? Impl.Units.smallBorder : 0
- property color color: Kirigami.Theme.focusColor
- }
-
-@@ -49,7 +51,7 @@ Loader {
- // readonly property int count: root.isInListView ? control.ListView.view.count : 0
- readonly property bool horizontalListView: root.isInListView && control.ListView.view.orientation === ListView.Horizontal
-
-- implicitHeight: Kirigami.Units.mediumControlHeight
-+ implicitHeight: Impl.Units.mediumControlHeight
-
- radius: root.radius
- readonly property real topRadius: !root.isInListView || (isCurrentItem && currentIndex == 0) ? radius : 0
-@@ -72,7 +74,7 @@ Loader {
- Behavior on color {
- enabled: highlightBackground
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- onRunningChanged: root.backgroundAnimationRunning = running
- }
-@@ -80,7 +82,7 @@ Loader {
- Behavior on border.color {
- enabled: highlightBackground
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- onRunningChanged: root.borderAnimationRunning = running
- }
-diff --git a/style/impl/OverlayDimBackground.qml b/style/impl/OverlayDimBackground.qml
-index c24a0ca..50c2c0d 100644
---- a/style/impl/OverlayDimBackground.qml
-+++ b/style/impl/OverlayDimBackground.qml
-@@ -5,11 +5,13 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Rectangle {
- color: Qt.rgba(0,0,0,0.2)
- Behavior on opacity {
- OpacityAnimator {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- }
- }
- }
-diff --git a/style/impl/OverlayModalBackground.qml b/style/impl/OverlayModalBackground.qml
-index d87d10c..19e2591 100644
---- a/style/impl/OverlayModalBackground.qml
-+++ b/style/impl/OverlayModalBackground.qml
-@@ -5,11 +5,13 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Rectangle {
- color: Qt.rgba(0,0,0,0.4)
- Behavior on opacity {
- OpacityAnimator {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- }
- }
- }
-diff --git a/style/impl/RadioIndicator.qml b/style/impl/RadioIndicator.qml
-index e00a277..c9e8956 100644
---- a/style/impl/RadioIndicator.qml
-+++ b/style/impl/RadioIndicator.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- // TODO: replace with ShadowedRectangle because it produces smoother circles.
- // Unfortunately I can't do it now because batching issues can cause all radio
- // buttons to show hover effects when only one is hovered
-@@ -17,7 +19,7 @@ Rectangle {
- readonly property bool controlHasContent: control.contentItem && control.contentItem.width > 0
-
- implicitWidth: implicitHeight
-- implicitHeight: Kirigami.Units.inlineControlHeight
-+ implicitHeight: Impl.Units.inlineControlHeight
-
- x: controlHasContent ? (root.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
- y: control.topPadding + (control.availableHeight - height) / 2
-@@ -29,14 +31,14 @@ Rectangle {
- color: control.down || control.checked ? Kirigami.Theme.alternateBackgroundColor : Kirigami.Theme.backgroundColor
-
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: control.down || control.checked || control.visualFocus || control.hovered ? Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
- }
-
- Behavior on color {
- enabled: control.down || control.checked
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -44,7 +46,7 @@ Rectangle {
- Behavior on border.color {
- enabled: control.down || control.checked || control.visualFocus || control.hovered
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -112,7 +114,7 @@ Rectangle {
- from: "unchecked"
- to: "checked"
- ScaleAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutQuad
- }
- }
-diff --git a/style/impl/ScrollHandle.qml b/style/impl/ScrollHandle.qml
-index da87f56..06fde58 100644
---- a/style/impl/ScrollHandle.qml
-+++ b/style/impl/ScrollHandle.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Rectangle {
- id: root
- property T.Control control: root.parent
-@@ -16,7 +18,7 @@ Rectangle {
-
- visible: control.size < 1 && root.policy !== T.ScrollBar.AlwaysOff
-
-- implicitWidth: Kirigami.Units.grooveHeight
-+ implicitWidth: Impl.Units.grooveHeight
- implicitHeight: implicitWidth
-
- radius: width / 2
-@@ -30,7 +32,7 @@ Rectangle {
- Behavior on color {
- enabled: root.pressed
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -47,9 +49,9 @@ Rectangle {
- transitions: Transition {
- from: "active"
- SequentialAnimation {
-- PauseAnimation { duration: Kirigami.Units.veryLongDuration }
-+ PauseAnimation { duration: Impl.Units.veryLongDuration }
- OpacityAnimator {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- to: 0.0
- }
- }
-diff --git a/style/impl/SliderGroove.qml b/style/impl/SliderGroove.qml
-index 1d53b20..602ca52 100644
---- a/style/impl/SliderGroove.qml
-+++ b/style/impl/SliderGroove.qml
-@@ -7,6 +7,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as Templates
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Rectangle {
- id: root
-
-@@ -25,25 +27,25 @@ Rectangle {
- readonly property bool vertical: root.control.vertical
-
-
-- implicitWidth: root.horizontal ? 200 : Kirigami.Units.grooveHeight
-- implicitHeight: root.vertical ? 200 : Kirigami.Units.grooveHeight
-+ implicitWidth: root.horizontal ? 200 : Impl.Units.grooveHeight
-+ implicitHeight: root.vertical ? 200 : Impl.Units.grooveHeight
-
-
- //NOTE: Manually setting x,y,width,height because that's what the Basic, Fusion and Material QQC2 styles do.
- // Inset would be more idiomatic for QQC2, but this is easier to deal with for now since the behavior is expected by app devs.
-
-- width: root.horizontal ? control.availableWidth - root.handleWidth/2 - secondHandleWidth/2 + Kirigami.Units.grooveHeight : implicitWidth
-- height: root.vertical ? control.availableHeight - root.handleHeight/2 - secondHandleHeight/2 + Kirigami.Units.grooveHeight : implicitHeight
-+ width: root.horizontal ? control.availableWidth - root.handleWidth/2 - secondHandleWidth/2 + Impl.Units.grooveHeight : implicitWidth
-+ height: root.vertical ? control.availableHeight - root.handleHeight/2 - secondHandleHeight/2 + Impl.Units.grooveHeight : implicitHeight
-
- x: control.leftPadding + (root.horizontal ?
- (control.mirrored ? root.secondHandleWidth/2 : root.handleWidth/2) - radius
- : (control.availableWidth - width) / 2)
- y: control.topPadding + (root.vertical ? root.secondHandleHeight/2 - radius : (control.availableHeight - height) / 2)
-
-- radius: Kirigami.Units.grooveHeight/2
-+ radius: Impl.Units.grooveHeight/2
- color: Kirigami.Theme.backgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: Kirigami.Theme.separatorColor
- }
-
-@@ -51,23 +53,23 @@ Rectangle {
- id: fill
- anchors {
- fill: parent
-- leftMargin: root.horizontal ? root.startPosition * parent.width - (root.startPosition * Kirigami.Units.grooveHeight) : 0
-- rightMargin: root.horizontal ? (1-root.endPosition) * parent.width - ((1-root.endPosition) * Kirigami.Units.grooveHeight) : 0
-- topMargin: root.vertical ? (1-root.endPosition) * parent.height - ((1-root.endPosition) * Kirigami.Units.grooveHeight) : 0
-- bottomMargin: root.vertical ? root.startPosition * parent.height - (root.startPosition * Kirigami.Units.grooveHeight) : 0
-+ leftMargin: root.horizontal ? root.startPosition * parent.width - (root.startPosition * Impl.Units.grooveHeight) : 0
-+ rightMargin: root.horizontal ? (1-root.endPosition) * parent.width - ((1-root.endPosition) * Impl.Units.grooveHeight) : 0
-+ topMargin: root.vertical ? (1-root.endPosition) * parent.height - ((1-root.endPosition) * Impl.Units.grooveHeight) : 0
-+ bottomMargin: root.vertical ? root.startPosition * parent.height - (root.startPosition * Impl.Units.grooveHeight) : 0
- }
-
- radius: parent.radius
- color: Kirigami.Theme.alternateBackgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: Kirigami.Theme.focusColor
- }
-
- Behavior on anchors.leftMargin {
- enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- //SmoothedAnimations have a hardcoded InOutQuad easing
- }
-@@ -75,21 +77,21 @@ Rectangle {
- Behavior on anchors.rightMargin {
- enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- }
- }
- Behavior on anchors.topMargin {
- enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- }
- }
- Behavior on anchors.bottomMargin {
- enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- }
- }
-@@ -117,8 +119,8 @@ Rectangle {
- anchors {
- left: root.horizontal ? parent.left : parent.right
- top: root.vertical ? parent.top : parent.bottom
-- leftMargin: root.horizontal ? parent.radius : Kirigami.Units.smallBorder
-- topMargin: root.vertical ? parent.radius : Kirigami.Units.smallBorder
-+ leftMargin: root.horizontal ? parent.radius : Impl.Units.smallBorder
-+ topMargin: root.vertical ? parent.radius : Impl.Units.smallBorder
- }
- width: root.vertical ? implicitWidth : root.width - parent.radius
- height: root.horizontal ? implicitHeight : root.height - parent.radius
-@@ -132,8 +134,8 @@ Rectangle {
- anchors {
- left: parent.left
- top: parent.top
-- leftMargin: root.horizontal ? parent.radius : -width - Kirigami.Units.smallBorder
-- topMargin: root.vertical ? parent.radius : -height - Kirigami.Units.smallBorder
-+ leftMargin: root.horizontal ? parent.radius : -width - Impl.Units.smallBorder
-+ topMargin: root.vertical ? parent.radius : -height - Impl.Units.smallBorder
- }
- width: tickmarkLoader.width
- height: tickmarkLoader.height
-@@ -146,13 +148,13 @@ Rectangle {
- id: markGrid
- rows: root.vertical ? markRepeater.model : 1
- columns: root.horizontal ? markRepeater.model : 1
-- spacing: (root.vertical ? height/(markRepeater.model-1) : width/(markRepeater.model-1)) - Kirigami.Units.smallBorder*2
-+ spacing: (root.vertical ? height/(markRepeater.model-1) : width/(markRepeater.model-1)) - Impl.Units.smallBorder*2
- Repeater {
- id: markRepeater
- model: (root.control.to - root.control.from)/root.control.stepSize + 1
- delegate: Rectangle {
-- implicitWidth: root.vertical ? root.x - Kirigami.Units.smallBorder : Kirigami.Units.smallBorder
-- implicitHeight: root.horizontal ? root.y - Kirigami.Units.smallBorder : Kirigami.Units.smallBorder
-+ implicitWidth: root.vertical ? root.x - Impl.Units.smallBorder : Impl.Units.smallBorder
-+ implicitHeight: root.horizontal ? root.y - Impl.Units.smallBorder : Impl.Units.smallBorder
- color: (root.horizontal && x >= fill.x && x <= fill.x + fill.width)
- || (root.vertical && y >= fill.y && y <= fill.y + fill.height)
- ? Kirigami.Theme.focusColor
-diff --git a/style/impl/SliderHandle.qml b/style/impl/SliderHandle.qml
-index 5cba7f8..174c214 100644
---- a/style/impl/SliderHandle.qml
-+++ b/style/impl/SliderHandle.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Rectangle {
- id: root
-
-@@ -19,7 +21,7 @@ Rectangle {
- property bool usePreciseHandle: false
-
- implicitWidth: implicitHeight
-- implicitHeight: Kirigami.Units.inlineControlHeight
-+ implicitHeight: Impl.Units.inlineControlHeight
-
- // It's not necessary here. Not sure if it would swap leftPadding with
- // rightPadding in the x position calculation, but there's no risk to
-@@ -51,14 +53,14 @@ Rectangle {
- radius: height / 2
- color: Kirigami.Theme.backgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: root.pressed || root.visualFocus || root.hovered ? Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
- }
-
- Behavior on border.color {
- enabled: root.pressed || root.visualFocus || root.hovered
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -66,7 +68,7 @@ Rectangle {
- Behavior on x {
- enabled: root.loaded && !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- //SmoothedAnimations have a hardcoded InOutQuad easing
- }
-@@ -74,7 +76,7 @@ Rectangle {
- Behavior on y {
- enabled: root.loaded && !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- }
- }
-diff --git a/style/impl/SmallShadow.qml b/style/impl/SmallShadow.qml
-index 8bbce74..c443a09 100644
---- a/style/impl/SmallShadow.qml
-+++ b/style/impl/SmallShadow.qml
-@@ -5,9 +5,11 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Loader {
- id: root
-- property real radius: Kirigami.Units.smallRadius
-+ property real radius: Impl.Units.smallRadius
- anchors.fill: parent
- z: -1
- active: visible && !Kirigami.Theme.lowPowerHardware
-@@ -24,7 +26,7 @@ Loader {
- opacity: parent.opacity
- Behavior on opacity {
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-diff --git a/style/impl/SpinBoxIndicator.qml b/style/impl/SpinBoxIndicator.qml
-index 47b2c57..410bb68 100644
---- a/style/impl/SpinBoxIndicator.qml
-+++ b/style/impl/SpinBoxIndicator.qml
-@@ -5,6 +5,8 @@
- import QtQuick 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Item {
- id: root
-
-@@ -16,7 +18,7 @@ Item {
- property real leftRadius: {
- if ((leftAligned && !mirrored)
- || (rightAligned && mirrored)) {
-- return Kirigami.Units.smallRadius
-+ return Impl.Units.smallRadius
- } else {
- return 0
- }
-@@ -24,7 +26,7 @@ Item {
- property real rightRadius: {
- if ((rightAligned && !mirrored)
- || (leftAligned && mirrored)) {
-- return Kirigami.Units.smallRadius
-+ return Impl.Units.smallRadius
- } else {
- return 0
- }
-@@ -41,11 +43,11 @@ Item {
- height: parent.height
-
- implicitWidth: implicitHeight
-- implicitHeight: Kirigami.Units.mediumControlHeight
-+ implicitHeight: Impl.Units.mediumControlHeight
-
- Rectangle {
- id: separator
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- x: {
- if ((leftAligned && !mirrored)
- || (rightAligned && mirrored)) {
-@@ -57,8 +59,8 @@ Item {
- anchors {
- top: parent.top
- bottom: parent.bottom
-- topMargin: Kirigami.Units.smallSpacing
-- bottomMargin: Kirigami.Units.smallSpacing
-+ topMargin: Impl.Units.smallSpacing
-+ bottomMargin: Impl.Units.smallSpacing
- }
-
- color: button.pressed || button.hovered ? Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
-@@ -66,7 +68,7 @@ Item {
- Behavior on color {
- enabled: button.pressed || button.hovered
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -86,7 +88,7 @@ Item {
- bottomRightRadius: root.rightRadius
- }
- border.color: Kirigami.Theme.focusColor
-- border.width: Kirigami.Units.smallBorder
-+ border.width: Impl.Units.smallBorder
-
- states: State {
- name: "pressed"
-@@ -102,7 +104,7 @@ Item {
- to: ""
- SequentialAnimation {
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- PropertyAction {
-@@ -115,7 +117,7 @@ Item {
- }
-
- Kirigami.Icon {
-- implicitHeight: Kirigami.Units.iconSizes.auto
-+ implicitHeight: Impl.Units.iconSizes.auto
- implicitWidth: implicitHeight
- anchors {
- centerIn: parent
-diff --git a/style/impl/SwitchIndicator.qml b/style/impl/SwitchIndicator.qml
-index 0bb3fb8..15807ea 100644
---- a/style/impl/SwitchIndicator.qml
-+++ b/style/impl/SwitchIndicator.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Item {
- id: root
-
-@@ -14,7 +16,7 @@ Item {
- readonly property bool controlHasContent: control.contentItem && control.contentItem.width > 0
-
- implicitWidth: implicitHeight*2
-- implicitHeight: Kirigami.Units.inlineControlHeight
-+ implicitHeight: Impl.Units.inlineControlHeight
-
- x: controlHasContent ? (root.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
- y: control.topPadding + (control.availableHeight - height) / 2
-@@ -31,7 +33,7 @@ Item {
- radius: height / 2
- color: Kirigami.Theme.backgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: Kirigami.Theme.separatorColor
- }
- }
-@@ -41,7 +43,7 @@ Item {
- visible: width > handle.width/2
- color: Kirigami.Theme.alternateBackgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: Kirigami.Theme.focusColor
- }
- radius: height/2
-@@ -77,7 +79,7 @@ Item {
- radius: height / 2
- color: Kirigami.Theme.backgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: control.down || control.visualFocus || control.hovered ?
- Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
- }
-@@ -85,7 +87,7 @@ Item {
- Behavior on border.color {
- enabled: control.down || control.visualFocus || control.hovered
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -94,7 +96,7 @@ Item {
- enabled: handle.loaded// && !Kirigami.Settings.hasTransientTouchInput
- // Using SmoothedAnimation because the fill effect is anchored to the handle.
- SmoothedAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- //SmoothedAnimations have a hardcoded InOutQuad easing
- }
- }
-diff --git a/style/impl/TextEditBackground.qml b/style/impl/TextEditBackground.qml
-index c29520c..ea58d3f 100644
---- a/style/impl/TextEditBackground.qml
-+++ b/style/impl/TextEditBackground.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "." as Impl
-+
- Rectangle {
- id: root
-
-@@ -17,14 +19,14 @@ Rectangle {
- )
-
- implicitWidth: implicitHeight
-- implicitHeight: Kirigami.Units.mediumControlHeight
-+ implicitHeight: Impl.Units.mediumControlHeight
-
- color: Kirigami.Theme.backgroundColor
-- radius: Kirigami.Units.smallRadius
-+ radius: Impl.Units.smallRadius
- border {
- color: control.activeFocus || control.hovered ?
- Kirigami.Theme.focusColor : Kirigami.Theme.buttonSeparatorColor
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- }
-
- FocusRect {
-@@ -35,7 +37,7 @@ Rectangle {
- Behavior on border.color {
- enabled: control.activeFocus || control.hovered
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-diff --git a/style/kirigami/Units.qml b/style/impl/Units.qml
-similarity index 71%
-rename from style/kirigami/Units.qml
-rename to style/impl/Units.qml
-index 7359590..a91d8b9 100644
---- a/style/kirigami/Units.qml
-+++ b/style/impl/Units.qml
-@@ -11,6 +11,8 @@ import QtQuick.Window 2.15
- import QtQuick.Controls 1.4 as QtQuickControls
- import QtQuick.Controls.Private 1.0 as QtQuickControlsPrivate
-
-+import org.kde.kirigami 2.14 as Kirigami
-+
- pragma Singleton
-
- /**
-@@ -25,7 +27,7 @@ QtObject {
- * Given the screen has an accurate DPI settings, it corresponds to a width of
- * the capital letter M
- */
-- property int gridUnit: fontMetrics.height + fontMetrics.height % 2
-+ property int gridUnit: Kirigami.Units.gridUnit
-
- /**
- * units.iconSizes provides access to platform-dependent icon sizing
-@@ -46,26 +48,26 @@ QtObject {
- */
- property QtObject iconSizes: QtObject {
- // Breeze
-- property int sizeForLabels: units.iconSizes.auto
-- property int auto: fontMetrics.roundedIconSize(fontMetrics.height)
-- property int tiny: fontMetrics.roundedIconSize(8 * devicePixelRatio)
-- property int tinySmall: fontMetrics.roundedIconSize(12 * devicePixelRatio)
-+ property int sizeForLabels: Kirigami.Units.iconSizes.sizeForLabels
-+ property int auto: Kirigami.Units.iconSizes.sizeForLabels
-+ property int tiny: Kirigami.Units.iconSizes.small * 0.5
-+ property int tinySmall: Kirigami.Units.iconSizes.small * 0.75
- // Breeze
-- property int small: fontMetrics.roundedIconSize(16 * devicePixelRatio)
-- property int smallMedium: fontMetrics.roundedIconSize(22 * devicePixelRatio)
-- property int medium: fontMetrics.roundedIconSize(32 * devicePixelRatio)
-- property int large: fontMetrics.roundedIconSize(48 * devicePixelRatio)
-- property int huge: fontMetrics.roundedIconSize(64 * devicePixelRatio)
-- property int enormous: 128 * devicePixelRatio
-+ property int small: Kirigami.Units.iconSizes.small
-+ property int smallMedium: Kirigami.Units.iconSizes.smallMedium
-+ property int medium: Kirigami.Units.iconSizes.medium
-+ property int large: Kirigami.Units.iconSizes.large
-+ property int huge: Kirigami.Units.iconSizes.huge
-+ property int enormous: Kirigami.Units.iconSizes.enormous
- }
-
- //BEGIN Breeze Units
- // The default border width
- property int smallBorder: 1
- // Used for the focus ring
-- property int mediumBorder: smallBorder*2
-+ property int mediumBorder: smallBorder * 2
- // Usually for highlights on larger surfaces like Cards
-- property int largeBorder: smallBorder*4
-+ property int largeBorder: smallBorder * 4
-
- // The default corner radius
- property int smallRadius: 3
-@@ -78,13 +80,13 @@ QtObject {
- property int highlightLineThickness: smallRadius
-
- property int grooveHeight: {
-- let h = Math.floor(gridUnit/3);
-+ let h = Math.floor(gridUnit / 3);
- h += h % 2;
- return h;
- }
-
- property int thickGrooveHeight: {
-- let h = Math.floor(gridUnit/1.5);
-+ let h = Math.floor(gridUnit / 1.5);
- h += h % 2;
- return h;
- }
-@@ -93,15 +95,15 @@ QtObject {
- property int inlineControlHeight: gridUnit
-
- // For small controls with a small amount of vertical padding
-- property int smallControlHeight: gridUnit + units.smallSpacing*2
-+ property int smallControlHeight: gridUnit + units.smallSpacing * 2
-
- // For medium controls with a medium amount of vertical padding
-- property int mediumControlHeight: gridUnit + units.mediumSpacing*2
-+ property int mediumControlHeight: gridUnit + units.mediumSpacing * 2
-
- // For large controls with a large amount of vertical padding
-- property int largeControlHeight: gridUnit + units.largeSpacing*2
-+ property int largeControlHeight: gridUnit + units.largeSpacing * 2
-
-- property real horizontalPaddingRatio: Math.max(fontMetrics.height/fontMetrics.fullWidthCharWidth, 1)
-+ property real horizontalPaddingRatio: Math.max(fontMetrics.height / fontMetrics.fullWidthCharWidth, 1)
-
- property int verySmallHorizontalPadding: Math.round(horizontalPaddingRatio * units.verySmallSpacing)
-
-@@ -146,7 +148,7 @@ QtObject {
- * the default font as rendered on the screen, so it takes user-configured font size and DPI
- * into account.
- */
-- property int verySmallSpacing: 2
-+ property int verySmallSpacing: Kirigami.Units.smallSpacing * 0.5
-
- /**
- * Units.smallSpacing is the amount of spacing that should be used around smaller UI elements,
-@@ -154,12 +156,12 @@ QtObject {
- * the default font as rendered on the screen, so it takes user-configured font size and DPI
- * into account.
- */
-- property int smallSpacing: 4
-+ property int smallSpacing: Kirigami.Units.smallSpacing
-
- /**
- * Units.mediumSpacing is the amount of spacing that should be used around medium UI elements
- */
-- property int mediumSpacing: 6
-+ property int mediumSpacing: Kirigami.Units.smallSpacing * 1.5
-
- /**
- * Units.largeSpacing is the amount of spacing that should be used inside bigger UI elements,
-@@ -167,99 +169,70 @@ QtObject {
- * the size of the default font as rendered on the screen, so it takes user-configured font
- * size and DPI into account.
- */
-- property int largeSpacing: 8
-+ property int largeSpacing: Kirigami.Units.largeSpacing
-
- /**
- * Units.veryLargeSpacing is the amount of spacing that should be used inside very big UI elements
- */
-- property int veryLargeSpacing: 12
-+ property int veryLargeSpacing: Kirigami.Units.largeSpacing * 1.5
-
- /**
- * The ratio between physical and device-independent pixels. This value does not depend on the \
- * size of the configured font. If you want to take font sizes into account when scaling elements,
- * use theme.mSize(theme.defaultFont), units.smallSpacing and units.largeSpacing.
- * The devicePixelRatio follows the definition of "device independent pixel" by Microsoft.
-+ *
-+ * @deprecated See Kirigami.Units.devicePixelRatio
- */
-- property real devicePixelRatio: Math.max(1, (fontMetrics.font.pixelSize*0.75) / fontMetrics.font.pointSize)
-+ property real devicePixelRatio: Kirigami.Units.devicePixelRatio
-
- /**
- * units.shortDuration should be used for short animations, such as accentuating a UI event,
- * hover events, etc..
- */
-- property int veryShortDuration: 50
-+ property int veryShortDuration: Kirigami.Units.veryShortDuration
-
- /**
- * units.shortDuration should be used for short animations, such as accentuating a UI event,
- * hover events, etc..
- */
-- property int shortDuration: 100
-+ property int shortDuration: Kirigami.Units.shortDuration
-
- /**
- * units.shortDuration should be used for short animations, such as accentuating a UI event,
- * hover events, etc..
- */
-- property int mediumDuration: 150
-+ property int mediumDuration: Kirigami.Units.longDuration * 0.75 // Was 150
-
- /**
- * units.longDuration should be used for longer, screen-covering animations, for opening and
- * closing of dialogs and other "not too small" animations
- */
-- property int longDuration: 200
-+ property int longDuration: Kirigami.Units.longDuration
-
- /**
- * units.veryLongDuration should be used for specialty animations that benefit
- * from being even longer than longDuration.
- */
-- property int veryLongDuration: 400
-+ property int veryLongDuration: Kirigami.Units.veryLongDuration
-
- /**
- * time in ms by which the display of tooltips will be delayed.
- *
- * @sa ToolTip.delay property
- */
-- property int toolTipDelay: 700
--
-+ property int toolTipDelay: Kirigami.Units.toolTipDelay
-+
- /**
-- * Time in milliseconds equivalent to the theoretical human moment, which can be used
-- * to determine whether how long to wait until the user should be informed of something,
-- * or can be used as the limit for how long something should wait before being
-- * automatically initiated.
-- *
-- * Some examples:
-- *
-- * - When the user types text in a search field, wait no longer than this duration after
-- * the user completes typing before starting the search
-- * - When loading data which would commonly arrive rapidly enough to not require interaction,
-- * wait this long before showing a spinner
-- *
-- * This might seem an arbitrary number, but given the psychological effect that three
-- * seconds seems to be what humans consider a moment (and in the case of waiting for
-- * something to happen, a moment is that time when you think "this is taking a bit long,
-- * isn't it?"), the idea is to postpone for just before such a conceptual moment. The reason
-- * for the two seconds, rather than three, is to function as a middle ground: Not long enough
-- * that the user would think that something has taken too long, for also not so fast as to
-- * happen too soon.
-- *
-- * See also
-- * https://www.psychologytoday.com/blog/all-about-addiction/201101/tick-tock-tick-hugs-and-life-in-3-second-intervals
-- * (the actual paper is hidden behind an academic paywall and consequently not readily
-- * available to us, so the source will have to be the blog entry above)
-- *
-- * \note This should __not__ be used as an animation duration, as it is deliberately not scaled according
-- * to the animation settings. This is specifically for determining when something has taken too long and
-- * the user should expect some kind of feedback. See veryShortDuration, shortDuration, longDuration, and
-- * veryLongDuration for animation duration choices.
-- *
-- * @since 5.81
-- * @since org.kde.kirigami 2.16
-+ * See Kirigami.Units.humanMoment
- */
-- property int humanMoment: 2000
-+ property int humanMoment: Kirigami.Units.humanMoment
-
- /**
- * How much the mouse scroll wheel scrolls, expressed in lines of text.
- * Note: this is strictly for classical mouse wheels, touchpads 2 figer scrolling won't be affected
- */
-- readonly property int wheelScrollLines: 3
-+ readonly property int wheelScrollLines: Kirigami.Units.wheelScrollLines
-
- /**
- * metrics used by the default font
-diff --git a/style/impl/qmldir b/style/impl/qmldir
-index d69467c..ac1e565 100644
---- a/style/impl/qmldir
-+++ b/style/impl/qmldir
-@@ -21,7 +21,6 @@ InlineIconLabelContent 1.0 InlineIconLabelContent.qml
- LargeShadow 1.0 LargeShadow.qml
- ListViewHighlight 1.0 ListViewHighlight.qml
- MediumShadow 1.0 MediumShadow.qml
--MobileCursor 1.0 MobileCursor.qml
- RadioIndicator 1.0 RadioIndicator.qml
- ScrollHandle 1.0 ScrollHandle.qml
- SliderGroove 1.0 SliderGroove.qml
-@@ -30,3 +29,5 @@ SmallShadow 1.0 SmallShadow.qml
- SpinBoxIndicator 1.0 SpinBoxIndicator.qml
- SwitchIndicator 1.0 SwitchIndicator.qml
- TextEditBackground 1.0 TextEditBackground.qml
-+
-+singleton Units 1.0 Units.qml
-diff --git a/style/qtquickcontrols/BusyIndicator.qml b/style/qtquickcontrols/BusyIndicator.qml
-index 21ee43e..310fe2b 100644
---- a/style/qtquickcontrols/BusyIndicator.qml
-+++ b/style/qtquickcontrols/BusyIndicator.qml
-@@ -7,6 +7,8 @@ import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
- import org.kde.quickcharts 1.0 as Charts
-
-+import "impl" as Impl
-+
- T.BusyIndicator {
- id: control
-
-@@ -17,7 +19,7 @@ T.BusyIndicator {
-
- hoverEnabled: false
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
-
- ListModel {
- id: pieModel
-@@ -55,13 +57,13 @@ T.BusyIndicator {
- id: lowPowerSpinnerComponent
- Kirigami.Icon {
- id: lowPowerSpinner
-- implicitWidth: Kirigami.Units.iconSizes.auto
-- implicitHeight: Kirigami.Units.iconSizes.auto
-+ implicitWidth: Impl.Units.iconSizes.auto
-+ implicitHeight: Impl.Units.iconSizes.auto
- source: "view-refresh"
-
- opacity: control.visible && control.enabled && control.running ? 1 : 0
- Behavior on opacity {
-- OpacityAnimator { duration: Kirigami.Units.shortDuration }
-+ OpacityAnimator { duration: Impl.Units.shortDuration }
- }
-
- smooth: true
-@@ -80,12 +82,12 @@ T.BusyIndicator {
- id: fancySpinnerComponent
- Charts.PieChart {
- id: fancySpinner
-- implicitWidth: Kirigami.Units.gridUnit
-- implicitHeight: Kirigami.Units.gridUnit
-+ implicitWidth: Impl.Units.gridUnit
-+ implicitHeight: Impl.Units.gridUnit
-
- opacity: control.visible && control.enabled && control.running ? 1 : 0
- Behavior on opacity {
-- OpacityAnimator { duration: Kirigami.Units.shortDuration }
-+ OpacityAnimator { duration: Impl.Units.shortDuration }
- }
-
- valueSources: Charts.ModelSource { roleName: "value"; model: pieModel }
-@@ -93,7 +95,7 @@ T.BusyIndicator {
-
- fromAngle: 0
- toAngle: 360
-- thickness: Math.max(Kirigami.Units.smallRadius * 2, Math.floor(Math.min(width, height)/6))
-+ thickness: Math.max(Impl.Units.smallRadius * 2, Math.floor(Math.min(width, height)/6))
- filled: false
- //smoothEnds: true // Turns the segments into aesthetically pleasing round dots, but breaks the connected appearance when the ends meet :(
-
-diff --git a/style/qtquickcontrols/Button.qml b/style/qtquickcontrols/Button.qml
-index fd7da18..80a2ebd 100644
---- a/style/qtquickcontrols/Button.qml
-+++ b/style/qtquickcontrols/Button.qml
-@@ -5,7 +5,8 @@
- import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.Button {
- id: control
-@@ -21,6 +22,8 @@ T.Button {
-
- palette: Kirigami.Theme.palette
-
-+ hoverEnabled: true
-+
- Kirigami.Theme.colorSet: /*control.highlighted ? Kirigami.Theme.Selection :*/ Kirigami.Theme.Button
- Kirigami.Theme.inherit: false//control.flat && !control.down && !control.checked
- // Absolutely terrible HACK:
-@@ -30,28 +33,28 @@ T.Button {
- Kirigami.Theme.inherit = false//Qt.binding(() => control.flat && !(control.down || control.checked))
- }
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
- rightPadding: {
- if (contentItem.hasLabel && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.MnemonicData.enabled: control.enabled && control.visible
- Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.ActionElement
-@@ -63,12 +66,12 @@ T.Button {
- onActivated: control.clicked()
- }
-
-- contentItem: IconLabelContent {
-+ contentItem: Impl.IconLabelContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- }
-
-- background: ButtonBackground {
-+ background: Impl.ButtonBackground {
- control: control
- }
- }
-diff --git a/style/qtquickcontrols/CheckBox.qml b/style/qtquickcontrols/CheckBox.qml
-index df4e232..74337fd 100644
---- a/style/qtquickcontrols/CheckBox.qml
-+++ b/style/qtquickcontrols/CheckBox.qml
-@@ -6,7 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.CheckBox {
- id: control
-@@ -18,15 +19,15 @@ T.CheckBox {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.verySmallSpacing
-- horizontalPadding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.verySmallSpacing
-+ horizontalPadding: Impl.Units.mediumSpacing
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
-- indicator: CheckIndicator {
-+ indicator: Impl.CheckIndicator {
- control: control
- }
-
-@@ -40,7 +41,7 @@ T.CheckBox {
- onActivated: control.toggle();
- }
-
-- contentItem: InlineIconLabelContent {
-+ contentItem: Impl.InlineIconLabelContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- alignment: Qt.AlignLeft | Qt.AlignVCenter
-diff --git a/style/qtquickcontrols/CheckDelegate.qml b/style/qtquickcontrols/CheckDelegate.qml
-index 6159b37..ad2ac22 100644
---- a/style/qtquickcontrols/CheckDelegate.qml
-+++ b/style/qtquickcontrols/CheckDelegate.qml
-@@ -6,7 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.CheckDelegate {
- id: control
-@@ -18,12 +19,12 @@ T.CheckDelegate {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
-@@ -32,32 +33,32 @@ T.CheckDelegate {
- if (!control.indicator.visible
- && contentItem.hasLabel
- && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.Theme.colorSet: control.down || control.highlighted ? Kirigami.Theme.Button : -1
- Kirigami.Theme.inherit: !background || !background.visible && !(control.highlighted || control.down)
-
-- contentItem: IconLabelContent {
-+ contentItem: Impl.IconLabelContent {
- control: control
- alignment: Qt.AlignLeft | Qt.AlignVCenter
- //color: (control.pressed && !control.checked && !control.sectionDelegate) ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
- }
-
-- indicator: CheckIndicator {
-+ indicator: Impl.CheckIndicator {
- control: control
- mirrored: !control.mirrored
- }
-
-- background: DelegateBackground {
-+ background: Impl.DelegateBackground {
- control: control
- }
- }
-diff --git a/style/qtquickcontrols/ComboBox.qml b/style/qtquickcontrols/ComboBox.qml
-index 6e7751f..e14020d 100644
---- a/style/qtquickcontrols/ComboBox.qml
-+++ b/style/qtquickcontrols/ComboBox.qml
-@@ -9,7 +9,8 @@ import QtQuick.Window 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.ComboBox {
- id: control
-@@ -28,7 +29,7 @@ T.ComboBox {
- Kirigami.Theme.colorSet: control.editable ? Kirigami.Theme.View : Kirigami.Theme.Button
- Kirigami.Theme.inherit: false
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
- leftPadding: horizontalPadding + (!control.mirrored ? 0 : __indicatorMargin)
- rightPadding: horizontalPadding + (control.mirrored ? 0 : __indicatorMargin)
-@@ -37,8 +38,8 @@ T.ComboBox {
- id: textField
- palette: control.palette
- // TextField padding doesn't automatically mirror
-- leftPadding: control.mirrored ? 0 : Kirigami.Units.mediumHorizontalPadding
-- rightPadding: !control.mirrored ? 0 : Kirigami.Units.mediumHorizontalPadding
-+ leftPadding: control.mirrored ? 0 : Impl.Units.mediumHorizontalPadding
-+ rightPadding: !control.mirrored ? 0 : Impl.Units.mediumHorizontalPadding
-
- text: control.editable ? control.editText : control.displayText
-
-@@ -57,20 +58,20 @@ T.ComboBox {
- }
-
- indicator: Kirigami.Icon {
-- implicitHeight: Kirigami.Units.iconSizes.sizeForLabels
-+ implicitHeight: Impl.Units.iconSizes.sizeForLabels
- implicitWidth: implicitHeight
- x: control.mirrored ? control.leftPadding : control.leftPadding + control.availableWidth + control.spacing
- y: control.topPadding + (control.availableHeight - height) / 2
- source: "arrow-down"
- }
-
-- background: ComboBoxBackground {
-+ background: Impl.ComboBoxBackground {
- control: control
-
- Rectangle {
- id: separator
- visible: control.editable
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- anchors {
- right: parent.right
- top: parent.top
-@@ -88,7 +89,7 @@ T.ComboBox {
- Behavior on color {
- enabled: control.down || control.hovered
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -120,7 +121,7 @@ T.ComboBox {
- }
-
- border.color: Kirigami.Theme.focusColor
-- border.width: Kirigami.Units.smallBorder
-+ border.width: Impl.Units.smallBorder
-
- opacity: 0
-
-@@ -138,7 +139,7 @@ T.ComboBox {
- to: ""
- SequentialAnimation {
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- PropertyAction {
-@@ -180,9 +181,9 @@ T.ComboBox {
- implicitWidth: contentWidth
- model: control.delegateModel // Why isn't this in the ComboBox documentation?
- currentIndex: control.highlightedIndex
-- highlightMoveDuration: Kirigami.Units.shortDuration
-- highlightMoveVelocity: Kirigami.Units.gridUnit * 20
-- highlight: ListViewHighlight {
-+ highlightMoveDuration: Impl.Units.shortDuration
-+ highlightMoveVelocity: Impl.Units.gridUnit * 20
-+ highlight: Impl.ListViewHighlight {
- currentIndex: control.highlightedIndex
- count: control.count
- }
-diff --git a/style/qtquickcontrols/DelayButton.qml b/style/qtquickcontrols/DelayButton.qml
-index 4b988c8..ddf347a 100644
---- a/style/qtquickcontrols/DelayButton.qml
-+++ b/style/qtquickcontrols/DelayButton.qml
-@@ -5,7 +5,8 @@
- import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.DelayButton {
- id: control
-@@ -20,25 +21,25 @@ T.DelayButton {
- Kirigami.Theme.colorSet: control.highlighted ? Kirigami.Theme.Selection : Kirigami.Theme.Button
- Kirigami.Theme.inherit: false
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
- rightPadding: {
- if (contentItem.hasLabel && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
- transition: Transition {
- NumberAnimation {
-@@ -46,8 +47,8 @@ T.DelayButton {
- }
- }
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.MnemonicData.enabled: control.enabled && control.visible
- Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.ActionElement
-@@ -59,19 +60,19 @@ T.DelayButton {
- onActivated: control.clicked()
- }
-
-- contentItem: IconLabelContent {
-+ contentItem: Impl.IconLabelContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- }
-
-- background: ButtonBackground {
-+ background: Impl.ButtonBackground {
- control: control
- color: control.palette.button
-
- Kirigami.ShadowedRectangle {
- id: progressFillRect
- property real radiusThreshold: parent.width - leftRadius
-- property real leftRadius: Kirigami.Units.smallRadius
-+ property real leftRadius: Impl.Units.smallRadius
- property real rightRadius: width > radiusThreshold ? width - radiusThreshold : 0
-
- visible: width > 0
-diff --git a/style/qtquickcontrols/Dial.qml b/style/qtquickcontrols/Dial.qml
-index 9ef6344..5f755d8 100644
---- a/style/qtquickcontrols/Dial.qml
-+++ b/style/qtquickcontrols/Dial.qml
-@@ -8,7 +8,7 @@ import QtQuick.Controls.impl 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
- import org.kde.breeze 1.0
--import "impl"
-+import "impl" as Impl
-
- T.Dial {
- id: control
-@@ -31,11 +31,11 @@ T.Dial {
- fillBorderColor: Kirigami.Theme.focusColor
- fillColor: Kirigami.Theme.alternateBackgroundColor
- angle: control.angle
-- grooveThickness: Kirigami.Units.grooveHeight
-+ grooveThickness: Impl.Units.grooveHeight
- Behavior on angle {
- enabled: !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- //SmoothedAnimations have a hardcoded InOutQuad easing
- }
-@@ -55,7 +55,7 @@ T.Dial {
- color: Kirigami.Theme.backgroundColor
-
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: control.pressed || control.visualFocus || control.hovered
- ? Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
- }
-@@ -76,7 +76,7 @@ T.Dial {
- Behavior on rotation {
- enabled: !Kirigami.Settings.hasTransientTouchInput
- SmoothedAnimation {
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- velocity: 800
- //SmoothedAnimations have a hardcoded InOutQuad easing
- }
-@@ -127,7 +127,7 @@ T.Dial {
- Behavior on border.color {
- enabled: control.pressed || control.visualFocus || control.hovered
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-@@ -135,12 +135,12 @@ T.Dial {
- Behavior on shadow.color {
- enabled: control.pressed
- ColorAnimation {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-
-- FocusRect {
-+ Impl.FocusRect {
- z: -1
- baseRadius: parent.radius
- visible: control.visualFocus
-@@ -164,7 +164,7 @@ T.Dial {
- }
- Behavior on opacity {
- OpacityAnimator {
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- easing.type: Easing.OutCubic
- }
- }
-diff --git a/style/qtquickcontrols/Dialog.qml b/style/qtquickcontrols/Dialog.qml
-index 33f89e7..c8619e1 100644
---- a/style/qtquickcontrols/Dialog.qml
-+++ b/style/qtquickcontrols/Dialog.qml
-@@ -5,7 +5,7 @@
- import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.Dialog {
- id: control
-@@ -19,7 +19,7 @@ T.Dialog {
- + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0)
- + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0))
-
-- padding: Kirigami.Units.gridUnit
-+ padding: Impl.Units.gridUnit
-
- // anchors.centerIn: T.Overlay.overlay
-
-@@ -29,7 +29,7 @@ T.Dialog {
- from: 0
- to: 1
- easing.type: Easing.InOutQuad
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- }
- }
-
-@@ -39,17 +39,17 @@ T.Dialog {
- from: 1
- to: 0
- easing.type: Easing.InOutQuad
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- }
- }
-
- background: Rectangle {
-- radius: Kirigami.Units.smallRadius
-+ radius: Impl.Units.smallRadius
- color: Kirigami.Theme.backgroundColor
- border.color: Kirigami.Theme.separatorColor
-- border.width: control.dim ? 0 : Kirigami.Units.smallBorder
-+ border.width: control.dim ? 0 : Impl.Units.smallBorder
-
-- LargeShadow {
-+ Impl.LargeShadow {
- radius: parent.radius
- }
- }
-@@ -59,7 +59,7 @@ T.Dialog {
- level: 2
- visible: control.title
- elide: Label.ElideRight
-- padding: Kirigami.Units.gridUnit
-+ padding: Impl.Units.gridUnit
- bottomPadding: 0
- }
-
-@@ -67,6 +67,6 @@ T.Dialog {
- visible: count > 0
- }
-
-- T.Overlay.modal: OverlayModalBackground {}
-- T.Overlay.modeless: OverlayDimBackground {}
-+ T.Overlay.modal: Impl.OverlayModalBackground {}
-+ T.Overlay.modeless: Impl.OverlayDimBackground {}
- }
-diff --git a/style/qtquickcontrols/DialogButtonBox.qml b/style/qtquickcontrols/DialogButtonBox.qml
-index e1d006c..37a1305 100644
---- a/style/qtquickcontrols/DialogButtonBox.qml
-+++ b/style/qtquickcontrols/DialogButtonBox.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.DialogButtonBox {
- id: control
-
-@@ -21,9 +23,9 @@ T.DialogButtonBox {
- implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- contentHeight + topPadding + bottomPadding)
-
-- spacing: Kirigami.Units.smallSpacing
-+ spacing: Impl.Units.smallSpacing
-
-- padding: Kirigami.Units.smallSpacing
-+ padding: Impl.Units.smallSpacing
-
- // Add space for the separator above the footer
- topPadding: __isFooter && background && background.hasOwnProperty("separator") ?
-@@ -51,7 +53,7 @@ T.DialogButtonBox {
- background: Kirigami.ShadowedRectangle {
- property real topRadius: control.__isHeader ? radius : 0
- property real bottomRadius: control.__isFooter ? radius : 0
-- radius: control.__isInPopup ? Kirigami.Units.smallRadius : 0
-+ radius: control.__isInPopup ? Impl.Units.smallRadius : 0
- corners {
- topLeftRadius: topRadius
- topRightRadius: topRadius
-@@ -59,7 +61,7 @@ T.DialogButtonBox {
- bottomRightRadius: bottomRadius
- }
- // Enough height for Buttons/ComboBoxes/TextFields with smallSpacing padding on top and bottom
-- implicitHeight: Kirigami.Units.mediumControlHeight + (Kirigami.Units.smallSpacing * 2) + (separator.visible ? separator.height : 0)
-+ implicitHeight: Impl.Units.mediumControlHeight + (Impl.Units.smallSpacing * 2) + (separator.visible ? separator.height : 0)
- color: control.__isInPopup ? "transparent" : Kirigami.Theme.backgroundColor
- property Item separator: Kirigami.Separator {
- parent: background
-diff --git a/style/qtquickcontrols/Drawer.qml b/style/qtquickcontrols/Drawer.qml
-index a8281fb..63d1abe 100644
---- a/style/qtquickcontrols/Drawer.qml
-+++ b/style/qtquickcontrols/Drawer.qml
-@@ -9,7 +9,7 @@ import QtQuick 2.15
- import QtQuick.Controls 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.Drawer {
- id: control
-@@ -34,8 +34,8 @@ T.Drawer {
- }
- Kirigami.Separator {
- readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge
-- width: horizontal ? Kirigami.Units.smallBorder : parent.width
-- height: horizontal ? parent.height : Kirigami.Units.smallBorder
-+ width: horizontal ? Impl.Units.smallBorder : parent.width
-+ height: horizontal ? parent.height : Impl.Units.smallBorder
- x: control.edge === Qt.LeftEdge ? parent.width - 1 : 0
- y: control.edge === Qt.TopEdge ? parent.height - 1 : 0
- visible: !control.dim
-@@ -53,6 +53,6 @@ T.Drawer {
- }
- }
-
-- T.Overlay.modal: OverlayModalBackground {}
-- T.Overlay.modeless: OverlayDimBackground {}
-+ T.Overlay.modal: Impl.OverlayModalBackground {}
-+ T.Overlay.modeless: Impl.OverlayDimBackground {}
- }
-diff --git a/style/qtquickcontrols/Frame.qml b/style/qtquickcontrols/Frame.qml
-index a84d6fb..665cde3 100644
---- a/style/qtquickcontrols/Frame.qml
-+++ b/style/qtquickcontrols/Frame.qml
-@@ -7,6 +7,8 @@ import QtQuick.Controls 2.15 as Controls
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.Frame {
- id: control
-
-@@ -18,12 +20,12 @@ T.Frame {
- // contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
- //contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
-
-- padding: Kirigami.Units.veryLargeSpacing + Kirigami.Units.smallBorder
-+ padding: Impl.Units.veryLargeSpacing + Impl.Units.smallBorder
-
- background: Rectangle {
- color: Kirigami.Theme.backgroundColor
-- radius: Kirigami.Units.smallRadius
-+ radius: Impl.Units.smallRadius
- border.color: Kirigami.Theme.separatorColor
-- border.width: Kirigami.Units.smallBorder
-+ border.width: Impl.Units.smallBorder
- }
- }
-diff --git a/style/qtquickcontrols/GroupBox.qml b/style/qtquickcontrols/GroupBox.qml
-index db01aff..86a0661 100644
---- a/style/qtquickcontrols/GroupBox.qml
-+++ b/style/qtquickcontrols/GroupBox.qml
-@@ -8,6 +8,8 @@ import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.GroupBox {
- id: control
-
-@@ -20,8 +22,8 @@ T.GroupBox {
- // contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
- //contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
-
-- spacing: Kirigami.Units.mediumSpacing
-- padding: Kirigami.Units.veryLargeSpacing
-+ spacing: Impl.Units.mediumSpacing
-+ padding: Impl.Units.veryLargeSpacing
- topPadding: padding + (implicitLabelWidth > 0 ? implicitLabelHeight + spacing : 0)
-
- label: Controls.Label {
-diff --git a/style/qtquickcontrols/ItemDelegate.qml b/style/qtquickcontrols/ItemDelegate.qml
-index ff9a6ae..6177b94 100644
---- a/style/qtquickcontrols/ItemDelegate.qml
-+++ b/style/qtquickcontrols/ItemDelegate.qml
-@@ -6,7 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.ItemDelegate {
- id: control
-@@ -18,39 +19,39 @@ T.ItemDelegate {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
-
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
- rightPadding: {
- if (contentItem.hasLabel && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.Theme.colorSet: control.down || control.highlighted ? Kirigami.Theme.Button : -1
- Kirigami.Theme.inherit: !background || !background.visible && !(control.highlighted || control.down)
-
-- contentItem: IconLabelContent {
-+ contentItem: Impl.IconLabelContent {
- control: control
- alignment: Qt.AlignLeft | Qt.AlignVCenter
- }
-
-- background: DelegateBackground {
-+ background: Impl.DelegateBackground {
- control: control
- }
- }
-diff --git a/style/qtquickcontrols/Menu.qml b/style/qtquickcontrols/Menu.qml
-index 39ab7fe..9238e34 100644
---- a/style/qtquickcontrols/Menu.qml
-+++ b/style/qtquickcontrols/Menu.qml
-@@ -13,7 +13,8 @@ import QtQuick.Controls 2.15 as Controls
- import QtQuick.Controls.impl 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.Menu {
- id: control
-@@ -39,9 +40,9 @@ T.Menu {
- implicitHeight: contentHeight
- implicitWidth: contentWidth
- model: control.contentModel
-- highlightMoveDuration: Kirigami.Units.shortDuration
-+ highlightMoveDuration: Impl.Units.shortDuration
- highlightMoveVelocity: 800
-- highlight: ListViewHighlight {
-+ highlight: Impl.ListViewHighlight {
- currentIndex: control.currentIndex
- count: control.count
- }
-@@ -64,7 +65,7 @@ T.Menu {
- from: 0
- to: 1
- easing.type: Easing.OutCubic
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- }
-@@ -76,23 +77,23 @@ T.Menu {
- from: 1
- to: 0
- easing.type: Easing.InCubic
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- }
-
- background: Rectangle {
-- radius: Kirigami.Units.smallRadius
-- implicitHeight: Kirigami.Units.mediumControlHeight
-- implicitWidth: Kirigami.Units.gridUnit * 15
-+ radius: Impl.Units.smallRadius
-+ implicitHeight: Impl.Units.mediumControlHeight
-+ implicitWidth: Impl.Units.gridUnit * 15
- color: Kirigami.Theme.backgroundColor
-
- border {
- color: Kirigami.Theme.separatorColor
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- }
-
-- LargeShadow {
-+ Impl.LargeShadow {
- radius: parent.radius
- }
- }
-diff --git a/style/qtquickcontrols/MenuBarItem.qml b/style/qtquickcontrols/MenuBarItem.qml
-index 1ca62e1..672d45f 100644
---- a/style/qtquickcontrols/MenuBarItem.qml
-+++ b/style/qtquickcontrols/MenuBarItem.qml
-@@ -12,7 +12,7 @@ import QtQuick.Layouts 1.12
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.MenuBarItem {
- id: controlRoot
-@@ -23,10 +23,10 @@ T.MenuBarItem {
- baselineOffset: contentItem.y + contentItem.baselineOffset
-
- Layout.fillWidth: true
-- leftPadding: Kirigami.Units.largeSpacing
-- rightPadding: Kirigami.Units.largeSpacing
-- topPadding: Kirigami.Units.smallSpacing
-- bottomPadding: Kirigami.Units.smallSpacing
-+ leftPadding: Impl.Units.largeSpacing
-+ rightPadding: Impl.Units.largeSpacing
-+ topPadding: Impl.Units.smallSpacing
-+ bottomPadding: Impl.Units.smallSpacing
- hoverEnabled: true
-
- Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible
-@@ -52,7 +52,7 @@ T.MenuBarItem {
-
- background: Item {
- anchors.fill: parent
-- implicitWidth: Kirigami.Units.gridUnit * 8
-+ implicitWidth: Impl.Units.gridUnit * 8
-
- Rectangle {
- anchors.fill: parent
-diff --git a/style/qtquickcontrols/MenuItem.qml b/style/qtquickcontrols/MenuItem.qml
-index 7974436..cfe60a9 100644
---- a/style/qtquickcontrols/MenuItem.qml
-+++ b/style/qtquickcontrols/MenuItem.qml
-@@ -9,7 +9,7 @@ import QtQuick.Layouts 1.12
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.MenuItem {
- id: control
-@@ -49,19 +49,19 @@ T.MenuItem {
-
- // width: parent ? parent.width : implicitWidth
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Layout.fillWidth: true
-
-- spacing: Kirigami.Units.mediumSpacing
-- padding: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if (!control.indicator.visible
- && ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon)) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
-@@ -70,7 +70,7 @@ T.MenuItem {
- if (!control.arrow.visible
- && contentItem.hasLabel // False if contentItem has been replaced
- && display != T.AbstractButton.IconOnly) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
-@@ -92,7 +92,7 @@ T.MenuItem {
- }
- }
-
-- indicator: CheckIndicator {
-+ indicator: Impl.CheckIndicator {
- visible: control.checkable
- control: control
- checkState: control.checked ? Qt.Checked : Qt.Unchecked
-@@ -105,12 +105,12 @@ T.MenuItem {
- verticalCenter: control.verticalCenter
- }
- source: control.mirrored ? "arrow-left" : "arrow-right"
-- implicitWidth: Kirigami.Units.iconSizes.auto
-- implicitHeight: Kirigami.Units.iconSizes.auto
-+ implicitWidth: Impl.Units.iconSizes.auto
-+ implicitHeight: Impl.Units.iconSizes.auto
- visible: control.subMenu
- }
-
-- contentItem: IconLabelShortcutContent {
-+ contentItem: Impl.IconLabelShortcutContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- alignment: Qt.AlignLeft | Qt.AlignVCenter
-@@ -119,7 +119,7 @@ T.MenuItem {
- reserveSpaceForArrow: control.__reserveSpaceForArrow
- }
-
-- background: MenuItemBackground {
-+ background: Impl.MenuItemBackground {
- control: control
- }
- }
-diff --git a/style/qtquickcontrols/MobileTextActionsToolBar.qml b/style/qtquickcontrols/MobileTextActionsToolBar.qml
-index 2d9347b..e493614 100644
---- a/style/qtquickcontrols/MobileTextActionsToolBar.qml
-+++ b/style/qtquickcontrols/MobileTextActionsToolBar.qml
-@@ -9,6 +9,8 @@ import QtQuick.Window 2.15
- import QtQuick.Controls 2.15
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- Loader {
- id: root
- property Item target
-@@ -24,7 +26,7 @@ Loader {
- parent: Overlay.overlay
- modal: false
- focus: false
-- margins: Kirigami.Units.verySmallSpacing
-+ margins: Impl.Units.verySmallSpacing
- padding: 0
-
- x: xAlignHCenter
-diff --git a/style/qtquickcontrols/PageIndicator.qml b/style/qtquickcontrols/PageIndicator.qml
-index 8001315..35f2f40 100644
---- a/style/qtquickcontrols/PageIndicator.qml
-+++ b/style/qtquickcontrols/PageIndicator.qml
-@@ -7,6 +7,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.PageIndicator {
- id: control
-
-@@ -15,14 +17,14 @@ T.PageIndicator {
- implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- implicitContentHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-- spacing: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
- // Using ShadowedRectangle because it makes smoother circles than Rectangle
- delegate: Kirigami.ShadowedRectangle {
- implicitWidth: implicitHeight
- implicitHeight: {
-- let h = Kirigami.Units.inlineControlHeight/2
-+ let h = Impl.Units.inlineControlHeight/2
- h -= h % 2
- return h
- }
-@@ -31,7 +33,7 @@ T.PageIndicator {
- color: Kirigami.Theme.textColor
-
- opacity: index === currentIndex ? 1 : pressed ? 0.67 : 0.33
-- Behavior on opacity { OpacityAnimator { duration: Kirigami.Units.shortDuration } }
-+ Behavior on opacity { OpacityAnimator { duration: Impl.Units.shortDuration } }
- }
-
- contentItem: Row {
-diff --git a/style/qtquickcontrols/Pane.qml b/style/qtquickcontrols/Pane.qml
-index 9a7d807..43de0ba 100644
---- a/style/qtquickcontrols/Pane.qml
-+++ b/style/qtquickcontrols/Pane.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.Pane {
- id: control
-
-@@ -17,7 +19,7 @@ T.Pane {
- // Not confident about this value.
- // Why do Qt QQC2 styles use large padding for this
- // and no padding for Pages?
-- padding: Kirigami.Units.veryLargeSpacing
-+ padding: Impl.Units.veryLargeSpacing
-
- background: Rectangle {
- color: Kirigami.Theme.backgroundColor
-diff --git a/style/qtquickcontrols/Popup.qml b/style/qtquickcontrols/Popup.qml
-index df3afde..1add253 100644
---- a/style/qtquickcontrols/Popup.qml
-+++ b/style/qtquickcontrols/Popup.qml
-@@ -8,7 +8,7 @@
- import QtQuick 2.6
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.Popup {
- id: control
-@@ -18,7 +18,7 @@ T.Popup {
- implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- contentHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.veryLargeSpacing
-+ padding: Impl.Units.veryLargeSpacing
- // clip: true
-
- enter: Transition {
-@@ -27,7 +27,7 @@ T.Popup {
- from: 0
- to: 1
- easing.type: Easing.InOutQuad
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
-
-@@ -37,26 +37,26 @@ T.Popup {
- from: 1
- to: 0
- easing.type: Easing.InOutQuad
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
-
- background: Rectangle {
-- radius: Kirigami.Units.smallRadius
--// implicitHeight: Kirigami.Units.smallControlHeight
-- //implicitWidth: Kirigami.Units.gridUnit * 12
-+ radius: Impl.Units.smallRadius
-+// implicitHeight: Impl.Units.smallControlHeight
-+ //implicitWidth: Impl.Units.gridUnit * 12
- color: Kirigami.Theme.backgroundColor
-
- border {
- color: Kirigami.Theme.separatorColor
-- width: control.dim ? 0 : Kirigami.Units.smallBorder
-+ width: control.dim ? 0 : Impl.Units.smallBorder
- }
-
-- MediumShadow {
-+ Impl.MediumShadow {
- radius: parent.radius
- }
- }
-
-- T.Overlay.modal: OverlayModalBackground {}
-- T.Overlay.modeless: OverlayDimBackground {}
-+ T.Overlay.modal: Impl.OverlayModalBackground {}
-+ T.Overlay.modeless: Impl.OverlayDimBackground {}
- }
-diff --git a/style/qtquickcontrols/ProgressBar.qml b/style/qtquickcontrols/ProgressBar.qml
-index 0fbd86d..ffc0045 100644
---- a/style/qtquickcontrols/ProgressBar.qml
-+++ b/style/qtquickcontrols/ProgressBar.qml
-@@ -5,7 +5,7 @@
- import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.ProgressBar {
- id: control
-@@ -20,7 +20,7 @@ T.ProgressBar {
-
- contentItem: Item {
- implicitWidth: 200
-- implicitHeight: Kirigami.Units.grooveHeight
-+ implicitHeight: Impl.Units.grooveHeight
- clip: true
- Rectangle {
- id: progressFill
-@@ -32,10 +32,10 @@ T.ProgressBar {
- }
- width: control.position * parent.width
-
-- radius: Kirigami.Units.grooveHeight/2
-+ radius: Impl.Units.grooveHeight/2
- color: Kirigami.Theme.alternateBackgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: Kirigami.Theme.focusColor
- }
- }
-@@ -49,12 +49,12 @@ T.ProgressBar {
-
- background: Rectangle {
- implicitWidth: 200
-- implicitHeight: Kirigami.Units.grooveHeight
-+ implicitHeight: Impl.Units.grooveHeight
-
-- radius: Kirigami.Units.grooveHeight/2
-+ radius: Impl.Units.grooveHeight/2
- color: Kirigami.Theme.backgroundColor
- border {
-- width: Kirigami.Units.smallBorder
-+ width: Impl.Units.smallBorder
- color: Kirigami.Theme.separatorColor
- }
- }
-diff --git a/style/qtquickcontrols/RadioButton.qml b/style/qtquickcontrols/RadioButton.qml
-index 41677d8..1e4f609 100644
---- a/style/qtquickcontrols/RadioButton.qml
-+++ b/style/qtquickcontrols/RadioButton.qml
-@@ -6,7 +6,7 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.RadioButton {
- id: control
-@@ -18,15 +18,15 @@ T.RadioButton {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.verySmallSpacing
-- horizontalPadding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.verySmallSpacing
-+ horizontalPadding: Impl.Units.mediumSpacing
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
-- indicator: RadioIndicator {
-+ indicator: Impl.RadioIndicator {
- control: control
- }
-
-@@ -40,7 +40,7 @@ T.RadioButton {
- onActivated: control.checked = true
- }
-
-- contentItem: InlineIconLabelContent {
-+ contentItem: Impl.InlineIconLabelContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- alignment: Qt.AlignLeft | Qt.AlignVCenter
-diff --git a/style/qtquickcontrols/RadioDelegate.qml b/style/qtquickcontrols/RadioDelegate.qml
-index 53bfd52..8c7c1d7 100644
---- a/style/qtquickcontrols/RadioDelegate.qml
-+++ b/style/qtquickcontrols/RadioDelegate.qml
-@@ -6,7 +6,7 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.RadioDelegate {
- id: control
-@@ -18,12 +18,12 @@ T.RadioDelegate {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
-@@ -32,32 +32,32 @@ T.RadioDelegate {
- if (!control.indicator.visible
- && contentItem.hasLabel
- && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.Theme.colorSet: control.down || control.highlighted ? Kirigami.Theme.Button : -1
- Kirigami.Theme.inherit: !background || !background.visible && !(control.highlighted || control.down)
-
-- contentItem: IconLabelContent {
-+ contentItem:Impl.IconLabelContent {
- control: control
- alignment: Qt.AlignLeft | Qt.AlignVCenter
- //color: (control.pressed && !control.checked && !control.sectionDelegate) ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
- }
-
-- indicator: RadioIndicator {
-+ indicator: Impl.RadioIndicator {
- control: control
- mirrored: !control.mirrored
- }
-
-- background: DelegateBackground {
-+ background: Impl.DelegateBackground {
- control: control
- }
- }
-diff --git a/style/qtquickcontrols/RangeSlider.qml b/style/qtquickcontrols/RangeSlider.qml
-index 479eab0..02970c4 100644
---- a/style/qtquickcontrols/RangeSlider.qml
-+++ b/style/qtquickcontrols/RangeSlider.qml
-@@ -8,7 +8,7 @@ import QtQuick 2.15
- import QtQuick.Controls 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.RangeSlider {
- id: control
-@@ -23,9 +23,9 @@ T.RangeSlider {
- Kirigami.Theme.colorSet: Kirigami.Theme.Button
- Kirigami.Theme.inherit: false
-
-- padding: Kirigami.Settings.tabletMode ? Kirigami.Units.mediumSpacing : 0
-+ padding: Kirigami.Settings.tabletMode ? Impl.Units.mediumSpacing : 0
-
-- first.handle: SliderHandle {
-+ first.handle: Impl.SliderHandle {
- control: control
- position: control.first.position
- visualPosition: control.first.visualPosition
-@@ -35,7 +35,7 @@ T.RangeSlider {
- visualFocus: activeFocus
- }
-
-- second.handle: SliderHandle {
-+ second.handle: Impl.SliderHandle {
- control: control
- position: control.second.position
- visualPosition: control.second.visualPosition
-@@ -45,7 +45,7 @@ T.RangeSlider {
- visualFocus: activeFocus
- }
-
-- background: SliderGroove {
-+ background: Impl.SliderGroove {
- control: control
- startPosition: first.position
- endPosition: second.position
-diff --git a/style/qtquickcontrols/RoundButton.qml b/style/qtquickcontrols/RoundButton.qml
-index 3b6d6b2..ab27cca 100644
---- a/style/qtquickcontrols/RoundButton.qml
-+++ b/style/qtquickcontrols/RoundButton.qml
-@@ -11,7 +11,7 @@ import QtQuick.Layouts 1.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.RoundButton {
- id: control
-@@ -28,11 +28,11 @@ T.RoundButton {
- Kirigami.Theme.colorSet: control.highlighted ? Kirigami.Theme.Selection : Kirigami.Theme.Button
- Kirigami.Theme.inherit: control.flat && !control.down && !control.checked
-
-- padding: Kirigami.Units.mediumSpacing
-- spacing: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.MnemonicData.enabled: control.enabled && control.visible
- Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.ActionElement
-@@ -44,12 +44,12 @@ T.RoundButton {
- onActivated: control.clicked()
- }
-
-- contentItem: IconLabelContent {
-+ contentItem:Impl.IconLabelContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- }
-
-- background: ButtonBackground {
-+ background: Impl.ButtonBackground {
- control: control
- radius: control.radius
- }
-diff --git a/style/qtquickcontrols/ScrollBar.qml b/style/qtquickcontrols/ScrollBar.qml
-index 2000562..4598d14 100644
---- a/style/qtquickcontrols/ScrollBar.qml
-+++ b/style/qtquickcontrols/ScrollBar.qml
-@@ -5,7 +5,8 @@
- import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.ScrollBar {
- id: control
-@@ -15,7 +16,7 @@ T.ScrollBar {
- implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- implicitContentHeight + topPadding + bottomPadding)
-
-- padding: control.interactive ? Kirigami.Units.mediumSpacing : Kirigami.Units.verySmallSpacing
-+ padding: control.interactive ? Impl.Units.mediumSpacing : Impl.Units.verySmallSpacing
- leftPadding: horizontalPadding + separator.thickness
-
- visible: control.size < 1 && control.policy !== T.ScrollBar.AlwaysOff
-@@ -25,7 +26,7 @@ T.ScrollBar {
-
- policy: Kirigami.Settings.isMobile || !control.interactive ? T.ScrollBar.AsNeeded : T.ScrollBar.AlwaysOn
-
-- contentItem: ScrollHandle {
-+ contentItem: Impl.ScrollHandle {
- control: control
- policy: control.policy
- pressed: control.pressed
-diff --git a/style/qtquickcontrols/ScrollIndicator.qml b/style/qtquickcontrols/ScrollIndicator.qml
-index e9e42fd..ea19a64 100644
---- a/style/qtquickcontrols/ScrollIndicator.qml
-+++ b/style/qtquickcontrols/ScrollIndicator.qml
-@@ -5,7 +5,8 @@
- import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.ScrollIndicator {
- id: control
-@@ -19,9 +20,9 @@ T.ScrollIndicator {
-
- minimumSize: horizontal ? height / width : width / height
-
-- padding: Kirigami.Units.verySmallSpacing
-+ padding: Impl.Units.verySmallSpacing
-
-- contentItem: ScrollHandle {
-+ contentItem: Impl.ScrollHandle {
- control: control
- }
- }
-diff --git a/style/qtquickcontrols/Slider.qml b/style/qtquickcontrols/Slider.qml
-index 100a1fa..dc586ea 100644
---- a/style/qtquickcontrols/Slider.qml
-+++ b/style/qtquickcontrols/Slider.qml
-@@ -5,7 +5,7 @@
- import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.Slider {
- id: control
-@@ -18,9 +18,9 @@ T.Slider {
- Kirigami.Theme.colorSet: Kirigami.Theme.Button
- Kirigami.Theme.inherit: false
-
-- padding: Kirigami.Settings.tabletMode ? Kirigami.Units.mediumSpacing : 0
-+ padding: Kirigami.Settings.tabletMode ? Impl.Units.mediumSpacing : 0
-
-- handle: SliderHandle {
-+ handle: Impl.SliderHandle {
- control: control
- }
-
-@@ -40,7 +40,7 @@ T.Slider {
- */
-
- // groove
-- background: SliderGroove {
-+ background: Impl.SliderGroove {
- control: control
- startPosition: 0
- endPosition: control.position
-diff --git a/style/qtquickcontrols/SpinBox.qml b/style/qtquickcontrols/SpinBox.qml
-index f0dd272..7ce7185 100644
---- a/style/qtquickcontrols/SpinBox.qml
-+++ b/style/qtquickcontrols/SpinBox.qml
-@@ -6,7 +6,7 @@ import QtQuick 2.15
- import QtQuick.Controls 2.15 as Controls
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.SpinBox {
- id: control
-@@ -33,10 +33,10 @@ T.SpinBox {
- editable: true
- inputMethodHints: Qt.ImhDigitsOnly
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: __leftIndicatorWidth
- rightPadding: __rightIndicatorWidth
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
- validator: IntValidator {
- locale: control.locale.name
-@@ -44,7 +44,7 @@ T.SpinBox {
- top: Math.max(control.from, control.to)
- }
-
-- down.indicator: SpinBoxIndicator {
-+ down.indicator: Impl.SpinBoxIndicator {
- button: control.down
- alignment: Qt.AlignLeft
- mirrored: control.mirrored
-@@ -81,16 +81,16 @@ T.SpinBox {
- background: null
- }
-
-- up.indicator: SpinBoxIndicator {
-+ up.indicator: Impl.SpinBoxIndicator {
- button: control.up
- alignment: Qt.AlignRight
- mirrored: control.mirrored
- }
-
-- background: TextEditBackground {
-+ background:Impl.TextEditBackground {
- control: control
-- implicitWidth: Kirigami.Units.mediumControlHeight * 3 - Kirigami.Units.smallBorder * 2
-- implicitHeight: Kirigami.Units.mediumControlHeight
-+ implicitWidth: Impl.Units.mediumControlHeight * 3 - Impl.Units.smallBorder * 2
-+ implicitHeight: Impl.Units.mediumControlHeight
- // Work around SpinBox focus handling flaw
- visualFocus: control.visualFocus || (control.contentItem.activeFocus && (
- control.contentItem.focusReason == Qt.TabFocusReason ||
-diff --git a/style/qtquickcontrols/SwipeDelegate.qml b/style/qtquickcontrols/SwipeDelegate.qml
-index 8107c3b..43ee975 100644
---- a/style/qtquickcontrols/SwipeDelegate.qml
-+++ b/style/qtquickcontrols/SwipeDelegate.qml
-@@ -6,7 +6,8 @@ import QtQuick 2.15
- import QtQuick.Controls 2.15 as Controls
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+
-+import "impl" as Impl
-
- T.SwipeDelegate {
- id: control
-@@ -18,40 +19,40 @@ T.SwipeDelegate {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
- rightPadding: {
- if (contentItem.hasLabel && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.Theme.colorSet: control.down || control.highlighted ? Kirigami.Theme.Button : -1
- Kirigami.Theme.inherit: !background || !background.visible && !(control.highlighted || control.down)
-
-- contentItem: IconLabelContent {
-+ contentItem:Impl.IconLabelContent {
- control: control
- text: control.text
- alignment: Qt.AlignLeft | Qt.AlignVCenter
- //color: (control.pressed && !control.checked && !control.sectionDelegate) ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
- }
-
-- background: DelegateBackground {
-+ background: Impl.DelegateBackground {
- control: control
- }
-
-diff --git a/style/qtquickcontrols/Switch.qml b/style/qtquickcontrols/Switch.qml
-index b4e26f3..d6b40e4 100644
---- a/style/qtquickcontrols/Switch.qml
-+++ b/style/qtquickcontrols/Switch.qml
-@@ -6,7 +6,7 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.Switch {
- id: control
-@@ -18,15 +18,15 @@ T.Switch {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.verySmallSpacing
-- horizontalPadding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.verySmallSpacing
-+ horizontalPadding: Impl.Units.mediumSpacing
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
-- indicator: SwitchIndicator {
-+ indicator: Impl.SwitchIndicator {
- control: control
- }
-
-@@ -40,7 +40,7 @@ T.Switch {
- onActivated: control.toggle();
- }
-
-- contentItem: InlineIconLabelContent {
-+ contentItem: Impl.InlineIconLabelContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- alignment: Qt.AlignLeft | Qt.AlignVCenter
-diff --git a/style/qtquickcontrols/SwitchDelegate.qml b/style/qtquickcontrols/SwitchDelegate.qml
-index b9c3c3f..9983f08 100644
---- a/style/qtquickcontrols/SwitchDelegate.qml
-+++ b/style/qtquickcontrols/SwitchDelegate.qml
-@@ -6,7 +6,7 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import QtQuick.Controls 2.15 as Controls
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.SwitchDelegate {
- id: control
-@@ -18,12 +18,12 @@ T.SwitchDelegate {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
-@@ -32,32 +32,32 @@ T.SwitchDelegate {
- if (!control.indicator.visible
- && contentItem.hasLabel
- && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.Theme.colorSet: control.down || control.highlighted ? Kirigami.Theme.Button : -1
- Kirigami.Theme.inherit: !background || !background.visible && !(control.highlighted || control.down)
-
-- contentItem: IconLabelContent {
-+ contentItem:Impl.IconLabelContent {
- control: control
- alignment: Qt.AlignLeft | Qt.AlignVCenter
- //color: (control.pressed && !control.checked && !control.sectionDelegate) ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
- }
-
-- indicator: SwitchIndicator {
-+ indicator: Impl.SwitchIndicator {
- control: control
- mirrored: !control.mirrored
- }
-
-- background: DelegateBackground {
-+ background: Impl.DelegateBackground {
- control: control
- }
- }
-diff --git a/style/qtquickcontrols/TabBar.qml b/style/qtquickcontrols/TabBar.qml
-index eb2e87c..bcd5d33 100644
---- a/style/qtquickcontrols/TabBar.qml
-+++ b/style/qtquickcontrols/TabBar.qml
-@@ -4,6 +4,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.TabBar {
- id: control
-
-@@ -41,7 +43,7 @@ T.TabBar {
-
- background: Rectangle {
- // Enough height for Buttons/ComboBoxes/TextFields with smallSpacing padding on top and bottom
-- implicitHeight: Kirigami.Units.mediumControlHeight + (Kirigami.Units.smallSpacing * 2) + (separator.visible ? separator.height : 0)
-+ implicitHeight: Impl.Units.mediumControlHeight + (Impl.Units.smallSpacing * 2) + (separator.visible ? separator.height : 0)
- color: Kirigami.Theme.backgroundColor
- property Item separator: Kirigami.Separator {
- parent: background
-diff --git a/style/qtquickcontrols/TabButton.qml b/style/qtquickcontrols/TabButton.qml
-index dac5535..fe27dd8 100644
---- a/style/qtquickcontrols/TabButton.qml
-+++ b/style/qtquickcontrols/TabButton.qml
-@@ -6,7 +6,7 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
- import org.kde.breeze 1.0
--import "impl"
-+import "impl" as Impl
-
- T.TabButton {
- id: control
-@@ -24,19 +24,19 @@ T.TabButton {
- implicitContentHeight + topPadding + bottomPadding,
- implicitIndicatorHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
- rightPadding: {
- if (contentItem.hasLabel && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
-@@ -61,10 +61,10 @@ T.TabButton {
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.Theme.colorSet: {
- if (control.__inTabBar && !(control.checked)) {
-@@ -75,13 +75,13 @@ T.TabButton {
- }
- Kirigami.Theme.inherit: !(background && background.visible)
-
-- contentItem: IconLabelContent {
-+ contentItem:Impl.IconLabelContent {
- control: control
- }
-
- //TODO: tweak the appearance. This is just to have something usable and reasonably close to what we want.
- background: Rectangle {
-- implicitHeight: Kirigami.Units.mediumControlHeight + (Kirigami.Units.smallSpacing * 2) // fill TabBar
-+ implicitHeight: Impl.Units.mediumControlHeight + (Impl.Units.smallSpacing * 2) // fill TabBar
- implicitWidth: implicitHeight
- color: control.checked ? Kirigami.Theme.backgroundColor : "transparent"
-
-@@ -94,12 +94,12 @@ T.TabButton {
- anchors.leftMargin: -control.leftInset
- anchors.verticalCenter: parent.verticalCenter
- width: 1
-- height: control.checked ? parent.height : Math.min(parent.height, Kirigami.Units.gridUnit)
-+ height: control.checked ? parent.height : Math.min(parent.height, Impl.Units.gridUnit)
- color: Kirigami.Theme.separatorColor
- Behavior on height {
- NumberAnimation {
- easing.type: Easing.InOutQuad
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- }
- }
- }
-@@ -124,7 +124,7 @@ T.TabButton {
- anchors.leftMargin: -control.leftInset
- anchors.rightMargin: -control.rightInset
- y: control.__inHeader ? 0 : parent.height - height
-- height: Kirigami.Units.highlightLineThickness
-+ height: Impl.Units.highlightLineThickness
- opacity: control.visualFocus || control.checked || control.hovered || control.down ? 1 : 0
- Kirigami.Theme.colorSet: Kirigami.Theme.Button
- Kirigami.Theme.inherit: false
-@@ -140,13 +140,13 @@ T.TabButton {
- Behavior on opacity {
- OpacityAnimator {
- easing.type: Easing.OutCubic
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- Behavior on color {
- ColorAnimation {
- easing.type: Easing.InOutQuad
-- duration: Kirigami.Units.longDuration
-+ duration: Impl.Units.longDuration
- }
- }
- }
-@@ -166,7 +166,7 @@ T.TabButton {
- Behavior on opacity {
- OpacityAnimator {
- easing.type: Easing.OutCubic
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
- }
-diff --git a/style/qtquickcontrols/TextArea.qml b/style/qtquickcontrols/TextArea.qml
-index 4494001..176b3af 100644
---- a/style/qtquickcontrols/TextArea.qml
-+++ b/style/qtquickcontrols/TextArea.qml
-@@ -7,7 +7,7 @@ import QtQuick 2.15
- import QtQuick.Controls 2.15 as Controls
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.TextArea {
- id: control
-@@ -25,8 +25,8 @@ T.TextArea {
- )
-
-
-- padding: Kirigami.Units.mediumSpacing
-- property real horizontalPadding: Kirigami.Units.mediumHorizontalPadding
-+ padding: Impl.Units.mediumSpacing
-+ property real horizontalPadding: Impl.Units.mediumHorizontalPadding
- property real verticalPadding: padding
- leftPadding: horizontalPadding
- rightPadding: horizontalPadding
-@@ -46,7 +46,7 @@ T.TextArea {
- cursorDelegate: Loader {
- visible: control.activeFocus && !control.readOnly && control.selectionStart === control.selectionEnd
- active: visible
-- sourceComponent: CursorDelegate { target: control }
-+ sourceComponent: Impl.CursorDelegate { target: control }
- }
-
- Controls.Label {
-@@ -69,18 +69,18 @@ T.TextArea {
- renderType: control.renderType
- }
-
-- background: TextEditBackground {
-+ background:Impl.TextEditBackground {
- control: control
- implicitWidth: 200
- visualFocus: control.visualFocus
- }
-
-- CursorHandle {
-+ Impl.CursorHandle {
- id: selectionStartHandle
- target: control
- }
-
-- CursorHandle {
-+ Impl.CursorHandle {
- id: selectionEndHandle
- target: control
- isSelectionEnd: true
-diff --git a/style/qtquickcontrols/TextField.qml b/style/qtquickcontrols/TextField.qml
-index 71304b9..fa17672 100644
---- a/style/qtquickcontrols/TextField.qml
-+++ b/style/qtquickcontrols/TextField.qml
-@@ -7,7 +7,7 @@ import QtQuick 2.15
- import QtQuick.Controls 2.15 as Controls
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- T.TextField {
- id: control
-@@ -24,9 +24,9 @@ T.TextField {
- contentHeight + topPadding + bottomPadding,
- placeholder.implicitHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-- leftPadding: Kirigami.Units.mediumHorizontalPadding
-- rightPadding: Kirigami.Units.mediumHorizontalPadding
-+ padding: Impl.Units.mediumSpacing
-+ leftPadding: Impl.Units.mediumHorizontalPadding
-+ rightPadding: Impl.Units.mediumHorizontalPadding
-
- Kirigami.Theme.colorSet: Kirigami.Theme.View
- Kirigami.Theme.inherit: !background || !background.visible
-@@ -43,7 +43,7 @@ T.TextField {
- cursorDelegate: Loader {
- visible: control.activeFocus && !control.readOnly && control.selectionStart === control.selectionEnd
- active: visible
-- sourceComponent: CursorDelegate { target: control }
-+ sourceComponent: Impl.CursorDelegate { target: control }
- }
-
- Controls.Label {
-@@ -66,18 +66,18 @@ T.TextField {
- renderType: control.renderType
- }
-
-- background: TextEditBackground {
-+ background: Impl.TextEditBackground {
- control: control
- implicitWidth: 200
- visualFocus: control.visualFocus
- }
-
-- CursorHandle {
-+ Impl.CursorHandle {
- id: selectionStartHandle
- target: control
- }
-
-- CursorHandle {
-+ Impl.CursorHandle {
- id: selectionEndHandle
- target: control
- isSelectionEnd: true
-diff --git a/style/qtquickcontrols/ToolBar.qml b/style/qtquickcontrols/ToolBar.qml
-index 0612363..f55791b 100644
---- a/style/qtquickcontrols/ToolBar.qml
-+++ b/style/qtquickcontrols/ToolBar.qml
-@@ -6,6 +6,8 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.ToolBar {
- id: control
-
-@@ -17,9 +19,9 @@ T.ToolBar {
- implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- contentHeight + topPadding + bottomPadding)
-
-- spacing: Kirigami.Units.smallSpacing
-+ spacing: Impl.Units.smallSpacing
-
-- padding: Kirigami.Units.smallSpacing
-+ padding: Impl.Units.smallSpacing
-
- // Add space for the separator above the footer
- topPadding: __isFooter && background && background.hasOwnProperty("separator") ?
-@@ -33,7 +35,7 @@ T.ToolBar {
-
- background: Rectangle {
- // Enough height for Buttons/ComboBoxes/TextFields with smallSpacing padding on top and bottom
-- implicitHeight: Kirigami.Units.mediumControlHeight + (Kirigami.Units.smallSpacing * 2) + (separator.visible ? separator.height : 0)
-+ implicitHeight: Impl.Units.mediumControlHeight + (Impl.Units.smallSpacing * 2) + (separator.visible ? separator.height : 0)
- color: Kirigami.Theme.backgroundColor
- property Item separator: Kirigami.Separator {
- parent: background
-diff --git a/style/qtquickcontrols/ToolButton.qml b/style/qtquickcontrols/ToolButton.qml
-index e1dd414..ca104e4 100644
---- a/style/qtquickcontrols/ToolButton.qml
-+++ b/style/qtquickcontrols/ToolButton.qml
-@@ -5,7 +5,7 @@ import QtQuick 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
- import org.kde.breeze 1.0
--import "impl"
-+import "impl" as Impl
-
- T.ToolButton {
- id: control
-@@ -35,28 +35,28 @@ T.ToolButton {
- Kirigami.Theme.inherit = false//Qt.binding(() => control.flat && !(control.down || control.checked))
- }
-
-- padding: Kirigami.Units.mediumSpacing
-+ padding: Impl.Units.mediumSpacing
- leftPadding: {
- if ((!contentItem.hasIcon && contentItem.textBesideIcon) // False if contentItem has been replaced
- || display == T.AbstractButton.TextOnly
- || display == T.AbstractButton.TextUnderIcon) {
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
- rightPadding: {
- if (contentItem.hasLabel && display != T.AbstractButton.IconOnly) { // False if contentItem has been replaced
-- return Kirigami.Units.mediumHorizontalPadding
-+ return Impl.Units.mediumHorizontalPadding
- } else {
- return control.horizontalPadding
- }
- }
-
-- spacing: Kirigami.Units.mediumSpacing
-+ spacing: Impl.Units.mediumSpacing
-
-- icon.width: Kirigami.Units.iconSizes.auto
-- icon.height: Kirigami.Units.iconSizes.auto
-+ icon.width: Impl.Units.iconSizes.auto
-+ icon.height: Impl.Units.iconSizes.auto
-
- Kirigami.MnemonicData.enabled: control.enabled && control.visible
- Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.ActionElement
-@@ -68,7 +68,7 @@ T.ToolButton {
- onActivated: control.clicked()
- }
-
-- contentItem: IconLabelContent {
-+ contentItem:Impl.IconLabelContent {
- control: control
- text: control.Kirigami.MnemonicData.richTextLabel
- }
-@@ -94,7 +94,7 @@ T.ToolButton {
- }
- }
-
-- background: ButtonBackground {
-+ background: Impl.ButtonBackground {
- // HACK: Compatibility with qqc2-desktop-style hack for showing arrows when buttons open menus
- // This one is in the background because that's what Kirigami expects
- property alias showMenuArrow: control.__showMenuArrow
-diff --git a/style/qtquickcontrols/ToolSeparator.qml b/style/qtquickcontrols/ToolSeparator.qml
-index f334760..5543dfc 100644
---- a/style/qtquickcontrols/ToolSeparator.qml
-+++ b/style/qtquickcontrols/ToolSeparator.qml
-@@ -8,6 +8,8 @@ import QtQuick.Controls.impl 2.15
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
-
-+import "impl" as Impl
-+
- T.ToolSeparator {
- id: control
- palette: Kirigami.Theme.palette
-@@ -21,7 +23,7 @@ T.ToolSeparator {
- focusPolicy: Qt.NoFocus
-
- contentItem: Kirigami.Separator {
-- readonly property int defaultHeight: Kirigami.Units.mediumControlHeight
-+ readonly property int defaultHeight: Impl.Units.mediumControlHeight
- implicitWidth: vertical ? 1 : defaultHeight
- implicitHeight: vertical ? defaultHeight : 1
- }
-diff --git a/style/qtquickcontrols/ToolTip.qml b/style/qtquickcontrols/ToolTip.qml
-index 833abac..17b41fa 100644
---- a/style/qtquickcontrols/ToolTip.qml
-+++ b/style/qtquickcontrols/ToolTip.qml
-@@ -8,7 +8,7 @@ import QtQuick.Window 2.15
- import QtQuick.Controls 2.15 as Controls
- import QtQuick.Templates 2.15 as T
- import org.kde.kirigami 2.14 as Kirigami
--import "impl"
-+import "impl" as Impl
-
- /* NOTE:
- * It took a LOT of trial and error to get the text to fit in a specific
-@@ -45,7 +45,7 @@ T.ToolTip {
- Kirigami.Theme.inherit: false
-
- x: parent ? Math.round((parent.width - implicitWidth) / 2) : 0
-- y: -implicitHeight - Kirigami.Units.smallSpacing
-+ y: -implicitHeight - Impl.Units.smallSpacing
- // Always show the tooltip on top of everything else
- z: 999
-
-@@ -54,19 +54,19 @@ T.ToolTip {
- implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- contentHeight + topPadding + bottomPadding)
-
-- padding: Kirigami.Units.mediumSpacing
-- horizontalPadding: Kirigami.Units.mediumHorizontalPadding
-+ padding: Impl.Units.mediumSpacing
-+ horizontalPadding: Impl.Units.mediumHorizontalPadding
-
- closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
-
-- delay: Kirigami.Units.toolTipDelay
-+ delay: Impl.Units.toolTipDelay
-
- enter: Transition {
- OpacityAnimator {
- from: 0
- to: 1
- easing.type: Easing.OutCubic
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
-
-@@ -75,7 +75,7 @@ T.ToolTip {
- from: 1
- to: 0
- easing.type: Easing.InCubic
-- duration: Kirigami.Units.shortDuration
-+ duration: Impl.Units.shortDuration
- }
- }
-
-@@ -111,17 +111,17 @@ T.ToolTip {
-
- background: Rectangle {
- implicitWidth: implicitHeight
-- implicitHeight: Kirigami.Units.mediumControlHeight
-- radius: Kirigami.Units.smallRadius
-+ implicitHeight: Impl.Units.mediumControlHeight
-+ radius: Impl.Units.smallRadius
- color: Kirigami.Theme.backgroundColor
-- border.width: Kirigami.Units.smallBorder
-+ border.width: Impl.Units.smallBorder
- border.color: Kirigami.Theme.separatorColor
-
-- LargeShadow {
-+ Impl.LargeShadow {
- radius: parent.radius
- }
- }
-
-- T.Overlay.modal: OverlayModalBackground {}
-- T.Overlay.modeless: OverlayDimBackground {}
-+ T.Overlay.modal: Impl.OverlayModalBackground {}
-+ T.Overlay.modeless: Impl.OverlayDimBackground {}
- }
-diff --git a/style/qtquickcontrols/qmldir b/style/qtquickcontrols/qmldir
-index 3109e01..c60d522 100644
---- a/style/qtquickcontrols/qmldir
-+++ b/style/qtquickcontrols/qmldir
-@@ -66,8 +66,6 @@ DelayButton 2.2 DelayButton.qml
- ScrollView 2.2 ScrollView.qml
-
- # QtQuick.Controls 2.3 (new types in Qt 5.10)
--Action 2.3 Action.qml
--ActionGroup 2.3 ActionGroup.qml
- MenuBar 2.3 MenuBar.qml
- MenuBarItem 2.3 MenuBarItem.qml
-
---
-GitLab
-
diff --git a/community/qqc2-breeze-style/APKBUILD b/community/qqc2-breeze-style/APKBUILD
index 101cc74977..806fbc3374 100644
--- a/community/qqc2-breeze-style/APKBUILD
+++ b/community/qqc2-breeze-style/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=qqc2-breeze-style
-pkgver=5.22.5
-pkgrel=1
+pkgver=5.23.0
+pkgrel=0
pkgdesc="Breeze inspired QQC2 style"
# armhf blocked by extra-cmake-modules
# s390x and mips64 blocked by kconfigwidgets
@@ -28,13 +28,7 @@ case "$pkgver" in
*.90*) _rel=unstable;;
*) _rel=stable;;
esac
-source="https://download.kde.org/$_rel/plasma/$pkgver/qqc2-breeze-style-$pkgver.tar.xz
- 0001-Remove-x1.5-mobile-icon-sizing.patch
- 0002-Use-kcoreaddons-macro-for-kirigami-plugin.patch
- 0003-Always-build-kirigami-plugin.patch
- 0004-Do-not-create-an-extra-KIconLoader-just-for-custom-palettes.patch
- 0005-Port-to-the-new-C++-units-plugin-in-Kirigami.patch
- "
+source="https://download.kde.org/$_rel/plasma/$pkgver/qqc2-breeze-style-$pkgver.tar.xz"
subpackages="$pkgname-dev"
options="!check" # No tests
@@ -56,10 +50,5 @@ package() {
}
sha512sums="
-17560976e7c1d291b7359b53ece1cda819595c84d92609ab2f3dd8ca5be870dc523377821b86a45852139385a219a2d271927b42c1a949cfd11df33fb35282ef qqc2-breeze-style-5.22.5.tar.xz
-12af2b0a96266b6f42919bd0c824fe9b5b6e77a86b8d70466ab1f727207f3834c657cb358c41618560509466543ba4b1e59cc76947bdd983628c3e9e6dfaa692 0001-Remove-x1.5-mobile-icon-sizing.patch
-0e07a9ab711b3ff21b64a2ca196db46161987ef8228ef2f2b6e0c2dc510a932ca6e09db49f7159b5ad3b9fc4908c66e9d6482948a7aff57a8ff897daf7794373 0002-Use-kcoreaddons-macro-for-kirigami-plugin.patch
-0267bd6bc34a5d6df17fd067078b8d245f264920277810e1041f37655007aeb5228b55d0ace52089b889c9ed871005fde0dd60eb832f8aa983a72f8efed5cd55 0003-Always-build-kirigami-plugin.patch
-7af556580c0b1b750e5fcdeeb589e3462dd536a17e976f9eed8c2678f55cdae5084bdd84b893f3173609a7a986795c4303e49536011594428304e32cc569fc84 0004-Do-not-create-an-extra-KIconLoader-just-for-custom-palettes.patch
-bf59365b80f116a11bb6944ee311f98cfada2f862df6c522b80eec73f05284cfffa2e780d4948760bc0f5bb38b1fbfab7a9aa0c21bc447765625be1790ea7b3d 0005-Port-to-the-new-C++-units-plugin-in-Kirigami.patch
+9362c30953db413ba04e07eb3b5e724e19379273882c515a516f6d2944aa45b1a20b51b53ad206aa89af2325a653dcb61377de81cd36a0c802bdd7f45716d29d qqc2-breeze-style-5.23.0.tar.xz
"
diff --git a/community/sddm-kcm/APKBUILD b/community/sddm-kcm/APKBUILD
index f379b189ea..6ae2922a0b 100644
--- a/community/sddm-kcm/APKBUILD
+++ b/community/sddm-kcm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=sddm-kcm
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Config module for SDDM"
# armhf blocked by extra-cmake-modules
@@ -52,5 +52,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-4026d5ae90ce6842541ef405c5859c35f7eb12fb16cfebb21a438ec33c73f7c741e1a2a1338caad9d97eb31bc8d74453c19a13434cbdf03a33fc12b1466f9cd3 sddm-kcm-5.22.5.tar.xz
+45fbe87a22bd632047e3399dd06616dd0950aaf52ecce6adffd64ed445e2bebe57aa2e9869786e8219952e201ec0d29fb19d0492fc7cf77b14457a60a2aacf52 sddm-kcm-5.23.0.tar.xz
"
diff --git a/community/systemsettings/APKBUILD b/community/systemsettings/APKBUILD
index dc5f6cfca8..18485a67a0 100644
--- a/community/systemsettings/APKBUILD
+++ b/community/systemsettings/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=systemsettings
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="Plasma system manager for hardware, software, and workspaces"
# armhf blocked by qt5-qtdeclarative
@@ -60,5 +60,5 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
-d74aca46221dd8da152139a7cb0d5eb05d29d9d39e935b8d29f8f105bc7573af55808d7b77d8416deec1743ae1a9149b24a6c6082dedf7ada53d16d4cf09f22f systemsettings-5.22.5.tar.xz
+8b45f0dcd102b5bf3780c621e2cd2c73cfa7a3187a4152866559b2e851c51f045fa2674dec972d2d8a6d95cf483d3c1bf34c81c2f4742e979d691df2ebb9307e systemsettings-5.23.0.tar.xz
"
diff --git a/community/xdg-desktop-portal-kde/APKBUILD b/community/xdg-desktop-portal-kde/APKBUILD
index ed935b4e39..f61cdaef57 100644
--- a/community/xdg-desktop-portal-kde/APKBUILD
+++ b/community/xdg-desktop-portal-kde/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=xdg-desktop-portal-kde
-pkgver=5.22.5
+pkgver=5.23.0
pkgrel=0
pkgdesc="A backend implementation for xdg-desktop-portal that is using Qt/KDE"
# armhf blocked by extra-cmake-modules
@@ -46,5 +46,5 @@ package() {
}
sha512sums="
-753adf3a4b7543ebbd220f85980e23f1bf98642c8aac408b41ba07bd7aa1ef9929518794e946d497b216eb781695b491c4eb35fce47c43a3a3463d6b9e62017f xdg-desktop-portal-kde-5.22.5.tar.xz
+4ad0f27d67bb9199dc779d687bf6f03c5047f429d2a8ad5708d50294b25c29fd6061dc5be1efc33f646d2963e4501a717a90107d17c1c9be2337b5a04f580ccd xdg-desktop-portal-kde-5.23.0.tar.xz
"