Some UI reorganization [release]

app/src/main/java/io/xpipe/app/comp/about/BrowseDirectoryComp.java

@@ -7,6 +7,7 @@ import io.xpipe.app.core.mode.OperationMode;
 import io.xpipe.app.fxcomps.SimpleComp;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.issue.UserReportComp;
+import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.util.*;
 import io.xpipe.core.impl.FileNames;
 import io.xpipe.core.process.OsType;
@@ -18,7 +19,7 @@ public class BrowseDirectoryComp extends SimpleComp {
 
     @Override
     protected Region createSimple() {
-        return new DynamicOptionsBuilder(false)
+        var b = new DynamicOptionsBuilder(false)
                 .addComp(
                         "issueReporter",
                         new ButtonComp(AppI18n.observable("reportIssue"), () -> {
@@ -37,27 +38,29 @@ public class BrowseDirectoryComp extends SimpleComp {
                                     .resolve("xpipe.log")
                                     .toString());
                         }),
-                        null)
+                        null);
-                .addComp(
+        if (AppPrefs.get().developerMode().getValue()) {
-                        "launchDebugMode",
+            b.addComp(
-                        new ButtonComp(AppI18n.observable("launchDebugMode"), () -> {
+                    "launchDebugMode",
-                            OperationMode.executeAfterShutdown(() -> {
+                    new ButtonComp(AppI18n.observable("launchDebugMode"), () -> {
-                                try (var sc = ShellStore.createLocal().create().start()) {
+                        OperationMode.executeAfterShutdown(() -> {
-                                    var script = FileNames.join(
+                            try (var sc = ShellStore.createLocal().create().start()) {
-                                            XPipeInstallation.getCurrentInstallationBasePath()
+                                var script = FileNames.join(
-                                                    .toString(),
+                                        XPipeInstallation.getCurrentInstallationBasePath()
-                                            XPipeInstallation.getDaemonDebugScriptPath(sc.getOsType()));
+                                                .toString(),
-                                    if (sc.getOsType().equals(OsType.WINDOWS)) {
+                                        XPipeInstallation.getDaemonDebugScriptPath(sc.getOsType()));
-                                        sc.executeSimpleCommand(ScriptHelper.createDetachCommand(sc, "\"" + script + "\""));
+                                if (sc.getOsType().equals(OsType.WINDOWS)) {
-                                    } else {
+                                    sc.executeSimpleCommand(ScriptHelper.createDetachCommand(sc, "\"" + script + "\""));
-                                        TerminalHelper.open("X-Pipe Debug", "\"" + script + "\"");
+                                } else {
-                                    }
+                                    TerminalHelper.open("X-Pipe Debug", "\"" + script + "\"");
                                 }
-                            });
+                            }
-                            DesktopHelper.browsePath(AppLogs.get().getSessionLogsDirectory());
+                        });
-                        }),
+                        DesktopHelper.browsePath(AppLogs.get().getSessionLogsDirectory());
-                        null)
+                    }),
-                .addComp(
+                    null);
+        }
+        return b.addComp(
                         "installationFiles",
                         new ButtonComp(AppI18n.observable("openInstallationDirectory"), () -> {
                             DesktopHelper.browsePath(XPipeInstallation.getCurrentInstallationBasePath());

app/src/main/java/io/xpipe/app/comp/storage/store/StoreCreationBarComp.java

@@ -34,21 +34,28 @@ public class StoreCreationBarComp extends SimpleComp {
                 .shortcut(new KeyCodeCombination(KeyCode.C, KeyCombination.SHORTCUT_DOWN))
                 .apply(new FancyTooltipAugment<>("addCommand"));
 
-        var newShellStore = new ButtonComp(
+        var newHostStore = new ButtonComp(
-                        AppI18n.observable("addHost"), new FontIcon("mdi2h-home-plus-outline"), () -> {
+                        AppI18n.observable("addHost"), new FontIcon("mdi2h-home-plus"), () -> {
                             GuiDsStoreCreator.showCreation(v -> v.getDisplayCategory().equals(DataStoreProvider.DisplayCategory.HOST));
                         })
                 .shortcut(new KeyCodeCombination(KeyCode.H, KeyCombination.SHORTCUT_DOWN))
                 .apply(new FancyTooltipAugment<>("addHost"));
 
+        var newShellStore = new ButtonComp(
+                AppI18n.observable("addShell"), new FontIcon("mdi2t-text-box-multiple"), () -> {
+            GuiDsStoreCreator.showCreation(v -> v.getDisplayCategory().equals(DataStoreProvider.DisplayCategory.SHELL));
+        })
+                .shortcut(new KeyCodeCombination(KeyCode.S, KeyCombination.SHORTCUT_DOWN))
+                .apply(new FancyTooltipAugment<>("addShell"));
+
         var newDbStore = new ButtonComp(
-                        AppI18n.observable("addDatabase"), new FontIcon("mdi2d-database-plus-outline"), () -> {
+                        AppI18n.observable("addDatabase"), new FontIcon("mdi2d-database-plus"), () -> {
                             GuiDsStoreCreator.showCreation(v -> v.getDisplayCategory().equals(DataStoreProvider.DisplayCategory.DATABASE));
                         })
                 .shortcut(new KeyCodeCombination(KeyCode.D, KeyCombination.SHORTCUT_DOWN))
                 .apply(new FancyTooltipAugment<>("addDatabase"));
 
-        var box = new VerticalComp(List.of(newShellStore, newDbStore, newStreamStore));
+        var box = new VerticalComp(List.of(newHostStore, newShellStore, newStreamStore, newDbStore));
         box.apply(s -> AppFont.medium(s.get()));
         var bar = box.createRegion();
         bar.getStyleClass().add("bar");

app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java

@@ -131,6 +131,7 @@ public interface DataStoreProvider {
     enum DisplayCategory {
         HOST,
         DATABASE,
+        SHELL,
         COMMAND,
         OTHER;
     }

app/src/main/resources/io/xpipe/app/resources/lang/dscreation_en.properties

@@ -36,6 +36,7 @@ clean=Clean
 refresh=Refresh
 addDatabase=Add Database ...
 addHost=Add Host ...
+addShell=Add Shell ...
 addCommand=Add Command ...
 addOther=Add Other ...
 addStreamTitle=Add Stream Store

version

@@ -1 +1 @@
-0.5.21
+0.5.22