Merge branch 'main' into feat/wezterm

This commit is contained in:
Lemmy
2025-11-03 15:34:41 -05:00
committed by GitHub
83 changed files with 5697 additions and 2061 deletions
+9 -9
View File
@@ -25,27 +25,27 @@ Singleton {
}
}
// Info log (always visible)
function i(...args) {
var msg = _formatMessage(...args)
console.log(msg)
}
// Debug log (only when Settings.isDebug is true)
function d(...args) {
if (Settings && Settings.isDebug) {
var msg = _formatMessage(...args)
console.log(msg)
console.debug(msg)
}
}
// Warning log
// Info log (always visible)
function i(...args) {
var msg = _formatMessage(...args)
console.info(msg)
}
// Warning log (always visible)
function w(...args) {
var msg = _formatMessage(...args)
console.warn(msg)
}
// Error log
// Error log (always visible)
function e(...args) {
var msg = _formatMessage(...args)
console.error(msg)
+25 -14
View File
@@ -14,7 +14,7 @@ Singleton {
readonly property alias data: adapter
property bool isLoaded: false
property bool directoriesCreated: false
property int settingsVersion: 16
property int settingsVersion: 17
property bool isDebug: Quickshell.env("NOCTALIA_DEBUG") === "1"
// Define our app directories
@@ -54,8 +54,9 @@ Singleton {
// This should only be activated once when the settings structure has changed
// Then it should be commented out again, regular users don't need to generate
// default settings on every start
// TODO: automate this someday!
//generateDefaultSettings()
if (isDebug) {
generateDefaultSettings()
}
// Patch-in the local default, resolved to user's home
adapter.general.avatarImage = defaultAvatar
@@ -146,6 +147,12 @@ Singleton {
property real marginVertical: 0.25
property real marginHorizontal: 0.25
// Bar outer corners (inverted/concave corners at bar edges when not floating)
property bool outerCorners: true
// Reserves space with compositor
property bool exclusive: true
// Widget configuration for modular bar system
property JsonObject widgets
widgets: JsonObject {
@@ -182,6 +189,7 @@ Singleton {
// general
property JsonObject general: JsonObject {
property string avatarImage: ""
property bool dimDesktop: true
property bool showScreenCorners: false
property bool forceBlackScreenCorners: false
property real scaleRatio: 1.0
@@ -191,9 +199,21 @@ Singleton {
property bool animationDisabled: false
property bool compactLockScreen: false
property bool lockOnSuspend: true
property bool enableShadows: true
property string language: ""
}
// ui
property JsonObject ui: JsonObject {
property string fontDefault: "Roboto"
property string fontFixed: "DejaVu Sans Mono"
property real fontDefaultScale: 1.0
property real fontFixedScale: 1.0
property bool tooltipsEnabled: true
property bool panelsAttachedToBar: true
property bool panelsOverlayLayer: false
}
// location
property JsonObject location: JsonObject {
property string name: defaultLocation
@@ -236,6 +256,7 @@ Singleton {
property string transitionType: "random"
property real transitionEdgeSmoothness: 0.05
property list<var> monitors: []
property string panelPosition: "folow_bar"
}
// applauncher
@@ -346,21 +367,11 @@ Singleton {
property string preferredPlayer: ""
}
// ui
property JsonObject ui: JsonObject {
property string fontDefault: "Roboto"
property string fontFixed: "DejaVu Sans Mono"
property real fontDefaultScale: 1.0
property real fontFixedScale: 1.0
property bool tooltipsEnabled: true
property bool panelsAttachedToBar: true
property bool panelsOverlayLayer: true
}
// brightness
property JsonObject brightness: JsonObject {
property int brightnessStep: 5
property bool enforceMinimum: true
property bool enableDdcSupport: false
}
property JsonObject colorSchemes: JsonObject {