diff --git a/Config/Config.qml b/Config/Config.qml index 5e71887..ba0eb08 100644 --- a/Config/Config.qml +++ b/Config/Config.qml @@ -37,17 +37,6 @@ Singleton { id: timer } - Timer { - running: true - interval: 5000 - repeat: false - - onTriggered: { - - root.save(); - } - } - Timer { id: saveTimer @@ -120,6 +109,7 @@ Singleton { recolorLogo: lock.recolorLogo, enableFprint: lock.enableFprint, maxFprintTries: lock.maxFprintTries, + blurAmount: lock.blurAmount, sizes: { heightMult: lock.sizes.heightMult, ratio: lock.sizes.ratio, diff --git a/Config/LockConf.qml b/Config/LockConf.qml index d34fa83..011dc86 100644 --- a/Config/LockConf.qml +++ b/Config/LockConf.qml @@ -5,6 +5,7 @@ JsonObject { property bool enableFprint: true property int maxFprintTries: 3 property Sizes sizes: Sizes {} + property int blurAmount: 40 component Sizes: JsonObject { property real heightMult: 0.7 diff --git a/Helpers/Wallpapers.qml b/Helpers/Wallpapers.qml index 1bbca74..84564b7 100644 --- a/Helpers/Wallpapers.qml +++ b/Helpers/Wallpapers.qml @@ -19,7 +19,7 @@ Searcher { function setWallpaper(path: string): void { actualCurrent = path; WallpaperPath.currentWallpaperPath = path; - Quickshell.execDetached(["sh", "-c", `python3 ${Quickshell.shellPath("scripts/LockScreenBg.py")} --input_image=${root.actualCurrent} --output_path=${Paths.state}/lockscreen_bg.png`]); + Quickshell.execDetached(["sh", "-c", `python3 ${Quickshell.shellPath("scripts/LockScreenBg.py")} --input_image=${root.actualCurrent} --output_path=${Paths.state}/lockscreen_bg.png --blur_amount=${Config.lock.blurAmount}`]); } function preview(path: string): void { diff --git a/Modules/Launcher/Items/WallpaperItem.qml b/Modules/Launcher/Items/WallpaperItem.qml index f309472..d7533f9 100644 --- a/Modules/Launcher/Items/WallpaperItem.qml +++ b/Modules/Launcher/Items/WallpaperItem.qml @@ -28,6 +28,7 @@ Item { radius: Appearance.rounding.normal function onClicked(): void { + console.log(root.modelData.path); Wallpapers.setWallpaper(root.modelData.path); root.visibilities.launcher = false; } diff --git a/Modules/Lock/Center.qml b/Modules/Lock/Center.qml index a66f281..7293d84 100644 --- a/Modules/Lock/Center.qml +++ b/Modules/Lock/Center.qml @@ -51,22 +51,6 @@ ColumnLayout { font.family: Appearance.font.family.clock font.bold: true } - - Loader { - Layout.leftMargin: Appearance.spacing.small - Layout.alignment: Qt.AlignVCenter - - active: Config.services.useTwelveHourClock - visible: active - - sourceComponent: CustomText { - text: Time.amPmStr - color: DynamicColors.palette.m3primary - font.pointSize: Math.floor(Appearance.font.size.extraLarge * 2 * root.centerScale) - font.family: Appearance.font.family.clock - font.bold: true - } - } } CustomText { diff --git a/Modules/Lock/LockSurface.qml b/Modules/Lock/LockSurface.qml index 2576e73..c32e3f2 100644 --- a/Modules/Lock/LockSurface.qml +++ b/Modules/Lock/LockSurface.qml @@ -139,16 +139,10 @@ WlSessionLockSurface { } } - CachingImage { + Image { id: background anchors.fill: parent - asynchronous: true - path: WallpaperPath.currentWallpaperPath - opacity: 1 - - Component.onCompleted: { - console.log(path); - } + source: WallpaperPath.lockscreenBg } Item { diff --git a/Modules/Lock/LockTime.qml b/Modules/Lock/LockTime.qml deleted file mode 100644 index a42096a..0000000 --- a/Modules/Lock/LockTime.qml +++ /dev/null @@ -1,95 +0,0 @@ -import Quickshell -import QtQuick -import QtQuick.Layouts -import qs.Modules -import qs.Components -import qs.Config - -RowLayout { - id: root - - property list time: Time.longTime.split("") - - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - animate: true - - text: root.time[0] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - animate: true - - text: root.time[1] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.bottomMargin: 8 - animate: true - - text: root.time[2] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - animate: true - - text: root.time[3] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - animate: true - - text: root.time[4] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.bottomMargin: 8 - animate: true - - text: root.time[5] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - animate: true - - text: root.time[6] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } - CustomText { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - animate: true - - text: root.time[7] - font.pixelSize: 64 - font.weight: Font.Normal - font.letterSpacing: 0.5 - color: DynamicColors.palette.m3onSurface - } -} diff --git a/scripts/LockScreenBg.py b/scripts/LockScreenBg.py index ef26103..a35711b 100644 --- a/scripts/LockScreenBg.py +++ b/scripts/LockScreenBg.py @@ -1,12 +1,12 @@ from PIL import Image, ImageFilter import argparse -def gen_blurred_image(input_image, output_path): +def gen_blurred_image(input_image, output_path, blur_amount): img = Image.open(input_image) size = img.size img = img.resize((size[0] // 2, size[1] // 2), Image.NEAREST) - img = img.filter(ImageFilter.GaussianBlur(40)) + img = img.filter(ImageFilter.GaussianBlur(blur_amount)) # img = img.resize(size, Image.LANCZOS) img.save(output_path, "PNG") @@ -15,7 +15,8 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description="Generate a blurred lock screen background image.") parser.add_argument("--input_image", type=str) parser.add_argument("--output_path", type=str) + parser.add_argument("--blur_amount", type=int) args = parser.parse_args() - gen_blurred_image(args.input_image, args.output_path) + gen_blurred_image(args.input_image, args.output_path, args.blur_amount)