Revert "Port away from PlasmaCore and PlasmaExtras to Kirigami"

This (partially) reverts commit 127bbdf653.

Only incorrect changes from Kirigami.Units.largeSpacing to
Kirigami.Units.gridUnit are reverted. Only Plasma.Units were buggy.
This commit is contained in:
ivan tkachenko 2023-11-08 20:57:27 +03:00
parent c6749a8728
commit 22f7d490ba
No known key found for this signature in database
GPG key ID: AF72731B7C654CB3
29 changed files with 64 additions and 64 deletions

View file

@ -106,8 +106,8 @@ MobileShell.BaseItem {
property real fullHeight: height + Layout.topMargin property real fullHeight: height + Layout.topMargin
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.smallSpacing Layout.topMargin: Kirigami.Units.smallSpacing
Layout.leftMargin: Kirigami.Units.gridUnit Layout.leftMargin: Kirigami.Units.largeSpacing
Layout.rightMargin: Kirigami.Units.gridUnit Layout.rightMargin: Kirigami.Units.largeSpacing
} }
Handle { Handle {

View file

@ -26,7 +26,7 @@ Item {
onContentItemChanged: { onContentItemChanged: {
contentItem.parent = contentParent; contentItem.parent = contentParent;
contentItem.anchors.fill = contentParent; contentItem.anchors.fill = contentParent;
contentItem.anchors.margins = Kirigami.Units.gridUnit; contentItem.anchors.margins = Kirigami.Units.largeSpacing;
contentParent.children.push(contentItem); contentParent.children.push(contentItem);
} }

View file

@ -52,7 +52,7 @@ BaseNotificationItem {
// notification // notification
NotificationCard { NotificationCard {
id: mainCard id: mainCard
anchors.topMargin: notificationHeading.visible ? Kirigami.Units.gridUnit : 0 anchors.topMargin: notificationHeading.visible ? Kirigami.Units.largeSpacing : 0
anchors.top: notificationHeading.bottom anchors.top: notificationHeading.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@ -148,7 +148,7 @@ BaseNotificationItem {
// thumbnails // thumbnails
Loader { Loader {
id: thumbnailStripLoader id: thumbnailStripLoader
Layout.topMargin: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.largeSpacing
Layout.fillWidth: true Layout.fillWidth: true
active: notificationItem.urls.length > 0 active: notificationItem.urls.length > 0
visible: active visible: active

View file

@ -158,7 +158,7 @@ Item {
} }
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.largeSpacing
// TODO keyboard focus // TODO keyboard focus
highlightMoveDuration: 0 highlightMoveDuration: 0
@ -363,8 +363,8 @@ Item {
top: spacer.bottom top: spacer.bottom
right: parent.right right: parent.right
left: parent.left left: parent.left
leftMargin: Kirigami.Units.gridUnit leftMargin: PlasmaCore.Units.largeSpacing
rightMargin: Kirigami.Units.gridUnit rightMargin: PlasmaCore.Units.largeSpacing
topMargin: list.spacing topMargin: list.spacing
bottomMargin: list.spacing bottomMargin: list.spacing
} }

View file

@ -35,7 +35,7 @@ MobileShell.GridView {
readonly property int reservedSpaceForLabel: metrics.height readonly property int reservedSpaceForLabel: metrics.height
readonly property real effectiveContentWidth: width - leftMargin - rightMargin readonly property real effectiveContentWidth: width - leftMargin - rightMargin
cellWidth: gridView.effectiveContentWidth / Math.min(Math.floor(effectiveContentWidth / (Kirigami.Units.iconSizes.large + Kirigami.Units.gridUnit * 2)), 8) cellWidth: gridView.effectiveContentWidth / Math.min(Math.floor(effectiveContentWidth / (Kirigami.Units.iconSizes.large + Kirigami.Units.largeSpacing * 2)), 8)
cellHeight: cellWidth + reservedSpaceForLabel cellHeight: cellWidth + reservedSpaceForLabel
property int columns: Math.floor(effectiveContentWidth / cellWidth) property int columns: Math.floor(effectiveContentWidth / cellWidth)

View file

@ -33,7 +33,7 @@ Item {
anchors { anchors {
fill: parent fill: parent
topMargin: Kirigami.Units.gridUnit topMargin: Kirigami.Units.gridUnit
bottomMargin: Kirigami.Units.gridUnit bottomMargin: Kirigami.Units.largeSpacing
} }
width: root.width width: root.width
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.gridUnit

View file

@ -19,7 +19,7 @@ Item {
anchors { anchors {
fill: parent fill: parent
topMargin: Kirigami.Units.gridUnit topMargin: Kirigami.Units.gridUnit
bottomMargin: Kirigami.Units.gridUnit bottomMargin: Kirigami.Units.largeSpacing
} }
width: root.width width: root.width
@ -71,10 +71,10 @@ Item {
header: Control { header: Control {
width: listView.width width: listView.width
leftPadding: Kirigami.Units.gridUnit leftPadding: Kirigami.Units.largeSpacing
rightPadding: Kirigami.Units.gridUnit rightPadding: Kirigami.Units.largeSpacing
topPadding: Kirigami.Units.gridUnit topPadding: Kirigami.Units.largeSpacing
bottomPadding: Kirigami.Units.gridUnit bottomPadding: Kirigami.Units.largeSpacing
contentItem: Kirigami.SearchField { contentItem: Kirigami.SearchField {
id: searchField id: searchField

View file

@ -43,7 +43,7 @@ Kirigami.PromptDialog {
ColumnLayout { ColumnLayout {
id: column id: column
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.largeSpacing
PasswordField { PasswordField {
id: passwordField id: passwordField

View file

@ -47,7 +47,7 @@ FormCard.AbstractFormDelegate {
} }
contentItem: RowLayout { contentItem: RowLayout {
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.largeSpacing
Item { Item {
Layout.preferredWidth: Kirigami.Units.gridUnit Layout.preferredWidth: Kirigami.Units.gridUnit

View file

@ -53,7 +53,7 @@ Item {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.topMargin: Kirigami.Units.gridUnit anchors.topMargin: Kirigami.Units.gridUnit
anchors.bottomMargin: Kirigami.Units.gridUnit anchors.bottomMargin: Kirigami.Units.largeSpacing
width: root.width width: root.width
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.gridUnit

View file

@ -70,7 +70,7 @@ Item {
ColumnLayout { ColumnLayout {
opacity: root.contentOpacity opacity: root.contentOpacity
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.largeSpacing
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left

View file

@ -290,8 +290,8 @@ Kirigami.Page {
topPadding: Kirigami.Units.largeSpacing topPadding: Kirigami.Units.largeSpacing
bottomPadding: Kirigami.Units.largeSpacing bottomPadding: Kirigami.Units.largeSpacing
leftPadding: Kirigami.Units.largeSpacing leftPadding: Kirigami.Units.gridUnit
rightPadding: Kirigami.Units.largeSpacing rightPadding: Kirigami.Units.gridUnit
text: i18n("Back") text: i18n("Back")
icon.name: "arrow-left" icon.name: "arrow-left"
@ -308,8 +308,8 @@ Kirigami.Page {
topPadding: Kirigami.Units.largeSpacing topPadding: Kirigami.Units.largeSpacing
bottomPadding: Kirigami.Units.largeSpacing bottomPadding: Kirigami.Units.largeSpacing
leftPadding: Kirigami.Units.largeSpacing leftPadding: Kirigami.Units.gridUnit
rightPadding: Kirigami.Units.largeSpacing rightPadding: Kirigami.Units.gridUnit
visible: !root.onFinalPage visible: !root.onFinalPage
text: i18n("Next") text: i18n("Next")
@ -325,8 +325,8 @@ Kirigami.Page {
topPadding: Kirigami.Units.largeSpacing topPadding: Kirigami.Units.largeSpacing
bottomPadding: Kirigami.Units.largeSpacing bottomPadding: Kirigami.Units.largeSpacing
leftPadding: Kirigami.Units.largeSpacing leftPadding: Kirigami.Units.gridUnit
rightPadding: Kirigami.Units.largeSpacing rightPadding: Kirigami.Units.gridUnit
visible: root.onFinalPage visible: root.onFinalPage
text: i18n("Finish") text: i18n("Finish")

View file

@ -25,7 +25,7 @@ Kirigami.ScrollablePage {
MessagesList { MessagesList {
visible: count != 0 visible: count != 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: Kirigami.Units.gridUnit Layout.margins: Kirigami.Units.largeSpacing
model: kcm.messages model: kcm.messages
} }
} }

View file

@ -23,7 +23,7 @@ ColumnLayout {
model: root.model model: root.model
delegate: Kirigami.InlineMessage { delegate: Kirigami.InlineMessage {
Layout.bottomMargin: Kirigami.Units.gridUnit Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.fillWidth: true Layout.fillWidth: true
visible: true visible: true
text: modelData.message text: modelData.message

View file

@ -29,7 +29,7 @@ Controls.Dialog {
header: Item { header: Item {
transform: Translate { y: dialog.translateY } transform: Translate { y: dialog.translateY }
implicitHeight: heading.implicitHeight + Kirigami.Units.gridUnit * 2 implicitHeight: heading.implicitHeight + Kirigami.Units.largeSpacing * 2
Kirigami.Heading { Kirigami.Heading {
id: heading id: heading
@ -38,7 +38,7 @@ Controls.Dialog {
elide: Text.ElideRight elide: Text.ElideRight
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: Kirigami.Units.gridUnit anchors.leftMargin: Kirigami.Units.largeSpacing
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
// use tooltip for long text that is elided // use tooltip for long text that is elided

View file

@ -21,7 +21,7 @@ Kirigami.ScrollablePage {
anchors.centerIn: parent anchors.centerIn: parent
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.margins: Kirigami.Units.gridUnit anchors.margins: Kirigami.Units.largeSpacing
visible: profileListView.count === 0 visible: profileListView.count === 0
text: i18n("No APNs configured") text: i18n("No APNs configured")
icon.name: "globe" icon.name: "globe"
@ -52,14 +52,14 @@ Kirigami.ScrollablePage {
id: messagesList id: messagesList
visible: count != 0 visible: count != 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: Kirigami.Units.gridUnit Layout.margins: Kirigami.Units.largeSpacing
model: kcm.messages model: kcm.messages
} }
Kirigami.InlineMessage { Kirigami.InlineMessage {
id: cannotFindWarning id: cannotFindWarning
Layout.margins: visible ? Kirigami.Units.gridUnit : 0 Layout.margins: visible ? Kirigami.Units.largeSpacing : 0
Layout.topMargin: visible && !messagesList.visible ? Kirigami.Units.gridUnit : 0 Layout.topMargin: visible && !messagesList.visible ? Kirigami.Units.largeSpacing : 0
Layout.fillWidth: true Layout.fillWidth: true
visible: false visible: false

View file

@ -81,8 +81,8 @@ FormCard.FormCardPage {
} }
Kirigami.Separator { Kirigami.Separator {
Layout.leftMargin: Kirigami.Units.gridUnit Layout.leftMargin: Kirigami.Units.largeSpacing
Layout.rightMargin: Kirigami.Units.gridUnit Layout.rightMargin: Kirigami.Units.largeSpacing
opacity: (!disableSimLockButton.controlHovered && !changePinButton.controlHovered) ? 0.5 : 0 opacity: (!disableSimLockButton.controlHovered && !changePinButton.controlHovered) ? 0.5 : 0
} }
@ -105,7 +105,7 @@ FormCard.FormCardPage {
id: unlockPinDialog id: unlockPinDialog
title: i18n("Unlock SIM") title: i18n("Unlock SIM")
standardButtons: Controls.Dialog.Ok | Controls.Dialog.Cancel standardButtons: Controls.Dialog.Ok | Controls.Dialog.Cancel
padding: Kirigami.Units.gridUnit padding: Kirigami.Units.largeSpacing
onAccepted: sim.sendPin(unlockPinCurPin.text) onAccepted: sim.sendPin(unlockPinCurPin.text)
@ -125,7 +125,7 @@ FormCard.FormCardPage {
id: changePinDialog id: changePinDialog
title: i18n("Change SIM PIN") title: i18n("Change SIM PIN")
standardButtons: isValid ? Controls.Dialog.Ok | Controls.Dialog.Cancel : Controls.Dialog.Cancel standardButtons: isValid ? Controls.Dialog.Ok | Controls.Dialog.Cancel : Controls.Dialog.Cancel
padding: Kirigami.Units.gridUnit padding: Kirigami.Units.largeSpacing
property bool isValid: changePinNewPin.text == changePinConfirmPin.text && property bool isValid: changePinNewPin.text == changePinConfirmPin.text &&
changePinNewPin.text.length >= 4 && changePinNewPin.text.length <= 8 // SIM PINs are between 4-8 digits changePinNewPin.text.length >= 4 && changePinNewPin.text.length <= 8 // SIM PINs are between 4-8 digits
@ -173,7 +173,7 @@ FormCard.FormCardPage {
id: removePinDialog id: removePinDialog
title: i18n("Remove SIM PIN") title: i18n("Remove SIM PIN")
standardButtons: Controls.Dialog.Ok | Controls.Dialog.Cancel standardButtons: Controls.Dialog.Ok | Controls.Dialog.Cancel
padding: Kirigami.Units.gridUnit padding: Kirigami.Units.largeSpacing
onAccepted: sim.togglePinEnabled(removePinCurPin.text); onAccepted: sim.togglePinEnabled(removePinCurPin.text);
@ -190,7 +190,7 @@ FormCard.FormCardPage {
id: createPinDialog id: createPinDialog
title: i18n("Add SIM PIN") title: i18n("Add SIM PIN")
standardButtons: isValid ? Controls.Dialog.Ok | Controls.Dialog.Cancel : Controls.Dialog.Cancel standardButtons: isValid ? Controls.Dialog.Ok | Controls.Dialog.Cancel : Controls.Dialog.Cancel
padding: Kirigami.Units.gridUnit padding: Kirigami.Units.largeSpacing
property bool isValid: createPinNewPin.text == createPinConfirmPin.text && property bool isValid: createPinNewPin.text == createPinConfirmPin.text &&
createPinNewPin.text.length >= 4 && createPinNewPin.text.length <= 8 // SIM PINs are between 4-8 digits createPinNewPin.text.length >= 4 && createPinNewPin.text.length <= 8 // SIM PINs are between 4-8 digits

View file

@ -59,7 +59,7 @@ KCM.SimpleKCM {
MessagesList { MessagesList {
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: Kirigami.Units.gridUnit Layout.margins: Kirigami.Units.largeSpacing
model: kcm.messages model: kcm.messages
} }

View file

@ -53,8 +53,8 @@ SimpleKCM {
} }
FormCard.FormCard { FormCard.FormCard {
Layout.topMargin: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.gridUnit Layout.bottomMargin: Kirigami.Units.largeSpacing
FormCard.FormTextFieldDelegate { FormCard.FormTextFieldDelegate {
label: i18n("Hotspot SSID") label: i18n("Hotspot SSID")

View file

@ -28,7 +28,7 @@ FormCard.FormCardPage {
contentItem: RowLayout { contentItem: RowLayout {
Kirigami.ListItemDragHandle { Kirigami.ListItemDragHandle {
visible: qsDelegate.isEnabled visible: qsDelegate.isEnabled
Layout.rightMargin: Kirigami.Units.gridUnit Layout.rightMargin: Kirigami.Units.largeSpacing
listItem: qsDelegate listItem: qsDelegate
listView: qsDelegate.ListView.view listView: qsDelegate.ListView.view
onMoveRequested: savedQuickSettings.enabledModel.moveRow(oldIndex, newIndex) onMoveRequested: savedQuickSettings.enabledModel.moveRow(oldIndex, newIndex)

View file

@ -48,7 +48,7 @@ SimpleKCM {
Kirigami.Icon { Kirigami.Icon {
implicitWidth: Kirigami.Units.iconSizes.smallMedium implicitWidth: Kirigami.Units.iconSizes.smallMedium
implicitHeight: Kirigami.Units.iconSizes.smallMedium implicitHeight: Kirigami.Units.iconSizes.smallMedium
Layout.rightMargin: Kirigami.Units.gridUnit Layout.rightMargin: Kirigami.Units.largeSpacing
source: { source: {
switch (model.battery.type) { switch (model.battery.type) {
case 3: return model.battery.chargeState === 1 ? "battery-full-charging" : "battery-full" case 3: return model.battery.chargeState === 1 ? "battery-full-charging" : "battery-full"

View file

@ -29,7 +29,7 @@ KCM.SimpleKCM {
width: parent.width width: parent.width
FormCard.FormCard { FormCard.FormCard {
Layout.topMargin: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormTextFieldDelegate { FormCard.FormTextFieldDelegate {
label: i18n("Type anything here…") label: i18n("Type anything here…")

View file

@ -103,7 +103,7 @@ Controls.Dialog {
header: Item { header: Item {
transform: Translate { y: dialogRoot.translateY } transform: Translate { y: dialogRoot.translateY }
implicitHeight: heading.implicitHeight + Kirigami.Units.gridUnit * 2 implicitHeight: heading.implicitHeight + Kirigami.Units.largeSpacing * 2
Kirigami.Heading { Kirigami.Heading {
id: heading id: heading
@ -112,7 +112,7 @@ Controls.Dialog {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: Kirigami.Units.gridUnit anchors.leftMargin: Kirigami.Units.largeSpacing
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
} }
@ -122,7 +122,7 @@ Controls.Dialog {
ColumnLayout { ColumnLayout {
id: column id: column
transform: Translate { y: dialogRoot.translateY } transform: Translate { y: dialogRoot.translateY }
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.largeSpacing
PasswordField { PasswordField {
id: passwordField id: passwordField

View file

@ -23,8 +23,8 @@ Kirigami.SwipeListItem {
SecurityType == PlasmaNM.Enums.SAE) SecurityType == PlasmaNM.Enums.SAE)
RowLayout { RowLayout {
anchors.leftMargin: Kirigami.Units.gridUnit * 5 anchors.leftMargin: Kirigami.Units.largeSpacing * 5
spacing: Kirigami.Units.gridUnit spacing: Kirigami.Units.largeSpacing
Kirigami.Separator {} Kirigami.Separator {}
Item { Item {

View file

@ -77,7 +77,7 @@ ScrollViewKCM {
Kirigami.PlaceholderMessage { Kirigami.PlaceholderMessage {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width - (Kirigami.Units.gridUnit * 4) width: parent.width - (Kirigami.Units.largeSpacing * 4)
visible: !enabledConnections.wirelessEnabled visible: !enabledConnections.wirelessEnabled
text: i18n("Wi-Fi is disabled") text: i18n("Wi-Fi is disabled")
icon.name: "network-wireless-disconnected" icon.name: "network-wireless-disconnected"

View file

@ -181,8 +181,8 @@ Item {
// info notification text // info notification text
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: Kirigami.Units.gridUnit Layout.rightMargin: Kirigami.Units.largeSpacing
Layout.leftMargin: Kirigami.Units.gridUnit Layout.leftMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.smallSpacing * 2 Layout.bottomMargin: Kirigami.Units.smallSpacing * 2
font.pointSize: 9 font.pointSize: 9

View file

@ -149,10 +149,10 @@ Item {
contentItem: RowLayout { contentItem: RowLayout {
Kirigami.Heading { Kirigami.Heading {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.gridUnit Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.leftMargin: Kirigami.Units.gridUnit Layout.leftMargin: Kirigami.Units.largeSpacing
Layout.rightMargin: Kirigami.Units.gridUnit Layout.rightMargin: Kirigami.Units.largeSpacing
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
level: 2 level: 2
text: root.mainText text: root.mainText
@ -184,8 +184,8 @@ Item {
Label { Label {
id: subtitleLabel id: subtitleLabel
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.gridUnit Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.leftMargin: Kirigami.Units.gridUnit * 3 Layout.leftMargin: Kirigami.Units.gridUnit * 3
Layout.rightMargin: Kirigami.Units.gridUnit * 3 Layout.rightMargin: Kirigami.Units.gridUnit * 3
visible: root.subtitle !== "" visible: root.subtitle !== ""

View file

@ -50,10 +50,10 @@ AbstractButton {
} }
} }
leftPadding: Kirigami.Units.gridUnit leftPadding: Kirigami.Units.largeSpacing
rightPadding: Kirigami.Units.gridUnit rightPadding: Kirigami.Units.largeSpacing
topPadding: Kirigami.Units.gridUnit topPadding: Kirigami.Units.largeSpacing
bottomPadding: Kirigami.Units.gridUnit bottomPadding: Kirigami.Units.largeSpacing
contentItem: Item { contentItem: Item {
implicitHeight: row.height + Kirigami.Units.smallSpacing implicitHeight: row.height + Kirigami.Units.smallSpacing

View file

@ -31,7 +31,7 @@ Kirigami.ScrollablePage {
implicitHeight: loader.height implicitHeight: loader.height
padding: Kirigami.Units.gridUnit padding: Kirigami.Units.largeSpacing
bottomPadding: 0 bottomPadding: 0
Loader { Loader {