From 9571fd0fd3073040996a75562471abe2f6bc5563 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 9 Jul 2017 12:48:50 +0200 Subject: [PATCH] Show input label in input dialog title --- .../java/de/neemann/digital/draw/shapes/InputShape.java | 2 +- .../digital/gui/components/SingleValueDialog.java | 9 +++++---- src/main/resources/lang/lang_de.xml | 1 + src/main/resources/lang/lang_en.xml | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/shapes/InputShape.java b/src/main/java/de/neemann/digital/draw/shapes/InputShape.java index ab69ec7d7..5e5e74e79 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/InputShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/InputShape.java @@ -72,7 +72,7 @@ public class InputShape implements Shape { value.setValue(1 - value.getValue()); }); } else { - SingleValueDialog.editValue(pos, value, modelSync); + SingleValueDialog.editValue(pos, label, value, modelSync); } return true; } diff --git a/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java b/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java index 29911cfdb..f5e7a56d0 100644 --- a/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java @@ -57,8 +57,8 @@ public final class SingleValueDialog extends JDialog { private long editValue; private boolean ok = false; - private SingleValueDialog(Point pos, ObservableValue value) { - super((Frame) null, Lang.get("attr_dialogTitle"), true); + private SingleValueDialog(Point pos, String label, ObservableValue value) { + super((Frame) null, Lang.get("win_valueInputTitle_N", label), true); setDefaultCloseOperation(DISPOSE_ON_CLOSE); editValue = value.getValue(); @@ -211,11 +211,12 @@ public final class SingleValueDialog extends JDialog { * Edits a single value * * @param pos the position to pop up the dialog + * @param label the name of the value * @param value the value to edit * @param modelSync used to access the running model */ - public static void editValue(Point pos, ObservableValue value, Sync modelSync) { - SingleValueDialog svd = new SingleValueDialog(pos, value); + public static void editValue(Point pos, String label, ObservableValue value, Sync modelSync) { + SingleValueDialog svd = new SingleValueDialog(pos, label, value); if (svd.showDialog()) { if (svd.getSelectedFormat().equals(InMode.HIGHZ)) { modelSync.access(() -> value.set(0, true)); diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml index e5cac5935..1c7ed45b8 100644 --- a/src/main/resources/lang/lang_de.xml +++ b/src/main/resources/lang/lang_de.xml @@ -982,6 +982,7 @@ Die Icons stammen aus dem Tango Desktop Project. Tabelle Export Auswahl + Eingabe {0} Hilfe Ausdrücke Zur Definition eines Ausdruckes können alle üblichen diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index 0947e5bb5..2fa5d5faf 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -969,6 +969,7 @@ The icons are taken from the Tango Desktop Project. Select Testdata {0} Data + Input {0} Help