controlcenter: correcting containers (network details)
This commit is contained in:
parent
57bb5cede1
commit
9f8f8ac731
3 changed files with 37 additions and 43 deletions
|
|
@ -16,6 +16,8 @@ Item {
|
||||||
required property Session session
|
required property Session session
|
||||||
readonly property var device: session.ethernet.active
|
readonly property var device: session.ethernet.active
|
||||||
|
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if (device && device.interface) {
|
if (device && device.interface) {
|
||||||
Nmcli.getEthernetDeviceDetails(device.interface, () => {});
|
Nmcli.getEthernetDeviceDetails(device.interface, () => {});
|
||||||
|
|
@ -30,19 +32,6 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StyledFlickable {
|
|
||||||
id: flickable
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
flickableDirection: Flickable.VerticalFlick
|
|
||||||
clip: true
|
|
||||||
contentHeight: layout.height
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
|
||||||
flickable: flickable
|
|
||||||
}
|
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: layout
|
id: layout
|
||||||
|
|
||||||
|
|
@ -112,8 +101,6 @@ Item {
|
||||||
deviceDetails: Nmcli.ethernetDeviceDetails
|
deviceDetails: Nmcli.ethernetDeviceDetails
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -463,6 +463,7 @@ Item {
|
||||||
opacity: 1
|
opacity: 1
|
||||||
scale: 1
|
scale: 1
|
||||||
transformOrigin: Item.Center
|
transformOrigin: Item.Center
|
||||||
|
clip: false
|
||||||
|
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings
|
sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings
|
||||||
|
|
@ -533,20 +534,38 @@ Item {
|
||||||
Component {
|
Component {
|
||||||
id: ethernetDetails
|
id: ethernetDetails
|
||||||
|
|
||||||
|
StyledFlickable {
|
||||||
|
flickableDirection: Flickable.VerticalFlick
|
||||||
|
contentHeight: ethernetDetailsInner.height
|
||||||
|
|
||||||
EthernetDetails {
|
EthernetDetails {
|
||||||
|
id: ethernetDetailsInner
|
||||||
|
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
session: root.session
|
session: root.session
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
id: wirelessDetails
|
id: wirelessDetails
|
||||||
|
|
||||||
|
StyledFlickable {
|
||||||
|
flickableDirection: Flickable.VerticalFlick
|
||||||
|
contentHeight: wirelessDetailsInner.height
|
||||||
|
|
||||||
WirelessDetails {
|
WirelessDetails {
|
||||||
|
id: wirelessDetailsInner
|
||||||
|
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
session: root.session
|
session: root.session
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
WirelessPasswordDialog {
|
WirelessPasswordDialog {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ Item {
|
||||||
required property Session session
|
required property Session session
|
||||||
readonly property var network: session.network.active
|
readonly property var network: session.network.active
|
||||||
|
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
updateDeviceDetails();
|
updateDeviceDetails();
|
||||||
checkSavedProfile();
|
checkSavedProfile();
|
||||||
|
|
@ -98,19 +100,6 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StyledFlickable {
|
|
||||||
id: flickable
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
flickableDirection: Flickable.VerticalFlick
|
|
||||||
clip: true
|
|
||||||
contentHeight: layout.height
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
|
||||||
flickable: flickable
|
|
||||||
}
|
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: layout
|
id: layout
|
||||||
|
|
||||||
|
|
@ -215,7 +204,6 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function handleConnect(): void {
|
function handleConnect(): void {
|
||||||
if (Nmcli.active && Nmcli.active.ssid !== root.network.ssid) {
|
if (Nmcli.active && Nmcli.active.ssid !== root.network.ssid) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue