lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-08-13 13:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework shell terminal command handling and clipboards

Browse Source
This commit is contained in:
crschnick
2023-12-19 14:55:50 +00:00
parent 2af59af190
commit 4daa183dad
8 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/base/src/main/java/io/xpipe/ext/base/action/ShareStoreAction.java
+4 -9
View File
@@ -5,15 +5,12 @@ import io.xpipe.app.core.AppI18n;
import io.xpipe.app.ext.ActionProvider;
import io.xpipe.app.storage.DataStoreEntry;
import io.xpipe.app.storage.DataStoreEntryRef;
import io.xpipe.app.util.ClipboardHelper;
import io.xpipe.app.util.SecretHelper;
import io.xpipe.core.store.DataStore;
import javafx.beans.value.ObservableValue;
import lombok.Value;
import java.awt.*;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
public class ShareStoreAction implements ActionProvider {
@Value
@@ -33,11 +30,9 @@ public class ShareStoreAction implements ActionProvider {
@Override
public void execute() {
var string = create(store.getStore());
var selection = new StringSelection(string);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
AppActionLinkDetector.setLastDetectedAction(string);
clipboard.setContents(selection, selection);
var url = create(store.getStore());
AppActionLinkDetector.setLastDetectedAction(url);
ClipboardHelper.copyUrl(url);
}
}
ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java
+8 -22
View File
@@ -6,15 +6,13 @@ import io.xpipe.app.browser.action.BranchAction;
import io.xpipe.app.browser.action.BrowserAction;
import io.xpipe.app.browser.action.BrowserActionFormatter;
import io.xpipe.app.browser.action.LeafAction;
import io.xpipe.core.store.FileNames;
import io.xpipe.app.util.ClipboardHelper;
import io.xpipe.core.store.FileKind;
import io.xpipe.core.store.FileNames;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import java.awt.*;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.util.List;
import java.util.stream.Collectors;
@@ -60,9 +58,7 @@ public class CopyPathAction implements BrowserAction, BranchAction {
var s = entries.stream()
.map(entry -> entry.getRawFileEntry().getPath())
.collect(Collectors.joining("\n"));
var selection = new StringSelection(s);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents(selection, selection);
ClipboardHelper.copyText(s);
}
},
new LeafAction() {
@@ -94,9 +90,7 @@ public class CopyPathAction implements BrowserAction, BranchAction {
var s = entries.stream()
.map(entry -> entry.getRawFileEntry().getPath())
.collect(Collectors.joining("\n"));
var selection = new StringSelection(s);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents(selection, selection);
ClipboardHelper.copyText(s);
}
},
new LeafAction() {
@@ -124,9 +118,7 @@ public class CopyPathAction implements BrowserAction, BranchAction {
var s = entries.stream()
.map(entry -> "\"" + entry.getRawFileEntry().getPath() + "\"")
.collect(Collectors.joining("\n"));
var selection = new StringSelection(s);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents(selection, selection);
ClipboardHelper.copyText(s);
}
},
new LeafAction() {
@@ -156,9 +148,7 @@ public class CopyPathAction implements BrowserAction, BranchAction {
.map(entry -> FileNames.getFileName(
entry.getRawFileEntry().getPath()))
.collect(Collectors.joining("\n"));
var selection = new StringSelection(s);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents(selection, selection);
ClipboardHelper.copyText(s);
}
},
new LeafAction() {
@@ -200,9 +190,7 @@ public class CopyPathAction implements BrowserAction, BranchAction {
.map(entry -> FileNames.getFileName(
entry.getRawFileEntry().getPath()))
.collect(Collectors.joining("\n"));
var selection = new StringSelection(s);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents(selection, selection);
ClipboardHelper.copyText(s);
}
},
new LeafAction() {
@@ -235,9 +223,7 @@ public class CopyPathAction implements BrowserAction, BranchAction {
+ FileNames.getFileName(
entry.getRawFileEntry().getPath()) + "\"")
.collect(Collectors.joining("\n"));
var selection = new StringSelection(s);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents(selection, selection);
ClipboardHelper.copyText(s);
}
});
}