From 5ca15b2af6f786a76d159d9bb00a01b52688ab9d Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 27 Jun 2024 09:34:53 +0000 Subject: [PATCH] Small fixes [stage] --- .../main/java/io/xpipe/app/browser/BrowserTransferComp.java | 2 +- .../main/java/io/xpipe/app/core/window/AppWindowHelper.java | 5 +++-- app/src/main/java/io/xpipe/app/prefs/SyncCategory.java | 4 ++-- version | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java index 15c6d9c4..822e8032 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java @@ -92,7 +92,7 @@ public class BrowserTransferComp extends SimpleComp { .hide(Bindings.isEmpty(syncItems)); var bottom = - new HorizontalComp(List.of(dragNotice, Comp.hspacer(), downloadButton, Comp.hspacer(4), clearButton)); + new HorizontalComp(List.of(Comp.hspacer(), dragNotice, Comp.hspacer(), downloadButton, Comp.hspacer(4), clearButton)); var listBox = new VerticalComp(List.of(list, bottom)) .spacing(5) .padding(new Insets(10, 10, 5, 10)) diff --git a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java index ae27c6bc..62e0af59 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java @@ -8,7 +8,6 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.InputHelper; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.OsType; - import javafx.application.Platform; import javafx.beans.value.ObservableValue; import javafx.css.PseudoClass; @@ -190,7 +189,9 @@ public class AppWindowHelper { alert.initOwner(AppMainWindow.getInstance().getStage()); } alert.getDialogPane().getScene().setFill(Color.TRANSPARENT); - addIcons(((Stage) alert.getDialogPane().getScene().getWindow())); + var stage = (Stage) alert.getDialogPane().getScene().getWindow(); + stage.initStyle(StageStyle.UNIFIED); + addIcons(stage); setupStylesheets(alert.getDialogPane().getScene()); return alert; } diff --git a/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java b/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java index 44a1b3b0..407c3892 100644 --- a/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java @@ -22,9 +22,9 @@ public class SyncCategory extends AppPrefsCategory { .sub(new OptionsBuilder() .name("enableGitStorage") .description( - AppProperties.get().isStaging() ? "enableGitStoragePtbDisabled" : "enableGitStorage") + AppProperties.get().isStaging() && !prefs.developerMode().getValue() ? "enableGitStoragePtbDisabled" : "enableGitStorage") .addToggle(prefs.enableGitStorage) - .disable(AppProperties.get().isStaging()) + .disable(AppProperties.get().isStaging() && !prefs.developerMode().getValue()) .nameAndDescription("storageGitRemote") .addString(prefs.storageGitRemote, true) .disable(prefs.enableGitStorage.not()) diff --git a/version b/version index 878f963e..1ca40ecb 100644 --- a/version +++ b/version @@ -1 +1 @@ -10.0-23 +10.0-24