diff --git a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java index 9c639cc6f..17afad0e3 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java @@ -99,9 +99,7 @@ public class IntegratedTextAreaComp extends RegionStructureBuilder { if (newValue.getTitle() != null) { var l = new LabelComp( - newValue.getTitle().getValue(), - newValue.getGraphic() != null + newValue.getTitle(), + new SimpleObjectProperty<>(newValue.getGraphic() != null ? newValue.getGraphic() - : new LabelGraphic.IconGraphic("mdi2i-information-outline")); + : new LabelGraphic.IconGraphic("mdi2i-information-outline"))); l.apply(struc -> { struc.setGraphicTextGap(8); AppFontSizes.xl(struc); diff --git a/app/src/main/java/io/xpipe/app/ext/ShellDialectChoiceComp.java b/app/src/main/java/io/xpipe/app/ext/ShellDialectChoiceComp.java index 08ee6cfb0..1db80f878 100644 --- a/app/src/main/java/io/xpipe/app/ext/ShellDialectChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/ext/ShellDialectChoiceComp.java @@ -31,34 +31,10 @@ public class ShellDialectChoiceComp extends SimpleRegionBuilder { NULL_DISABLED } - public static final Map ICONS = new LinkedHashMap<>(); - - static { - ICONS.put(ShellDialects.CMD, "cmd_icon.svg"); - ICONS.put(ShellDialects.POWERSHELL, "powershell_logo.svg"); - ICONS.put(ShellDialects.POWERSHELL_CORE, "pwsh_logo.png"); - ICONS.put(ShellDialects.SH, "sh_icon.svg"); - ICONS.put(ShellDialects.ASH, "sh_icon.svg"); - ICONS.put(ShellDialects.DASH, "sh_icon.svg"); - ICONS.put(ShellDialects.BASH, "bash_icon.svg"); - ICONS.put(ShellDialects.FISH, "fish_icon.svg"); - ICONS.put(ShellDialects.ZSH, "zsh_icon.svg"); - ICONS.put(ShellDialects.NUSHELL, "nushell_icon.svg"); - ICONS.put(ShellDialects.XONSH, "xonsh_icon.png"); - } - private final List available; private final Property selected; private final NullHandling nullHandling; - public static String getImageName(ShellDialect t) { - if (t == null) { - return "proc:defaultShell_icon.svg"; - } - - return "proc:" + ICONS.get(t); - } - @Override protected Region createSimple() { Supplier> supplier = () -> new ListCell<>() { @@ -71,12 +47,7 @@ public class ShellDialectChoiceComp extends SimpleRegionBuilder { : nullHandling == NullHandling.NULL_IS_ALL ? AppI18n.get("all") : AppI18n.get("default")); - setGraphic( - item != null - ? PrettyImageHelper.ofFixedSizeSquare("proc:" + ICONS.get(item), 16) - .build() - : PrettyImageHelper.ofFixedSizeSquare("proc:defaultShell_icon.svg", 16) - .build()); + setGraphic(PrettyImageHelper.ofFixedSizeSquare(ShellDialectIcons.getImageName(item), 16).build()); } }; var cb = new ComboBox(); diff --git a/app/src/main/java/io/xpipe/app/ext/ShellDialectIcons.java b/app/src/main/java/io/xpipe/app/ext/ShellDialectIcons.java new file mode 100644 index 000000000..14b3a4b6b --- /dev/null +++ b/app/src/main/java/io/xpipe/app/ext/ShellDialectIcons.java @@ -0,0 +1,48 @@ +package io.xpipe.app.ext; + + +import io.xpipe.app.comp.SimpleRegionBuilder; +import io.xpipe.app.comp.base.PrettyImageHelper; +import io.xpipe.app.core.AppI18n; +import io.xpipe.app.platform.MenuHelper; +import io.xpipe.app.process.ShellDialect; +import io.xpipe.app.process.ShellDialects; +import javafx.beans.property.Property; +import javafx.scene.control.ComboBox; +import javafx.scene.control.ListCell; +import javafx.scene.control.skin.ComboBoxListViewSkin; +import javafx.scene.input.KeyCode; +import javafx.scene.layout.Region; +import lombok.AllArgsConstructor; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; + +public class ShellDialectIcons { + + private static final Map ICONS = new LinkedHashMap<>(); + + static { + ICONS.put(ShellDialects.CMD, "cmd_icon.svg"); + ICONS.put(ShellDialects.POWERSHELL, "powershell_icon.svg"); + ICONS.put(ShellDialects.POWERSHELL_CORE, "pwsh_icon.svg"); + ICONS.put(ShellDialects.SH, "sh_icon.svg"); + ICONS.put(ShellDialects.ASH, "sh_icon.svg"); + ICONS.put(ShellDialects.DASH, "sh_icon.svg"); + ICONS.put(ShellDialects.BASH, "bash_icon.svg"); + ICONS.put(ShellDialects.FISH, "fish_icon.svg"); + ICONS.put(ShellDialects.ZSH, "zsh_icon.svg"); + ICONS.put(ShellDialects.NUSHELL, "nushell_icon.svg"); + ICONS.put(ShellDialects.XONSH, "xonsh_icon.svg"); + } + + public static String getImageName(ShellDialect t) { + if (t == null) { + return "proc:defaultShell_icon.svg"; + } + + return "proc:" + ICONS.get(t); + } +} diff --git a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java index d6f0c642d..0df9af5dc 100644 --- a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java @@ -2,10 +2,13 @@ package io.xpipe.app.pwman; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ProcessControlProvider; +import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.CommandSupport; +import io.xpipe.app.process.ProcessOutputException; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.util.DocumentationLink; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; @@ -70,7 +73,11 @@ public class OnePasswordManager implements PasswordManager { username != null ? username.asText() : null, password != null ? InPlaceSecretValue.of(password.asText()) : null); } catch (Exception e) { - ErrorEventFactory.fromThrowable(e).handle(); + var event = ErrorEventFactory.fromThrowable(e); + if (!key.startsWith("op://") && e instanceof ProcessOutputException pex && pex.getOutput().contains("Specify the item")) { + event.documentationLink(DocumentationLink.ONE_PASSWORD_KEYS).expected(); + } + event.handle(); return null; } } diff --git a/app/src/main/java/io/xpipe/app/util/DocumentationLink.java b/app/src/main/java/io/xpipe/app/util/DocumentationLink.java index 054c4035e..36a593c3c 100644 --- a/app/src/main/java/io/xpipe/app/util/DocumentationLink.java +++ b/app/src/main/java/io/xpipe/app/util/DocumentationLink.java @@ -97,6 +97,7 @@ public enum DocumentationLink { SHELL_ENVIRONMENTS_SCRIPTS("guide/environments#scripts"), SERIAL("guide/serial"), ICONS("guide/hub#icons"), + ONE_PASSWORD_KEYS("guide/password-manager#key-format"), GNOME_WAYLAND_SCALING("troubleshoot/wayland-blur"), BEACON_PORT_BIND("troubleshoot/beacon-port"), SERIAL_IMPLEMENTATION("guide/serial#serial-implementations"), diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java index 2d16ef873..27e456b47 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java @@ -103,6 +103,11 @@ public class DesktopApplicationStoreProvider implements DataStoreProvider { return "base:desktopApplication_icon.svg"; } + @Override + public int getOrderPriority() { + return 2; + } + @Override public DataStore defaultStore(DataStoreCategory category) { return DesktopApplicationStore.builder().build(); diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportDialog.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportDialog.java index a499e4d58..8da759245 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportDialog.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportDialog.java @@ -3,11 +3,13 @@ package io.xpipe.ext.base.script; import io.xpipe.app.comp.base.*; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ShellDialectChoiceComp; +import io.xpipe.app.ext.ShellDialectIcons; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.platform.DerivedObservableList; import io.xpipe.app.platform.LabelGraphic; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.BooleanScope; +import io.xpipe.app.util.ThreadHelper; import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.*; @@ -23,7 +25,7 @@ public class ScriptCollectionSourceImportDialog { private final ScriptCollectionSource source; private final ObservableList available = FXCollections.observableArrayList(); - private final DerivedObservableList shown = DerivedObservableList.arrayList(true); + private final ObservableList shown = FXCollections.observableArrayList(); private final ObservableList selected = FXCollections.observableArrayList(); private final StringProperty filter = new SimpleStringProperty(); private final BooleanProperty busy = new SimpleBooleanProperty(); @@ -55,24 +57,26 @@ public class ScriptCollectionSourceImportDialog { }); var refresh = new ButtonComp(null, new FontIcon("mdmz-refresh"), () -> { - try (var ignored = new BooleanScope(busy).exclusive().start()) { - source.prepare(); - var all = source.listScripts(); - available.setAll(all); - update(); - } catch (Exception e) { - ErrorEventFactory.fromThrowable(e).handle(); - } + ThreadHelper.runAsync(() -> { + try (var ignored = new BooleanScope(busy).exclusive().start()) { + source.prepare(); + var all = source.listScripts(); + available.setAll(all); + update(); + } catch (Exception e) { + ErrorEventFactory.fromThrowable(e).handle(); + } + }); }).maxHeight(100); var notFound = new LabelComp(AppI18n.observable("noScriptsFound")); - notFound.show(Bindings.isEmpty(shown.getList()).and(busy.not())); + notFound.show(Bindings.isEmpty(shown).and(busy.not())); - var selector = new ListSelectorComp<>(shown.getList(), + var selector = new ListSelectorComp<>(shown, e -> e.getName()+ " [" + e.getDialect().getDisplayName() + "]", - e -> new LabelGraphic.ImageGraphic(ShellDialectChoiceComp.getImageName(e.getDialect()), 16), + e -> new LabelGraphic.ImageGraphic(ShellDialectIcons.getImageName(e.getDialect()), 16), selected, e -> false, - () -> shown.getList().size() > 0); + () -> shown.size() > 0); selector.disable(busy); var stack = new StackComp(List.of(notFound, selector)); @@ -96,7 +100,7 @@ public class ScriptCollectionSourceImportDialog { private void update() { if (filter.get() == null) { - shown.setContent(available); + shown.setAll(available); count.set(available.size()); return; } @@ -106,7 +110,7 @@ public class ScriptCollectionSourceImportDialog { var newList = new ArrayList(); newList.addAll(selected); newList.addAll(filtered); - shown.setContent(newList); + shown.setAll(newList); count.set(newList.size()); } } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportHubProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportHubProvider.java index 55687ab39..2774d0eb4 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportHubProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceImportHubProvider.java @@ -29,7 +29,7 @@ public class ScriptCollectionSourceImportHubProvider implements HubLeafProvider< @Override public LabelGraphic getIcon(DataStoreEntryRef store) { - return new LabelGraphic.IconGraphic("mdi2e-export"); + return new LabelGraphic.IconGraphic("mdi2f-file-undo-outline"); } @Override diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreProvider.java index ca39aae6f..8b871baa4 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreProvider.java @@ -217,7 +217,7 @@ public class ScriptStoreProvider implements EnabledParentStoreProvider, DataStor } ScriptStore st = store.asNeeded(); - return ShellDialectChoiceComp.getImageName(st.getMinimumDialect()); + return ShellDialectIcons.getImageName(st.getMinimumDialect()); } @Override diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16-dark.png index c4fdcb5af..0772f1e34 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16.png index c4fdcb5af..695ea3688 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-16.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24-dark.png index 62530083d..2570db319 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24.png index 62530083d..8dba0a420 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-24.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40-dark.png index 08bf1dc0d..cb2391be7 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40.png index 08bf1dc0d..63e0fd800 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-40.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80-dark.png index 7e3846641..f345032da 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80.png index 7e3846641..89bbde1f9 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopApplication_icon-80.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-16-dark.png deleted file mode 100644 index 49d79a70f..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-16-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-16.png deleted file mode 100644 index 49d79a70f..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-16.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-24-dark.png deleted file mode 100644 index fd49f0e84..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-24-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-24.png deleted file mode 100644 index fd49f0e84..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-24.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-40-dark.png deleted file mode 100644 index fc366ea7e..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-40-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-40.png deleted file mode 100644 index fc366ea7e..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-40.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-80-dark.png deleted file mode 100644 index fbd58ca30..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-80-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-80.png deleted file mode 100644 index fbd58ca30..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopCommand_icon-80.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-16-dark.png deleted file mode 100644 index 78169e7fd..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-16-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-16.png deleted file mode 100644 index 78169e7fd..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-16.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-24-dark.png deleted file mode 100644 index 0cb2954ab..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-24-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-24.png deleted file mode 100644 index 0cb2954ab..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-24.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-40-dark.png deleted file mode 100644 index 7db653e63..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-40-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-40.png deleted file mode 100644 index 7db653e63..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-40.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-80-dark.png deleted file mode 100644 index 956cc2e21..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-80-dark.png and /dev/null differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-80.png deleted file mode 100644 index 956cc2e21..000000000 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/desktopEnvironment_icon-80.png and /dev/null differ diff --git a/img/base/desktopApplication_icon-dark.svg b/img/base/desktopApplication_icon-dark.svg index 9186ef3aa..7ebae066d 100644 --- a/img/base/desktopApplication_icon-dark.svg +++ b/img/base/desktopApplication_icon-dark.svg @@ -1,97 +1,48 @@ - - - - - - - - - - - - - - - - - - - + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/">identityidentity diff --git a/img/base/desktopApplication_icon.svg b/img/base/desktopApplication_icon.svg index f0f5b4ef0..d150e2bf9 100644 --- a/img/base/desktopApplication_icon.svg +++ b/img/base/desktopApplication_icon.svg @@ -1,97 +1,48 @@ - - - - - - - - - - - - - - - - - - - + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/">identityidentity diff --git a/img/base/desktopCommand_icon-dark.svg b/img/base/desktopCommand_icon-dark.svg deleted file mode 100644 index d8107c4ef..000000000 --- a/img/base/desktopCommand_icon-dark.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/img/base/desktopCommand_icon.svg b/img/base/desktopCommand_icon.svg deleted file mode 100644 index 024408baa..000000000 --- a/img/base/desktopCommand_icon.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/img/base/desktopEnvironment_icon-dark.svg b/img/base/desktopEnvironment_icon-dark.svg deleted file mode 100644 index f9f467091..000000000 --- a/img/base/desktopEnvironment_icon-dark.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - shell environment v2 - - - - - - - shell environment v2 - - - - diff --git a/img/base/desktopEnvironment_icon.svg b/img/base/desktopEnvironment_icon.svg deleted file mode 100644 index 22440eebe..000000000 --- a/img/base/desktopEnvironment_icon.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - shell environment v2 - - - - - - - shell environment v2 - - - - diff --git a/img/proc/actionMacro_icon.svg b/img/proc/actionMacro_icon.svg deleted file mode 100644 index 550631b55..000000000 --- a/img/proc/actionMacro_icon.svg +++ /dev/null @@ -1,57 +0,0 @@ - -ssh draftssh draft diff --git a/img/proc/appleContainers_icon-16.png b/img/proc/appleContainers_icon-16.png new file mode 100644 index 000000000..e0336aa3d Binary files /dev/null and b/img/proc/appleContainers_icon-16.png differ diff --git a/img/proc/appleContainers_icon-24.png b/img/proc/appleContainers_icon-24.png new file mode 100644 index 000000000..e6088717a Binary files /dev/null and b/img/proc/appleContainers_icon-24.png differ diff --git a/img/proc/appleContainers_icon-40.png b/img/proc/appleContainers_icon-40.png new file mode 100644 index 000000000..15a9baee8 Binary files /dev/null and b/img/proc/appleContainers_icon-40.png differ diff --git a/img/proc/appleContainers_icon-80.png b/img/proc/appleContainers_icon-80.png new file mode 100644 index 000000000..6d946f86a Binary files /dev/null and b/img/proc/appleContainers_icon-80.png differ diff --git a/img/proc/appleContainers_icon.png b/img/proc/appleContainers_icon.png deleted file mode 100644 index 237bb9640..000000000 Binary files a/img/proc/appleContainers_icon.png and /dev/null differ diff --git a/img/proc/cmd_icon-dark.svg b/img/proc/cmd_icon-dark.svg index c43fbc7d5..df10ad1bc 100644 --- a/img/proc/cmd_icon-dark.svg +++ b/img/proc/cmd_icon-dark.svg @@ -8,32 +8,39 @@ y="0px" viewBox="0 0 188.2 188.2" xml:space="preserve" - sodipodi:docname="cmd_icon.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + sodipodi:docname="cmd_icon-dark.svg" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" width="188.2" height="188.2" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + inkscape:current-layer="Layer_1" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> - - ssh draft - - - - ssh draft - - - - - identityidentity - - - - + id="path975" /> diff --git a/img/proc/rdpFile_icon.svg b/img/proc/rdpFile_icon.svg index deadd4709..9e3a2c977 100644 --- a/img/proc/rdpFile_icon.svg +++ b/img/proc/rdpFile_icon.svg @@ -5,80 +5,56 @@ viewBox="0 0 204.59 204.59" version="1.1" sodipodi:docname="rdpFile_icon.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" - inkscape:export-filename="C:\Projects\xpipe\xpipex\ext\proc\src\main\resources\io\xpipe\ext\proc\resources\img\ssh_icon-16.png" - inkscape:export-xdpi="7.5076985" - inkscape:export-ydpi="7.5076985" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - ssh draft - - - - ssh draft - - - - - identityidentity - - - - + id="path975" /> diff --git a/img/proc/rdpTunnel_icon-dark.svg b/img/proc/rdpTunnel_icon-dark.svg new file mode 100644 index 000000000..7e407f92e --- /dev/null +++ b/img/proc/rdpTunnel_icon-dark.svg @@ -0,0 +1,59 @@ + +identityidentity diff --git a/img/proc/rdpTunnel_icon.svg b/img/proc/rdpTunnel_icon.svg new file mode 100644 index 000000000..46406b99e --- /dev/null +++ b/img/proc/rdpTunnel_icon.svg @@ -0,0 +1,59 @@ + +identityidentity diff --git a/img/proc/rdp_icon-dark.svg b/img/proc/rdp_icon-dark.svg index e3731006c..5bd8b0c94 100644 --- a/img/proc/rdp_icon-dark.svg +++ b/img/proc/rdp_icon-dark.svg @@ -5,67 +5,50 @@ viewBox="0 0 204.59 204.59" version="1.1" sodipodi:docname="rdp_icon-dark.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" - inkscape:export-filename="C:\Projects\xpipe\xpipex\ext\proc\src\main\resources\io\xpipe\ext\proc\resources\img\ssh_icon-16.png" - inkscape:export-xdpi="7.5076985" - inkscape:export-ydpi="7.5076985" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - ssh draft - - - - ssh draft - - - - - identityidentity - - + style="fill:#35c233;fill-opacity:1;stroke-width:1.60407" + sodipodi:nodetypes="cccccccc" /> diff --git a/img/proc/rdp_icon.svg b/img/proc/rdp_icon.svg index 3a680defe..5ac61fafa 100644 --- a/img/proc/rdp_icon.svg +++ b/img/proc/rdp_icon.svg @@ -5,67 +5,50 @@ viewBox="0 0 204.59 204.59" version="1.1" sodipodi:docname="rdp_icon.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" - inkscape:export-filename="C:\Projects\xpipe\xpipex\ext\proc\src\main\resources\io\xpipe\ext\proc\resources\img\ssh_icon-16.png" - inkscape:export-xdpi="7.5076985" - inkscape:export-ydpi="7.5076985" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - ssh draft - - - - ssh draft - - - - - identityidentity - - + style="fill:#30962e;fill-opacity:1;stroke-width:1.60407" + sodipodi:nodetypes="cccccccc" /> diff --git a/img/proc/sh_icon-dark.svg b/img/proc/sh_icon-dark.svg index 0f7d54491..db7a4c6e9 100644 --- a/img/proc/sh_icon-dark.svg +++ b/img/proc/sh_icon-dark.svg @@ -5,7 +5,7 @@ viewBox="0 0 188.16 188.16" version="1.1" sodipodi:docname="sh_icon-dark.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -23,14 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="3.2206128" - inkscape:cx="55.424235" - inkscape:cy="92.218475" + inkscape:cx="55.579485" + inkscape:cy="92.684225" inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-height="1009" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" /> + inkscape:current-layer="Layer_1" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> - - - - - - - - - - - - - - - - diff --git a/img/proc/shellCommand_icon.svg b/img/proc/shellCommand_icon.svg deleted file mode 100644 index 6bdf56c0d..000000000 --- a/img/proc/shellCommand_icon.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/img/proc/shBsd_icon-dark.svg b/img/proc/sudo_icon-dark.svg similarity index 88% rename from img/proc/shBsd_icon-dark.svg rename to img/proc/sudo_icon-dark.svg index 0f7d54491..e5033623b 100644 --- a/img/proc/shBsd_icon-dark.svg +++ b/img/proc/sudo_icon-dark.svg @@ -4,8 +4,8 @@ data-name="Layer 1" viewBox="0 0 188.16 188.16" version="1.1" - sodipodi:docname="sh_icon-dark.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + sodipodi:docname="sudo_icon-dark.svg" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -15,7 +15,7 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:current-layer="Layer_1" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> identityidentity diff --git a/img/proc/vncTunnel_icon.svg b/img/proc/vncTunnel_icon.svg new file mode 100644 index 000000000..4bf10e0ab --- /dev/null +++ b/img/proc/vncTunnel_icon.svg @@ -0,0 +1,77 @@ + +identityidentity diff --git a/img/proc/vnc_icon-dark.svg b/img/proc/vnc_icon-dark.svg index 2958b7196..8f43507ed 100644 --- a/img/proc/vnc_icon-dark.svg +++ b/img/proc/vnc_icon-dark.svg @@ -1,66 +1,72 @@ - - - identityidentity - - - - - - - + d="m 101.87212,149.00901 c 27.78436,-0.16001 55.57671,-0.16001 83.35306,0 0.20001,5.64806 0.20001,11.30414 0,16.95221 -27.77635,0.168 -55.5687,0.176 -83.34506,0 -0.2,-5.64807 -0.2,-11.30415 -0.008,-16.95221 z" + id="path14" + style="stroke-width:0.800009;fill:#5858e9;fill-opacity:1" /> diff --git a/img/proc/vnc_icon.svg b/img/proc/vnc_icon.svg index 7838b6763..144a18b75 100644 --- a/img/proc/vnc_icon.svg +++ b/img/proc/vnc_icon.svg @@ -1,63 +1,72 @@ - - - identityidentity - - - - - - - + d="m 101.87212,149.00901 c 27.78436,-0.16001 55.57671,-0.16001 83.35306,0 0.20001,5.64806 0.20001,11.30414 0,16.95221 -27.77635,0.168 -55.5687,0.176 -83.34506,0 -0.2,-5.64807 -0.2,-11.30415 -0.008,-16.95221 z" + id="path14" + style="stroke-width:0.800009" /> diff --git a/img/proc/wsl_icon-16.png b/img/proc/wsl_icon-16.png new file mode 100644 index 000000000..13fbb83e6 Binary files /dev/null and b/img/proc/wsl_icon-16.png differ diff --git a/img/proc/wsl_icon-24.png b/img/proc/wsl_icon-24.png new file mode 100644 index 000000000..511d50627 Binary files /dev/null and b/img/proc/wsl_icon-24.png differ diff --git a/img/proc/wsl_icon-40.png b/img/proc/wsl_icon-40.png new file mode 100644 index 000000000..c1e816da8 Binary files /dev/null and b/img/proc/wsl_icon-40.png differ diff --git a/img/proc/wsl_icon-80.png b/img/proc/wsl_icon-80.png new file mode 100644 index 000000000..3a426dd90 Binary files /dev/null and b/img/proc/wsl_icon-80.png differ diff --git a/img/proc/wsl_icon.svg b/img/proc/wsl_icon.svg deleted file mode 100644 index a172ca97f..000000000 --- a/img/proc/wsl_icon.svg +++ /dev/null @@ -1,3409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/img/proc/xonsh_icon-16.png b/img/proc/xonsh_icon-16.png new file mode 100644 index 000000000..b32fac033 Binary files /dev/null and b/img/proc/xonsh_icon-16.png differ diff --git a/img/proc/xonsh_icon-24.png b/img/proc/xonsh_icon-24.png new file mode 100644 index 000000000..f7e9a6091 Binary files /dev/null and b/img/proc/xonsh_icon-24.png differ diff --git a/img/proc/xonsh_icon-40.png b/img/proc/xonsh_icon-40.png new file mode 100644 index 000000000..c4a9723f6 Binary files /dev/null and b/img/proc/xonsh_icon-40.png differ diff --git a/img/proc/xonsh_icon-80.png b/img/proc/xonsh_icon-80.png new file mode 100644 index 000000000..5e04556f0 Binary files /dev/null and b/img/proc/xonsh_icon-80.png differ diff --git a/img/proc/xonsh_icon.png b/img/proc/xonsh_icon.png deleted file mode 100644 index dcf0fb572..000000000 Binary files a/img/proc/xonsh_icon.png and /dev/null differ diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties index ee1e6488c..937d1529b 100644 --- a/lang/strings/translations_en.properties +++ b/lang/strings/translations_en.properties @@ -1515,7 +1515,8 @@ categoryFreezeDescription=Marks connection configurations as read-only. This mea updateFail=Update installation did not succeed updateFailAction=Install update manually updateFailActionDescription=Check out the latest releases at GitHub -onePasswordPlaceholder=Item name +#force +onePasswordPlaceholder=Item name or op:// URL computeDirectorySizes=Compute directory sizes computeSize=Compute size vncClient=VNC client