Merge branch 'master' of https://github.com/MarginallyClever/Makelang…

…elo-software
MarginallyClever · Dec 19, 2024 · ed2c7ea · ed2c7ea
2 parents 34d1307 + 43385c9
commit ed2c7ea
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.marginallyclever</groupId>
 	<artifactId>Makelangelo</artifactId>
-	<version>7.59.1</version>
+	<version>7.60.0</version>
 	<name>Makelangelo</name>
 	<description>Makelangelo Software is a Java program that prepares art for CNC plotters.  It is especially designed for the Makelangelo Robot.
 It pairs really well with Marlin-polargraph, the code in the brain of the robot that receives instructions and moves the motors.</description>

diff --git a/src/main/java/com/marginallyclever/makelangelo/MainMenu.java b/src/main/java/com/marginallyclever/makelangelo/MainMenu.java
@@ -212,9 +212,13 @@ private JMenu createHelpMenu() {
         JMenuItem buttonDonation = createMenuItemBrowse(Translator.get("MenuItemPayPalDonation"), "https://www.marginallyclever.com/products/makelangelo-software/");
         menu.add(buttonDonation);
 
+        JMenuItem buttonTranslate = createMenuItemBrowse(Translator.get("MenuItemTranslate"), "https://crowdin.com/project/makelangelo");
+        buttonTranslate.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/com/marginallyclever/makelangelo/icons8-translate-16.png"))));
+        menu.add(buttonTranslate);
+
         JMenuItem buttonCheckForUpdate = new JMenuItem(Translator.get("MenuUpdate"));
         buttonCheckForUpdate.addActionListener((e) -> app.checkForUpdate(true));
-        //buttonCheckForUpdate.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/com/marginallyclever/makelangelo/icons8-update-16.png"))));
+        buttonCheckForUpdate.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/com/marginallyclever/makelangelo/icons8-update-16.png"))));
         menu.add(buttonCheckForUpdate);
 
         menu.addSeparator();

diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/io/OpenFileChooser.java b/src/main/java/com/marginallyclever/makelangelo/makeart/io/OpenFileChooser.java
@@ -16,7 +16,7 @@
 import java.util.stream.Stream;
 
 /**
- * Takes care about configuring the file chooser with all the extensions the app supports
+ * Configuring a {@link JFileChooser} with all the extensions the app supports
  */
 public class OpenFileChooser {
     private static final Logger logger = LoggerFactory.getLogger(OpenFileChooser.class);

diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/io/SaveGCode.java b/src/main/java/com/marginallyclever/makelangelo/makeart/io/SaveGCode.java
@@ -66,10 +66,11 @@ public void run(Turtle turtle, Plotter plotter, JFrame parent, int trimHead, int
 	}
 
 	/**
-	 * remove trimHead commands from the start of the turtle history.
-	 * remove trimTail commands from the end of the turtle history.
-	 * Returns the {@link Turtle} with the trimmed history.
+	 * <p>Remove trimHead number of commands from the start of the turtle history.</p>
+	 * <p>Remove trimTail number of commands from the end of the turtle history.</p>
 	 * @param turtle the source turtle.
+	 * @param trimHead the number of commands to remove from the start of the turtle history.
+	 * @param trimTail the number of commands to remove from the end of the turtle history.
 	 * @return the {@link Turtle} with the trimmed history.
 	 */
 	protected Turtle trimTurtle(Turtle turtle, int trimHead, int trimTail) {

diff --git a/src/main/resources/com/marginallyclever/makelangelo/icons8-translate-16.png b/src/main/resources/com/marginallyclever/makelangelo/icons8-translate-16.png
diff --git a/src/main/resources/com/marginallyclever/makelangelo/icons8-update-16.png b/src/main/resources/com/marginallyclever/makelangelo/icons8-update-16.png
diff --git a/src/main/resources/languages/english.xml b/src/main/resources/languages/english.xml
@@ -238,6 +238,7 @@
 	<string><key>InfoTitle</key><value>Information</value></string>
 	<string><key>ErrorTitle</key><value>Error</value></string>
 	<string><key>MenuItemPayPalDonation</key><value>PayPal donation</value></string>
+	<string><key>MenuItemTranslate</key><value>Help Translate</value></string>
 
 	<string><key>EstimatedTimeIs</key><value>Estimated time is %1</value></string>
 	<string><key>firmwareVersionBadMessage</key><value><![CDATA[<html><body>The firmware (code in the brain of your robot) is not the version I expect. I found <strong>%1%</strong>.<br/>Please visit <a href="https://www.marginallyclever.com/product/makelangelo-firmware/">https://www.marginallyclever.com/product/makelangelo-firmware/</a><br>for the latest firmware.<br>Please visit <a href="https://www.marginallyclever.com/product/makelangelo-software/">https://www.marginallyclever.com/product/makelangelo-software/</a> for the latest software.</body></html>]]></value></string>