This commit is contained in:
crschnick 2024-02-23 04:54:04 +00:00
parent 0f01d29772
commit 6b7ce70cd7
7 changed files with 24 additions and 5 deletions

View file

@ -16,6 +16,7 @@ import io.xpipe.app.fxcomps.util.SimpleChangeListener;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.issue.ExceptionConverter;
import io.xpipe.app.issue.TrackEvent;
import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.app.storage.DataStorage;
import io.xpipe.app.storage.DataStoreEntry;
import io.xpipe.app.util.*;
@ -172,7 +173,7 @@ public class StoreCreationComp extends DialogComp {
e -> {
try {
DataStorage.get().addStoreEntryIfNotPresent(e);
if (e.getProvider().shouldHaveChildren()) {
if (e.getProvider().shouldHaveChildren() && AppPrefs.get().openConnectionSearchWindowOnConnectionCreation().get()) {
ScanAlert.showAsync(e);
}
} catch (Exception ex) {

View file

@ -224,7 +224,8 @@ public class AppSocketServer {
TrackEvent.trace("Sending server error to #" + id + ": " + se.getMessage());
Deobfuscator.deobfuscate(se);
sendServerErrorResponse(clientSocket, se);
ErrorEvent.fromThrowable(se).build().handle();
var toReport = se.getCause() != null ? se.getCause() : se;
ErrorEvent.fromThrowable(toReport).build().handle();
} catch (SocketException ex) {
// Do not send error and omit it, as this might happen often
// We do not send the error as the socket connection might be broken

View file

@ -89,6 +89,8 @@ public class AppPrefs {
map(new SimpleBooleanProperty(false), "condenseConnectionDisplay", Boolean.class);
final BooleanProperty showChildCategoriesInParentCategory =
map(new SimpleBooleanProperty(true), "showChildrenConnectionsInParentCategory", Boolean.class);
final BooleanProperty openConnectionSearchWindowOnConnectionCreation =
map(new SimpleBooleanProperty(true), "openConnectionSearchWindowOnConnectionCreation", Boolean.class);
final ObjectProperty<Path> storageDirectory =
map(new SimpleObjectProperty<>(DEFAULT_STORAGE_DIR), "storageDirectory", Path.class);
private final AppPrefsStorageHandler vaultStorageHandler =
@ -274,6 +276,10 @@ public class AppPrefs {
return showChildCategoriesInParentCategory;
}
public ObservableBooleanValue openConnectionSearchWindowOnConnectionCreation() {
return openConnectionSearchWindowOnConnectionCreation;
}
public ReadOnlyProperty<CloseBehaviour> closeBehaviour() {
return closeBehaviour;
}

View file

@ -32,8 +32,14 @@ public class AppearanceCategory extends AppPrefsCategory {
.addToggle(prefs.useSystemFont)
.nameAndDescription("condenseConnectionDisplay")
.addToggle(prefs.condenseConnectionDisplay)
.nameAndDescription("showChildCategoriesInParentCategory")
.addToggle(prefs.showChildCategoriesInParentCategory))
.nameAndDescription("showChildCategoriesInParentCategory")
.addToggle(prefs.showChildCategoriesInParentCategory)
)
.addTitle("workflow")
.sub(new OptionsBuilder()
.nameAndDescription("openConnectionSearchWindowOnConnectionCreation")
.addToggle(prefs.openConnectionSearchWindowOnConnectionCreation)
)
.addTitle("windowOptions")
.sub(new OptionsBuilder()
.nameAndDescription("windowOpacity")

View file

@ -61,6 +61,9 @@ condenseConnectionDisplay=Condense connection display
condenseConnectionDisplayDescription=Make every top level connection take a less vertical space to allow for a more condensed connection list.
enforceWindowModality=Enforce window modality
enforceWindowModalityDescription=Makes secondary windows, such the connection creation dialog, block all input for the main window while they are open. This is useful if you sometimes misclick.
openConnectionSearchWindowOnConnectionCreation=Open connection search window on connection creation
openConnectionSearchWindowOnConnectionCreationDescription=Whether or not to automatically open the window to search for available subconnections upon adding a new shell connection.
workflow=Workflow
system=System
application=Application
updateToPrereleases=Include prereleases

View file

@ -24,6 +24,7 @@ public class ShellDialects {
public static ShellDialect FISH;
public static ShellDialect CISCO;
public static ShellDialect MIKROTIK;
public static ShellDialect RBASH;
public static List<ShellDialect> getStartableDialects() {
@ -72,6 +73,7 @@ public class ShellDialects {
ASH = byId("ash");
SH = byId("sh");
CISCO = byId("cisco");
MIKROTIK = byId("mikrotik");
RBASH = byId("rbash");
}

View file

@ -12,7 +12,7 @@ The terminal launcher functionality got completely reworked with the goal to mak
## Proxmox integration
There is now support to directly query all VMs and containers located on a Proxmox system via the `pct` and `qm` tools. The containers can be accessed directly as any other containers while the VMs can be accessed via SSH. In case no SSH server is running in a vm, you can also choose to set one up automatically within XPipe.
There is now support to directly query all VMs and containers located on a Proxmox system via the `pct` and `qm` tools. The containers can be accessed directly as any other containers while the VMs can be accessed via SSH. In case no SSH server is running in a vm, you can also choose to start one within XPipe.
This feature will probably be available in the professional version in the full release but is available for everyone in the PTB release.