feat: network popout
Also qstr dashboard performance pane labels
This commit is contained in:
parent
eb10c60734
commit
017b1b4ce0
5 changed files with 41 additions and 6 deletions
|
|
@ -14,12 +14,18 @@ StyledRect {
|
||||||
function checkPopout(y: real): var {
|
function checkPopout(y: real): var {
|
||||||
const aw = activeWindow.child;
|
const aw = activeWindow.child;
|
||||||
const awy = activeWindow.y + aw.y;
|
const awy = activeWindow.y + aw.y;
|
||||||
|
const n = statusIconsInner.network;
|
||||||
|
const ny = statusIcons.y + statusIconsInner.y + n.y;
|
||||||
const b = statusIconsInner.battery;
|
const b = statusIconsInner.battery;
|
||||||
const by = statusIcons.y + statusIconsInner.y + b.y;
|
const by = statusIcons.y + statusIconsInner.y + b.y;
|
||||||
if (y >= awy && y <= awy + aw.implicitHeight) {
|
if (y >= awy && y <= awy + aw.implicitHeight) {
|
||||||
Popouts.currentName = "activewindow";
|
Popouts.currentName = "activewindow";
|
||||||
Popouts.currentCenter = Qt.binding(() => activeWindow.y + aw.y + aw.implicitHeight / 2);
|
Popouts.currentCenter = Qt.binding(() => activeWindow.y + aw.y + aw.implicitHeight / 2);
|
||||||
Popouts.hasCurrent = true;
|
Popouts.hasCurrent = true;
|
||||||
|
} else if (y >= ny && y <= ny + n.implicitHeight) {
|
||||||
|
Popouts.currentName = "network";
|
||||||
|
Popouts.currentCenter = Qt.binding(() => statusIcons.y + statusIconsInner.y + n.y + n.implicitHeight / 2);
|
||||||
|
Popouts.hasCurrent = true;
|
||||||
} else if (y >= by && y <= by + b.implicitHeight) {
|
} else if (y >= by && y <= by + b.implicitHeight) {
|
||||||
Popouts.currentName = "battery";
|
Popouts.currentName = "battery";
|
||||||
Popouts.currentCenter = Qt.binding(() => statusIcons.y + statusIconsInner.y + b.y + b.implicitHeight / 2);
|
Popouts.currentCenter = Qt.binding(() => statusIcons.y + statusIconsInner.y + b.y + b.implicitHeight / 2);
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
property color colour: Colours.palette.m3secondary
|
property color colour: Colours.palette.m3secondary
|
||||||
|
|
||||||
|
readonly property Item network: network
|
||||||
readonly property Item battery: battery
|
readonly property Item battery: battery
|
||||||
|
|
||||||
clip: true
|
clip: true
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@ Item {
|
||||||
source: "ActiveWindow.qml"
|
source: "ActiveWindow.qml"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Popout {
|
||||||
|
name: "network"
|
||||||
|
source: "Network.qml"
|
||||||
|
}
|
||||||
|
|
||||||
Popout {
|
Popout {
|
||||||
name: "battery"
|
name: "battery"
|
||||||
source: "Battery.qml"
|
source: "Battery.qml"
|
||||||
|
|
|
||||||
22
modules/bar/popouts/Network.qml
Normal file
22
modules/bar/popouts/Network.qml
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
import "root:/widgets"
|
||||||
|
import "root:/services"
|
||||||
|
import "root:/config"
|
||||||
|
import QtQuick
|
||||||
|
|
||||||
|
Column {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
spacing: Appearance.spacing.normal
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: qsTr("Connected to: %1").arg(Network.active?.ssid ?? "None")
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: qsTr("Strength: %1/100").arg(Network.active?.strength ?? 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
StyledText {
|
||||||
|
text: qsTr("Frequency: %1 MHz").arg(Network.active?.frequency ?? 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -18,8 +18,8 @@ Row {
|
||||||
label1: `${Math.ceil(SystemUsage.gpuTemp)}°C`
|
label1: `${Math.ceil(SystemUsage.gpuTemp)}°C`
|
||||||
label2: `${Math.round(SystemUsage.gpuPerc * 100)}%`
|
label2: `${Math.round(SystemUsage.gpuPerc * 100)}%`
|
||||||
|
|
||||||
sublabel1: "GPU temp"
|
sublabel1: qsTr("GPU temp")
|
||||||
sublabel2: "Usage"
|
sublabel2: qsTr("Usage")
|
||||||
}
|
}
|
||||||
|
|
||||||
Resource {
|
Resource {
|
||||||
|
|
@ -31,8 +31,8 @@ Row {
|
||||||
label1: `${Math.ceil(SystemUsage.cpuTemp)}°C`
|
label1: `${Math.ceil(SystemUsage.cpuTemp)}°C`
|
||||||
label2: `${Math.round(SystemUsage.cpuPerc * 100)}%`
|
label2: `${Math.round(SystemUsage.cpuPerc * 100)}%`
|
||||||
|
|
||||||
sublabel1: "CPU temp"
|
sublabel1: qsTr("CPU temp")
|
||||||
sublabel2: "Usage"
|
sublabel2: qsTr("Usage")
|
||||||
}
|
}
|
||||||
|
|
||||||
Resource {
|
Resource {
|
||||||
|
|
@ -48,8 +48,8 @@ Row {
|
||||||
return `${Math.floor(fmt.value)}${fmt.unit}`;
|
return `${Math.floor(fmt.value)}${fmt.unit}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
sublabel1: "Memory"
|
sublabel1: qsTr("Memory")
|
||||||
sublabel2: "Storage"
|
sublabel2: qsTr("Storage")
|
||||||
}
|
}
|
||||||
|
|
||||||
component Resource: Item {
|
component Resource: Item {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue