From eb45a66473cbedd173e5584f99f24de721e095b2 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Tue, 3 Jun 2025 22:44:49 +0000
Subject: [PATCH] Fixes

---
 app/src/main/java/io/xpipe/app/comp/base/ChoicePaneComp.java | 2 +-
 app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java      | 2 +-
 app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java    | 2 +-
 app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java       | 1 +
 lang/strings/fixed_en.properties                             | 2 +-
 lang/strings/translations_en.properties                      | 1 +
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/comp/base/ChoicePaneComp.java b/app/src/main/java/io/xpipe/app/comp/base/ChoicePaneComp.java
index 48604fe23..70a89e865 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/ChoicePaneComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ChoicePaneComp.java
@@ -48,7 +48,7 @@ public class ChoicePaneComp extends Comp<CompStructure<VBox>> {
             @Override
             public String toString(Entry object) {
                 if (object == null || object.name() == null) {
-                    return AppI18n.get("none");
+                    return "";
                 }
 
                 return object.name().getValue();
diff --git a/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java b/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java
index 5cf3ee5ab..84a854755 100644
--- a/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java
+++ b/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java
@@ -42,7 +42,7 @@ public class CustomVncClient implements ExternalVncClient {
                 .nameAndDescription("customVncCommand")
                 .addComp(new TextFieldComp(command, false)
                         .apply(struc -> struc.get().setPromptText("myvncclient $ADDRESS"))
-                        .maxWidth(600))
+                        .maxWidth(600), command)
                 .bind(() -> CustomVncClient.builder().command(command.get()).build(), property);
     }
 
diff --git a/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java b/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java
index c72e7bbd6..8c71a90cb 100644
--- a/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java
+++ b/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java
@@ -36,7 +36,6 @@ public interface ExternalVncClient {
     static List<Class<?>> getClasses() {
         var l = new ArrayList<Class<?>>();
         l.add(InternalVncClient.class);
-        l.add(TightVncClient.class);
         switch (OsType.getLocal()) {
             case OsType.Linux linux -> {
                 l.add(RealVncClient.Linux.class);
@@ -47,6 +46,7 @@ public interface ExternalVncClient {
                 l.add(TigerVncClient.MacOs.class);
             }
             case OsType.Windows windows -> {
+                l.add(TightVncClient.class);
                 l.add(RealVncClient.Windows.class);
                 l.add(TigerVncClient.Windows.class);
             }
diff --git a/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java b/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java
index f43ea87b4..47c40f075 100644
--- a/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java
+++ b/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java
@@ -71,6 +71,7 @@ public abstract class TigerVncClient implements ExternalVncClient {
         @Override
         public void launch(LaunchConfiguration configuration) throws Exception {
             var builder = createBuilder(configuration);
+            builder.add(0, "vncviewer");
             if (configuration.hasFixedPassword()) {
                 var pw = configuration.retrievePassword();
                 if (pw.isPresent()) {
diff --git a/lang/strings/fixed_en.properties b/lang/strings/fixed_en.properties
index 3a82513d7..cbf6d64ad 100644
--- a/lang/strings/fixed_en.properties
+++ b/lang/strings/fixed_en.properties
@@ -134,5 +134,5 @@ psono=Psono
 psonoPlaceholder=Secret ID
 vnc=VNC
 tightVnc=TightVNC
-tigherVnc=TigerVNC
+tigerVnc=TigerVNC
 realVnc=RealVNC
diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties
index 89f4cf65d..080d2f7d0 100644
--- a/lang/strings/translations_en.properties
+++ b/lang/strings/translations_en.properties
@@ -1465,3 +1465,4 @@ vncClientDescription=The VNC client to launch when opening VNC connections in XP
 integratedXPipeVncClient=Integrated XPipe VNC client
 customVncCommand=Custom command
 customVncCommandDescription=The custom command to execute to launch VNC sessions. The placeholder string $ADDRESS will be replaced by the quoted address when called.
+vncConnections=VNC connections