[plasma/plasma-mobile] kcms/waydroidintegration/ui: kcm/waydroidintegration: Use QtQuick.Controls button instead PC3 buttons
Florian RICHER <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit f469fcce79c9cf9c3e21a88f529bdab6f131bf14 by Florian RICHER.
Committed on 19/08/2026 at 12:10.
Pushed by florianricher into branch 'master'.
kcm/waydroidintegration: Use QtQuick.Controls button instead PC3 buttons
Use Plasma component with Dark Plasma theme and light color theme cause
Dark button with dark text.
BUG: 523696
FIXED-IN: 6.7.5
M +0 -1 kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml
M +2 -3 kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml
M +0 -1 kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml
M +0 -1 kcms/waydroidintegration/ui/WaydroidErrorPage.qml
M +1 -2 kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml
M +2 -3 kcms/waydroidintegration/ui/main.qml
https://invent.kde.org/plasma/plasma-mobile/-/commit/f469fcce79c9cf9c3e21a88f529bdab6f131bf14
diff --git a/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml b/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml
index 7ee54b11e..6d452ac26 100644
--- a/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml
+++ b/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml
@@ -11,7 +11,6 @@ import QtQuick.Dialogs
import org.kde.kirigami as Kirigami
import org.kde.kcmutils as KCM
import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-import org.kde.plasma.components 3.0 as PC3
import org.kde.plasma.private.mobileshell.waydroidintegrationplugin as AIP
KCM.SimpleKCM {
diff --git a/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml b/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml
index 88b51696a..eddfacb77 100644
--- a/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml
+++ b/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml
@@ -9,7 +9,6 @@ import QtQuick.Controls 2.15 as QQC2
import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-import org.kde.plasma.components 3.0 as PC3
import org.kde.plasma.private.mobileshell.waydroidintegrationplugin as AIP
ColumnLayout {
@@ -23,7 +22,7 @@ ColumnLayout {
FormCard.FormTextDelegate {
text: i18n("IP address")
description: AIP.WaydroidDBusClient.ipAddress
- trailing: PC3.Button {
+ trailing: QQC2.Button {
visible: AIP.WaydroidDBusClient.ipAddress !== ""
text: i18n("Copy")
icon.name: 'edit-copy-symbolic'
@@ -35,7 +34,7 @@ ColumnLayout {
text: i18n("Waydroid status")
description: i18n("Running")
- trailing: PC3.Button {
+ trailing: QQC2.Button {
text: i18n("Stop session")
onClicked: AIP.WaydroidDBusClient.stopSession()
}
diff --git a/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml b/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml
index 0db76c4c9..148cbb7e0 100644
--- a/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml
+++ b/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml
@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 as QQC2
import org.kde.kirigami as Kirigami
-import org.kde.plasma.components 3.0 as PC3
ColumnLayout {
id: root
diff --git a/kcms/waydroidintegration/ui/WaydroidErrorPage.qml b/kcms/waydroidintegration/ui/WaydroidErrorPage.qml
index 4eff949f8..0d79c56f2 100644
--- a/kcms/waydroidintegration/ui/WaydroidErrorPage.qml
+++ b/kcms/waydroidintegration/ui/WaydroidErrorPage.qml
@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 as QQC2
import org.kde.kirigami as Kirigami
-import org.kde.plasma.components 3.0 as PC3
ColumnLayout {
id: root
diff --git a/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml b/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml
index 548e68f18..09859bd30 100644
--- a/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml
+++ b/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml
@@ -8,7 +8,6 @@ import QtQuick.Controls 2.15 as QQC2
import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-import org.kde.plasma.components 3.0 as PC3
import org.kde.plasma.private.mobileshell.waydroidintegrationplugin as AIP
ColumnLayout {
@@ -31,7 +30,7 @@ ColumnLayout {
}
}
- PC3.Button {
+ QQC2.Button {
text: i18n("Configure Waydroid")
Layout.alignment: Qt.AlignHCenter
enabled: systemType.currentValue !== undefined
diff --git a/kcms/waydroidintegration/ui/main.qml b/kcms/waydroidintegration/ui/main.qml
index 6e5b618ae..26d043812 100644
--- a/kcms/waydroidintegration/ui/main.qml
+++ b/kcms/waydroidintegration/ui/main.qml
@@ -10,7 +10,6 @@ import QtQuick.Controls 2.15 as QQC2
import org.kde.kirigami as Kirigami
import org.kde.kcmutils as KCM
import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-import org.kde.plasma.components 3.0 as PC3
import org.kde.plasma.private.mobileshell.waydroidintegrationplugin as AIP
KCM.SimpleKCM {
@@ -35,7 +34,7 @@ KCM.SimpleKCM {
}
- PC3.Button {
+ QQC2.Button {
text: i18n("Check installation")
Layout.alignment: Qt.AlignHCenter
onClicked: AIP.WaydroidDBusClient.refreshSupportsInfo()
@@ -78,7 +77,7 @@ KCM.SimpleKCM {
horizontalAlignment: Text.AlignHCenter
}
- PC3.Button {
+ QQC2.Button {
text: i18n("Start the session")
Layout.alignment: Qt.AlignHCenter
onClicked: AIP.WaydroidDBusClient.startSession()