Rework icon handling

CONTRIBUTING.md

@@ -25,7 +25,7 @@ components from it when it is run in a development environment.
 Note that in case the current master branch is ahead of the latest release, it might happen that there are some incompatibilities when loading data from your local XPipe installation.
 You should therefore always check out the matching version tag for your local repository and local XPipe installation.
 You can find the available version tags at https://github.com/xpipe-io/xpipe/tags.
-So for example if you currently have XPipe `10.0` installed, you should run `git reset --hard 10.0` first to properly compile against it.
+So for example if you currently have XPipe `11.3` installed, you should run `git reset --hard 11.3` first to properly compile against it.
 
 You need to have JDK for Java 21 installed to compile the project.
 If you are on Linux or macOS, you can easily accomplish that by running
@@ -74,7 +74,7 @@ Especially when starting out, it might be a good idea to start with easy tasks f
 
 ### Interacting via the HTTP API
 
-You can create clients they communicate with the XPipe daemon via its HTTP API.
+You can create clients that communicate with the XPipe daemon via its HTTP API.
 To get started, see the [OpenAPI spec](/openapi.yaml).
 
 ### Implementing support for a new editor
@@ -98,6 +98,10 @@ All actions that you can perform for certain connections in the connection overv
 
 You can add custom script definitions [here](https://github.com/xpipe-io/xpipe/tree/master/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java) and [here](https://github.com/xpipe-io/xpipe/tree/master/ext/base/src/main/resources/io/xpipe/ext/base/resources/scripts).
 
+### Adding more system icons for system autodetection
+
+You can register new system types [here](https://github.com/xpipe-io/xpipe/blob/master/app/src/main/java/io/xpipe/app/resources/SystemIcons.java) and add the respective icons [here](https://github.com/xpipe-io/xpipe/tree/master/app/src/main/resources/io/xpipe/app/resources/img/system).
+
 ### Adding more file icons for specific types
 
 You can register file types [here](https://github.com/xpipe-io/xpipe/blob/master/app/src/main/resources/io/xpipe/app/resources/file_list.txt) and add the respective icons [here](https://github.com/xpipe-io/xpipe/tree/master/app/src/main/resources/io/xpipe/app/resources/img/browser).
@@ -108,6 +112,6 @@ The existing file list and icons are taken from the [vscode-icons](https://githu
 
 if you want to work on something that was not listed here, you can still do so of course. You can reach out on the [Discord server](https://discord.gg/8y89vS8cRb) to discuss any development plans and get you started.
 
-### Translations
+### Adding translations
 
 See the [translation guide](/lang) for details.

app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java

@@ -631,6 +631,10 @@ public final class BrowserFileListComp extends SimpleComp {
                             () -> getTableRow().getItem(), fileList.getFileSystemModel())
                     .hide(Bindings.createBooleanBinding(
                             () -> {
+                                if (getTableRow() == null) {
+                                    return true;
+                                }
+
                                 var item = getTableRow().getItem();
                                 var notDir = item.getRawFileEntry().resolved().getKind() != FileKind.DIRECTORY;
                                 var isParentLink = item.getRawFileEntry()

app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java

@@ -142,7 +142,7 @@ public class BrowserQuickAccessContextMenu extends ContextMenu {
             this.menu = new Menu(
                     // Use original name, not the link target
                     browserEntry.getRawFileEntry().getName(),
-                    PrettyImageHelper.ofFixedRasterized(
+                    PrettyImageHelper.ofFixedSize(
                                     FileIconManager.getFileIcon(browserEntry.getRawFileEntry(), false), 24, 24)
                             .createRegion());
             createMenu();

app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java

@@ -72,7 +72,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
                             // But it is good enough.
                             var showProvider = true;
                             try {
-                                showProvider = storeEntryWrapper.getEntry().getProvider().shouldShow(storeEntryWrapper);
+                                showProvider = storeEntryWrapper.getEntry().getProvider() == null || storeEntryWrapper.getEntry().getProvider().shouldShow(storeEntryWrapper);
                             } catch (Exception ignored) {}
                             return inRootCategory && showProvider;
                         },

app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialogComp.java

@@ -26,7 +26,7 @@ public class StoreIconChoiceDialogComp extends SimpleComp {
 
     public static void show(DataStoreEntry entry) {
         SystemIcons.load();
-        var window = AppWindowHelper.sideWindow(AppI18n.get("chooseCustomIcon"), stage -> new StoreIconChoiceDialogComp(entry,stage),true,null);
+        var window = AppWindowHelper.sideWindow(AppI18n.get("chooseCustomIcon"), stage -> new StoreIconChoiceDialogComp(entry,stage),false,null);
         window.initModality(Modality.APPLICATION_MODAL);
         window.show();
     }

app/src/main/java/io/xpipe/app/core/App.java

@@ -10,6 +10,8 @@ import io.xpipe.app.util.LicenseProvider;
 
 import javafx.application.Application;
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.value.ObservableDoubleValue;
 import javafx.stage.Stage;
 
 import lombok.Getter;
@@ -63,4 +65,12 @@ public class App extends Application {
             stage.requestFocus();
         });
     }
+
+    public ObservableDoubleValue displayScale() {
+        if (getStage() == null) {
+            return new SimpleDoubleProperty(1.0);
+        }
+
+        return getStage().outputScaleXProperty();
+    }
 }

app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageHelper.java

@@ -1,55 +1,68 @@
 package io.xpipe.app.fxcomps.impl;
 
+import io.xpipe.app.core.App;
 import io.xpipe.app.resources.AppImages;
 import io.xpipe.app.fxcomps.Comp;
 import io.xpipe.app.fxcomps.util.BindingsHelper;
 import io.xpipe.core.store.FileNames;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.value.ObservableValue;
 
+import java.util.List;
 import java.util.Optional;
 
 public class PrettyImageHelper {
 
-    private static Optional<String> rasterizedImageIfExists(String img, int width, int height) {
+    private static Optional<String> rasterizedImageIfExists(String img, int height) {
         if (img != null && img.endsWith(".svg")) {
             var base = FileNames.getBaseName(img);
             var renderedName = base + "-" + height + ".png";
-            if (AppImages.hasNormalImage(base + "-" + height + ".png")) {
+            if (AppImages.hasNormalImage(renderedName)) {
                 return Optional.of(renderedName);
             }
         }
 
+        if (img != null && img.endsWith(".png")) {
+            if (AppImages.hasNormalImage(img)) {
+                return Optional.of(img);
+            }
+        }
+
         return Optional.empty();
     }
 
+    private static ObservableValue<String> rasterizedImageIfExistsScaled(String img, int height) {
+        return Bindings.createStringBinding(() -> {
+            if (img == null) {
+                return null;
+            }
+
+            if (!img.endsWith(".svg")) {
+                return rasterizedImageIfExists(img, height).orElse(null);
+            }
+
+            var sizes = List.of(16, 24, 40, 80);
+            var mult = Math.round(App.getApp().displayScale().get() * height);
+            var base = FileNames.getBaseName(img);
+            var available = sizes.stream()
+                    .filter(integer -> AppImages.hasNormalImage(base + "-" + integer + ".png"))
+                    .toList();
+            var closest = available.stream()
+                    .filter(integer -> integer >= mult)
+                    .findFirst()
+                    .orElse(available.size() > 0 ? available.getLast() : 0);
+            return rasterizedImageIfExists(img, closest).orElse(null);
+        }, App.getApp().displayScale());
+    }
+
     public static Comp<?> ofFixedSizeSquare(String img, int size) {
         return ofFixedSize(img, size, size);
     }
 
-    public static Comp<?> ofFixedRasterized(String img, int w, int h) {
-        if (img == null) {
-            return new PrettyImageComp(new SimpleStringProperty(null), w, h);
-        }
-
-        var rasterized = rasterizedImageIfExists(img, w, h);
-        return new PrettyImageComp(new SimpleStringProperty(rasterized.orElse(null)), w, h);
-    }
-
     public static Comp<?> ofFixedSize(String img, int w, int h) {
-        if (img == null) {
-            return new PrettyImageComp(new SimpleStringProperty(null), w, h);
-        }
-
-        var rasterized = rasterizedImageIfExists(img, w, h);
-        if (rasterized.isPresent()) {
-            return new PrettyImageComp(new SimpleStringProperty(rasterized.get()), w, h);
-        } else {
-            return img.endsWith(".svg")
-                    ? new PrettySvgComp(new SimpleStringProperty(img), w, h)
-                    : new PrettyImageComp(new SimpleStringProperty(img), w, h);
-        }
+        return ofFixedSize(new SimpleStringProperty(img), w,h);
     }
 
     public static Comp<?> ofFixedSize(ObservableValue<String> img, int w, int h) {
@@ -57,8 +70,8 @@ public class PrettyImageHelper {
             return new PrettyImageComp(new SimpleStringProperty(null), w, h);
         }
 
-        var binding = BindingsHelper.map(img, s -> {
-            return rasterizedImageIfExists(s, w, h).orElse(s);
+        var binding = BindingsHelper.flatMap(img, s -> {
+            return rasterizedImageIfExistsScaled(s, h);
         });
         return new PrettyImageComp(binding, w, h);
     }

app/src/main/java/io/xpipe/app/resources/SystemIcons.java

@@ -18,7 +18,7 @@ import java.util.Optional;
 public class SystemIcons {
 
     private static final List<SystemIcon> AUTO_SYSTEM_ICONS = List.of(
-            new SystemIcon("opnsense", "OpnSense") {
+            new SystemIcon("opnsense", "opnsense") {
                 @Override
                 public boolean isApplicable(DataStore store) {
                     return store instanceof StatefulDataStore<?> statefulDataStore &&
@@ -26,7 +26,7 @@ public class SystemIcons {
                             shellStoreState.getShellDialect() == ShellDialects.OPNSENSE;
                 }
             },
-            new SystemIcon("pfsense", "PfSense")  {
+            new SystemIcon("pfsense", "pfsense")  {
                 @Override
                 public boolean isApplicable(DataStore store) {
                     return store instanceof StatefulDataStore<?> statefulDataStore &&
@@ -34,8 +34,8 @@ public class SystemIcons {
                             shellStoreState.getShellDialect() == ShellDialects.PFSENSE;
                 }
             },
-            new ContainerAutoSystemIcon("file-browser", "File Browser", name -> name.contains("filebrowser")),
-            new FileAutoSystemIcon("syncthing", "Syncthing", OsType.LINUX, "~/.local/state/syncthing")
+            new ContainerAutoSystemIcon("file-browser", "file browser", name -> name.contains("filebrowser")),
+            new FileAutoSystemIcon("syncthing", "syncthing", OsType.LINUX, "~/.local/state/syncthing")
     );
 
     private static final List<SystemIcon> SYSTEM_ICONS = new ArrayList<>();
@@ -52,10 +52,10 @@ public class SystemIcons {
                 var all = stream.toList();
                 for (Path file : all) {
                     var name = FilenameUtils.getBaseName(file.getFileName().toString());
-                    if (name.contains("-dark") || name.contains("-40")) {
+                    if (name.contains("-dark") || name.contains("-16") || name.contains("-24")) {
                         continue;
                     }
-                    var base = name.replaceAll("-24", "");
+                    var base = name.replaceAll("-40", "");
                     if (AUTO_SYSTEM_ICONS.stream().anyMatch(autoSystemIcon -> autoSystemIcon.getIconName().equals(base))) {
                         continue;
                     }

app/src/main/java/io/xpipe/app/util/PlatformState.java

@@ -84,7 +84,7 @@ public enum PlatformState {
             // fails
         } catch (HeadlessException h) {
             var msg = (OsType.getLocal().equals(OsType.LINUX)
-                            ? "No X11 DISPLAY variable was set or no headful library support was found."
+                            ? "No DISPLAY variable was set or no headful library support was found."
                             : "The application does not have desktop access, but this program performed an operation which requires it.")
                     + "\n\n"
                     + "Please note that XPipe is a desktop application that should be run on your local workstation."