mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
Merge branch 'rebuild' of github.com:Ly-sec/Noctalia into rebuild
This commit is contained in:
@@ -199,6 +199,7 @@ Singleton {
|
||||
colorSchemes: JsonObject {
|
||||
property bool useWallpaperColors: false
|
||||
property string predefinedScheme: ""
|
||||
property bool darkMode: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,6 +138,20 @@ ColumnLayout {
|
||||
}
|
||||
}
|
||||
|
||||
// Dark Mode Toggle
|
||||
NToggle {
|
||||
label: "Dark Mode"
|
||||
description: "Generate dark theme colors when using Matugen. Disable for light theme."
|
||||
checked: Settings.data.colorSchemes.darkMode
|
||||
enabled: Settings.data.colorSchemes.useWallpaperColors
|
||||
onToggled: checked => {
|
||||
Settings.data.colorSchemes.darkMode = checked
|
||||
if (Settings.data.colorSchemes.useWallpaperColors) {
|
||||
ColorSchemeService.changedWallpaper()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NDivider {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: Style.marginLarge * scaling
|
||||
@@ -157,7 +171,7 @@ ColumnLayout {
|
||||
}
|
||||
|
||||
NText {
|
||||
text: "These color schemes only apply when 'Use Matugen' is disabled. When enabled, Matugen will generate colors based on your wallpaper instead."
|
||||
text: "These color schemes only apply when 'Use Matugen' is disabled. When enabled, Matugen will generate colors based on your wallpaper instead. You can toggle between light and dark themes when using Matugen."
|
||||
font.pointSize: Style.fontSizeSmall * scaling
|
||||
color: Color.mOnSurface
|
||||
Layout.fillWidth: true
|
||||
|
||||
@@ -62,7 +62,15 @@ Singleton {
|
||||
|
||||
Process {
|
||||
id: generateColorsProcess
|
||||
command: ["matugen", "image", WallpaperService.currentWallpaper, "--config", Quickshell.shellDir + "/Assets/Matugen/matugen.toml"]
|
||||
command: {
|
||||
var cmd = ["matugen", "image", WallpaperService.currentWallpaper, "--config", Quickshell.shellDir + "/Assets/Matugen/matugen.toml"]
|
||||
if (!Settings.data.colorSchemes.darkMode) {
|
||||
cmd.push("--mode", "light")
|
||||
} else {
|
||||
cmd.push("--mode", "dark")
|
||||
}
|
||||
return cmd
|
||||
}
|
||||
workingDirectory: Quickshell.shellDir
|
||||
running: false
|
||||
stdout: StdioCollector {
|
||||
|
||||
Reference in New Issue
Block a user