Formatting

This commit is contained in:
Ly-sec 2025-08-22 19:57:29 +02:00
parent 566e3e2aa7
commit ce9ab7f90f
8 changed files with 73 additions and 86 deletions

View file

@ -47,7 +47,8 @@ Singleton {
// -----------
function applyOpacity(color, opacity) {
// Convert color to string and apply opacity
if (!color) return "transparent"
if (!color)
return "transparent"
return color.toString().replace("#", "#" + opacity)
}

View file

@ -133,7 +133,7 @@ Singleton {
// Widget configuration for modular bar system
property JsonObject widgets
widgets: JsonObject {
property list<string> left: ["SystemMonitor", "ActiveWindow", "MediaMini"]
property list<string> center: ["Workspace"]

View file

@ -19,16 +19,17 @@ QtObject {
if (!widgetName || widgetName.trim() === "") {
return null
}
const widgetPath = `../Modules/Bar/Widgets/${widgetName}.qml`
// Try to load the widget directly from file
const component = Qt.createComponent(widgetPath)
if (component.status === Component.Ready) {
return component
}
const errorMsg = `Failed to load ${widgetName}.qml widget, status: ${component.status}, error: ${component.errorString()}`
const errorMsg = `Failed to load ${widgetName}.qml widget, status: ${component.status}, error: ${component.errorString(
)}`
Logger.error("WidgetLoader", errorMsg)
return null
}
@ -44,7 +45,7 @@ QtObject {
function onWidgetLoaded(widgetName) {
loadedWidgets++
widgetLoaded(widgetName)
if (loadedWidgets + failedWidgets === totalWidgets) {
Logger.log("WidgetLoader", `Loaded ${loadedWidgets} widgets`)
loadingComplete(totalWidgets, loadedWidgets, failedWidgets)
@ -55,7 +56,7 @@ QtObject {
function onWidgetFailed(widgetName, error) {
failedWidgets++
widgetFailed(widgetName, error)
if (loadedWidgets + failedWidgets === totalWidgets) {
loadingComplete(totalWidgets, loadedWidgets, failedWidgets)
}
@ -64,28 +65,24 @@ QtObject {
// This is where you should add your Modules/Bar/Widgets/
// so it gets registered in the BarTab
function discoverAvailableWidgets() {
const widgetFiles = [
"ActiveWindow", "Battery", "Bluetooth", "Brightness", "Clock",
"MediaMini", "NotificationHistory", "ScreenRecorderIndicator",
"SidePanelToggle", "SystemMonitor", "Tray", "Volume", "WiFi", "Workspace"
]
const widgetFiles = ["ActiveWindow", "Battery", "Bluetooth", "Brightness", "Clock", "MediaMini", "NotificationHistory", "ScreenRecorderIndicator", "SidePanelToggle", "SystemMonitor", "Tray", "Volume", "WiFi", "Workspace"]
const availableWidgets = []
widgetFiles.forEach(widgetName => {
// Test if the widget can be loaded
const component = getWidgetComponent(widgetName)
if (component) {
availableWidgets.push({
key: widgetName,
name: widgetName
})
}
})
// Test if the widget can be loaded
const component = getWidgetComponent(widgetName)
if (component) {
availableWidgets.push({
"key": widgetName,
"name": widgetName
})
}
})
// Sort alphabetically
availableWidgets.sort((a, b) => a.name.localeCompare(b.name))
return availableWidgets
}
}