Merge branch 'dev' into qt_migration
This commit is contained in:
commit
167d3caa5d
47 changed files with 1061 additions and 876 deletions
|
|
@ -35,10 +35,10 @@ PageBase {
|
|||
|
||||
ListView {
|
||||
id: listWidget_servers
|
||||
x: 20
|
||||
x: GC.defaultMargin
|
||||
anchors.top: caption.bottom
|
||||
anchors.topMargin: 15
|
||||
width: parent.width
|
||||
width: parent.width - GC.defaultMargin - 1
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 20
|
||||
model: ServerListLogic.serverListModel
|
||||
|
|
@ -49,7 +49,7 @@ PageBase {
|
|||
clip: true
|
||||
delegate: Item {
|
||||
height: 60
|
||||
width: root.width - 40
|
||||
width: listWidget_servers.width - 15
|
||||
MouseArea {
|
||||
id: ms
|
||||
anchors.fill: parent
|
||||
|
|
@ -96,14 +96,14 @@ PageBase {
|
|||
id: label_address
|
||||
x: 20
|
||||
y: 40
|
||||
width: 141
|
||||
width: listWidget_servers.width - 100
|
||||
height: 16
|
||||
text: address
|
||||
}
|
||||
Text {
|
||||
x: 10
|
||||
y: 10
|
||||
width: 181
|
||||
width: listWidget_servers.width - 100
|
||||
height: 21
|
||||
font.family: "Lato"
|
||||
font.styleName: "normal"
|
||||
|
|
@ -177,5 +177,9 @@ PageBase {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
policy: ScrollBar.AsNeeded
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue