From 9e2aab9a90e51355d61e76e288da000fcb39fe5c Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Thu, 7 Feb 2019 11:39:47 +0100
Subject: [PATCH] simplified the settings

---
 .../java/de/neemann/digital/core/element/Keys.java   | 12 +++---------
 .../de/neemann/digital/draw/library/LibraryNode.java |  2 +-
 src/main/java/de/neemann/digital/gui/Settings.java   |  1 -
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/neemann/digital/core/element/Keys.java b/src/main/java/de/neemann/digital/core/element/Keys.java
index 6c7ff7004..3d4db0654 100644
--- a/src/main/java/de/neemann/digital/core/element/Keys.java
+++ b/src/main/java/de/neemann/digital/core/element/Keys.java
@@ -457,7 +457,7 @@ public final class Keys {
      * enables the MAC mouse mode
      */
     public static final Key<Boolean> SETTINGS_MAC_MOUSE
-            = new Key<>("macMouse", Screen.isMac()).setRequiresRestart();
+            = new Key<>("macMouse", Screen.isMac()).setRequiresRestart().setSecondary();
 
     /**
      * output format for numbers
@@ -591,7 +591,8 @@ public final class Keys {
                     .setComboBoxValues(100, 120, 150, 180, 200, 250, 300)
                     .setMin(50)
                     .setMax(400)
-                    .setRequiresRestart();
+                    .setRequiresRestart()
+                    .setSecondary();
 
     /**
      * true if a enable input is needed
@@ -701,11 +702,4 @@ public final class Keys {
     public static final Key<Boolean> WIDE_SHAPE
             = new Key<>("wideShape", false).setSecondary().allowGroupEdit();
 
-    /**
-     * Selects the wide shapes as the default
-     */
-    public static final Key<Boolean> SETTINGS_USE_WIDE_SHAPES
-            = new Key<>("wideShapeAsDefault", false).setSecondary().setRequiresRestart();
-
-
 }
diff --git a/src/main/java/de/neemann/digital/draw/library/LibraryNode.java b/src/main/java/de/neemann/digital/draw/library/LibraryNode.java
index 87003fce8..66eeea02d 100644
--- a/src/main/java/de/neemann/digital/draw/library/LibraryNode.java
+++ b/src/main/java/de/neemann/digital/draw/library/LibraryNode.java
@@ -305,7 +305,7 @@ public class LibraryNode implements Iterable<LibraryNode> {
     public VisualElement setWideShapeFlagTo(VisualElement visualElement) {
         // set the wide shape option to the element
         try {
-            if (Settings.getInstance().get(Keys.SETTINGS_USE_WIDE_SHAPES)
+            if (Settings.getInstance().get(Keys.SETTINGS_IEEE_SHAPES)
                     && getDescription().hasAttribute(Keys.WIDE_SHAPE))
                 visualElement.setAttribute(Keys.WIDE_SHAPE, true);
         } catch (IOException e1) {
diff --git a/src/main/java/de/neemann/digital/gui/Settings.java b/src/main/java/de/neemann/digital/gui/Settings.java
index e74d1d609..0680b0ef3 100644
--- a/src/main/java/de/neemann/digital/gui/Settings.java
+++ b/src/main/java/de/neemann/digital/gui/Settings.java
@@ -46,7 +46,6 @@ public final class Settings implements AttributeListener {
     private Settings() {
         List<Key> intList = new ArrayList<>();
         intList.add(Keys.SETTINGS_IEEE_SHAPES);
-        intList.add(Keys.SETTINGS_USE_WIDE_SHAPES);
         intList.add(Keys.SETTINGS_LANGUAGE);
         intList.add(Keys.SETTINGS_EXPRESSION_FORMAT);
         intList.add(Keys.SETTINGS_DEFAULT_TREESELECT);