Skip to content

fix saveLocation support #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lisuke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix saveLocation support #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions grimblast/Grimblast.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import QtCore
import QtQuick
import QtQuick.Layouts
import Quickshell
Expand All @@ -11,7 +12,7 @@ PluginComponent {
id: pluginRoot

// Automatically loaded from settings
property string saveLocation: pluginData.saveLocation || "~/Pictures/Screenshots"
property string saveLocation: resolvePath(pluginData.saveLocation || "~/Pictures/Screenshots")

// State for dynamic height calculation
property int openSubmenuIndex: -1
Expand Down Expand Up @@ -53,23 +54,23 @@ PluginComponent {
submenu: [
{
label: "Area",
command: "grimblast",
args: ["save", "area"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "save", "area"]
},
{
label: "Active Window",
command: "grimblast",
args: ["save", "active"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "save", "active"]
},
{
label: "Current Output",
command: "grimblast",
args: ["save", "output"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "save", "output"]
},
{
label: "All Screens",
command: "grimblast",
args: ["save", "screen"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "save", "screen"]
}
]
},
Expand All @@ -80,23 +81,23 @@ PluginComponent {
submenu: [
{
label: "Area",
command: "grimblast",
args: ["copysave", "area"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "copysave", "area"]
},
{
label: "Active Window",
command: "grimblast",
args: ["copysave", "active"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "copysave", "active"]
},
{
label: "Current Output",
command: "grimblast",
args: ["copysave", "output"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "copysave", "output"]
},
{
label: "All Screens",
command: "grimblast",
args: ["copysave", "screen"]
command: "env",
args: [ "DEFAULT_TARGET_DIR=" + saveLocation, "grimblast", "copysave", "screen"]
}
]
},
Expand Down Expand Up @@ -129,6 +130,16 @@ PluginComponent {
}
]

function resolvePath(path) {
const homeDir = StandardPaths.writableLocation(StandardPaths.HomeLocation);

let expandedPath = path.replace("~", homeDir).replace("$HOME", homeDir);

let ret = Qt.resolvedUrl(expandedPath).toString().replace("file://", "");

return ret;
}

function executeCommand(command, args) {
if (ToastService) {
ToastService.showInfo("Taking screenshot...");
Expand Down