From 188e41e1bab3cca7dd2ee9ef32ac9525360bde6d Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 22 Apr 2024 17:38:33 +0000 Subject: [PATCH] Fixes --- .../app/comp/store/StoreSectionComp.java | 4 +- .../app/comp/store/StoreSectionMiniComp.java | 4 +- .../app/comp/store/StoreSidebarComp.java | 23 +++++++----- .../io/xpipe/app/resources/style/browser.css | 4 +- .../xpipe/app/resources/style/color-box.css | 8 ++-- .../xpipe/app/resources/style/header-bars.css | 37 ++++--------------- .../io/xpipe/app/resources/style/prefs.css | 2 +- .../xpipe/app/resources/style/third-party.css | 14 +++---- .../core/process/ShellLaunchCommand.java | 2 + dist/licenses/graalvm.properties | 2 +- setup.sh | 4 +- 11 files changed, 46 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java index 098d16890..346a658d0 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java @@ -178,12 +178,12 @@ public class StoreSectionComp extends Comp> { newList.removeIf(s -> Arrays.stream(DataStoreColor.values()) .anyMatch( dataStoreColor -> dataStoreColor.getId().equals(s))); - newList.remove("none"); + newList.remove("gray"); newList.add("color-box"); if (val != null) { newList.add(val.getId()); } else { - newList.add("none"); + newList.add("gray"); } struc.get().getStyleClass().setAll(newList); }); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java index 3c8e854b7..169627130 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java @@ -176,12 +176,12 @@ public class StoreSectionMiniComp extends Comp> { struc.get().getStyleClass().removeIf(s -> Arrays.stream(DataStoreColor.values()) .anyMatch(dataStoreColor -> dataStoreColor.getId().equals(s))); - struc.get().getStyleClass().remove("none"); + struc.get().getStyleClass().remove("gray"); struc.get().getStyleClass().add("color-box"); if (val != null) { struc.get().getStyleClass().add(val.getId()); } else { - struc.get().getStyleClass().add("none"); + struc.get().getStyleClass().add("gray"); } }); } diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java index e2b0396ed..6732dc091 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java @@ -14,17 +14,22 @@ public class StoreSidebarComp extends SimpleComp { @Override protected Region createSimple() { var sideBar = new VerticalComp(List.of( - new StoreEntryListStatusComp().styleClass("color-box").styleClass("gray"), - new StoreCategoryListComp(StoreViewState.get().getAllConnectionsCategory()) - .styleClass("color-box") - .styleClass("gray"), - new StoreCategoryListComp(StoreViewState.get().getAllScriptsCategory()) - .styleClass("color-box") - .styleClass("gray"), - Comp.of(() -> new Region()) - .styleClass("bar") + new StoreEntryListStatusComp() .styleClass("color-box") .styleClass("gray") + .styleClass("bar"), + new StoreCategoryListComp(StoreViewState.get().getAllConnectionsCategory()) + .styleClass("color-box") + .styleClass("gray") + .styleClass("bar"), + new StoreCategoryListComp(StoreViewState.get().getAllScriptsCategory()) + .styleClass("color-box") + .styleClass("gray") + .styleClass("bar"), + Comp.of(() -> new Region()) + .styleClass("color-box") + .styleClass("gray") + .styleClass("bar") .styleClass("filler-bar") .vgrow())); sideBar.apply(struc -> struc.get().setFillWidth(true)); diff --git a/app/src/main/resources/io/xpipe/app/resources/style/browser.css b/app/src/main/resources/io/xpipe/app/resources/style/browser.css index 97300ce42..a33805d0c 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/browser.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/browser.css @@ -47,6 +47,7 @@ .browser .overview { -fx-spacing: 1.5em; -fx-padding: 1.5em; + -fx-background-color: -color-bg-default; } .selected-file-list { @@ -133,13 +134,14 @@ } .browser .overview-file-list { - -fx-border-width: 1px; + -fx-border-width: 0; } .browser .overview-file-list .button { -fx-border-width: 0; -fx-background-radius: 0; -fx-background-insets: 0; + -fx-effect: none; } .browser .tab-pane { diff --git a/app/src/main/resources/io/xpipe/app/resources/style/color-box.css b/app/src/main/resources/io/xpipe/app/resources/style/color-box.css index d7f379a22..decadc1c3 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/color-box.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/color-box.css @@ -30,12 +30,12 @@ } .root:pretty:light .color-box.gray { - -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, -5%) 40%, derive(-color-bg-default, -3%) 50%, derive(-color-bg-default, -5%) 100%); + -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, -2%) 40%, derive(-color-bg-default, 0%) 50%, derive(-color-bg-default, -3%) 100%); -fx-border-color: derive(-color-border-default, -10%); } .root:performance:light .color-box.gray { - -fx-background-color: derive(-color-bg-default, -5%); + -fx-background-color: derive(-color-bg-default, -2%); -fx-border-color: derive(-color-border-default, -10%); } @@ -45,12 +45,12 @@ .root:pretty:light .color-box.blue { - -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, rgb(130, 130, 250, 0.2) 40%, rgb(57, 57, 200, 0.2) 50%, rgb(137, 137, 250, 0.2) 100%); + -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, rgb(130, 130, 250, 0.15) 40%, rgb(57, 57, 200, 0.15) 50%, rgb(137, 137, 250, 0.15) 100%); -fx-border-color: rgba(80, 100, 150, 0.3); } .root:performance:light .color-box.blue { - -fx-background-color: rgb(130, 130, 250, 0.2); + -fx-background-color: rgb(130, 130, 250, 0.15); -fx-border-color: rgba(80, 100, 150, 0.3); } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/header-bars.css b/app/src/main/resources/io/xpipe/app/resources/style/header-bars.css index 05154ec42..3ecd89ae9 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/header-bars.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/header-bars.css @@ -1,12 +1,10 @@ .bar { -fx-padding: 0.8em 1.0em 0.8em 1.0em; - -fx-background-color: -color-bg-subtle; - -fx-border-color: -color-border-default; } .root:pretty .bar { - -fx-effect: dropshadow(three-pass-box, -color-shadow-default, 3px, 0.5, 0, 1); + -fx-effect: dropshadow(three-pass-box, -color-shadow-default, 3, 0.5, 1, 1); } .store-header-bar { @@ -88,8 +86,6 @@ .store-category-bar { -fx-padding: 0.8em 0.5em 0.8em 0.5em; - -fx-background-color: -color-bg-subtle; - -fx-border-color: -color-border-default; } .store-sort-bar { @@ -110,47 +106,30 @@ -fx-background-color: transparent; } -.bar .button-comp { +.store-header-bar .button-comp { -fx-padding: 0.2em 0em 0.2em 0em; } -.collections-bar { - -fx-background-radius: 0 0 4px 0; - -fx-border-radius: 0 0 4px 0; - -fx-border-width: 0 4px 4px 0; -} - -.entry-bar { - -fx-background-radius: 0 0 4px 4px; - -fx-border-radius: 0 0 4px 4px; - -fx-border-width: 0 4px 4px 4px; - -fx-background-color: -color-neutral-muted; -} - -.entry-bar .horizontal-comp { - -fx-spacing: 5px; -} - -.bar .icon-button-comp { +.store-header-bar .icon-button-comp { -fx-text-fill: -color-fg-default; } -.bar .name { +.store-header-bar .name { -fx-font-weight: BOLD; -fx-text-fill: -color-fg-default; } -.bar .count-comp { +.store-header-bar .count-comp { -fx-font-weight: BOLD; -fx-padding: 0.0em 0em 0.0em 0.4em; -fx-text-fill: -color-fg-muted; } -.bar .filter-bar .text-field { +.store-header-bar .filter-bar .text-field { -fx-text-fill: -color-fg-default; } -.bar .filter-bar { +.store-header-bar .filter-bar { -fx-background-radius: 3px; -fx-background-color: -color-bg-default; -fx-border-color: -color-fg-default; @@ -159,7 +138,7 @@ } -.bar .filter-bar .filter-background { +.store-header-bar .filter-bar .filter-background { -fx-opacity: 0.7; } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/prefs.css b/app/src/main/resources/io/xpipe/app/resources/style/prefs.css index 19e314289..2323ba028 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/prefs.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/prefs.css @@ -27,7 +27,7 @@ } .prefs { - -fx-background-color: transparent; + -fx-background-color: -color-bg-default; } .prefs .sidebar { diff --git a/app/src/main/resources/io/xpipe/app/resources/style/third-party.css b/app/src/main/resources/io/xpipe/app/resources/style/third-party.css index c8a9803e0..340bf47e2 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/third-party.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/third-party.css @@ -1,11 +1,11 @@ -.third-party-dependency-list-comp { - -} - -.third-party-dependency-list-comp .titled-pane { +.third-party-dependency-list-comp .titled-pane .content * { -fx-background-color: transparent; } -.titled-pane .content { - -fx-padding: 0em; +.titled-pane { + -fx-background-radius: 5; +} + +.titled-pane .content { + -fx-padding: 4; } diff --git a/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java b/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java index d31448870..18913b577 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java +++ b/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java @@ -4,6 +4,8 @@ import java.util.List; public interface ShellLaunchCommand { + String inlineCdCommand(String cd); + List localCommand(); default String loginCommand() { diff --git a/dist/licenses/graalvm.properties b/dist/licenses/graalvm.properties index 0f02199ec..97bb40924 100644 --- a/dist/licenses/graalvm.properties +++ b/dist/licenses/graalvm.properties @@ -1,4 +1,4 @@ name=GraalVM Community -version=21.0.2 +version=21.0.1 license=GPL2 with the Classpath Exception link=https://www.graalvm.org/ \ No newline at end of file diff --git a/setup.sh b/setup.sh index 1844c1d83..3d762428d 100755 --- a/setup.sh +++ b/setup.sh @@ -10,5 +10,5 @@ if [ $? -ne 0 ]; then . "$HOME/.sdkman/bin/sdkman-init.sh" fi; -sdk install java 21.0.2-graalce -sdk default java 21.0.2-graalce +sdk install java 21.0.1-graalce +sdk default java 21.0.1-graalce