beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add model info to branching actions

Browse source
This commit is contained in:
crschnick 2023-09-07 19:18:55 +00:00
parent f382f30476
commit d629fdddc8
8 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/browser/BrowserContextMenu.java
View file

@ -66,7 +66,7 @@ final class BrowserContextMenu extends ContextMenu {
if (a instanceof BranchAction la) {
var m = new Menu(a.getName(model, used) + " ...");
for (LeafAction sub : la.getBranchingActions()) {
for (LeafAction sub : la.getBranchingActions(model, used)) {
var subUsed = resolveIfNeeded(sub, selected);
if (!sub.isApplicable(model, subUsed)) {
continue;

2
app/src/main/java/io/xpipe/app/browser/BrowserFileListComp.java
View file

@ -179,7 +179,7 @@ final class BrowserFileListComp extends SimpleComp {
private void prepareTableShortcuts(TableView<BrowserEntry> table) {
table.setOnKeyPressed(event -> {
var selected = fileList.getSelection();
BrowserAction.getFlattened().stream()
BrowserAction.getFlattened(fileList.getFileSystemModel(), selected).stream()
.filter(browserAction -> browserAction.isApplicable(fileList.getFileSystemModel(), selected)
&& browserAction.isActive(fileList.getFileSystemModel(), selected))
.filter(browserAction -> browserAction.getShortcut() != null)

8
app/src/main/java/io/xpipe/app/browser/OpenFileSystemComp.java
View file

@ -47,10 +47,10 @@ public class OpenFileSystemComp extends SimpleComp {
overview.disableProperty().bind(model.getInOverview());
overview.setAccessibleText("System overview");
var backBtn = BrowserAction.byId("back").toButton(model, List.of());
var forthBtn = BrowserAction.byId("forward").toButton(model, List.of());
var refreshBtn = BrowserAction.byId("refresh").toButton(model, List.of());
var terminalBtn = BrowserAction.byId("openTerminal").toButton(model, List.of());
var backBtn = BrowserAction.byId("back", model, List.of()).toButton(model, List.of());
var forthBtn = BrowserAction.byId("forward", model, List.of()).toButton(model, List.of());
var refreshBtn = BrowserAction.byId("refresh", model, List.of()).toButton(model, List.of());
var terminalBtn = BrowserAction.byId("openTerminal", model, List.of()).toButton(model, List.of());
var menuButton = new MenuButton(null, new FontIcon("mdral-folder_open"));
new ContextMenuAugment<>(

5
app/src/main/java/io/xpipe/app/browser/action/BranchAction.java
View file

@ -1,8 +1,11 @@
package io.xpipe.app.browser.action;
import io.xpipe.app.browser.BrowserEntry;
import io.xpipe.app.browser.OpenFileSystemModel;
import java.util.List;
public interface BranchAction extends BrowserAction {
List<LeafAction> getBranchingActions();
List<LeafAction> getBranchingActions(OpenFileSystemModel model, List<BrowserEntry> entries);
}

8
app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java
View file

@ -23,17 +23,17 @@ public interface BrowserAction {
List<BrowserAction> ALL = new ArrayList<>();
static List<LeafAction> getFlattened() {
static List<LeafAction> getFlattened(OpenFileSystemModel model, List<BrowserEntry> entries) {
return ALL.stream()
.map(browserAction -> browserAction instanceof LeafAction
? List.of((LeafAction) browserAction)
: ((BranchAction) browserAction).getBranchingActions())
: ((BranchAction) browserAction).getBranchingActions(model, entries))
.flatMap(List::stream)
.toList();
}
static LeafAction byId(String id) {
return getFlattened().stream()
static LeafAction byId(String id, OpenFileSystemModel model, List<BrowserEntry> entries) {
return getFlattened(model, entries).stream()
.filter(browserAction -> id.equals(browserAction.getId()))
.findAny()
.orElseThrow();

2
app/src/main/java/io/xpipe/app/browser/action/MultiExecuteAction.java
View file

@ -20,7 +20,7 @@ public abstract class MultiExecuteAction implements BranchAction {
protected abstract String createCommand(ShellControl sc, OpenFileSystemModel model, BrowserEntry entry);
@Override
public List<LeafAction> getBranchingActions() {
public List<LeafAction> getBranchingActions(OpenFileSystemModel model, List<BrowserEntry> entries) {
return List.of(
new LeafAction() {

2
ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java
View file

@ -36,7 +36,7 @@ public class CopyPathAction implements BrowserAction, BranchAction {
}
@Override
public List<LeafAction> getBranchingActions() {
public List<LeafAction> getBranchingActions(OpenFileSystemModel model, List<BrowserEntry> entries) {
return List.of(
new LeafAction() {
@Override

2
ext/base/src/main/java/io/xpipe/ext/base/browser/NewItemAction.java
View file

@ -49,7 +49,7 @@ public class NewItemAction implements BrowserAction, BranchAction {
}
@Override
public List<LeafAction> getBranchingActions() {
public List<LeafAction> getBranchingActions(OpenFileSystemModel model, List<BrowserEntry> entries) {
return List.of(
new LeafAction() {
@Override