Merge branch 'dev' of github.com:Ly-sec/Noctalia into dev

This commit is contained in:
quadbyte 2025-08-07 14:09:47 -04:00
commit ef7e187301

View file

@ -142,159 +142,25 @@ ColumnLayout {
} }
// Random Wallpaper // Random Wallpaper
ColumnLayout { ToggleOption {
spacing: 8 label: "Random Wallpaper"
Layout.fillWidth: true description: "Automatically select random wallpapers from the folder"
Layout.topMargin: 8 value: Settings.settings.randomWallpaper
onToggled: function() {
RowLayout {
spacing: 8
Layout.fillWidth: true
ColumnLayout {
spacing: 4
Layout.fillWidth: true
Text {
text: "Random Wallpaper"
font.pixelSize: 13
font.bold: true
color: Theme.textPrimary
}
Text {
text: "Automatically select random wallpapers from the folder"
font.pixelSize: 12
color: Theme.textSecondary
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
}
Rectangle {
id: randomWallpaperSwitch
width: 52
height: 32
radius: 16
color: Settings.settings.randomWallpaper ? Theme.accentPrimary : Theme.surfaceVariant
border.color: Settings.settings.randomWallpaper ? Theme.accentPrimary : Theme.outline
border.width: 2
Rectangle {
id: randomWallpaperThumb
width: 28
height: 28
radius: 14
color: Theme.surface
border.color: Theme.outline
border.width: 1
y: 2
x: Settings.settings.randomWallpaper ? randomWallpaperSwitch.width - width - 2 : 2
Behavior on x {
NumberAnimation {
duration: 200
easing.type: Easing.OutCubic
}
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
Settings.settings.randomWallpaper = !Settings.settings.randomWallpaper; Settings.settings.randomWallpaper = !Settings.settings.randomWallpaper;
} }
} }
}
}
}
// Use Wallpaper Theme // Use Wallpaper Theme
ColumnLayout { ToggleOption {
spacing: 8 label: "Use Wallpaper Theme"
Layout.fillWidth: true description: "Automatically adjust theme colors based on wallpaper"
Layout.topMargin: 8 value: Settings.settings.useWallpaperTheme
onToggled: function() {
RowLayout {
spacing: 8
Layout.fillWidth: true
ColumnLayout {
spacing: 4
Layout.fillWidth: true
Text {
text: "Use Wallpaper Theme"
font.pixelSize: 13
font.bold: true
color: Theme.textPrimary
}
Text {
text: "Automatically adjust theme colors based on wallpaper"
font.pixelSize: 12
color: Theme.textSecondary
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
}
Rectangle {
id: wallpaperThemeSwitch
width: 52
height: 32
radius: 16
color: Settings.settings.useWallpaperTheme ? Theme.accentPrimary : Theme.surfaceVariant
border.color: Settings.settings.useWallpaperTheme ? Theme.accentPrimary : Theme.outline
border.width: 2
Rectangle {
id: wallpaperThemeThumb
width: 28
height: 28
radius: 14
color: Theme.surface
border.color: Theme.outline
border.width: 1
y: 2
x: Settings.settings.useWallpaperTheme ? wallpaperThemeSwitch.width - width - 2 : 2
Behavior on x {
NumberAnimation {
duration: 200
easing.type: Easing.OutCubic
}
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
Settings.settings.useWallpaperTheme = !Settings.settings.useWallpaperTheme; Settings.settings.useWallpaperTheme = !Settings.settings.useWallpaperTheme;
} }
} }
}
}
}
// Wallpaper Interval // Wallpaper Interval
ColumnLayout { ColumnLayout {
spacing: 8 spacing: 8
@ -402,82 +268,15 @@ ColumnLayout {
} }
// Use SWWW // Use SWWW
ColumnLayout { ToggleOption {
spacing: 8 label: "Use SWWW"
Layout.fillWidth: true description: "Use SWWW daemon for advanced wallpaper management"
Layout.topMargin: 8 value: Settings.settings.useSWWW
onToggled: function() {
RowLayout {
spacing: 8
Layout.fillWidth: true
ColumnLayout {
spacing: 4
Layout.fillWidth: true
Text {
text: "Use SWWW"
font.pixelSize: 13
font.bold: true
color: Theme.textPrimary
}
Text {
text: "Use SWWW daemon for advanced wallpaper management"
font.pixelSize: 12
color: Theme.textSecondary
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
}
Rectangle {
id: swwwSwitch
width: 52
height: 32
radius: 16
color: Settings.settings.useSWWW ? Theme.accentPrimary : Theme.surfaceVariant
border.color: Settings.settings.useSWWW ? Theme.accentPrimary : Theme.outline
border.width: 2
Rectangle {
id: swwwThumb
width: 28
height: 28
radius: 14
color: Theme.surface
border.color: Theme.outline
border.width: 1
y: 2
x: Settings.settings.useSWWW ? swwwSwitch.width - width - 2 : 2
Behavior on x {
NumberAnimation {
duration: 200
easing.type: Easing.OutCubic
}
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
Settings.settings.useSWWW = !Settings.settings.useSWWW; Settings.settings.useSWWW = !Settings.settings.useSWWW;
} }
} }
}
}
}
// SWWW Settings (only visible when useSWWW is enabled) // SWWW Settings (only visible when useSWWW is enabled)
ColumnLayout { ColumnLayout {
spacing: 8 spacing: 8