Release 1.1.1: add print support and UI fixes

Adds the 1.1.1 patch release updates for printing, the trash icon, JS preview opening, and drag-and-drop insertion behavior.

Made-with: Cursor

Author: code4teaching

README.md

@@ -22,6 +22,12 @@ git clone https://github.com/code4teaching/VisuStruct.git
 
 ---
 
+## Changes in 1.1.1 (summary)
+
+- **About dialog:** clearer links for website, GitHub repository, and developer site.
+- **Palette:** Lucide trash icon for the delete area, shown larger.
+- **File menu:** added system **Print...** support for printing or saving via the OS dialog.
+
 ## Changes in 1.1 (summary)
 
 - **Element editor:** first step toward the Swift-style bottom editor panel.
@@ -97,7 +103,7 @@ This release aligns **branding and technical identity** with **VisuStruct**. **`
 - **Java 17** target (build and run with JDK 17+).
 - **FlatLaf** light/dark themes; **JDOM2**; no legacy AppleJavaExtensions.
 - **Motif** look-and-feel removed; **Metal** and FlatLaf available.
-- Current fat JAR name follows **`pom.xml`** **`version`** (e.g. **`visustruct-1.1.jar`**).
+- Current fat JAR name follows **`pom.xml`** **`version`** (e.g. **`visustruct-1.1.1.jar`**).
 
 ---
 
@@ -121,7 +127,7 @@ On **Windows**, double-click often works if `.jar` is associated with Java. If a
 
 All releases: [github.com/code4teaching/VisuStruct/releases](https://github.com/code4teaching/VisuStruct/releases)
 
-**Maintainers:** To ship a new version, create a GitHub **Release** with a tag such as **`v1.1`**. Workflow [`.github/workflows/release-assets.yml`](.github/workflows/release-assets.yml) builds the JARs and attaches **`visustruct.jar`** (stable download URL above).
+**Maintainers:** To ship a new version, create a GitHub **Release** with a tag such as **`v1.1.1`**. Workflow [`.github/workflows/release-assets.yml`](.github/workflows/release-assets.yml) builds the JARs and attaches **`visustruct.jar`** (stable download URL above).
 
 ---
 
@@ -172,13 +178,13 @@ chmod +x mvnw
 Output (version from `pom.xml`):
 
 ```text
-target/visustruct-1.1.jar
+target/visustruct-1.1.1.jar
 ```
 
 ## Run
 
 ```bash
