Merge branch 'dev' into feature/ovpn-config-import
This commit is contained in:
commit
d9630afafd
32 changed files with 409 additions and 533 deletions
|
|
@ -175,11 +175,7 @@ PageBase {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Flickable {
|
||||
FlickableType {
|
||||
visible: container_selector.selectedIndex <= 0
|
||||
clip: true
|
||||
width: parent.width
|
||||
|
|
@ -225,7 +221,6 @@ PageBase {
|
|||
|
||||
ListView {
|
||||
id: tb_c
|
||||
x: 10
|
||||
width: parent.width - 10
|
||||
height: tb_c.contentItem.height
|
||||
currentIndex: -1
|
||||
|
|
@ -432,7 +427,7 @@ PageBase {
|
|||
|
||||
width: parent.width - 40
|
||||
height: 40
|
||||
text: qsTr("Install new protocols container")
|
||||
text: qsTr("Install new service")
|
||||
font.pixelSize: 16
|
||||
onClicked: container_selector.visible ? container_selector.close() : container_selector.open()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue