Fix Layout, more changes to modular bar
This commit is contained in:
parent
12092ca6f6
commit
f441bec32d
5 changed files with 212 additions and 237 deletions
|
|
@ -23,6 +23,10 @@ Variants {
|
|||
implicitHeight: Style.barHeight * scaling
|
||||
color: Color.transparent
|
||||
|
||||
Component.onCompleted: {
|
||||
logWidgetLoadingSummary()
|
||||
}
|
||||
|
||||
// If no bar activated in settings, then show them all
|
||||
visible: modelData ? (Settings.data.bar.monitors.includes(modelData.name)
|
||||
|| (Settings.data.bar.monitors.length === 0)) : false
|
||||
|
|
@ -66,9 +70,10 @@ Variants {
|
|||
anchors.verticalCenter: parent.verticalCenter
|
||||
onStatusChanged: {
|
||||
if (status === Loader.Error) {
|
||||
console.warn(`Failed to load widget: ${modelData}`)
|
||||
Logger.error("Bar", `Failed to load ${modelData} widget`)
|
||||
onWidgetFailed()
|
||||
} else if (status === Loader.Ready) {
|
||||
console.log(`Successfully loaded widget: ${modelData}`)
|
||||
onWidgetLoaded()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -93,9 +98,10 @@ Variants {
|
|||
anchors.verticalCenter: parent.verticalCenter
|
||||
onStatusChanged: {
|
||||
if (status === Loader.Error) {
|
||||
console.warn(`Failed to load widget: ${modelData}`)
|
||||
Logger.error("Bar", `Failed to load ${modelData} widget`)
|
||||
onWidgetFailed()
|
||||
} else if (status === Loader.Ready) {
|
||||
console.log(`Successfully loaded widget: ${modelData}`)
|
||||
onWidgetLoaded()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -121,9 +127,10 @@ Variants {
|
|||
anchors.verticalCenter: parent.verticalCenter
|
||||
onStatusChanged: {
|
||||
if (status === Loader.Error) {
|
||||
console.warn(`Failed to load widget: ${modelData}`)
|
||||
Logger.error("Bar", `Failed to load ${modelData} widget`)
|
||||
onWidgetFailed()
|
||||
} else if (status === Loader.Ready) {
|
||||
console.log(`Successfully loaded widget: ${modelData}`)
|
||||
onWidgetLoaded()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -137,19 +144,56 @@ Variants {
|
|||
return null
|
||||
}
|
||||
|
||||
console.log(`Attempting to load widget: ${widgetName}.qml`)
|
||||
const widgetPath = `../Bar/Widgets/${widgetName}.qml`
|
||||
Logger.log("Bar", `Attempting to load widget from: ${widgetPath}`)
|
||||
|
||||
// Try to load the widget directly from file
|
||||
const component = Qt.createComponent(`../Bar/Widgets/${widgetName}.qml`)
|
||||
const component = Qt.createComponent(widgetPath)
|
||||
if (component.status === Component.Ready) {
|
||||
console.log(`Successfully created component for: ${widgetName}.qml`)
|
||||
Logger.log("Bar", `Successfully created component for: ${widgetName}.qml`)
|
||||
return component
|
||||
}
|
||||
|
||||
console.warn(`Failed to load widget: ${widgetName}.qml, status:`, component.status, "error:", component.errorString())
|
||||
Logger.error("Bar", `Failed to load ${widgetName}.qml widget, status: ${component.status}, error: ${component.errorString()}`)
|
||||
return null
|
||||
}
|
||||
|
||||
// Track widget loading status
|
||||
property int totalWidgets: 0
|
||||
property int loadedWidgets: 0
|
||||
property int failedWidgets: 0
|
||||
|
||||
// Log widget loading summary
|
||||
function logWidgetLoadingSummary() {
|
||||
const allWidgets = [
|
||||
...Settings.data.bar.widgets.left,
|
||||
...Settings.data.bar.widgets.center,
|
||||
...Settings.data.bar.widgets.right
|
||||
]
|
||||
|
||||
totalWidgets = allWidgets.length
|
||||
loadedWidgets = 0
|
||||
failedWidgets = 0
|
||||
|
||||
if (totalWidgets > 0) {
|
||||
Logger.log("Bar", `Attempting to load ${totalWidgets} widgets`)
|
||||
}
|
||||
}
|
||||
|
||||
function onWidgetLoaded() {
|
||||
loadedWidgets++
|
||||
if (loadedWidgets + failedWidgets === totalWidgets) {
|
||||
Logger.log("Bar", `Loaded ${loadedWidgets}/${totalWidgets} widgets`)
|
||||
}
|
||||
}
|
||||
|
||||
function onWidgetFailed() {
|
||||
failedWidgets++
|
||||
if (loadedWidgets + failedWidgets === totalWidgets) {
|
||||
Logger.log("Bar", `Loaded ${loadedWidgets}/${totalWidgets} widgets`)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import qs.Commons
|
|||
import qs.Services
|
||||
import qs.Widgets
|
||||
|
||||
|
||||
NIconButton {
|
||||
id: root
|
||||
|
||||
|
|
@ -32,7 +33,30 @@ NIconButton {
|
|||
bluetoothPanel.toggle(screen)
|
||||
}
|
||||
|
||||
BluetoothPanel {
|
||||
Loader {
|
||||
id: bluetoothPanel
|
||||
source: "BluetoothPanel.qml"
|
||||
active: false
|
||||
|
||||
property var pendingToggleScreen: null
|
||||
|
||||
onStatusChanged: {
|
||||
if (status === Loader.Ready && item && pendingToggleScreen !== null) {
|
||||
item.toggle(pendingToggleScreen)
|
||||
pendingToggleScreen = null
|
||||
}
|
||||
}
|
||||
|
||||
function toggle(screen) {
|
||||
// Load the panel if it's not already loaded
|
||||
if (!active) {
|
||||
active = true
|
||||
pendingToggleScreen = screen
|
||||
} else if (status === Loader.Ready && item) {
|
||||
item.toggle(screen)
|
||||
} else {
|
||||
pendingToggleScreen = screen
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,34 +7,76 @@ import qs.Commons
|
|||
import qs.Services
|
||||
import qs.Widgets
|
||||
|
||||
|
||||
NIconButton {
|
||||
id: root
|
||||
|
||||
sizeMultiplier: 0.8
|
||||
|
||||
Component.onCompleted: {
|
||||
Logger.log("WiFi", "Widget component completed")
|
||||
Logger.log("WiFi", "NetworkService available:", !!NetworkService)
|
||||
if (NetworkService) {
|
||||
Logger.log("WiFi", "NetworkService.networks available:", !!NetworkService.networks)
|
||||
}
|
||||
}
|
||||
|
||||
colorBg: Color.mSurfaceVariant
|
||||
colorFg: Color.mOnSurface
|
||||
colorBorder: Color.transparent
|
||||
colorBorderHover: Color.transparent
|
||||
|
||||
icon: {
|
||||
let connected = false
|
||||
let signalStrength = 0
|
||||
for (const net in NetworkService.networks) {
|
||||
if (NetworkService.networks[net].connected) {
|
||||
connected = true
|
||||
signalStrength = NetworkService.networks[net].signal
|
||||
break
|
||||
try {
|
||||
let connected = false
|
||||
let signalStrength = 0
|
||||
for (const net in NetworkService.networks) {
|
||||
if (NetworkService.networks[net].connected) {
|
||||
connected = true
|
||||
signalStrength = NetworkService.networks[net].signal
|
||||
break
|
||||
}
|
||||
}
|
||||
return connected ? NetworkService.signalIcon(signalStrength) : "wifi"
|
||||
} catch (error) {
|
||||
Logger.error("WiFi", "Error getting icon:", error)
|
||||
return "wifi"
|
||||
}
|
||||
return connected ? NetworkService.signalIcon(signalStrength) : "wifi"
|
||||
}
|
||||
tooltipText: "WiFi Networks"
|
||||
onClicked: {
|
||||
wifiPanel.toggle(screen)
|
||||
try {
|
||||
Logger.log("WiFi", "Button clicked, toggling panel")
|
||||
wifiPanel.toggle(screen)
|
||||
} catch (error) {
|
||||
Logger.error("WiFi", "Error toggling panel:", error)
|
||||
}
|
||||
}
|
||||
|
||||
WiFiPanel {
|
||||
Loader {
|
||||
id: wifiPanel
|
||||
source: "WiFiPanel.qml"
|
||||
active: false
|
||||
|
||||
property var pendingToggleScreen: null
|
||||
|
||||
onStatusChanged: {
|
||||
if (status === Loader.Ready && item && pendingToggleScreen !== null) {
|
||||
item.toggle(pendingToggleScreen)
|
||||
pendingToggleScreen = null
|
||||
}
|
||||
}
|
||||
|
||||
function toggle(screen) {
|
||||
// Load the panel if it's not already loaded
|
||||
if (!active) {
|
||||
active = true
|
||||
pendingToggleScreen = screen
|
||||
} else if (status === Loader.Ready && item) {
|
||||
item.toggle(screen)
|
||||
} else {
|
||||
pendingToggleScreen = screen
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue