Scale the clipart when resizing the dialog (#2538)

ugs-core/src/resources/MessagesBundle_en_US.properties

@@ -726,6 +726,7 @@ platform.plugin.toolbox.title=Toolbox
 platform.plugin.toolbox.tooltip=Toolbox
 platform.plugin.toolbox.settings.title=Edit toolbox buttons...
 platform.plugin.editor.showOnOpen=Show editor when opening g-code files
+platform.plugin.designer.clipart.all=All
 platform.plugin.designer.clipart.animals=Animals
 platform.plugin.designer.clipart.buildings=Buildings
 platform.plugin.designer.clipart.computer=Computer

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/Category.java

@@ -24,6 +24,7 @@ This file is part of Universal Gcode Sender (UGS).
  * @author Joacim Breiler
  */
 public enum Category {
+    ALL("platform.plugin.designer.clipart.all"),
     ANIMALS("platform.plugin.designer.clipart.animals"),
     BUILDINGS("platform.plugin.designer.clipart.buildings"),
     DECORATIONS("platform.plugin.designer.clipart.decorations"),

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/ClipartButton.java

@@ -31,13 +31,14 @@ This file is part of Universal Gcode Sender (UGS).
  * @author Joacim Breiler
  */
 public class ClipartButton extends RoundedPanel {
-    private final Clipart clipart;
+    private final transient Clipart clipart;
 
     public ClipartButton(Clipart clipart, ClipartTooltip tooltip) {
         super(12);
         this.clipart = clipart;
         setLayout(new MigLayout("fill, inset 0"));
         setMinimumSize(new Dimension(128, 128));
+        setMaximumSize(new Dimension(512, 512));
         setForeground(ThemeColors.LIGHT_GREY);
         setBackground(Color.WHITE);
         setHoverBackground(ThemeColors.LIGHT_GREY);
@@ -49,4 +50,11 @@ public ClipartButton(Clipart clipart, ClipartTooltip tooltip) {
     public Clipart getClipart() {
         return clipart;
     }
+
+    @Override
+    public Dimension getPreferredSize() {
+        Dimension d = super.getSize();
+        int width = (int) Math.round(d.getWidth());
+        return new Dimension(width, width); // Make the buttion square
+    }
 }

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/ClipartLabel.java

@@ -0,0 +1,29 @@
+package com.willwinder.ugs.nbp.designer.gui.clipart;
+
+import javax.swing.JLabel;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.font.FontRenderContext;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+
+public class ClipartLabel extends JLabel {
+    public ClipartLabel(String text) {
+        super(text);
+        AffineTransform affinetransform = new AffineTransform();
+        FontRenderContext frc = new FontRenderContext(affinetransform, true, true);
+
+        addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentResized(ComponentEvent e) {
+                Rectangle2D stringBounds = getFont().getStringBounds(getText(), frc);
+                int currentSize = (int) Math.round(Math.max(stringBounds.getWidth(), stringBounds.getHeight()));
+                float sizeChange = (float) Math.min(getWidth(), getHeight()) / (float) currentSize;
+                if (sizeChange < 1f || sizeChange > 1.1f) {
+                    int newFontSize = Math.min(Math.round((getFont().getSize() * sizeChange)), getHeight());
+                    setFont(getFont().deriveFont((float) newFontSize));
+                }
+            }
+        });
+    }
+}

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/ClipartSource.java

@@ -34,7 +34,7 @@ public interface ClipartSource {
 
     String getUrl();
 
-    List<Clipart> getCliparts(Category category);
+    List<? extends Clipart> getCliparts(Category category);
 
     String getLicense();
 }

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/FontClipart.java

@@ -22,8 +22,12 @@ This file is part of Universal Gcode Sender (UGS).
 import com.willwinder.ugs.nbp.designer.entities.cuttable.Path;
 import com.willwinder.universalgcodesender.uielements.helpers.ThemeColors;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Shape;
 import java.awt.font.GlyphVector;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
@@ -48,7 +52,7 @@ public FontClipart(String name, Category category, Font font, String text, Clipa
         this.font = font;
         this.source = source;
 
-        label = new JLabel(text);
+        label = new ClipartLabel(text);
         label.setFont(font);
         label.setHorizontalAlignment(SwingConstants.CENTER);
         label.setForeground(ThemeColors.VERY_DARK_GREY);

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/PreviewListPanel.java

@@ -124,7 +124,7 @@ public void setCategory(Category category) {
                         selectedClipart = clipart;
                         selectAction.actionPerformed(new ActionEvent(roundedPanel, 0, "selected_clipart"));
                     });
-                    buttonsPanel.add(roundedPanel);
+                    buttonsPanel.add(roundedPanel, "grow, w 100:100:400");
                 });
         buttonsPanel.revalidate();
         buttonsPanel.repaint();

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/AbstractClipartSource.java

