From 388050d0d7d0dc9fbc31db8a18a1125aeecdb26c Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 18 Sep 2025 04:38:10 +0000 Subject: [PATCH] Merge branch 'desktop-hosts' into 19-release --- .../java/io/xpipe/app/platform/OptionsBuilder.java | 1 + .../java/io/xpipe/ext/base/store/HostStore.java | 14 ++++++++++++++ lang/strings/translations_en.properties | 4 ++++ 3 files changed, 19 insertions(+) create mode 100644 ext/base/src/main/java/io/xpipe/ext/base/store/HostStore.java diff --git a/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java b/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java index b421ef421..3e052804e 100644 --- a/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java +++ b/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java @@ -293,6 +293,7 @@ public class OptionsBuilder { var prop = new SimpleStringProperty(); s.subscribe(prop::set); var comp = new TextFieldComp(prop, false); + BindingsHelper.preserve(comp, s); comp.apply(struc -> { struc.get().setEditable(false); struc.get().setOpacity(0.9); diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/HostStore.java b/ext/base/src/main/java/io/xpipe/ext/base/store/HostStore.java new file mode 100644 index 000000000..09761ab53 --- /dev/null +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/HostStore.java @@ -0,0 +1,14 @@ +package io.xpipe.ext.base.store; + +import io.xpipe.app.ext.DataStore; +import io.xpipe.app.ext.HostAddress; +import io.xpipe.app.ext.NetworkTunnelStore; +import io.xpipe.app.ext.ShellStore; +import io.xpipe.ext.base.identity.IdentityValue; + +public interface HostStore extends DataStore, ShellStore, NetworkTunnelStore { + + HostAddress getHostAddress(); + + IdentityValue getIdentity(); +} diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties index 07e4b8abb..5d3d543bd 100644 --- a/lang/strings/translations_en.properties +++ b/lang/strings/translations_en.properties @@ -1111,6 +1111,8 @@ vncSystem=VNC target system vncSystemDescription=The actual system to interact with. This is usually the same as the tunnel host vncHost=Target VNC host vncHostDescription=The system on which the VNC server is running on +vncDirectHost=Host +vncDirectHostDescription=The address of the server on which the VNC server is running on gitVaultTitle=Git vault gitVaultForcePushContent=Do you want to force push to the remote repository? This will completely replace all remote repository contents with your local one, including the history. gitVaultOverwriteLocalContent=Do you want to override your local vault changes? This will apply all remote changes to your local repository. @@ -1647,3 +1649,5 @@ netbirdPublicKey=Public key netbirdPublicKeyDescription=The internal public key of the peer netbirdHostName=Host name netbirdHostNameDescription=The hostname of the peer in the network +vncRefSystem=Associated system +vncRefSystemDescription=The connection entry to associate this VNC connection with. Leave empty if there is none