This commit is contained in:
crschnick
2026-03-29 17:52:32 +00:00
parent 1023e400a3
commit 9895b5600a
5 changed files with 12 additions and 3 deletions
@@ -24,7 +24,7 @@ public class AppAotTrain {
true);
AppLayoutModel.get().selectSettings();
ThreadHelper.sleep(1000);
AppLayoutModel.get().selectLicense();
// AppLayoutModel.get().selectLicense();
ThreadHelper.sleep(1000);
AppLayoutModel.get().selectBrowser();
ThreadHelper.sleep(5000);
@@ -30,6 +30,7 @@ public class AppProperties {
boolean useVirtualThreads;
boolean debugThreads;
Path dataDir;
Path defaultReleaseDataDir;
Path defaultDataDir;
Path dataBinDir;
boolean showcase;
@@ -108,6 +109,7 @@ public class AppProperties {
System.getProperty(AppNames.propertyName("debugPlatformThreadAccess")))
.map(Boolean::parseBoolean)
.orElse(false);
defaultReleaseDataDir = AppSystemInfo.ofCurrent().getUserHome().resolve(".xpipe");
defaultDataDir = AppSystemInfo.ofCurrent().getUserHome().resolve(isStaging() ? ".xpipe-ptb" : ".xpipe");
dataDir = Optional.ofNullable(System.getProperty(AppNames.propertyName("dataDir")))
.map(s -> {
@@ -2,6 +2,7 @@ package io.xpipe.app.prefs;
import io.xpipe.app.comp.SimpleRegionBuilder;
import io.xpipe.app.comp.base.VerticalComp;
import io.xpipe.app.issue.TrackEvent;
import io.xpipe.app.platform.PlatformThread;
import io.xpipe.app.util.BooleanScope;
@@ -16,6 +17,7 @@ public class AppPrefsComp extends SimpleRegionBuilder {
@Override
protected Region createSimple() {
TrackEvent.info("paaaaa");
var categories = AppPrefs.get().getCategories().stream()
.filter(appPrefsCategory -> appPrefsCategory.show())
.toList();
@@ -30,10 +32,13 @@ public class AppPrefsComp extends SimpleRegionBuilder {
struc.getStyleClass().add("prefs-box");
});
boxComp.maxWidth(850);
TrackEvent.info("baaaaaa");
var box = boxComp.build();
TrackEvent.info("caaaaa");
var pane = new GraphicDecorationStackPane();
pane.getChildren().add(box);
TrackEvent.info("daaaaaa");
var scrollPane = new ScrollPane(pane);
@@ -83,6 +88,7 @@ public class AppPrefsComp extends SimpleRegionBuilder {
scrollPane.setFitToWidth(true);
HBox.setHgrow(scrollPane, Priority.ALWAYS);
TrackEvent.info("eaaaaaa");
var sidebar = new AppPrefsSidebarComp().build();
sidebar.setMinWidth(260);
sidebar.setPrefWidth(260);
@@ -93,6 +99,7 @@ public class AppPrefsComp extends SimpleRegionBuilder {
HBox.setMargin(sidebar, new Insets(4));
split.setFillHeight(true);
split.getStyleClass().add("prefs");
TrackEvent.info("faaaaa");
return split;
}
@@ -62,7 +62,7 @@ public class WorkspaceManager {
private void save() {
try {
var file = AppProperties.get().getDefaultDataDir().resolve("workspaces.json");
var file = AppProperties.get().getDefaultReleaseDataDir().resolve("workspaces.json");
JacksonMapper.getDefault().writeValue(file.toFile(), workspaces);
} catch (Exception e) {
ErrorEventFactory.fromThrowable(e).expected().handle();
+1 -1
View File
@@ -1 +1 @@
22.2-5
22.2-6