ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port DevicesPage to FormCard

Browse Source
This commit is contained in:
Tobias Fella
2023-09-01 16:56:43 +02:00
parent d9dc5f48bc
commit ddd690f6d5
3 changed files with 57 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qml/Settings/DeviceDelegate.qml
View File

@@ -7,11 +7,11 @@ import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import org.kde.kirigami 2.19 as Kirigami import org.kde.kirigami 2.19 as Kirigami
import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm import org.kde.kirigamiaddons.formcard 1.0 as FormCard
import org.kde.neochat 1.0 import org.kde.neochat 1.0
MobileForm.AbstractFormDelegate { FormCard.AbstractFormDelegate {
id: deviceDelegate id: deviceDelegate
required property string id required property string id
@@ -21,8 +21,6 @@ MobileForm.AbstractFormDelegate {
property bool editDeviceName: false property bool editDeviceName: false
property bool showVerifyButton property bool showVerifyButton
Layout.fillWidth: true
onClicked: deviceDelegate.editDeviceName = true onClicked: deviceDelegate.editDeviceName = true
contentItem: RowLayout { contentItem: RowLayout {

16
src/qml/Settings/DevicesCard.qml
View File

@@ -6,7 +6,7 @@ import QtQuick 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import org.kde.kirigami 2.19 as Kirigami import org.kde.kirigami 2.19 as Kirigami
import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm import org.kde.kirigamiaddons.formcard 1.0 as FormCard
import org.kde.neochat 1.0 import org.kde.neochat 1.0
@@ -18,20 +18,14 @@ ColumnLayout {
required property bool showVerifyButton required property bool showVerifyButton
visible: deviceRepeater.count > 0 visible: deviceRepeater.count > 0
MobileForm.FormHeader {
FormCard.FormHeader {
title: root.title title: root.title
Layout.fillWidth: true
} }
MobileForm.FormCard { FormCard.FormCard {
id: devicesCard id: devicesCard
Layout.fillWidth: true
contentItem: ColumnLayout {
spacing: 0
Repeater { Repeater {
id: deviceRepeater id: deviceRepeater
model: DevicesProxyModel { model: DevicesProxyModel {
@@ -50,6 +44,6 @@ ColumnLayout {
} }
} }
} }
}

15
src/qml/Settings/DevicesPage.qml
View File

@@ -7,26 +7,22 @@ import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import org.kde.kirigami 2.19 as Kirigami import org.kde.kirigami 2.19 as Kirigami
import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm import org.kde.kirigamiaddons.formcard 1.0 as FormCard
import org.kde.neochat 1.0 import org.kde.neochat 1.0
Kirigami.ScrollablePage { FormCard.FormCardPage {
id: root id: root
title: i18n("Devices") title: i18n("Devices")
required property NeoChatConnection connection required property NeoChatConnection connection
leftPadding: 0 property DevicesModel devicesModel: DevicesModel {
rightPadding: 0
DevicesModel {
id: devicesModel id: devicesModel
connection: root.connection connection: root.connection
} }
ColumnLayout {
DevicesCard { DevicesCard {
title: i18n("This Device") title: i18n("This Device")
type: DevicesModel.This type: DevicesModel.This
@@ -48,7 +44,7 @@ Kirigami.ScrollablePage {
showVerifyButton: false showVerifyButton: false
} }
MobileForm.AbstractFormDelegate { FormCard.AbstractFormDelegate {
Layout.fillWidth: true Layout.fillWidth: true
visible: Controller.activeConnection && devicesModel.count === 0 // We can assume 0 means loading since there is at least one device visible: Controller.activeConnection && devicesModel.count === 0 // We can assume 0 means loading since there is at least one device
contentItem: Kirigami.LoadingPlaceholder { } contentItem: Kirigami.LoadingPlaceholder { }
@@ -62,9 +58,8 @@ Kirigami.ScrollablePage {
type: Kirigami.MessageType.Information type: Kirigami.MessageType.Information
visible: !Controller.activeConnection visible: !Controller.activeConnection
} }
}
Kirigami.OverlaySheet { property Kirigami.OverlaySheet passwordSheet: Kirigami.OverlaySheet {
id: passwordSheet id: passwordSheet
property string deviceId property string deviceId