marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Port away from PlasmaCore and PlasmaExtras to Kirigami"

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
View file

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

2
components/mobileshell/qml/widgets/notifications/NotificationCard.qml
View file

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

4
components/mobileshell/qml/widgets/notifications/NotificationItem.qml
View file

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

6
components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml
View file

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

2
containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
View file

@ -35,7 +35,7 @@ MobileShell.GridView {
readonly property int reservedSpaceForLabel: metrics.height
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
property int columns: Math.floor(effectiveContentWidth / cellWidth)

2
initialstart/modules/cellular/package/contents/ui/main.qml
View file

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

10
initialstart/modules/time/package/contents/ui/main.qml
View file

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

2
initialstart/modules/wifi/package/contents/ui/ConnectDialog.qml
View file

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

2
initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml
View file

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

2
initialstart/modules/wifi/package/contents/ui/main.qml
View file

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

2
initialstart/qml/LandingComponent.qml
View file

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

12
initialstart/qml/Wizard.qml
View file

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

2
kcms/cellularnetwork/ui/AvailableNetworks.qml
View file

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

2
kcms/cellularnetwork/ui/MessagesList.qml
View file

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

4
kcms/cellularnetwork/ui/PopupDialog.qml
View file

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

8
kcms/cellularnetwork/ui/ProfileList.qml
View file

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

12
kcms/cellularnetwork/ui/SimLockPage.qml
View file

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

2
kcms/cellularnetwork/ui/main.qml
View file

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

4
kcms/hotspot/ui/main.qml
View file

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

2
kcms/mobileshell/ui/QuickSettingsForm.qml
View file

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

2
kcms/powermanagement/ui/main.qml
View file

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

2
kcms/virtualkeyboard/ui/main.qml
View file

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

6
kcms/wifi/ui/ConnectDialog.qml
View file

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

4
kcms/wifi/ui/ConnectionItemDelegate.qml
View file

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

2
kcms/wifi/ui/main.qml
View file

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

4
lookandfeel/contents/lockscreen/LockScreen.qml
View file

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

12
lookandfeel/contents/systemdialog/SystemDialog.qml
View file

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

8
lookandfeel/contents/systemdialog/private/MobileSystemDialogButton.qml
View file

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

2
shell/contents/configuration/ConfigurationAppletPage.qml
View file

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