diff --git a/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java b/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java index 1e3f8e792..527dcb1ce 100644 --- a/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java +++ b/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java @@ -380,7 +380,7 @@ public final class McpTools { .getExtendedLayer() .findModule(AppNames.extModuleName("base")) .orElseThrow(), - AppNames.extModuleName("base") + ".script.SimpleScriptStore"); + AppNames.extModuleName("base") + ".script.ScriptStore"); var method = clazz.getDeclaredMethod("assembleScriptChain", ShellControl.class); var command = (String) method.invoke(script.getStore(), shellSession.getControl()); var scriptFile = ScriptHelper.createExecScript(shellSession.getControl(), command); diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceStoreProvider.java index 131e80804..e924915b4 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptCollectionSourceStoreProvider.java @@ -20,6 +20,11 @@ import java.util.UUID; public class ScriptCollectionSourceStoreProvider implements DataStoreProvider { + @Override + public int getOrderPriority() { + return 1; + } + @Override public UUID getTargetCategory(DataStore store, UUID target) { return DataStorage.SCRIPT_SOURCES_CATEGORY_UUID; 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 afe6ed76a..c276763d3 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 @@ -212,7 +212,7 @@ public class ScriptStoreProvider implements EnabledParentStoreProvider, DataStor @Override public String getDisplayIconFileName(DataStore store) { if (store == null) { - return "proc:shellEnvironment_icon.svg"; + return "base:script_icon.svg"; } ScriptStore st = store.asNeeded(); diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java index 87f90c0ed..a1d182152 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java @@ -108,7 +108,7 @@ public class ScriptStoreSetup { } var applicable = refs.stream() - .filter(simpleScriptStore -> simpleScriptStore.getStore().isCompatible(sc.getShellDialect())) + .filter(ss -> ss.getStore().isCompatible(sc.getShellDialect())) .toList(); if (applicable.isEmpty()) { return null; diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-16-dark.png new file mode 100644 index 000000000..81bad7733 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-16-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-16.png index 61ae6c43f..4abb4de09 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-16.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-16.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-24-dark.png new file mode 100644 index 000000000..1cca88d66 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-24-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-24.png index 597a95a90..51eef463b 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-24.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-24.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-40-dark.png new file mode 100644 index 000000000..c8cfd08f4 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-40-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-40.png index d224fbf9b..a6321633a 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-40.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-40.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-80-dark.png new file mode 100644 index 000000000..bb107b277 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-80-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-80.png index 06b55af2a..6041a0cab 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-80.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/localIdentity_icon-80.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16-dark.png index 054812885..f1fa1e689 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16.png index c41df8ecb..ec45dbb87 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-16.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24-dark.png index e745ffd7a..2e0195c9b 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24.png index c191c2405..d019d8579 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-24.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40-dark.png index 21aa9dc46..c079cd487 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40.png index 8d18f62dd..dc1ba1158 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-40.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80-dark.png index 67369a438..32e393ed3 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80.png index 769bda170..3521fdd1d 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/passwordManagerIdentity_icon-80.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16-dark.png index f93c45eab..79a228953 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16.png index 3d88693cb..2f7f53e98 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-16.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24-dark.png index b87a97f27..eaf99bfa7 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24.png index 36bba569f..212507081 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-24.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40-dark.png index b0ed83f92..d1516cf52 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40.png index 2b884c3e8..d5b02774b 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-40.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80-dark.png index 1c43b4b5f..935fb8cfa 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80.png index 1c0afffc7..a5b216f58 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptCollectionSource_icon-80.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16-dark.png index 159384834..55a8b9b72 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16.png index 13d705861..d2cccf171 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-16.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24-dark.png index acc1d487a..84217d593 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24.png index 09eafa2a2..9bb5a170f 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-24.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40-dark.png index e0d6f9b00..66f9ecd46 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40.png index e027bd50c..ac00030d3 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-40.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80-dark.png index 7ed735a94..51c66fb46 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80-dark.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80.png index ca393d5a0..90f34d6ca 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/scriptGroup_icon-80.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-16-dark.png new file mode 100644 index 000000000..96ed74163 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-16-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-16.png new file mode 100644 index 000000000..ae786a268 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-16.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-24-dark.png new file mode 100644 index 000000000..5822fc0f6 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-24-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-24.png new file mode 100644 index 000000000..93a20c53c Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-24.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-40-dark.png new file mode 100644 index 000000000..e74e91246 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-40-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-40.png new file mode 100644 index 000000000..888020aca Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-40.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-80-dark.png new file mode 100644 index 000000000..1b91e63e2 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-80-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-80.png new file mode 100644 index 000000000..de4f0a250 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/script_icon-80.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-16-dark.png new file mode 100644 index 000000000..0411fca19 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-16-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-16.png index 8bb20c0b0..f9141b727 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-16.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-16.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-24-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-24-dark.png new file mode 100644 index 000000000..ad08d4bc0 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-24-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-24.png index dbee6d444..0c5a8dad5 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-24.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-24.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-40-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-40-dark.png new file mode 100644 index 000000000..464e3721b Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-40-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-40.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-40.png index 61a4d3bbe..a3a338a33 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-40.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-40.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-80-dark.png new file mode 100644 index 000000000..b69d35f75 Binary files /dev/null and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-80-dark.png differ diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-80.png index 5d62e7038..ec95c610a 100644 Binary files a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-80.png and b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/syncedIdentity_icon-80.png differ diff --git a/img/base/localIdentity_icon-dark.svg b/img/base/localIdentity_icon-dark.svg new file mode 100644 index 000000000..9ccf5d236 --- /dev/null +++ b/img/base/localIdentity_icon-dark.svg @@ -0,0 +1,57 @@ + +identityidentity diff --git a/img/base/localIdentity_icon.svg b/img/base/localIdentity_icon.svg index 5d9afc5dc..484d743c8 100644 --- a/img/base/localIdentity_icon.svg +++ b/img/base/localIdentity_icon.svg @@ -4,38 +4,54 @@ data-name="Layer 1" viewBox="0 0 204.59 204.59" version="1.1" + sodipodi:docname="localIdentity_icon.svg" + 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/"> - - - - - identity - identity - - - - identity - - - - - + style="fill:#212121;fill-opacity:1" + transform="translate(-153.7 -153.7)" />identity diff --git a/img/base/passwordManagerIdentity_icon-dark.svg b/img/base/passwordManagerIdentity_icon-dark.svg index a6ede4fd7..f4f4312bc 100644 --- a/img/base/passwordManagerIdentity_icon-dark.svg +++ b/img/base/passwordManagerIdentity_icon-dark.svg @@ -6,59 +6,56 @@ version="1.1" sodipodi:docname="passwordManagerIdentity_icon-dark.svg" 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/"> - - - - - - identity - identity - - - - identity - - - - - + style="fill:#e7e7e7;fill-opacity:1" + transform="translate(-153.7 -153.7)" />identity + + + + diff --git a/img/base/passwordManagerIdentity_icon.svg b/img/base/passwordManagerIdentity_icon.svg index 4d6f5a026..d350d7b1a 100644 --- a/img/base/passwordManagerIdentity_icon.svg +++ b/img/base/passwordManagerIdentity_icon.svg @@ -6,14 +6,14 @@ version="1.1" sodipodi:docname="passwordManagerIdentity_icon.svg" 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/"> - - - - - - identity - identity - - - - identity - - - - - + style="fill:#212121;fill-opacity:1" + transform="translate(-153.7 -153.7)" />identity + + + + diff --git a/img/base/scriptCollectionSource_icon-dark.svg b/img/base/scriptCollectionSource_icon-dark.svg index 939812ff5..1d9022af3 100644 --- a/img/base/scriptCollectionSource_icon-dark.svg +++ b/img/base/scriptCollectionSource_icon-dark.svg @@ -4,57 +4,65 @@ data-name="Layer 1" viewBox="0 0 204.68 206.97" version="1.1" - sodipodi:docname="scriptSource_icon-dark.svg" + sodipodi:docname="scriptCollectionSource_icon-dark.svg" 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/"> + shell environment v2 + + + + shell environment v2 + + shell environment v2 + + + + shell environment v2 + + + + + style="fill:#1dbe71;fill-opacity:1;stroke:none;stroke-width:0.160482;stroke-opacity:1" /> + diff --git a/img/base/scriptCollectionSource_icon.svg b/img/base/scriptCollectionSource_icon.svg index f6e15a3b8..3d10bd5eb 100644 --- a/img/base/scriptCollectionSource_icon.svg +++ b/img/base/scriptCollectionSource_icon.svg @@ -4,32 +4,65 @@ data-name="Layer 1" viewBox="0 0 204.68 206.97" version="1.1" - xml:space="preserve" + sodipodi:docname="scriptCollectionSource_icon.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" 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/">shell environment v2 + + + + + shell environment v2 + + shell environment v2 + + + + shell environment v2 + + + + + style="fill:#11b75c;fill-opacity:1;stroke:none;stroke-width:0.160482;stroke-opacity:1" /> + diff --git a/img/base/scriptGroup_icon-dark.svg b/img/base/scriptGroup_icon-dark.svg index a35a2e490..bda4de380 100644 --- a/img/base/scriptGroup_icon-dark.svg +++ b/img/base/scriptGroup_icon-dark.svg @@ -4,8 +4,8 @@ data-name="Layer 1" viewBox="0 0 204.68 206.97" version="1.1" - sodipodi:docname="shelEnvironment_icon-dark.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + sodipodi:docname="scriptGroup_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" @@ -23,14 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="2.0703483" - inkscape:cx="72.693081" - inkscape:cy="84.526838" + inkscape:cx="74.86663" + inkscape:cy="103.12275" 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="layer2" /> + inkscape:current-layer="Layer_1" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> identityidentity diff --git a/img/base/syncedIdentity_icon.svg b/img/base/syncedIdentity_icon.svg index f4900442e..fe56986e6 100644 --- a/img/base/syncedIdentity_icon.svg +++ b/img/base/syncedIdentity_icon.svg @@ -4,38 +4,48 @@ data-name="Layer 1" viewBox="0 0 204.59 204.59" version="1.1" + sodipodi:docname="syncedIdentity_icon.svg" + 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/"> - - - - - identity - identity - - - - identity - - - - - + style="fill:#212121;fill-opacity:1" + transform="translate(-153.7 -153.7)" />identity diff --git a/img/proc/command_icon-dark.svg b/img/proc/command_icon-dark.svg index 5630e60f7..5c2359009 100644 --- a/img/proc/command_icon-dark.svg +++ b/img/proc/command_icon-dark.svg @@ -1,75 +1,57 @@ - - - - - - - - - - - - - - + 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/">shell environment v2shell environment v2 diff --git a/img/proc/command_icon.svg b/img/proc/command_icon.svg index deb03c1d1..e91211bde 100644 --- a/img/proc/command_icon.svg +++ b/img/proc/command_icon.svg @@ -1,75 +1,57 @@ - - - - - - - - - - - - - - + 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/">shell environment v2shell environment v2 diff --git a/img/proc/serial_icon-dark.svg b/img/proc/serial_icon-dark.svg index 9b9e16008..ed58bcbf9 100644 --- a/img/proc/serial_icon-dark.svg +++ b/img/proc/serial_icon-dark.svg @@ -4,19 +4,19 @@ data-name="Layer 1" viewBox="0 0 204.59 204.59" version="1.1" - sodipodi:docname="serial_icon.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + sodipodi:docname="serial_icon-dark.svg" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" 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" + 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 - - - - ssh draftssh draft - - - + style="fill:#ebebeb;fill-opacity:1" /> diff --git a/img/proc/serial_icon.svg b/img/proc/serial_icon.svg index d0422dd18..6d3134bcb 100644 --- a/img/proc/serial_icon.svg +++ b/img/proc/serial_icon.svg @@ -4,19 +4,19 @@ data-name="Layer 1" viewBox="0 0 204.59 204.59" version="1.1" - sodipodi:docname="serial_icon-dark.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + sodipodi:docname="serial_icon.svg" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" 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" + 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 - - - - ssh draftssh draft - - - + id="path829" + style="fill:#2c2828;fill-opacity:1" /> diff --git a/img/proc/shellEnvironment_icon-dark.svg b/img/proc/shellEnvironment_icon-dark.svg index a35a2e490..daa185e14 100644 --- a/img/proc/shellEnvironment_icon-dark.svg +++ b/img/proc/shellEnvironment_icon-dark.svg @@ -4,84 +4,67 @@ data-name="Layer 1" viewBox="0 0 204.68 206.97" version="1.1" - sodipodi:docname="shelEnvironment_icon-dark.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + sodipodi:docname="shellEnvironment_icon-dark.svg" + 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/"> - - - - - shell environment v2 - - - - - - - shell environment v2 - - - - - - - - - + inkscape:current-layer="g3" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" />shell environment v2shell environment v2 + + + + diff --git a/img/proc/shellEnvironment_icon.svg b/img/proc/shellEnvironment_icon.svg index a66c0cc74..0bdfe0bb9 100644 --- a/img/proc/shellEnvironment_icon.svg +++ b/img/proc/shellEnvironment_icon.svg @@ -4,16 +4,16 @@ data-name="Layer 1" viewBox="0 0 204.68 206.97" version="1.1" - sodipodi:docname="shelEnvironment_icon.svg" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + sodipodi:docname="shellEnvironment_icon.svg" + 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/"> - - - - - shell environment v2 - shell environment v2 - - - - - - shell environment v2 - - - - + style="fill:#2e2e2e;fill-opacity:1" />shell environment v2 + + + + diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties index 8e04b1c14..65643f317 100644 --- a/lang/strings/translations_en.properties +++ b/lang/strings/translations_en.properties @@ -674,7 +674,8 @@ shouldElevateDescription=Whether to run this script with elevated permissions script.displayName=Shell script script.displayDescription=Create a reusable shell script scriptGroup.displayName=Script group -scriptGroup.displayDescription=Create a group to organize scripts within +#force +scriptGroup.displayDescription=Group scripts together and organize them within scriptGroup=Group scriptGroupDescription=The group to assign this script to scriptGroupGroupDescription=The group to assign this script group to @@ -1909,7 +1910,7 @@ scriptCollectionSourceType=Source type scriptCollectionSourceTypeDescription=The type of source from where shell scripts should be loaded gitRepository=Git repository scriptCollectionSource.displayName=Script source -scriptCollectionSource.displayDescription=Automatically import shell script files from an existing source +scriptCollectionSource.displayDescription=Automatically import shell scripts from an existing source directorySource=Directory source gitRepositorySource=Git repository source refreshSource=Refresh source