From e90f1facb79c4738a6b98a244c1871bbae6763c2 Mon Sep 17 00:00:00 2001 From: zach Date: Wed, 10 Jun 2026 19:29:20 +0200 Subject: [PATCH] default apps config entries, revert focus property on root shell --- Config/General.qml | 4 ++++ Drawers/Windows.qml | 1 + Modules/Dashboard/Dash/Media.qml | 2 +- Modules/DesktopIcons/DesktopIcons.qml | 15 +++++++-------- Modules/Settings/Categories/General.qml | 12 ++++++++++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Config/General.qml b/Config/General.qml index 45d3513..deb374c 100644 --- a/Config/General.qml +++ b/Config/General.qml @@ -16,8 +16,12 @@ JsonObject { property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers" component Apps: JsonObject { + property list archiver: ["ark"] property list audio: ["pavucontrol"] + property list document: ["libreoffice"] + property list editor: ["kate"] property list explorer: ["dolphin"] + property list image: ["imv"] property list playback: ["mpv"] property list terminal: ["kitty"] } diff --git a/Drawers/Windows.qml b/Drawers/Windows.qml index af41dcd..5d5b71f 100644 --- a/Drawers/Windows.qml +++ b/Drawers/Windows.qml @@ -26,6 +26,7 @@ CustomWindow { WlrLayershell.exclusionMode: ExclusionMode.Ignore // WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None color: "transparent" + contentItem.focus: true mask: visibilities.isDrawing ? null : region name: "Bar" diff --git a/Modules/Dashboard/Dash/Media.qml b/Modules/Dashboard/Dash/Media.qml index 57233c4..bc12293 100644 --- a/Modules/Dashboard/Dash/Media.qml +++ b/Modules/Dashboard/Dash/Media.qml @@ -15,7 +15,7 @@ Item { property real playerProgress: { const active = Players.active; - return active?.length ? active.position / active.length : 0; + return active?.length ? (active.position % active.length) / active.length : 0; } property int rowHeight: Appearance.padding.large + Config.dashboard.sizes.mediaProgressThickness + Appearance.spacing.small diff --git a/Modules/DesktopIcons/DesktopIcons.qml b/Modules/DesktopIcons/DesktopIcons.qml index 0264e81..c06f402 100644 --- a/Modules/DesktopIcons/DesktopIcons.qml +++ b/Modules/DesktopIcons/DesktopIcons.qml @@ -28,26 +28,25 @@ Item { let cmd = []; switch (type) { case "image": - cmd = [Config.options.apps.imageViewer, filePath]; + cmd = [Config.general.apps.image, filePath]; break; case "video": - cmd = [Config.options.apps.videoPlayer, filePath]; + cmd = [Config.general.apps.playback, filePath]; break; case "audio": - cmd = [Config.options.apps.audioPlayer, filePath]; + cmd = [Config.general.apps.audio, filePath]; break; case "archive": - cmd = [Config.options.apps.archiveManager, filePath]; + cmd = [Config.general.apps.archiver, filePath]; break; case "directory": - cmd = [Config.options.apps.fileManager, filePath]; + cmd = [Config.general.apps.explorer, filePath]; break; - case "code": case "text": - cmd = [Config.options.apps.textEditor, filePath]; + cmd = [Config.general.apps.editor, filePath]; break; case "document": - cmd = [Config.options.apps.documentViewer, filePath]; + cmd = [Config.general.apps.document, filePath]; break; default: cmd = ["xdg-open", filePath]; diff --git a/Modules/Settings/Categories/General.qml b/Modules/Settings/Categories/General.qml index 340c0fd..89d9bc7 100644 --- a/Modules/Settings/Categories/General.qml +++ b/Modules/Settings/Categories/General.qml @@ -247,6 +247,18 @@ SettingsPage { object: Config.general.color settings: ["scheduleHyprsunset", "scheduleHyprsunsetStart", "scheduleHyprsunsetEnd", "hyprsunsetTemp"] } + + Separator { + } + + SettingSpinBox { + max: 20000 + min: 1000 + name: "Hyprsunset temperature" + object: Config.general.color + setting: "hyprsunsetTemp" + step: 200 + } } SettingsSection {