@@ -0,0 +1,19 @@
+package com.willwinder.ugs.nbp.designer.gui.clipart.sources;
+
+import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
+import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
+import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
+
+import java.util.List;
+
+public abstract class AbstractClipartSource implements ClipartSource {
+    public abstract List<? extends Clipart> getCliparts();
+
+    @Override
+    public List<? extends Clipart> getCliparts(Category category) {
+        return getCliparts()
+                .stream()
+                .filter(clipart -> clipart.getCategory() == category || category == Category.ALL)
+                .toList();
+    }
+}

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/BuDingbatsSource.java

@@ -20,7 +20,6 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
 import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
-import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
 import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSourceException;
 import com.willwinder.ugs.nbp.designer.gui.clipart.FontClipart;
 
@@ -29,12 +28,11 @@ This file is part of Universal Gcode Sender (UGS).
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Joacim Breiler
  */
-public class BuDingbatsSource implements ClipartSource {
+public class BuDingbatsSource extends AbstractClipartSource {
     private final List<FontClipart> cliparts = new ArrayList<>();
 
     public BuDingbatsSource() {
@@ -117,8 +115,8 @@ public String getUrl() {
     }
 
     @Override
-    public List<Clipart> getCliparts(Category category) {
-        return cliparts.stream().filter(clipart -> clipart.getCategory() == category).collect(Collectors.toList());
+    public List<? extends Clipart> getCliparts() {
+        return cliparts;
     }
 
     @Override

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/ChristmasSource.java

@@ -20,20 +20,19 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
 import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
-import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
 import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSourceException;
 import com.willwinder.ugs.nbp.designer.gui.clipart.FontClipart;
 
-import java.awt.*;
+import java.awt.Font;
+import java.awt.FontFormatException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Joacim Breiler
  */
-public class ChristmasSource implements ClipartSource {
+public class ChristmasSource extends AbstractClipartSource {
     private final List<FontClipart> cliparts = new ArrayList<>();
 
     public ChristmasSource() {
@@ -153,11 +152,9 @@ public String getUrl() {
         return "https://www.fontspace.com/christmas-font-f4808";
     }
 
-
-
     @Override
-    public List<Clipart> getCliparts(Category category) {
-        return cliparts.stream().filter(clipart -> clipart.getCategory() == category).collect(Collectors.toList());
+    public List<? extends Clipart> getCliparts() {
+        return cliparts;
     }
 
     @Override

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/Corners2Source.java

@@ -20,7 +20,6 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
 import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
-import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
 import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSourceException;
 import com.willwinder.ugs.nbp.designer.gui.clipart.FontClipart;
 
@@ -29,12 +28,11 @@ This file is part of Universal Gcode Sender (UGS).
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Joacim Breiler
  */
-public class Corners2Source implements ClipartSource {
+public class Corners2Source extends AbstractClipartSource {
 
     private final List<FontClipart> cliparts = new ArrayList<>();
 
@@ -55,7 +53,7 @@ public Corners2Source() {
         cliparts.add(new FontClipart("Corner with star and leaves", Category.DECORATIONS, font, "E", this));
         cliparts.add(new FontClipart("Corner with eagle", Category.DECORATIONS, font, "F", this));
         cliparts.add(new FontClipart("Corner with bells", Category.DECORATIONS, font, "G", this));
-        cliparts.add(new FontClipart("Banner with heart and petals", Category.DECORATIONS, font.deriveFont(font.getSize() * 0.8f), "H", this));
+        cliparts.add(new FontClipart("Banner with heart and petals", Category.DECORATIONS, font, "H", this));
         cliparts.add(new FontClipart("Banner", Category.DECORATIONS, font, "I", this));
         cliparts.add(new FontClipart("Corner with flowers 2", Category.DECORATIONS, font, "J", this));
         cliparts.add(new FontClipart("Corner with fairy", Category.DECORATIONS, font, "K", this));
@@ -78,8 +76,8 @@ public String getUrl() {
     }
 
     @Override
-    public List<Clipart> getCliparts(Category category) {
-        return cliparts.stream().filter(clipart -> clipart.getCategory() == category).collect(Collectors.toList());
+    public List<? extends Clipart> getCliparts() {
+        return cliparts;
     }
 
     @Override

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/CreepyCrawliesSource.java

@@ -20,7 +20,6 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
 import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
-import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
 import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSourceException;
 import com.willwinder.ugs.nbp.designer.gui.clipart.FontClipart;
 
@@ -29,12 +28,11 @@ This file is part of Universal Gcode Sender (UGS).
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Joacim Breiler
  */
-public class CreepyCrawliesSource implements ClipartSource {
+public class CreepyCrawliesSource extends AbstractClipartSource {
     private final List<FontClipart> cliparts = new ArrayList<>();
 
     public CreepyCrawliesSource() {
@@ -103,8 +101,8 @@ public String getUrl() {
     }
 
     @Override
-    public List<Clipart> getCliparts(Category category) {
-        return cliparts.stream().filter(clipart -> clipart.getCategory() == category).collect(Collectors.toList());
+    public List<? extends Clipart> getCliparts() {
+        return cliparts;
     }
 
     @Override

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/DarriansFrames1Source.java

@@ -20,7 +20,6 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
 import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
-import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
 import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSourceException;
 import com.willwinder.ugs.nbp.designer.gui.clipart.FontClipart;
 
@@ -29,12 +28,11 @@ This file is part of Universal Gcode Sender (UGS).
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Joacim Breiler
  */
-public class DarriansFrames1Source implements ClipartSource {
+public class DarriansFrames1Source extends AbstractClipartSource {
     private final List<FontClipart> cliparts = new ArrayList<>();
 
     public DarriansFrames1Source() {
@@ -91,8 +89,8 @@ public String getUrl() {
     }
 
     @Override
-    public List<Clipart> getCliparts(Category category) {
-        return cliparts.stream().filter(clipart -> clipart.getCategory() == category).collect(Collectors.toList());
+    public List<? extends Clipart> getCliparts() {
+        return cliparts;
     }
 
     @Override

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/DarriansFrames2Source.java

@@ -20,7 +20,6 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
 import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
-import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
 import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSourceException;
 import com.willwinder.ugs.nbp.designer.gui.clipart.FontClipart;
 
@@ -29,12 +28,11 @@ This file is part of Universal Gcode Sender (UGS).
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Joacim Breiler
  */
-public class DarriansFrames2Source implements ClipartSource {
+public class DarriansFrames2Source extends AbstractClipartSource {
     private final List<FontClipart> cliparts = new ArrayList<>();
 
     public DarriansFrames2Source() {
@@ -91,8 +89,8 @@ public String getUrl() {
     }
 
     @Override
-    public List<Clipart> getCliparts(Category category) {
-        return cliparts.stream().filter(clipart -> clipart.getCategory() == category).collect(Collectors.toList());
+    public List<? extends Clipart> getCliparts() {
+        return cliparts;
     }
 
     @Override

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/clipart/sources/DestinysBordersSource.java

@@ -20,20 +20,19 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.ugs.nbp.designer.gui.clipart.Category;
 import com.willwinder.ugs.nbp.designer.gui.clipart.Clipart;
-import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSource;
 import com.willwinder.ugs.nbp.designer.gui.clipart.ClipartSourceException;
 import com.willwinder.ugs.nbp.designer.gui.clipart.FontClipart;
 
-import java.awt.*;
+import java.awt.Font;
+import java.awt.FontFormatException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Joacim Breiler
  */
-public class DestinysBordersSource implements ClipartSource {
+public class DestinysBordersSource extends AbstractClipartSource {
 
     private final List<FontClipart> cliparts = new ArrayList<>();
 
@@ -75,8 +74,8 @@ public String getUrl() {
     }
 
     @Override
-    public List<Clipart> getCliparts(Category category) {
-        return cliparts.stream().filter(clipart -> clipart.getCategory() == category).collect(Collectors.toList());
+    public List<? extends Clipart> getCliparts() {
+        return cliparts;
     }
 
     @Override