From ad32b68d8436716a2e34035e37587b95fbc12755 Mon Sep 17 00:00:00 2001 From: Cyril Anisimov Date: Tue, 20 May 2025 21:56:50 +0200 Subject: [PATCH] fix layout --- client/ui/qml/Pages2/PageProtocolRaw.qml | 2 ++ client/ui/qml/Pages2/PageSettingsServerProtocol.qml | 8 -------- client/ui/qml/Pages2/PageSetupWizardViewConfig.qml | 10 ++++++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml index 4360e1ce..b90af6f6 100644 --- a/client/ui/qml/Pages2/PageProtocolRaw.qml +++ b/client/ui/qml/Pages2/PageProtocolRaw.qml @@ -137,6 +137,8 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 + Layout.leftMargin: 16 + Layout.rightMargin: 16 padding: 0 height: 24 diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml index 88198913..a29b97bc 100644 --- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml +++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml @@ -65,8 +65,6 @@ PageType { id: clientSettings Layout.fillWidth: true - Layout.leftMargin: 16 - Layout.rightMargin: 16 text: protocolName + qsTr(" connection settings") rightImageSource: "qrc:/images/controls/chevron-right.svg" @@ -99,8 +97,6 @@ PageType { id: serverSettings Layout.fillWidth: true - Layout.leftMargin: 16 - Layout.rightMargin: 16 text: protocolName + qsTr(" server settings") rightImageSource: "qrc:/images/controls/chevron-right.svg" @@ -141,8 +137,6 @@ PageType { id: clearCacheButton Layout.fillWidth: true - Layout.leftMargin: 16 - Layout.rightMargin: 16 visible: root.isClearCacheVisible @@ -187,8 +181,6 @@ PageType { id: removeButton Layout.fillWidth: true - Layout.leftMargin: 16 - Layout.rightMargin: 16 visible: ServersModel.isProcessedServerHasWriteAccess() diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml index ecd104a2..1fe741a6 100644 --- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml +++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml @@ -153,13 +153,10 @@ PageType { iconPath: "qrc:/images/controls/alert-circle.svg" } - } - - footer: ColumnLayout { - width: listView.width Rectangle { Layout.fillWidth: true + Layout.topMargin: 16 Layout.bottomMargin: 48 Layout.rightMargin: 16 Layout.leftMargin: 16 @@ -175,12 +172,17 @@ PageType { id: configContent anchors.fill: parent + anchors.margins: 16 wrapMode: Text.Wrap text: ImportController.getConfig() } } + } + + footer: ColumnLayout { + width: listView.width BasicButtonType { id: connectButton