From 6599ef96f5cbeb473a4cbe5494a86994c0a1777f Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Fri, 26 May 2017 08:26:23 +0200
Subject: [PATCH] show the restart message also if the shape type is changed

---
 src/main/java/de/neemann/digital/gui/Main.java | 6 ++++--
 src/main/resources/lang/lang_de.xml            | 2 +-
 src/main/resources/lang/lang_en.xml            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index 7fa73703b..a8cb5dc14 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -508,11 +508,13 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
         ToolTipAction editSettings = new ToolTipAction(Lang.get("menu_editSettings")) {
             @Override
             public void actionPerformed(ActionEvent e) {
-                Language oldLang = Settings.getInstance().get(Keys.SETTINGS_LANGUAGE);
+                final Language oldLang = Settings.getInstance().get(Keys.SETTINGS_LANGUAGE);
+                final boolean oldIeeeShapes = Settings.getInstance().get(Keys.SETTINGS_IEEE_SHAPES);
                 if (new AttributeDialog(Main.this, Settings.SETTINGS_KEYS, Settings.getInstance().getAttributes()).showDialog()) {
                     FormatToExpression.setDefaultFormat(Settings.getInstance().get(Keys.SETTINGS_EXPRESSION_FORMAT));
                     final Language newLang = Settings.getInstance().getAttributes().get(Keys.SETTINGS_LANGUAGE);
-                    if (!newLang.equals(oldLang)) {
+                    final boolean newIeeeShapes = Settings.getInstance().get(Keys.SETTINGS_IEEE_SHAPES);
+                    if (!newLang.equals(oldLang) || (oldIeeeShapes != newIeeeShapes)) {
                         Lang.setLanguage(newLang);
                         JOptionPane.showMessageDialog(Main.this, Lang.get("msg_restartNeeded"));
                     }
diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml
index 5cbd74b25..ed3749b82 100644
--- a/src/main/resources/lang/lang_de.xml
+++ b/src/main/resources/lang/lang_de.xml
@@ -827,7 +827,7 @@ Die Icons stammen aus dem Tango Desktop Project.</string>
     <string name="msg_missingShape_N">Es fehlt ein Diagramm für {0}</string>
     <string name="msg_pins">Pinbelegung</string>
     <string name="msg_pinMap_pin_N_is_N">Pin {0}: {1}</string>
-    <string name="msg_restartNeeded">Die Änderung der Sprache erfordert einen Neustart!</string>
+    <string name="msg_restartNeeded">Die Änderung der Einstellung erfordert einen Neustart!</string>
     <string name="msg_noRomFound">Kein ROM im Model gefunden! Ein ROM muss als Programmspeicher gewählt werden!</string>
     <string name="msg_moreThenOneRomFound">Mehr als einen Programmspeicher gefunden. Es darf nur einen Programmspeicher geben.</string>
     <string name="msg_enterAnExpression">Geben Sie einen Ausdruck ein:</string>
diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml
index 6dbdcadf0..495dfe7e7 100644
--- a/src/main/resources/lang/lang_en.xml
+++ b/src/main/resources/lang/lang_en.xml
@@ -817,7 +817,7 @@ The icons are taken from the Tango Desktop Project.</string>
     <string name="msg_missingShape_N">Shape {0} is missing</string>
     <string name="msg_pins">Pin assignment</string>
     <string name="msg_pinMap_pin_N_is_N">Pin {0}: {1}</string>
-    <string name="msg_restartNeeded">To change the GUI language a restart is required!</string>
+    <string name="msg_restartNeeded">A restart is required for the changes to take effect!</string>
     <string name="msg_noRomFound">No ROM found! ROM needs to be set to be program memory.</string>
     <string name="msg_moreThenOneRomFound">More then one ROM found! Only one ROM must be set to be program memory.</string>
     <string name="msg_remoteUnknownCommand">Command {0} unknown!</string>