Commit 3d3b0c42 authored by Karel Slaný's avatar Karel Slaný

Merge branch 'qml-anchors-update' into 'develop'

Fixed some QML elements anchors

Closes #141

See merge request !146
parents 756e040f 555c8149
......@@ -128,10 +128,7 @@ Dialog {
ColumnLayout {
id: folderNavigation
AccessibleComboBox {
anchors {
left: parent.left;
right: parent.right;
}
Layout.fillWidth: true
accessibleDescription: qsTr("Select location type")
model: ListModel {
ListElement { label: qsTr("Desktop"); key: "desktop" }
......@@ -155,10 +152,7 @@ Dialog {
}
}
RowLayout {
anchors {
left: parent.left;
right: parent.right;
}
Layout.fillWidth: true
spacing: formItemVerticalSpacing
AccessibleButton {
id: upButton
......@@ -226,20 +220,15 @@ Dialog {
}
width: fileList.width
height: fileList.delegateHeight
RowLayout {
anchors.fill: parent
Text {
anchors.left: parent.left
Layout.fillWidth: true
elide: Text.ElideRight
/* Add '>' to directory names. */
text: fileName
}
Text {
anchors.right: parent.right
/* Add '>' to directory names. */
text: fileIsDir ? " >" : ""
}
Text {
anchors.left: parent.left
elide: Text.ElideRight
text: fileName
}
Text {
anchors.right: parent.right
/* Add '>' to directory names. */
text: fileIsDir ? " >" : ""
}
MouseArea {
function accessibleDescriptionText() {
......
......@@ -237,7 +237,6 @@ Component {
color: datovkaPalette.text
font.pointSize: textFontSizeSmall
font.italic: !rStoreIntoDb // Ephemeral accounts use italics.
renderType: Text.NativeRendering
}
}
}
......
......@@ -38,7 +38,7 @@ Component {
/* These properties must be set by caller. */
property var pageView
property var statusBar
property var fromLocalDb: false
property bool fromLocalDb: false
property var rawZfoContent: null /* Raw ZFO file content. */
property string acntName: ""
property string userName: ""
......@@ -311,7 +311,6 @@ Component {
text: rFileSizeStr
color: datovkaPalette.mid
font.pointSize: textFontSizeSmall
renderType: Text.NativeRendering
}
}
}
......
......@@ -330,7 +330,8 @@ Item {
Flickable {
id: tabGeneral
z: 0
anchors.fill: parent
Layout.fillWidth: true
Layout.fillHeight: true
contentHeight: generalContent.implicitHeight
Pane {
id: generalContent
......@@ -693,7 +694,8 @@ Item {
Flickable {
id: tabAdditional
z: 0
anchors.fill: parent
Layout.fillWidth: true
Layout.fillHeight: true
contentHeight: additonalsContent.implicitHeight
Pane {
id: additonalsContent
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment