From 657142b0aada9fe438aa19485d817c07d1d53ffe Mon Sep 17 00:00:00 2001 From: rdu Date: Thu, 28 Nov 2019 20:29:40 +0100 Subject: [PATCH] added settings option to show the tunnel rename dialog (#386) * added settings option to show the tunnel rename dialog * added missing _tt keys --- .gitignore | 8 ++++++- .../de/neemann/digital/core/element/Keys.java | 6 +++++ .../java/de/neemann/digital/gui/Settings.java | 4 ++-- .../gui/components/CircuitComponent.java | 22 ++++++++++--------- src/main/resources/lang/lang_de.xml | 3 +++ src/main/resources/lang/lang_en.xml | 3 +++ 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index af882a870..efb8f22e6 100644 --- a/.gitignore +++ b/.gitignore @@ -76,4 +76,10 @@ buildNumber.properties .attach_pid* #netbeans project files -nbactions.xml \ No newline at end of file +nbactions.xml + +#vscode +.classpath +.project +.settings +.vscode \ No newline at end of file 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 05fd9d876..cb39e0c05 100644 --- a/src/main/java/de/neemann/digital/core/element/Keys.java +++ b/src/main/java/de/neemann/digital/core/element/Keys.java @@ -473,6 +473,12 @@ public final class Keys { public static final Key SETTINGS_MAC_MOUSE = new Key<>("macMouse", Screen.isMac()).setRequiresRestart(); + /** + * enables tunnel rename dialog + */ + public static final Key SETTINGS_SHOW_TUNNEL_RENAME_DIALOG + = new Key<>("tunnelRenameDialog", true); + /** * output format for numbers */ diff --git a/src/main/java/de/neemann/digital/gui/Settings.java b/src/main/java/de/neemann/digital/gui/Settings.java index 2efbe6c64..b51eab3f3 100644 --- a/src/main/java/de/neemann/digital/gui/Settings.java +++ b/src/main/java/de/neemann/digital/gui/Settings.java @@ -18,7 +18,7 @@ import java.util.List; *

* Created by Helmut.Neemann on 11.05.2016. */ -public final class Settings extends SettingsBase { +public final class Settings extends SettingsBase { private static final class SettingsHolder { static final Settings INSTANCE = new Settings(); @@ -57,6 +57,7 @@ public final class Settings extends SettingsBase { intList.add(Keys.SETTINGS_FONT_SCALING); intList.add(Keys.SETTINGS_MAC_MOUSE); intList.add(Keys.SETTINGS_USE_EQUALS_KEY); + intList.add(Keys.SETTINGS_SHOW_TUNNEL_RENAME_DIALOG); return Collections.unmodifiableList(intList); } @@ -76,4 +77,3 @@ public final class Settings extends SettingsBase { } } - diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java index f89ec4fb8..f5694c892 100644 --- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java +++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java @@ -1190,16 +1190,18 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib if (others.size() > 0) { String newName = modified.get(Keys.NETNAME); - int res = JOptionPane.showConfirmDialog(this, - new LineBreaker().toHTML().preserveContainedLineBreaks().breakLines(Lang.get("msg_renameNet_N_OLD_NEW", others.size(), oldName, newName)), - Lang.get("msg_renameNet"), - JOptionPane.YES_NO_OPTION); - if (res == JOptionPane.YES_OPTION) { - Modifications.Builder b = - new Modifications.Builder(Lang.get("msg_renameNet")).add(mod); - for (VisualElement o : others) - b.add(new ModifyAttribute<>(o, Keys.NETNAME, newName)); - return b.build(); + if (Settings.getInstance().get(Keys.SETTINGS_SHOW_TUNNEL_RENAME_DIALOG)) { + int res = JOptionPane.showConfirmDialog(this, + new LineBreaker().toHTML().preserveContainedLineBreaks().breakLines(Lang.get("msg_renameNet_N_OLD_NEW", others.size(), oldName, newName)), + Lang.get("msg_renameNet"), + JOptionPane.YES_NO_OPTION); + if (res == JOptionPane.YES_OPTION) { + Modifications.Builder b = + new Modifications.Builder(Lang.get("msg_renameNet")).add(mod); + for (VisualElement o : others) + b.add(new ModifyAttribute<>(o, Keys.NETNAME, newName)); + return b.build(); + } } } } diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml index 57a5236e7..b7ecca0b8 100644 --- a/src/main/resources/lang/lang_de.xml +++ b/src/main/resources/lang/lang_de.xml @@ -1301,6 +1301,9 @@ Sind evtl. die Namen der Variablen nicht eindeutig? Keine ToolTips für Bauteile auf der Arbeitsfläche. Wenn gesetzt, werden keine ToolTips für die Bauteile auf der Arbeitsfläche angezeigt. Vor allem in einer Präsentation können diese ToolTips sehr störend sein. + Dialog zum automatischen umbenennen von Tunneln anzeigen + Wenn gesetzt, wird nach dem Umbenennen eines Tunnels ein Dialog für automatisches Umbenennen + aller gleichnamigen Tunnel angezeigt. ATMISP Pfad zur ausführbaren Datei ATMISP.exe. Wenn gesetzt, kann die Software ATMISP automatisch gestartet werden! diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index efcad9d59..8a6082ab2 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -1287,6 +1287,9 @@ No tool tips for components on the main panel. If set, no tool tips for the components on the main panel are displayed. Especially in a presentation, these tool tips can be very annoying. + Show dialog for automatic renaming of tunnels. + If set, a dialog for automatically renaming all tunnels of the same name is displayed after a + tunnel has been renamed. ATMISP Path to the executable file ATMISP.exe. If set, the ATMISP software can be started automatically!