never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Settings vs Colors

Browse source 
Moved the fontFamily in the settings
Theme is now called Colors (as in ColorScheme)
This commit is contained in:
quadbyte 2025-08-09 18:40:55 -04:00
parent 285321dcb9
commit 55bc7c9534
11 changed files with 45 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Services/Theme.qml → Services/Colors.qml
View file

@ -43,9 +43,6 @@ Singleton {
property color shadow: applyOpacity(themeData.shadow, "B3")
property color overlay: applyOpacity(themeData.overlay, "66")
// Font Properties
property string fontFamily: "Roboto" // Family for all text
function applyOpacity(color, opacity) {
return color.replace("#", "#" + opacity)
}
@ -53,7 +50,7 @@ Singleton {
// FileView to load theme data from JSON file
FileView {
id: themeFile
path: Settings.themeFile
path: Settings.colorsFile
watchChanges: true
onFileChanged: reload()
onAdapterUpdated: writeAdapter()

8
Services/Settings.qml
View file

@ -14,8 +14,8 @@ Singleton {
"HOME") + "/.config") + "/" + shellName + "/"
property string settingsFile: Quickshell.env("NOCTALIA_SETTINGS_FILE")
|| (settingsDir + "Settings.json")
property string themeFile: Quickshell.env("NOCTALIA_THEME_FILE")
|| (settingsDir + "Theme.json")
property string colorsFile: Quickshell.env("NOCTALIA_COLORS_FILE")
|| (settingsDir + "Colors.json")
property var settings: settingAdapter
Item {
@ -91,7 +91,9 @@ Singleton {
property var notificationMonitors: [] // Array of monitor names to show notifications on, "*" means all monitors
property var monitorScaleOverrides: {
} // Map of monitor name -> scale override (e.g., 0.8..2.0). When set, Theme.scale() returns this value
} // Map of monitor name -> scale override (e.g., 0.8..2.0). When set, Colors.scale() returns this value
property string fontFamily: "Roboto" // Family for all text
}
}