From 59d0706129b4cc2e3cf582e95cc0e2017a283a5f Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 26 May 2023 21:01:57 +0000 Subject: [PATCH] Small fixes --- app/src/main/java/io/xpipe/app/browser/BrowserComp.java | 2 ++ app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java | 1 + .../main/java/io/xpipe/app/browser/OpenFileSystemComp.java | 4 ++++ app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java | 4 +++- core/src/main/java/io/xpipe/core/process/ShellControl.java | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserComp.java index 537450e4..6d658406 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserComp.java @@ -73,6 +73,8 @@ public class BrowserComp extends SimpleComp { model.getOpenFileSystems(), model.getSelected()))) .createRegion(); + localDownloadStage.setPrefHeight(200); + localDownloadStage.setMaxHeight(200); var vertical = new VBox(bookmarksList, localDownloadStage); vertical.setFillWidth(true); diff --git a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java index 1410aa4c..58e2416d 100644 --- a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java +++ b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java @@ -89,6 +89,7 @@ public class FileSystemHelper { public static FileSystem.FileEntry getLocal(Path file) throws Exception { if (localFileSystem == null) { localFileSystem = new LocalStore().createFileSystem(); + localFileSystem.open(); } return new FileSystem.FileEntry( diff --git a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemComp.java b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemComp.java index 7667ac49..428fe52e 100644 --- a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemComp.java +++ b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemComp.java @@ -42,6 +42,9 @@ public class OpenFileSystemComp extends SimpleComp { } private Region createContent() { + var overview = new Button(null, new FontIcon("mdi2m-monitor")); + overview.setOnAction(e -> model.cd(null)); + var backBtn = new Button(null, new FontIcon("fth-arrow-left")); backBtn.setOnAction(e -> model.back()); backBtn.disableProperty().bind(model.getHistory().canGoBackProperty().not()); @@ -70,6 +73,7 @@ public class OpenFileSystemComp extends SimpleComp { var topBar = new ToolBar(); topBar.getItems() .setAll( + overview, backBtn, forthBtn, new Spacer(10), diff --git a/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java b/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java index 022bfdf4..15cd6a0a 100644 --- a/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java +++ b/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java @@ -1,8 +1,9 @@ package io.xpipe.app.test; +import io.xpipe.app.core.AppProperties; import io.xpipe.app.ext.XPipeServiceProviders; -import io.xpipe.core.util.JacksonMapper; import io.xpipe.app.util.XPipeSession; +import io.xpipe.core.util.JacksonMapper; import org.junit.jupiter.api.BeforeAll; import java.util.UUID; @@ -13,6 +14,7 @@ public class LocalExtensionTest extends ExtensionTest { public static void setup() throws Exception { JacksonMapper.initModularized(ModuleLayer.boot()); XPipeServiceProviders.load(ModuleLayer.boot()); + AppProperties.init(); XPipeSession.init(UUID.randomUUID()); } } diff --git a/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java index 29d80e90..091ec951 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellControl.java +++ b/core/src/main/java/io/xpipe/core/process/ShellControl.java @@ -37,7 +37,7 @@ public interface ShellControl extends ProcessControl { String getSubTemporaryDirectory(); - public void checkRunning() throws Exception; + public void checkRunning(); default CommandControl osascriptCommand(String script) { return command(String.format(