From 089a5f7a49d06b26f252c25a0cb162cca3ce1da1 Mon Sep 17 00:00:00 2001 From: inorishio Date: Sun, 9 Nov 2025 02:37:11 +0100 Subject: [PATCH] finished update --- Modules/GetGifs.qml | 2 +- Modules/GifsProcess.qml | 14 ----------- Modules/Pet.qml | 43 ---------------------------------- Modules/PetAcheron.qml | 10 -------- Modules/PetMarch.qml | 39 ------------------------------- shell.qml | 51 ++++++++++++++++++++++++++++++++++++++--- 6 files changed, 49 insertions(+), 110 deletions(-) delete mode 100644 Modules/GifsProcess.qml delete mode 100644 Modules/Pet.qml delete mode 100644 Modules/PetAcheron.qml delete mode 100644 Modules/PetMarch.qml diff --git a/Modules/GetGifs.qml b/Modules/GetGifs.qml index 13b00ed..b0cbf43 100644 --- a/Modules/GetGifs.qml +++ b/Modules/GetGifs.qml @@ -3,7 +3,7 @@ import Quickshell.Io Process { id: getGifsProcess property list gifsList: [] - command: ["sh", "-c", "./Scripts/files.sh"] + command: ["sh", "-c", "$HOME/.config/quickshell/QtDesktopPet/Scripts/files.sh"] stdout: StdioCollector { onStreamFinished: { var gifs = this.text.trim().split("\n") diff --git a/Modules/GifsProcess.qml b/Modules/GifsProcess.qml deleted file mode 100644 index 9ea63a6..0000000 --- a/Modules/GifsProcess.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Quickshell.Io - -Process { - id: getGifsProcess - property list gifsList: [] - command: ["sh", "-c", "/home/inorishio/.config/quickshell/QtDesktopPet/Scripts/gifs.sh"] - stdout: StdioCollector { - onStreamFinished: { - var gifs = this.text.trim().split("\n") - getGifsProcess.gifsList = gifs - } - } - -} diff --git a/Modules/Pet.qml b/Modules/Pet.qml deleted file mode 100644 index dbb8745..0000000 --- a/Modules/Pet.qml +++ /dev/null @@ -1,43 +0,0 @@ -import QtQuick -import Quickshell.Io -import Quickshell.Wayland - -Rectangle { - id: root - width: imageEvernight.width - height: imageEvernight.height - - required property var path - - AnimatedImage { - id: imageEvernight - source: root.path - fillMode: Image.PreserveAspectFit - } - - IpcHandler { - target: "command" - - // Keybind swap layer - function toggleLayer(): void { - if ( !mainWindow.onTop ) { - mainWindow.WlrLayershell.layer = WlrLayer.Top - mainWindow.onTop = true - } else { - mainWindow.WlrLayershell.layer = WlrLayer.Bottom - mainWindow.onTop = false - } - } - - // Keybind swap overlay - function toggleOverlay(): void { - if (!mainWindow.onTop) { - mainWindow.WlrLayershell.layer = WlrLayer.Overlay - mainWindow.onTop = true - } else { - mainWindow.WlrLayershell.layer = WlrLayer.Bottom - mainWindow.onTop = false - } - } - } -} diff --git a/Modules/PetAcheron.qml b/Modules/PetAcheron.qml deleted file mode 100644 index 2267d06..0000000 --- a/Modules/PetAcheron.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick - -Rectangle { - width: AnimatedImage.width - height: AnimatedImage.height - - AnimatedImage { - fillMode: Image.PreserveAspectFit - } -} diff --git a/Modules/PetMarch.qml b/Modules/PetMarch.qml deleted file mode 100644 index 93bd241..0000000 --- a/Modules/PetMarch.qml +++ /dev/null @@ -1,39 +0,0 @@ -import QtQuick -import Quickshell.Io -import Quickshell.Wayland - -Rectangle { - width: 320 - height: 293 - - AnimatedImage { - source: "../Gifs/Evernight.gif" - fillMode: Image.PreserveAspectFit - } - - IpcHandler { - target: "command" - - // Keybind swap layer - function toggleLayer(): void { - if ( !mainWindow.onTop ) { - mainWindow.WlrLayershell.layer = WlrLayer.Top - mainWindow.onTop = true - } else { - mainWindow.WlrLayershell.layer = WlrLayer.Bottom - mainWindow.onTop = false - } - } - - // Keybind swap overlay - function toggleOverlay(): void { - if (!mainWindow.onTop) { - mainWindow.WlrLayershell.layer = WlrLayer.Overlay - mainWindow.onTop = true - } else { - mainWindow.WlrLayershell.layer = WlrLayer.Bottom - mainWindow.onTop = false - } - } - } -} diff --git a/shell.qml b/shell.qml index 751c627..2eeb4c6 100644 --- a/shell.qml +++ b/shell.qml @@ -1,6 +1,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell +import Quickshell.Io import Quickshell.Wayland import qs.Modules @@ -30,7 +31,7 @@ PanelWindow { id: getGifs running: true } - + GifsLoader { id: gifloader gifsList: getGifs.gifsList @@ -39,6 +40,32 @@ PanelWindow { } } + IpcHandler { + target: "command" + + // Keybind swap layer + function toggleLayer(): void { + if ( !mainWindow.onTop ) { + mainWindow.WlrLayershell.layer = WlrLayer.Top + mainWindow.onTop = true + } else { + mainWindow.WlrLayershell.layer = WlrLayer.Bottom + mainWindow.onTop = false + } + } + + // Keybind swap overlay + function toggleOverlay(): void { + if (!mainWindow.onTop) { + mainWindow.WlrLayershell.layer = WlrLayer.Overlay + mainWindow.onTop = true + } else { + mainWindow.WlrLayershell.layer = WlrLayer.Bottom + mainWindow.onTop = false + } + } + } + function petRegion( itemObject ) { let newregion = regionComponent.createObject( pets, { "item": itemObject }) pets.regions.push( newregion ) @@ -49,7 +76,25 @@ PanelWindow { Region { } } - mask: Region { - id: pets + mask: Region {} + + property var petMove: Region { id: pets } + + property var noMove: Region {} + + property bool setMask: false + + IpcHandler { + target: "Mask" + + function edmask(): void { + if ( !mainWindow.setMask ) { + mainWindow.mask = petMove + mainWindow.setMask = true + } else { + mainWindow.mask = noMove + mainWindow.setMask = false + } + } } }