Removed extra 's' from all services. Made the noctalia color scheme the default

This commit is contained in:
quadbyte 2025-08-17 05:44:59 -04:00
parent b05abca3c1
commit f5a192baba
24 changed files with 79 additions and 89 deletions

View file

@ -10,17 +10,17 @@ Singleton {
id: root
Component.onCompleted: {
Logger.log("ColorSchemes", "Service started")
Logger.log("ColorScheme", "Service started")
loadColorSchemes()
}
property var schemes: []
property bool scanning: false
property string schemesDirectory: Quickshell.shellDir + "/Assets/ColorSchemes"
property string schemesDirectory: Quickshell.shellDir + "/Assets/ColorScheme"
property string colorsJsonFilePath: Settings.configDir + "colors.json"
function loadColorSchemes() {
Logger.log("ColorSchemes", "Load ColorSchemes")
Logger.log("ColorScheme", "Load ColorScheme")
scanning = true
schemes = []
// Unsetting, then setting the folder will re-trigger the parsing!
@ -34,7 +34,7 @@ Singleton {
function changedWallpaper() {
if (Settings.data.colorSchemes.useWallpaperColors) {
Logger.log("ColorSchemes", "Starting color generation from wallpaper")
Logger.log("ColorScheme", "Starting color generation from wallpaper")
generateColorsProcess.running = true
// Invalidate potential predefined scheme
Settings.data.colorSchemes.predefinedScheme = ""
@ -55,19 +55,19 @@ Singleton {
}
schemes = files
scanning = false
Logger.log("ColorSchemes", "Loaded", schemes.length, "schemes")
Logger.log("ColorScheme", "Listed", schemes.length, "schemes")
}
}
}
Process {
id: generateColorsProcess
command: ["matugen", "image", WallpapersService.currentWallpaper, "--config", Quickshell.shellDir + "/Assets/Matugen/matugen.toml"]
command: ["matugen", "image", WallpaperService.currentWallpaper, "--config", Quickshell.shellDir + "/Assets/Matugen/matugen.toml"]
workingDirectory: Quickshell.shellDir
running: false
stdout: StdioCollector {
onStreamFinished: {
Logger.log("ColorSchemes", "Completed colors generation")
Logger.log("ColorScheme", "Completed colors generation")
}
}
stderr: StdioCollector {

View file

@ -81,7 +81,7 @@ Singleton {
compositorType = "unknown"
isHyprland = false
isNiri = false
Logger.warn("CompositorService", "No supported compositor detected")
Logger.warn("Compositor", "No supported compositor detected")
}
// Hyprland integration
@ -90,9 +90,9 @@ Singleton {
Hyprland.refreshWorkspaces()
updateHyprlandWorkspaces()
setupHyprlandConnections()
Logger.log("CompositorService", "Hyprland initialized successfully")
Logger.log("Compositor", "Hyprland initialized successfully")
} catch (e) {
Logger.error("CompositorService", "Error initializing Hyprland:", e)
Logger.error("Compositor", "Error initializing Hyprland:", e)
compositorType = "unknown"
isHyprland = false
}
@ -124,7 +124,7 @@ Singleton {
}
}
} catch (e) {
Logger.error("CompositorService", "Error updating Hyprland workspaces:", e)
Logger.error("Compositor", "Error updating Hyprland workspaces:", e)
}
}
@ -136,9 +136,9 @@ Singleton {
// Initial load of workspaces and windows
updateNiriWorkspaces()
updateNiriWindows()
Logger.log("CompositorService", "Niri initialized successfully")
Logger.log("Compositor", "Niri initialized successfully")
} catch (e) {
Logger.error("CompositorService", "Error initializing Niri:", e)
Logger.error("Compositor", "Error initializing Niri:", e)
compositorType = "unknown"
isNiri = false
}
@ -197,7 +197,7 @@ Singleton {
}
workspaceChanged()
} catch (e) {
Logger.error("CompositorService", "Failed to parse workspaces:", e, line)
Logger.error("Compositor", "Failed to parse workspaces:", e, line)
}
}
}
@ -244,7 +244,7 @@ Singleton {
updateFocusedWindowTitle()
activeWindowChanged()
} catch (e) {
Logger.error("CompositorService", "Error parsing windows event:", e)
Logger.error("Compositor", "Error parsing windows event:", e)
}
} else if (event.WorkspaceActivated) {
niriWorkspaceProcess.running = true
@ -262,18 +262,18 @@ Singleton {
updateFocusedWindowTitle()
activeWindowChanged()
} catch (e) {
Logger.error("CompositorService", "Error parsing window focus event:", e)
Logger.error("Compositor", "Error parsing window focus event:", e)
}
} else if (event.OverviewOpenedOrClosed) {
try {
inOverview = event.OverviewOpenedOrClosed.is_open === true
overviewStateChanged()
} catch (e) {
Logger.error("CompositorService", "Error parsing overview state:", e)
Logger.error("Compositor", "Error parsing overview state:", e)
}
}
} catch (e) {
Logger.error("CompositorService", "Error parsing event stream:", e, data)
Logger.error("Compositor", "Error parsing event stream:", e, data)
}
}
}
@ -314,7 +314,7 @@ Singleton {
updateFocusedWindowTitle()
activeWindowChanged()
} catch (e) {
Logger.error("CompositorService", "Failed to parse windows:", e, line)
Logger.error("Compositor", "Failed to parse windows:", e, line)
}
}
}
@ -334,16 +334,16 @@ Singleton {
try {
Hyprland.dispatch(`workspace ${workspaceId}`)
} catch (e) {
Logger.error("CompositorService", "Error switching Hyprland workspace:", e)
Logger.error("Compositor", "Error switching Hyprland workspace:", e)
}
} else if (isNiri) {
try {
Quickshell.execDetached(["niri", "msg", "action", "focus-workspace", workspaceId.toString()])
} catch (e) {
Logger.error("CompositorService", "Error switching Niri workspace:", e)
Logger.error("Compositor", "Error switching Niri workspace:", e)
}
} else {
Logger.warn("CompositorService", "No supported compositor detected for workspace switching")
Logger.warn("Compositor", "No supported compositor detected for workspace switching")
}
}
@ -353,16 +353,16 @@ Singleton {
try {
Quickshell.execDetached(["hyprctl", "dispatch", "exit"])
} catch (e) {
Logger.error("CompositorService", "Error logging out from Hyprland:", e)
Logger.error("Compositor", "Error logging out from Hyprland:", e)
}
} else if (isNiri) {
try {
Quickshell.execDetached(["niri", "msg", "action", "quit", "--skip-confirmation"])
} catch (e) {
Logger.error("CompositorService", "Error logging out from Niri:", e)
Logger.error("Compositor", "Error logging out from Niri:", e)
}
} else {
Logger.warn("CompositorService", "No supported compositor detected for logout")
Logger.warn("Compositor", "No supported compositor detected for logout")
}
}

View file

@ -11,7 +11,7 @@ Singleton {
Component.onCompleted: {
Logger.log("Wallpapers", "Service started")
loadWallpapers()
listWallpapers()
// Wallpaper is set when the settings are loaded.
// Don't start random wallpaper during initialization
@ -25,8 +25,8 @@ Singleton {
property string transitionType: Settings.data.wallpaper.swww.transitionType
property var randomChoices: ["simple", "fade", "left", "right", "top", "bottom", "wipe", "wave", "grow", "center", "any", "outer"]
function loadWallpapers() {
Logger.log("Wallpapers", "Load Wallpapers")
function listWallpapers() {
Logger.log("Wallpapers", "Listing wallpapers")
scanning = true
wallpaperList = []
// Unsetting, then setting the folder will re-trigger the parsing!
@ -65,9 +65,9 @@ Singleton {
randomWallpaperTimer.restart()
}
// Only notify ColorSchemes service if the wallpaper actually changed
// Only notify ColorScheme service if the wallpaper actually changed
if (wallpaperChanged) {
ColorSchemesService.changedWallpaper()
ColorSchemeService.changedWallpaper()
}
}