From 363cb80f88f6131c36c745365c96f0d2201999b2 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Thu, 18 Apr 2024 23:03:47 +0000
Subject: [PATCH] Fixes

---
 app/src/main/java/io/xpipe/app/core/AppProperties.java      | 2 +-
 app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java | 1 -
 .../xpipe/ext/base/desktop/DesktopCommandStoreProvider.java | 3 +--
 .../ext/base/desktop/DesktopEnvironmentStoreProvider.java   | 3 +--
 lang/base/strings/translations_en.properties                | 6 +++---
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java
index bdadfa6bb..2b2709837 100644
--- a/app/src/main/java/io/xpipe/app/core/AppProperties.java
+++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java
@@ -55,7 +55,7 @@ public class AppProperties {
                 .orElse(UUID.randomUUID());
         sentryUrl = System.getProperty("io.xpipe.app.sentryUrl");
         arch = System.getProperty("io.xpipe.app.arch");
-        languages = Arrays.asList(System.getProperty("io.xpipe.app.languages").split(";"));
+        languages = Arrays.stream(System.getProperty("io.xpipe.app.languages").split(";")).sorted().toList();
         staging = XPipeInstallation.isStaging();
         useVirtualThreads = Optional.ofNullable(System.getProperty("io.xpipe.app.useVirtualThreads"))
                 .map(Boolean::parseBoolean)
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java
index 845e03add..a61fab6cd 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java
@@ -53,7 +53,6 @@ public class ChoiceComp<T> extends Comp<CompStructure<ComboBox<T>>> {
     @Override
     public CompStructure<ComboBox<T>> createBase() {
         var cb = new ComboBox<T>();
-        cb.setMaxWidth(2000);
         cb.setConverter(new StringConverter<>() {
             @Override
             public String toString(T object) {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java
index 50a2b9723..7b04937ce 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java
@@ -74,8 +74,7 @@ public class DesktopCommandStoreProvider implements DataStoreProvider {
                                 entry,
                                 env,
                                 DesktopEnvironmentStore.class,
-                                desktopStoreDataStoreEntryRef ->
-                                        desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(),
+                                desktopStoreDataStoreEntryRef -> desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(),
                                 StoreViewState.get().getAllConnectionsCategory()),
                         env)
                 .nonNull()
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java
index d5d5cc34e..94ef9c65c 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java
@@ -127,8 +127,7 @@ public class DesktopEnvironmentStoreProvider implements DataStoreProvider {
                 .nonNull()
                 .nameAndDescription("desktopTerminal")
                 .addComp(
-                        ChoiceComp.ofTranslatable(
-                                terminal, ExternalTerminalType.getTypes(st.getUsedOsType(), true, false), true),
+                        ChoiceComp.ofTranslatable(terminal, ExternalTerminalType.getTypes(st.getUsedOsType(), true, false), true).maxWidth(2000),
                         terminal)
                 .nonNull()
                 .nameAndDescription("desktopShellDialect")
diff --git a/lang/base/strings/translations_en.properties b/lang/base/strings/translations_en.properties
index cc7980eb3..5f12de7a2 100644
--- a/lang/base/strings/translations_en.properties
+++ b/lang/base/strings/translations_en.properties
@@ -107,7 +107,7 @@ file=File
 directory=Directory
 symbolicLink=Symbolic link
 desktopEnvironment.displayName=Desktop environment
-desktopEnvironment.displayDescription=Create a reusable desktop environment configuration
+desktopEnvironment.displayDescription=Create a reusable remote desktop environment configuration
 desktopHost=Desktop host
 desktopHostDescription=The desktop connection to use as a base
 desktopShellDialect=Shell dialect
@@ -119,7 +119,7 @@ desktopInitScriptDescription=Init commands specific to this environment
 desktopTerminal=Terminal application
 desktopTerminalDescription=The terminal to use on the desktop to start scripts in
 desktopApplication.displayName=Desktop application
-desktopApplication.displayDescription=Run an application on a desktop
+desktopApplication.displayDescription=Run an application on a remote desktop
 desktopBase=Desktop
 desktopBaseDescription=The desktop to run this application on
 desktopEnvironmentBase=Desktop environment
@@ -129,7 +129,7 @@ desktopApplicationPathDescription=The path of the executable to run
 desktopApplicationArguments=Arguments
 desktopApplicationArgumentsDescription=The optional arguments to pass to the application
 desktopCommand.displayName=Desktop command
-desktopCommand.displayDescription=Run a command in a desktop environment
+desktopCommand.displayDescription=Run a command in a remote desktop environment
 desktopCommandScript=Commands
 desktopCommandScriptDescription=The commands to run in the environment