From cd2f3655c67aa89d647b416502a7a4edd8af273f Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 29 May 2026 17:22:08 +0000 Subject: [PATCH] Rework --- .../java/io/xpipe/app/cred/SshAgentKeyListComp.java | 1 + .../main/java/io/xpipe/app/process/ShellControl.java | 11 +++++++++++ lang/strings/translations_en.properties | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java index 325ea3047..d26472459 100644 --- a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java +++ b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java @@ -82,6 +82,7 @@ public class SshAgentKeyListComp extends SimpleRegionBuilder { content.setPadding(new Insets(10)); content.setFillWidth(true); var header = new Label(AppI18n.get("sshAgentHasKeys")); + header.getStyleClass().add(Styles.TEXT_BOLD); header.setPadding(new Insets(0, 0, 8, 8)); content.getChildren().add(header); for (SshAgentKeyList.Entry entry : list) { diff --git a/app/src/main/java/io/xpipe/app/process/ShellControl.java b/app/src/main/java/io/xpipe/app/process/ShellControl.java index 70b17d79f..d880bf892 100644 --- a/app/src/main/java/io/xpipe/app/process/ShellControl.java +++ b/app/src/main/java/io/xpipe/app/process/ShellControl.java @@ -248,6 +248,17 @@ public interface ShellControl extends ProcessControl { } } + default void enforcePowershell(FailableConsumer sc) + throws Exception { + if (ShellDialects.isPowershell(this)) { + sc.accept(this); + } else { + try (var sub = subShell(ShellDialects.POWERSHELL).start()) { + sc.accept(sub); + } + } + } + default T enforceDialect(@NonNull ShellDialect type, FailableFunction sc) throws Exception { if (type.equals(getShellDialect())) { diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties index 2cf39a683..84c2aebdf 100644 --- a/lang/strings/translations_en.properties +++ b/lang/strings/translations_en.properties @@ -2048,7 +2048,7 @@ passwordManagerKeyStrategyDescription=How to retrieve SSH keys stored in the pas sshAgentNoKeys=The agent does not have any keys at the moment sshAgentHasKeys=The agent currently offers the following keys: networkInterfacesBroadcastNone=No network interfaces could automatically be detected -networkInterfacesBroadcastFound=The gateway system has the following broadcast addresses: +networkInterfacesBroadcastFound=The broadcast host has the following broadcast addresses: networkInterfacesNone=No network interfaces could automatically be detected networkInterfacesFound=The system has the following network interfaces: passwordManagerNoAgentSupport=Password manager does not support retrieving SSH keys via an agent @@ -2207,7 +2207,9 @@ wakeOnLanHost=Target host wakeOnLanHostDescription=The system to wake wakeOnLanGateway=Broadcast host wakeOnLanGatewayDescription=The system from which to send the broadcast -wakeOnLanAddress=Network interface +wakeOnLanBroadcastAddress=Broadcast address +wakeOnLanBroadcastAddressDescription=The broadcast address to send the packet to +wakeOnLanAddress=MAC address wakeOnLanAddressDescription=The MAC address of the target network interface wakeOnLan.displayName=Wake-on-Lan wakeOnLan.displayDescription=Wake a sleeping computer by sending a magic packet