-java -jar target/visustruct-1.1.jar
+java -jar target/visustruct-1.1.1.jar
 ```
 
 Double-click may work if `.jar` is associated with Java.

packaging/macos/build-lightweight-app.sh

@@ -4,7 +4,7 @@
 set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
-VER="${PROJECT_VERSION:-1.1}"
+VER="${PROJECT_VERSION:-1.1.1}"
 JAR_NAME="visustruct-${VER}.jar"
 OUT="${ROOT}/dist/macos-app-light"
 APP="${OUT}/VisuStruct.app"

packaging/macos/build-macos-app.sh

@@ -4,7 +4,7 @@
 # Voraussetzung: JDK 17+ mit jpackage (im PATH oder JAVA_HOME).
 set -euo pipefail
 ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-VER="${PROJECT_VERSION:-1.1}"
+VER="${PROJECT_VERSION:-1.1.1}"
 JAR="visustruct-${VER}.jar"
 INPUT="${ROOT}/target"
 OUT="${ROOT}/dist/macos-app"

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.visustruct</groupId>
 	<artifactId>visustruct</artifactId>
-	<version>1.1</version>
+	<version>1.1.1</version>
 	<name>VisuStruct</name>
 
 	<properties>

src/main/java/de/visustruct/control/Controlling.java

@@ -2,6 +2,7 @@
 
 import java.awt.Desktop;
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.ClipboardOwner;
@@ -17,6 +18,10 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
 
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JEditorPane;
@@ -255,6 +260,46 @@ public void bildSpeichernNurPng(){
 		}
 	}
 
+	public void bildDrucken(){
+		Struktogramm str = gibAktuellesStruktogramm();
+		if (str == null) {
+			return;
+		}
+
+		BufferedImage image = str.generateImage(false);
+		PrinterJob job = PrinterJob.getPrinterJob();
+		job.setJobName(GlobalSettings.APP_DISPLAY_NAME);
+		job.setPrintable((graphics, pageFormat, pageIndex) -> {
+			if (pageIndex > 0) {
+				return Printable.NO_SUCH_PAGE;
+			}
+			Graphics2D g2 = (Graphics2D) graphics.create();
+			try {
+				double scale = Math.min(
+						pageFormat.getImageableWidth() / image.getWidth(),
+						pageFormat.getImageableHeight() / image.getHeight());
+				scale = Math.min(scale, 1.0d);
+				double x = pageFormat.getImageableX() + (pageFormat.getImageableWidth() - image.getWidth() * scale) / 2.0d;
+				double y = pageFormat.getImageableY() + (pageFormat.getImageableHeight() - image.getHeight() * scale) / 2.0d;
+				g2.translate(x, y);
+				g2.scale(scale, scale);
+				g2.drawImage(image, 0, 0, null);
+			} finally {
+				g2.dispose();
+			}
+			return Printable.PAGE_EXISTS;
+		});
+
+		if (!job.printDialog()) {
+			return;
+		}
+		try {
+			job.print();
+		} catch (PrinterException ex) {
+			JOptionPane.showMessageDialog(gui, ex.getMessage(), I18n.tr("menu.file.print"), JOptionPane.ERROR_MESSAGE);
+		}
+	}
+
 	public void titelleisteAktualisieren(){
 		String pfad = "";
 
@@ -295,6 +340,10 @@ public void actionPerformed(ActionEvent e) {
 			bildSpeichern();
 			break;
 
+		case bildDrucken:
+			bildDrucken();
+			break;
+
 		case bildInZwischenAblage:
 			copyImagetoClipBoard(gibAktuellesStruktogramm().generateImage(false));
 			break;

src/main/java/de/visustruct/other/XActionCommands.java

@@ -1,7 +1,7 @@
 package de.visustruct.other;
 
 public enum XActionCommands {
-	neu, oeffnen, speichern, speicherUnter, bildSpeichern, bildInZwischenAblage, quellcodeErzeugen,
+	neu, oeffnen, speichern, speicherUnter, bildSpeichern, bildDrucken, bildInZwischenAblage, quellcodeErzeugen,
 	struktogrammSchliessen, programmBeenden,
 
 	rueckgaengig, widerrufen, ganzesStruktogrammKopieren,

src/main/java/de/visustruct/view/AuswahlPanel.java

@@ -37,6 +37,8 @@
 
 import org.jdom2.Document;
 
+import com.formdev.flatlaf.extras.FlatSVGIcon;
+
 import de.visustruct.control.Controlling;
 import de.visustruct.control.Struktogramm;
 import de.visustruct.i18n.I18n;
@@ -54,6 +56,8 @@ public class AuswahlPanel extends JPanel implements DropTargetListener, DragGest
 	private boolean muelleimerIstAuf;
 	private Controlling controlling;
 	private Document kopiertesStrElement;
+	private boolean paletteDragAktiv;
+	private long letzterPaletteDragEndeZeitpunkt;
 
 	public AuswahlPanel(Controlling controlling){
 
@@ -91,7 +95,7 @@ public AuswahlPanel(Controlling controlling){
 		for (int i = 0; i < panelElemente.length; i++) {
 			int typ = StruktogrammPalette.TYPEN_REIHENFOLGE[i];
 			panelElemente[i] = new AuswahlPanelElement(typ);
-			panelElemente[i].addActionListener(e -> controlling.paletteElementEinfuegen(typ));
+			panelElemente[i].addActionListener(e -> paletteElementGeklickt(typ));
 			add(panelElemente[i], c);
 			dragSource.createDefaultDragGestureRecognizer(panelElemente[i], DnDConstants.ACTION_COPY_OR_MOVE, this);
 			c.gridy++;
@@ -101,8 +105,8 @@ public AuswahlPanel(Controlling controlling){
 		muelleimer = new JLabel();
 		muelleimerIstAuf = true;
 		muelleimerAuf(!muelleimerIstAuf);
-		muelleimer.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 11));
 		muelleimer.setHorizontalAlignment(SwingConstants.CENTER);
+		muelleimer.setBorder(BorderFactory.createEmptyBorder(6, 0, 6, 0));
 		muelleimer.setToolTipText(I18n.tr("palette.trashDrop"));
 		add(muelleimer, c);
 
@@ -123,6 +127,8 @@ public AuswahlPanel(Controlling controlling){
 		c.gridy++;
 
 		kopiertesStrElement = null;
+		paletteDragAktiv = false;
+		letzterPaletteDragEndeZeitpunkt = 0;
 
 		c.weighty = 1000;
 		c.fill = GridBagConstraints.VERTICAL;
@@ -132,6 +138,13 @@ public AuswahlPanel(Controlling controlling){
 		new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE,this, true, null);
 	}
 
+	private void paletteElementGeklickt(int typ) {
+		if (paletteDragAktiv || System.currentTimeMillis() - letzterPaletteDragEndeZeitpunkt < 500) {
+			return;
+		}
+		controlling.paletteElementEinfuegen(typ);
+	}
+
 	private static JButton paletteAktionsButton(String text) {
 		JButton b = new JButton(text);
 		b.setFocusable(false);
@@ -198,13 +211,20 @@ public Document gibKopiertesStrElement(){
 
 	private void muelleimerAuf(boolean oeffnen){
 		if (muelleimerIstAuf != oeffnen){
-			if (oeffnen){
-				muelleimerIstAuf = true;
-			}else{
-				muelleimerIstAuf = false;
+			muelleimerIstAuf = oeffnen;
+			muelleimer.setIcon(erzeugeMuelleimerIcon(oeffnen));
+		}
+	}
+
+	private static FlatSVGIcon erzeugeMuelleimerIcon(boolean aktiv) {
+		FlatSVGIcon icon = new FlatSVGIcon("icons/lucide/trash-2.svg", 32, 32);
+		if (aktiv) {
+			java.awt.Color accent = UIManager.getColor("Component.accentColor");
+			if (accent != null) {
+				icon.setColorFilter(new FlatSVGIcon.ColorFilter(c -> accent));
 			}
-			muelleimer.setIcon(new ModernTrashIcon(oeffnen));
 		}
+		return icon;
 	}
 
 
@@ -228,6 +248,7 @@ public void dragGestureRecognized(DragGestureEvent evt){//User hat angefangen ei
 
 			Transferable t = new StringSelection("n"+typ);
 
+			paletteDragAktiv = true;
 			dragSource.startDrag(evt, DragSource.DefaultCopyDrop, t, this);
 		}
 	}
@@ -249,6 +270,8 @@ public void dropActionChanged(DragSourceDragEvent evt){
 	}
 
 	public void dragDropEnd(DragSourceDropEvent evt){
+		paletteDragAktiv = false;
+		letzterPaletteDragEndeZeitpunkt = System.currentTimeMillis();
 		PaletteButtonStyle.clearPressedArmedState(evt.getDragSourceContext().getComponent());
 	}
 

src/main/java/de/visustruct/view/CodeErzeuger.java

@@ -278,12 +278,7 @@ private void openJsPreviewInBrowser() {
 			Files.writeString(temp, html, StandardCharsets.UTF_8);
 			java.io.File file = temp.toFile();
 			file.deleteOnExit();
-			if (!Desktop.isDesktopSupported() || !Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-				JOptionPane.showMessageDialog(this, I18n.tr("dialog.codeGen.jsBrowserNoDesktop.message"),
-						I18n.tr("dialog.codeGen.jsBrowserNoDesktop.title"), JOptionPane.ERROR_MESSAGE);
-				return;
-			}
-			Desktop.getDesktop().browse(file.toURI());
+			openPreviewFile(file);
 		} catch (Exception ex) {
 			String detail = ex.getMessage();
 			if (detail == null || detail.isBlank()) {
@@ -294,6 +289,42 @@ private void openJsPreviewInBrowser() {
 		}
 	}
 
+	private void openPreviewFile(File file) throws Exception {
+		Exception letzterFehler = null;
+		if (Desktop.isDesktopSupported()) {
+			Desktop desktop = Desktop.getDesktop();
+			if (desktop.isSupported(Desktop.Action.OPEN)) {
+				try {
+					desktop.open(file);
+					return;
+				} catch (Exception ex) {
+					letzterFehler = ex;
+				}
+			}
+			if (desktop.isSupported(Desktop.Action.BROWSE)) {
+				try {
+					desktop.browse(file.toURI());
+					return;
+				} catch (Exception ex) {
+					letzterFehler = ex;
+				}
+			}
+		}
+		if (System.getProperty("os.name", "").toLowerCase().contains("mac")) {
+			try {
+				new ProcessBuilder("open", file.getAbsolutePath()).start();
+				return;
+			} catch (Exception ex) {
+				letzterFehler = ex;
+			}
+		}
+		if (letzterFehler != null) {
+			throw letzterFehler;
+		}
+		JOptionPane.showMessageDialog(this, I18n.tr("dialog.codeGen.jsBrowserNoDesktop.message"),
+				I18n.tr("dialog.codeGen.jsBrowserNoDesktop.title"), JOptionPane.ERROR_MESSAGE);
+	}
+
 	private static String escapeForHtmlText(String raw) {
 		if (raw == null) {
 			return "";

src/main/java/de/visustruct/view/GUI.java

@@ -129,6 +129,7 @@ private void buildMenuBar() {
 			menu.add(createMenuItem(I18n.tr("menu.file.saveAs"), XActionCommands.speicherUnter, KeyEvent.VK_A));
 			menu.add(new JSeparator());
 			menu.add(createMenuItem(I18n.tr("menu.file.saveImage"), XActionCommands.bildSpeichern, KeyEvent.VK_I));
+			menu.add(createMenuItem(I18n.tr("menu.file.print"), XActionCommands.bildDrucken, KeyEvent.VK_P, KeyEvent.VK_P));
 			menu.add(createMenuItem(I18n.tr("menu.file.copyImage"), XActionCommands.bildInZwischenAblage, KeyEvent.VK_B, KeyEvent.VK_K));
 			menu.add(new JSeparator());
 			menu.add(createMenuItem(I18n.tr("menu.file.generateCode"), XActionCommands.quellcodeErzeugen, KeyEvent.VK_G));

src/main/resources/de/visustruct/i18n/Messages.properties

@@ -7,6 +7,7 @@ menu.file.open=Open...
 menu.file.save=Save
 menu.file.saveAs=Save As...
 menu.file.saveImage=Save as Image...
+menu.file.print=Print...
 menu.file.copyImage=Copy Image to Clipboard
 menu.file.generateCode=Generate Source Code...
 menu.file.closeDiagram=Close Diagram