From 8b69903893b053b0db7ac50bc29471be80b41248 Mon Sep 17 00:00:00 2001
From: Bane Stojkovic <bancika@gmail.com>
Date: Mon, 9 Feb 2026 23:15:35 +0100
Subject: [PATCH] Consolidate a few keyboard shortcuts for consistency

---
 diylc/diylc-core/src/main/resources/update.xml       | 12 ++++++++++++
 .../java/org/diylc/swing/actions/FindAction.java     | 10 ++++++----
 .../org/diylc/swing/actions/edit/NudgeAction.java    |  2 +-
 .../org/diylc/swing/actions/file/ImportAction.java   |  4 ++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/diylc/diylc-core/src/main/resources/update.xml b/diylc/diylc-core/src/main/resources/update.xml
index 8c353325..03a56268 100644
--- a/diylc/diylc-core/src/main/resources/update.xml
+++ b/diylc/diylc-core/src/main/resources/update.xml
@@ -349,6 +349,18 @@
 			<releaseDate>2026-01-20 00:00:00.000 CET</releaseDate>
 			<name></name>
 			<changes>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Shape components shouldn't appear in the BOM</description>
+				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Consolidate a few keyboard shortcuts for consistency</description>
+				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Calculated length disappeared from Hookup Wire and similar curved components</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>Resize dimensions do not show for 'Chassis Panel' component when dragging a corner point</description>
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java
index c63d2364..2361441e 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java
@@ -1,7 +1,9 @@
 package org.diylc.swing.actions;
 
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Objects;
 import javax.swing.AbstractAction;
 import javax.swing.KeyStroke;
 
@@ -26,7 +28,7 @@ public class FindAction extends AbstractAction {
     putValue(AbstractAction.NAME, "Find");
     putValue(AbstractAction.SMALL_ICON, IconLoader.SearchBox.getIcon());
     putValue(AbstractAction.ACCELERATOR_KEY,
-        KeyStroke.getKeyStroke(KeyEvent.VK_F, ActionEvent.CTRL_MASK));
+        KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
   }
 
   @Override
@@ -35,13 +37,13 @@ public class FindAction extends AbstractAction {
     FindDialog dialog = DialogFactory.getInstance().createFindDialog();
     dialog.setVisible(true);
 
-    if (dialog.getSelectedButtonCaption() == FindDialog.OK) {
+    if (Objects.equals(dialog.getSelectedButtonCaption(), FindDialog.OK)) {
       String criteria = dialog.getCriteria();
       plugInPort.selectMatching(criteria);
-      if (plugInPort.getSelectedComponents().size() == 0) {
+      if (plugInPort.getSelectedComponents().isEmpty()) {
         swingUI.showMessage("No matching components found.", "Find",
             ISwingUI.INFORMATION_MESSAGE);
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java
index b052d964..0838cde4 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java
@@ -32,7 +32,7 @@ public class NudgeAction extends AbstractAction {
     putValue(AbstractAction.NAME, "Nudge");
     putValue(AbstractAction.SMALL_ICON, IconLoader.FitToSize.getIcon());
     putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Q,
-        Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+        ActionEvent.ALT_MASK));
   }
 
   @Override
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java
index 5c06edda..50d51e6f 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java
@@ -65,8 +65,8 @@ public class ImportAction extends AbstractAction {
       }
     }, InMemoryConfigurationManager.getInstance());
     putValue(AbstractAction.NAME, "Import");
-    putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I,
-        Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+//    putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I,
+//        Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
     putValue(AbstractAction.SMALL_ICON, IconLoader.ElementInto.getIcon());
   }