TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-26 06:22:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show input label in input dialog title

Browse Source
This commit is contained in:
hneemann 2017-07-09 12:48:50 +02:00
parent 5d27b3db1d
commit 9571fd0fd3
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/draw/shapes/InputShape.java
View File

@ -72,7 +72,7 @@ public class InputShape implements Shape {
value.setValue(1 - value.getValue()); value.setValue(1 - value.getValue());
}); });
} else { } else {
SingleValueDialog.editValue(pos, value, modelSync); SingleValueDialog.editValue(pos, label, value, modelSync);
} }
return true; return true;
} }

9
src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java
View File

@ -57,8 +57,8 @@ public final class SingleValueDialog extends JDialog {
private long editValue; private long editValue;
private boolean ok = false; private boolean ok = false;
private SingleValueDialog(Point pos, ObservableValue value) { private SingleValueDialog(Point pos, String label, ObservableValue value) {
super((Frame) null, Lang.get("attr_dialogTitle"), true); super((Frame) null, Lang.get("win_valueInputTitle_N", label), true);
setDefaultCloseOperation(DISPOSE_ON_CLOSE); setDefaultCloseOperation(DISPOSE_ON_CLOSE);
editValue = value.getValue(); editValue = value.getValue();
@ -211,11 +211,12 @@ public final class SingleValueDialog extends JDialog {
* Edits a single value * Edits a single value
* *
* @param pos the position to pop up the dialog * @param pos the position to pop up the dialog
* @param label the name of the value
* @param value the value to edit * @param value the value to edit
* @param modelSync used to access the running model * @param modelSync used to access the running model
*/ */
public static void editValue(Point pos, ObservableValue value, Sync modelSync) { public static void editValue(Point pos, String label, ObservableValue value, Sync modelSync) {
SingleValueDialog svd = new SingleValueDialog(pos, value); SingleValueDialog svd = new SingleValueDialog(pos, label, value);
if (svd.showDialog()) { if (svd.showDialog()) {
if (svd.getSelectedFormat().equals(InMode.HIGHZ)) { if (svd.getSelectedFormat().equals(InMode.HIGHZ)) {
modelSync.access(() -> value.set(0, true)); modelSync.access(() -> value.set(0, true));

1
src/main/resources/lang/lang_de.xml
View File

@ -982,6 +982,7 @@ Die Icons stammen aus dem Tango Desktop Project.</string>
<string name="win_table">Tabelle</string> <string name="win_table">Tabelle</string>
<string name="win_table_exportDialog">Export</string> <string name="win_table_exportDialog">Export</string>
<string name="win_itempicker_title">Auswahl</string> <string name="win_itempicker_title">Auswahl</string>
<string name="win_valueInputTitle_N">Eingabe {0}</string>
<string name="btn_help">Hilfe</string> <string name="btn_help">Hilfe</string>
<string name="msg_expressionHelpTitle">Ausdrücke</string> <string name="msg_expressionHelpTitle">Ausdrücke</string>
<string name="msg_expressionHelp">Zur Definition eines Ausdruckes können alle üblichen <string name="msg_expressionHelp">Zur Definition eines Ausdruckes können alle üblichen

1
src/main/resources/lang/lang_en.xml
View File

@ -969,6 +969,7 @@ The icons are taken from the Tango Desktop Project.</string>
<string name="win_itempicker_title">Select</string> <string name="win_itempicker_title">Select</string>
<string name="win_testdata_N">Testdata {0}</string> <string name="win_testdata_N">Testdata {0}</string>
<string name="win_data">Data</string> <string name="win_data">Data</string>
<string name="win_valueInputTitle_N">Input {0}</string>
<string name="btn_help">Help</string> <string name="btn_help">Help</string>