From 491d3c201cbc7bc10662f2405cd7f2c2d80140e8 Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 22 Feb 2023 15:14:46 +0000 Subject: [PATCH] New release [release] --- app/src/main/java/io/xpipe/app/browser/BookmarkList.java | 4 ++-- .../{BrowserClipboard.java => FileBrowserClipboard.java} | 2 +- .../browser/{BrowserComp.java => FileBrowserComp.java} | 6 +++--- .../browser/{BrowserModel.java => FileBrowserModel.java} | 4 ++-- ...tionHistory.java => FileBrowserNavigationHistory.java} | 2 +- app/src/main/java/io/xpipe/app/browser/FileListComp.java | 8 ++++---- .../java/io/xpipe/app/browser/OpenFileSystemModel.java | 4 ++-- app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java | 6 +++--- dist/changelogs/0.5.2.md | 1 + version | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) rename app/src/main/java/io/xpipe/app/browser/{BrowserClipboard.java => FileBrowserClipboard.java} (98%) rename app/src/main/java/io/xpipe/app/browser/{BrowserComp.java => FileBrowserComp.java} (97%) rename app/src/main/java/io/xpipe/app/browser/{BrowserModel.java => FileBrowserModel.java} (91%) rename app/src/main/java/io/xpipe/app/browser/{NavigationHistory.java => FileBrowserNavigationHistory.java} (97%) create mode 100644 dist/changelogs/0.5.2.md diff --git a/app/src/main/java/io/xpipe/app/browser/BookmarkList.java b/app/src/main/java/io/xpipe/app/browser/BookmarkList.java index 72afff0d..4c179706 100644 --- a/app/src/main/java/io/xpipe/app/browser/BookmarkList.java +++ b/app/src/main/java/io/xpipe/app/browser/BookmarkList.java @@ -14,9 +14,9 @@ import javafx.scene.layout.Region; final class BookmarkList extends SimpleComp { - private final BrowserModel model; + private final FileBrowserModel model; - BookmarkList(BrowserModel model) { + BookmarkList(FileBrowserModel model) { this.model = model; } diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java b/app/src/main/java/io/xpipe/app/browser/FileBrowserClipboard.java similarity index 98% rename from app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java rename to app/src/main/java/io/xpipe/app/browser/FileBrowserClipboard.java index d0f81e4d..f02fb53a 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java +++ b/app/src/main/java/io/xpipe/app/browser/FileBrowserClipboard.java @@ -10,7 +10,7 @@ import lombok.Value; import java.nio.file.Files; import java.util.*; -public class BrowserClipboard { +public class FileBrowserClipboard { @Value public static class Instance { diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserComp.java b/app/src/main/java/io/xpipe/app/browser/FileBrowserComp.java similarity index 97% rename from app/src/main/java/io/xpipe/app/browser/BrowserComp.java rename to app/src/main/java/io/xpipe/app/browser/FileBrowserComp.java index 761eebb6..4bc7f70e 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserComp.java +++ b/app/src/main/java/io/xpipe/app/browser/FileBrowserComp.java @@ -24,13 +24,13 @@ import static atlantafx.base.theme.Styles.DENSE; import static atlantafx.base.theme.Styles.toggleStyleClass; import static javafx.scene.control.TabPane.TabClosingPolicy.ALL_TABS; -public class BrowserComp extends SimpleComp { +public class FileBrowserComp extends SimpleComp { private static final double TAB_MIN_HEIGHT = 60; - private final BrowserModel model; + private final FileBrowserModel model; - public BrowserComp(BrowserModel model) { + public FileBrowserComp(FileBrowserModel model) { this.model = model; } diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserModel.java b/app/src/main/java/io/xpipe/app/browser/FileBrowserModel.java similarity index 91% rename from app/src/main/java/io/xpipe/app/browser/BrowserModel.java rename to app/src/main/java/io/xpipe/app/browser/FileBrowserModel.java index 5257715f..21cbf13d 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserModel.java +++ b/app/src/main/java/io/xpipe/app/browser/FileBrowserModel.java @@ -9,9 +9,9 @@ import javafx.collections.ObservableList; import lombok.Getter; @Getter -public class BrowserModel { +public class FileBrowserModel { - public static final BrowserModel DEFAULT = new BrowserModel(); + public static final FileBrowserModel DEFAULT = new FileBrowserModel(); private final ObservableList openFileSystems = FXCollections.observableArrayList(); private final Property selected = new SimpleObjectProperty<>(); diff --git a/app/src/main/java/io/xpipe/app/browser/NavigationHistory.java b/app/src/main/java/io/xpipe/app/browser/FileBrowserNavigationHistory.java similarity index 97% rename from app/src/main/java/io/xpipe/app/browser/NavigationHistory.java rename to app/src/main/java/io/xpipe/app/browser/FileBrowserNavigationHistory.java index 3764e934..b9c4186c 100644 --- a/app/src/main/java/io/xpipe/app/browser/NavigationHistory.java +++ b/app/src/main/java/io/xpipe/app/browser/FileBrowserNavigationHistory.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -final class NavigationHistory { +final class FileBrowserNavigationHistory { private final IntegerProperty cursor = new SimpleIntegerProperty(0); private final List history = new ArrayList<>(); diff --git a/app/src/main/java/io/xpipe/app/browser/FileListComp.java b/app/src/main/java/io/xpipe/app/browser/FileListComp.java index 3d8f616b..429cfa9b 100644 --- a/app/src/main/java/io/xpipe/app/browser/FileListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/FileListComp.java @@ -95,12 +95,12 @@ final class FileListComp extends AnchorPane { if (event.isControlDown() && event.getCode().equals(KeyCode.C) && table.getSelectionModel().getSelectedItems().size() > 0) { - BrowserClipboard.startCopy(table.getSelectionModel().getSelectedItems()); + FileBrowserClipboard.startCopy(table.getSelectionModel().getSelectedItems()); event.consume(); } if (event.isControlDown() && event.getCode().equals(KeyCode.V)) { - var clipboard = BrowserClipboard.retrieveCopy(); + var clipboard = FileBrowserClipboard.retrieveCopy(); if (clipboard != null) { var files = clipboard.getEntries(); var target = fileList.getModel().getCurrentDirectory(); @@ -155,7 +155,7 @@ final class FileListComp extends AnchorPane { var selected = table.getSelectionModel().getSelectedItems(); Dragboard db = row.startDragAndDrop(TransferMode.COPY); - db.setContent(BrowserClipboard.startDrag(selected)); + db.setContent(FileBrowserClipboard.startDrag(selected)); db.setDragView(image, 30, 60); event.setDragDetect(true); event.consume(); @@ -221,7 +221,7 @@ final class FileListComp extends AnchorPane { // Accept drops from inside the app window if (event.getGestureSource() != null) { event.setDropCompleted(true); - var files = BrowserClipboard.retrieveDrag(event.getDragboard()).getEntries(); + var files = FileBrowserClipboard.retrieveDrag(event.getDragboard()).getEntries(); var target = row.getItem() != null ? row.getItem() : fileList.getModel().getCurrentDirectory(); diff --git a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java index c232c153..ca772e5c 100644 --- a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java +++ b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java @@ -27,7 +27,7 @@ final class OpenFileSystemModel { private FileSystem fileSystem; private final FileListModel fileList; private final ReadOnlyObjectWrapper currentPath = new ReadOnlyObjectWrapper<>(); - private final NavigationHistory history = new NavigationHistory(); + private final FileBrowserNavigationHistory history = new FileBrowserNavigationHistory(); private final BooleanProperty busy = new SimpleBooleanProperty(); public OpenFileSystemModel() { @@ -208,7 +208,7 @@ final class OpenFileSystemModel { return currentPath.getReadOnlyProperty(); } - public NavigationHistory getHistory() { + public FileBrowserNavigationHistory getHistory() { return history; } diff --git a/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java index 4bb88b1c..4f9c5d7a 100644 --- a/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java @@ -1,7 +1,7 @@ package io.xpipe.app.comp; -import io.xpipe.app.browser.BrowserComp; -import io.xpipe.app.browser.BrowserModel; +import io.xpipe.app.browser.FileBrowserComp; +import io.xpipe.app.browser.FileBrowserModel; import io.xpipe.app.comp.about.AboutTabComp; import io.xpipe.app.comp.base.SideMenuBarComp; import io.xpipe.app.comp.storage.collection.SourceCollectionLayoutComp; @@ -43,7 +43,7 @@ public class AppLayoutComp extends Comp> { private List createEntryList() { var l = new ArrayList<>(List.of( new SideMenuBarComp.Entry(AppI18n.observable("connections"), "mdi2c-connection", new StoreLayoutComp()), - new SideMenuBarComp.Entry(AppI18n.observable("browser"), "mdi2f-file-cabinet", new BrowserComp(BrowserModel.DEFAULT)), + new SideMenuBarComp.Entry(AppI18n.observable("browser"), "mdi2f-file-cabinet", new FileBrowserComp(FileBrowserModel.DEFAULT)), new SideMenuBarComp.Entry(AppI18n.observable("data"), "mdsal-dvr", new SourceCollectionLayoutComp()), new SideMenuBarComp.Entry( AppI18n.observable("settings"), "mdsmz-miscellaneous_services", new PrefsComp(this)), diff --git a/dist/changelogs/0.5.2.md b/dist/changelogs/0.5.2.md new file mode 100644 index 00000000..e49f6f74 --- /dev/null +++ b/dist/changelogs/0.5.2.md @@ -0,0 +1 @@ +- Improvements and fixes for the file explorer \ No newline at end of file diff --git a/version b/version index 5d4294b9..2411653a 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.5.1 \ No newline at end of file +0.5.2 \ No newline at end of file