Skip to content

Commit 0558e1d

Browse files
committed
A bit more polishing for the import WebDAV dialog
1 parent 2daa271 commit 0558e1d

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/qml/QFieldLocalDataPickerScreen.qml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,9 +1135,10 @@ Page {
11351135
text: importWebdavUrlLabel.text
11361136
}
11371137

1138+
width: swipeDialog.width + padding * 2
11381139
SwipeView {
11391140
id: swipeDialog
1140-
width: mainWindow.width - 60 < importWebdavUrlLabelMetrics.width ? mainWindow.width - 60 : importWebdavUrlLabelMetrics.width
1141+
width: mainWindow.width - 60 < importWebdavUrlLabelMetrics.width + 40 ? mainWindow.width - 60 : importWebdavUrlLabelMetrics.width + 40
11411142
clip: true
11421143
interactive: false
11431144

@@ -1234,6 +1235,8 @@ Page {
12341235
}
12351236

12361237
QfToolButton {
1238+
Layout.rowSpan: 2
1239+
Layout.alignment: Qt.AlignVCenter
12371240
bgcolor: "transparent"
12381241
iconSource: Theme.getThemeVectorIcon('ic_delete_forever_white_24dp')
12391242
iconColor: enabled ? Theme.mainTextColor : Theme.mainTextDisabledColor
@@ -1286,9 +1289,6 @@ Page {
12861289
}
12871290
}
12881291

1289-
Item {
1290-
}
1291-
12921292
CheckBox {
12931293
id: importWebdavStorePasswordCheck
12941294
Layout.fillWidth: true
@@ -1325,7 +1325,7 @@ Page {
13251325
spacing: 10
13261326

13271327
Label {
1328-
width: importWebdavUrlLabel.width
1328+
width: parent.width
13291329
visible: importWebdavPathInput.visible
13301330
text: qsTr("Select the remote folder to import:")
13311331
wrapMode: Text.WordWrap
@@ -1335,7 +1335,7 @@ Page {
13351335

13361336
Rectangle {
13371337
id: importWebdavPathContainer
1338-
width: importWebdavUrlLabel.width
1338+
width: parent.width
13391339
height: 340
13401340
color: Theme.controlBackgroundColor
13411341
border.color: Theme.controlBorderColor
@@ -1490,11 +1490,8 @@ Page {
14901490

14911491
QfButton {
14921492
id: importWebdavRefetchFoldersButton
1493-
width: importWebdavUrlLabel.width - (importWebdavRefreshFoldersIndicator.visible ? importWebdavRefreshFoldersIndicator.width : 0)
1493+
width: parent.parent.width - (importWebdavRefreshFoldersIndicator.visible ? importWebdavRefreshFoldersIndicator.width : 0)
14941494
enabled: !webdavConnectionLoader.item || !webdavConnectionLoader.item.isFetchingAvailablePaths
1495-
bgcolor: "transparent"
1496-
borderColor: enabled ? Theme.secondaryTextColor : Theme.mainTextDisabledColor
1497-
color: enabled ? Theme.mainTextColor : Theme.mainTextDisabledColor
14981495
text: !enabled ? qsTr("Refreshing remote folders") : qsTr("Refresh remote folders")
14991496

15001497
onClicked: {

0 commit comments

Comments
 (0)