From 8500efd39094129b22c3fd3f3b3cea02e481d4c5 Mon Sep 17 00:00:00 2001 From: Raphael Jolly Date: Tue, 24 Sep 2024 17:08:00 +0200 Subject: [PATCH] empty --- bin/linoleum | 3 +++ bin/linoleum.bat | 2 ++ src/main/java/linoleum/Desktop.form | 9 +++++++++ src/main/java/linoleum/Desktop.java | 22 ++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/bin/linoleum b/bin/linoleum index 86a6bf5a..8395e706 100755 --- a/bin/linoleum +++ b/bin/linoleum @@ -1,4 +1,7 @@ #!/bin/sh LINOLEUM=`readlink -f $0` LINOLEUM_HOME=`dirname $LINOLEUM`/.. +until java -Djava.system.class.loader=linoleum.application.ClassLoader -Dscala.usejavacp=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -jar $LINOLEUM_HOME/linoleum.jar +do : +done diff --git a/bin/linoleum.bat b/bin/linoleum.bat index 60de84c0..c89fd3e3 100644 --- a/bin/linoleum.bat +++ b/bin/linoleum.bat @@ -1,3 +1,5 @@ @echo off set LINOLEUM_HOME=%~dp0.. +:loop java -Dfile.encoding=UTF-8 -Djava.system.class.loader=linoleum.application.ClassLoader -Dscala.usejavacp=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -jar %LINOLEUM_HOME%\linoleum.jar +if %ERRORLEVEL% GTR 0 goto loop diff --git a/src/main/java/linoleum/Desktop.form b/src/main/java/linoleum/Desktop.form index 1034da9c..57870add 100644 --- a/src/main/java/linoleum/Desktop.form +++ b/src/main/java/linoleum/Desktop.form @@ -24,6 +24,15 @@ + + + + + + + + + diff --git a/src/main/java/linoleum/Desktop.java b/src/main/java/linoleum/Desktop.java index e0fceb92..09dfee06 100644 --- a/src/main/java/linoleum/Desktop.java +++ b/src/main/java/linoleum/Desktop.java @@ -51,6 +51,7 @@ public class Desktop extends JFrame { + "%s"; private final Action openAction = new OpenAction(); private final Action saveAction = new SaveAction(); + private final Action restartAction = new RestartAction(); private final Action exitAction = new ExitAction(); private final Action fullScreenAction = new FullScreenAction(); private final Action screenshotAction = new ScreenshotAction(); @@ -106,6 +107,19 @@ public void run() { } } + private class RestartAction extends AbstractAction { + public RestartAction() { + super("Restart"); + putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK)); + putValue(MNEMONIC_KEY, (int) 'r'); + } + + @Override + public void actionPerformed(final ActionEvent e) { + System.exit(1); + } + } + private class ExitAction extends AbstractAction { public ExitAction() { super("Exit"); @@ -322,6 +336,8 @@ private void initComponents() { fileMenu = new javax.swing.JMenu(); openMenuItem = new javax.swing.JMenuItem(); saveMenuItem = new javax.swing.JMenuItem(); + jSeparator1 = new javax.swing.JPopupMenu.Separator(); + restartMenuItem = new javax.swing.JMenuItem(); separator = new javax.swing.JPopupMenu.Separator(); exitMenuItem = new javax.swing.JMenuItem(); viewMenu = new javax.swing.JMenu(); @@ -351,6 +367,10 @@ public void componentMoved(java.awt.event.ComponentEvent evt) { saveMenuItem.setAction(saveAction); fileMenu.add(saveMenuItem); + fileMenu.add(jSeparator1); + + restartMenuItem.setAction(restartAction); + fileMenu.add(restartMenuItem); fileMenu.add(separator); exitMenuItem.setAction(exitAction); @@ -420,8 +440,10 @@ public void run() { private javax.swing.JMenu fileMenu; private javax.swing.JCheckBoxMenuItem fullScreenMenuItem; private javax.swing.JMenu helpMenu; + private javax.swing.JPopupMenu.Separator jSeparator1; private javax.swing.JMenuBar menuBar; private javax.swing.JMenuItem openMenuItem; + private javax.swing.JMenuItem restartMenuItem; private javax.swing.JMenuItem saveMenuItem; private javax.swing.JMenuItem screenshotMenuItem; private javax.swing.JPopupMenu.Separator separator;