From 08f0001b9d6b65f88a08af019fedc15de67683f3 Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 4 Sep 2024 08:03:39 +0000 Subject: [PATCH] Various fixed and additions --- .../java/io/xpipe/app/comp/store/StoreCreationComp.java | 3 +++ app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java | 8 +++++--- lang/proc/strings/translations_da.properties | 4 ++++ lang/proc/strings/translations_de.properties | 4 ++++ lang/proc/strings/translations_en.properties | 5 ++++- lang/proc/strings/translations_es.properties | 4 ++++ lang/proc/strings/translations_fr.properties | 4 ++++ lang/proc/strings/translations_it.properties | 4 ++++ lang/proc/strings/translations_ja.properties | 4 ++++ lang/proc/strings/translations_nl.properties | 4 ++++ lang/proc/strings/translations_pt.properties | 4 ++++ lang/proc/strings/translations_ru.properties | 4 ++++ lang/proc/strings/translations_tr.properties | 4 ++++ lang/proc/strings/translations_zh.properties | 4 ++++ 14 files changed, 56 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java index e9d40dc3..528fff92 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java @@ -426,6 +426,9 @@ public class StoreCreationComp extends DialogComp { && (providerChoice.getProviders().size() > 1 || providerChoice.getProviders().getFirst().showProviderChoice())) || (staticDisplay && provider.getValue().showProviderChoice()); + if (staticDisplay) { + providerChoice.apply(struc -> struc.get().setDisable(true)); + } if (showProviders) { providerChoice.onSceneAssign(struc -> struc.get().requestFocus()); } diff --git a/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java index 10ed192d..cf5d388d 100644 --- a/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java +++ b/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java @@ -35,9 +35,11 @@ public class GuiErrorHandler extends GuiErrorHandlerBase implements ErrorHandler .findFirst(); if (lex.isPresent()) { LicenseProvider.get().showLicenseAlert(lex.get()); - event.setLicenseRequired(true); - event.clearAttachments(); - ErrorAction.ignore().handle(event); + if (!LicenseProvider.get().hasPaidLicense()) { + event.setLicenseRequired(true); + event.clearAttachments(); + ErrorAction.ignore().handle(event); + } } else { ErrorHandlerComp.showAndTryWait(event, true); } diff --git a/lang/proc/strings/translations_da.properties b/lang/proc/strings/translations_da.properties index 2284c2b3..96a7a9ea 100644 --- a/lang/proc/strings/translations_da.properties +++ b/lang/proc/strings/translations_da.properties @@ -396,3 +396,7 @@ hyperVVm.displayDescription=Opret forbindelse til en Hyper-V VM via SSH eller PS trustHost=Tillidsvært trustHostDescription=Tilføj ComputerName til listen over betroede værter copyIp=Kopier IP +setupSsh=Opsætning af SSH-server +hypervSshSetupTitle=Opsætning af SSH-server +hypervSshSetupHeader=Vil du installere Windows OpenSSH-serveren på denne VM? +hypervSshSetupContent=Dette giver XPipe mulighed for at oprette forbindelse via SSH og giver flere funktioner. Denne installation vil tage et stykke tid. diff --git a/lang/proc/strings/translations_de.properties b/lang/proc/strings/translations_de.properties index 91247184..15ce64f7 100644 --- a/lang/proc/strings/translations_de.properties +++ b/lang/proc/strings/translations_de.properties @@ -374,3 +374,7 @@ hyperVVm.displayDescription=Verbindung zu einer Hyper-V VM über SSH oder PSSess trustHost=Vertrauenswürdiger Host trustHostDescription=Computername zur Liste der vertrauenswürdigen Hosts hinzufügen copyIp=IP kopieren +setupSsh=SSH-Server einrichten +hypervSshSetupTitle=SSH-Server einrichten +hypervSshSetupHeader=Willst du den Windows OpenSSH-Server auf dieser VM installieren? +hypervSshSetupContent=Dadurch kann XPipe eine Verbindung über SSH herstellen und bietet mehr Funktionen. Diese Installation wird eine Weile dauern. diff --git a/lang/proc/strings/translations_en.properties b/lang/proc/strings/translations_en.properties index 7cbcdbe6..eb1de84f 100644 --- a/lang/proc/strings/translations_en.properties +++ b/lang/proc/strings/translations_en.properties @@ -372,4 +372,7 @@ hyperVVm.displayDescription=Connect to a Hyper-V VM via SSH or PSSession trustHost=Trust host trustHostDescription=Add ComputerName to trusted hosts list copyIp=Copy IP - +setupSsh=Setup SSH server +hypervSshSetupTitle=Setup SSH server +hypervSshSetupHeader=Do you want to install the Windows OpenSSH server on this VM? +hypervSshSetupContent=This will allow XPipe to connect via SSH and provide more functionality. This installation will take a while. diff --git a/lang/proc/strings/translations_es.properties b/lang/proc/strings/translations_es.properties index 0bb0495b..b49a1ed7 100644 --- a/lang/proc/strings/translations_es.properties +++ b/lang/proc/strings/translations_es.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=Conectarse a una máquina virtual Hyper-V mediante S trustHost=Host de confianza trustHostDescription=Añadir ComputerName a la lista de hosts de confianza copyIp=Copiar IP +setupSsh=Configurar servidor SSH +hypervSshSetupTitle=Configurar servidor SSH +hypervSshSetupHeader=¿Quieres instalar el servidor OpenSSH de Windows en esta máquina virtual? +hypervSshSetupContent=Esto permitirá a XPipe conectarse a través de SSH y proporcionará más funcionalidad. Esta instalación llevará un tiempo. diff --git a/lang/proc/strings/translations_fr.properties b/lang/proc/strings/translations_fr.properties index 9fde71e5..a3136515 100644 --- a/lang/proc/strings/translations_fr.properties +++ b/lang/proc/strings/translations_fr.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=Se connecter à une VM Hyper-V via SSH ou PSSession trustHost=Hôte de confiance trustHostDescription=Ajoute NomOrdinateur à la liste des hôtes de confiance copyIp=Copier l'IP +setupSsh=Configurer le serveur SSH +hypervSshSetupTitle=Configurer le serveur SSH +hypervSshSetupHeader=Veux-tu installer le serveur Windows OpenSSH sur cette VM ? +hypervSshSetupContent=Cela permettra à XPipe de se connecter via SSH et de fournir plus de fonctionnalités. Cette installation prendra un certain temps. diff --git a/lang/proc/strings/translations_it.properties b/lang/proc/strings/translations_it.properties index 7a2c1264..77a4dbd5 100644 --- a/lang/proc/strings/translations_it.properties +++ b/lang/proc/strings/translations_it.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=Connettersi a una macchina virtuale Hyper-V tramite trustHost=Host fiduciario trustHostDescription=Aggiungi NomeComputer all'elenco degli host attendibili copyIp=Copia IP +setupSsh=Configurazione del server SSH +hypervSshSetupTitle=Configurazione del server SSH +hypervSshSetupHeader=Vuoi installare il server OpenSSH di Windows su questa macchina virtuale? +hypervSshSetupContent=Questo permetterà a XPipe di connettersi tramite SSH e di fornire maggiori funzionalità. L'installazione richiederà un po' di tempo. diff --git a/lang/proc/strings/translations_ja.properties b/lang/proc/strings/translations_ja.properties index c3d1f9d5..0da2f4e8 100644 --- a/lang/proc/strings/translations_ja.properties +++ b/lang/proc/strings/translations_ja.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=SSHまたはPSSession経由でHyper-V VMに接続す trustHost=トラストホスト trustHostDescription=ComputerNameを信頼済みホストリストに追加する copyIp=コピーIP +setupSsh=SSHサーバーをセットアップする +hypervSshSetupTitle=SSHサーバーをセットアップする +hypervSshSetupHeader=このVMにWindows OpenSSHサーバーをインストールするか？ +hypervSshSetupContent=これにより、XPipeはSSH経由で接続できるようになり、より多くの機能を提供できるようになる。このインストールにはしばらく時間がかかる。 diff --git a/lang/proc/strings/translations_nl.properties b/lang/proc/strings/translations_nl.properties index 8d17e330..513fef1e 100644 --- a/lang/proc/strings/translations_nl.properties +++ b/lang/proc/strings/translations_nl.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=Verbinding maken met een Hyper-V VM via SSH of PSSes trustHost=Vertrouwende host trustHostDescription=ComputerNaam toevoegen aan vertrouwde hosts lijst copyIp=IP kopiëren +setupSsh=SSH-server instellen +hypervSshSetupTitle=SSH-server instellen +hypervSshSetupHeader=Wil je de Windows OpenSSH server op deze VM installeren? +hypervSshSetupContent=Hierdoor kan XPipe verbinding maken via SSH en meer functionaliteit bieden. Deze installatie duurt even. diff --git a/lang/proc/strings/translations_pt.properties b/lang/proc/strings/translations_pt.properties index bffdebe7..fb19276f 100644 --- a/lang/proc/strings/translations_pt.properties +++ b/lang/proc/strings/translations_pt.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=Liga-te a uma VM Hyper-V através de SSH ou PSSessio trustHost=Anfitrião de confiança trustHostDescription=Adiciona ComputerName à lista de anfitriões de confiança copyIp=Copia o IP +setupSsh=Configura o servidor SSH +hypervSshSetupTitle=Configura o servidor SSH +hypervSshSetupHeader=Queres instalar o servidor Windows OpenSSH nesta VM? +hypervSshSetupContent=Isso permitirá que o XPipe se conecte via SSH e forneça mais funcionalidades. Esta instalação vai demorar um pouco. diff --git a/lang/proc/strings/translations_ru.properties b/lang/proc/strings/translations_ru.properties index f5fd4906..79fb0163 100644 --- a/lang/proc/strings/translations_ru.properties +++ b/lang/proc/strings/translations_ru.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=Подключение к виртуальной м trustHost=Доверительный хост trustHostDescription=Добавьте ComputerName в список доверенных хостов copyIp=Копировать IP +setupSsh=Настройка SSH-сервера +hypervSshSetupTitle=Настройка SSH-сервера +hypervSshSetupHeader=Хочешь ли ты установить сервер Windows OpenSSH на эту виртуальную машину? +hypervSshSetupContent=Это позволит XPipe подключаться через SSH и обеспечит большую функциональность. Установка займет некоторое время. diff --git a/lang/proc/strings/translations_tr.properties b/lang/proc/strings/translations_tr.properties index 453db6ac..6b84cbb4 100644 --- a/lang/proc/strings/translations_tr.properties +++ b/lang/proc/strings/translations_tr.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=SSH veya PSSession aracılığıyla bir Hyper-V sana trustHost=Güven ev sahibi trustHostDescription=ComputerName'i güvenilir ana bilgisayarlar listesine ekleme copyIp=IP Kopyala +setupSsh=SSH sunucusunu kurun +hypervSshSetupTitle=SSH sunucusunu kurun +hypervSshSetupHeader=Windows OpenSSH sunucusunu bu sanal makineye kurmak istiyor musunuz? +hypervSshSetupContent=Bu, XPipe'ın SSH üzerinden bağlanmasına ve daha fazla işlevsellik sağlamasına olanak tanıyacaktır. Bu kurulum biraz zaman alacaktır. diff --git a/lang/proc/strings/translations_zh.properties b/lang/proc/strings/translations_zh.properties index 394ce119..b12fda66 100644 --- a/lang/proc/strings/translations_zh.properties +++ b/lang/proc/strings/translations_zh.properties @@ -370,3 +370,7 @@ hyperVVm.displayDescription=通过 SSH 或 PSSession 连接到 Hyper-V 虚拟机 trustHost=信任主机 trustHostDescription=将 ComputerName 添加到受信任主机列表 copyIp=复制 IP +setupSsh=设置 SSH 服务器 +hypervSshSetupTitle=设置 SSH 服务器 +hypervSshSetupHeader=您要在此虚拟机上安装 Windows OpenSSH 服务器吗？ +hypervSshSetupContent=这将允许 XPipe 通过 SSH 进行连接，并提供更多功能。安装需要一段时间。