diff --git a/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java b/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
index d4a601aeb..250bc08db 100644
--- a/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
+++ b/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
@@ -294,14 +294,12 @@ public class TableDialog extends JDialog {
createCircuit(ExpressionModifier.IDENTITY);
}
}.setToolTip(Lang.get("menu_table_createCircuit_tt")).createJMenuItem());
- if (Main.enableExperimental()) {
- createMenu.add(new ToolTipAction(Lang.get("menu_table_createCircuitJK")) {
- @Override
- public void actionPerformed(ActionEvent actionEvent) {
- createCircuit(true, ExpressionModifier.IDENTITY);
- }
- }.setToolTip(Lang.get("menu_table_createCircuitJK_tt")).createJMenuItem());
- }
+ createMenu.add(new ToolTipAction(Lang.get("menu_table_createCircuitJK")) {
+ @Override
+ public void actionPerformed(ActionEvent actionEvent) {
+ createCircuit(true, ExpressionModifier.IDENTITY);
+ }
+ }.setToolTip(Lang.get("menu_table_createCircuitJK_tt")).createJMenuItem());
createMenu.add(new ToolTipAction(Lang.get("menu_table_createTwo")) {
@Override
@@ -341,44 +339,43 @@ public class TableDialog extends JDialog {
}
- if (Main.enableExperimental()) {
- JMenu hardware = new JMenu(Lang.get("menu_table_create_hardware"));
- JMenu gal16v8 = new JMenu("GAL16v8");
- gal16v8.add(new ToolTipAction(Lang.get("menu_table_createCUPL")) {
- @Override
- public void actionPerformed(ActionEvent actionEvent) {
- createCUPL(new Gal16v8CuplExporter());
- }
- }.setToolTip(Lang.get("menu_table_createCUPL_tt")).createJMenuItem());
- gal16v8.add(new ToolTipAction(Lang.get("menu_table_create_jedec")) {
- @Override
- public void actionPerformed(ActionEvent actionEvent) {
- Gal16v8JEDECExporter jedecExporter = new Gal16v8JEDECExporter();
- createHardware(jedecExporter, filename);
- new ShowStringDialog(parent, Lang.get("win_pinMapDialog"), jedecExporter.getPinMapping().toString()).setVisible(true);
- }
- }.setToolTip(Lang.get("menu_table_create_jedec_tt")).createJMenuItem());
- hardware.add(gal16v8);
+ JMenu hardware = new JMenu(Lang.get("menu_table_create_hardware"));
+ JMenu gal16v8 = new JMenu("GAL16v8");
+ gal16v8.add(new ToolTipAction(Lang.get("menu_table_createCUPL")) {
+ @Override
+ public void actionPerformed(ActionEvent actionEvent) {
+ createCUPL(new Gal16v8CuplExporter());
+ }
+ }.setToolTip(Lang.get("menu_table_createCUPL_tt")).createJMenuItem());
+ gal16v8.add(new ToolTipAction(Lang.get("menu_table_create_jedec")) {
+ @Override
+ public void actionPerformed(ActionEvent actionEvent) {
+ Gal16v8JEDECExporter jedecExporter = new Gal16v8JEDECExporter();
+ createHardware(jedecExporter, filename);
+ new ShowStringDialog(parent, Lang.get("win_pinMapDialog"), jedecExporter.getPinMapping().toString()).setVisible(true);
+ }
+ }.setToolTip(Lang.get("menu_table_create_jedec_tt")).createJMenuItem());
+ hardware.add(gal16v8);
- JMenu gal22v10 = new JMenu("GAL22v10");
- gal22v10.add(new ToolTipAction(Lang.get("menu_table_createCUPL")) {
- @Override
- public void actionPerformed(ActionEvent actionEvent) {
- createCUPL(new Gal22v10CuplExporter());
- }
- }.setToolTip(Lang.get("menu_table_createCUPL_tt")).createJMenuItem());
- gal22v10.add(new ToolTipAction(Lang.get("menu_table_create_jedec")) {
- @Override
- public void actionPerformed(ActionEvent actionEvent) {
- Gal22v10JEDECExporter jedecExporter = new Gal22v10JEDECExporter();
- createHardware(jedecExporter, filename);
- new ShowStringDialog(parent, Lang.get("win_pinMapDialog"), jedecExporter.getPinMapping().toString()).setVisible(true);
- }
- }.setToolTip(Lang.get("menu_table_create_jedec_tt")).createJMenuItem());
- hardware.add(gal22v10);
+ JMenu gal22v10 = new JMenu("GAL22v10");
+ gal22v10.add(new ToolTipAction(Lang.get("menu_table_createCUPL")) {
+ @Override
+ public void actionPerformed(ActionEvent actionEvent) {
+ createCUPL(new Gal22v10CuplExporter());
+ }
+ }.setToolTip(Lang.get("menu_table_createCUPL_tt")).createJMenuItem());
+ gal22v10.add(new ToolTipAction(Lang.get("menu_table_create_jedec")) {
+ @Override
+ public void actionPerformed(ActionEvent actionEvent) {
+ Gal22v10JEDECExporter jedecExporter = new Gal22v10JEDECExporter();
+ createHardware(jedecExporter, filename);
+ new ShowStringDialog(parent, Lang.get("win_pinMapDialog"), jedecExporter.getPinMapping().toString()).setVisible(true);
+ }
+ }.setToolTip(Lang.get("menu_table_create_jedec_tt")).createJMenuItem());
+ hardware.add(gal22v10);
+
+ createMenu.add(hardware);
- createMenu.add(hardware);
- }
return createMenu;
}
@@ -507,7 +504,7 @@ public class TableDialog extends JDialog {
};
if (createJK.isSelected())
- expressionListener=new ExpressionListenerJK(expressionListener);
+ expressionListener = new ExpressionListenerJK(expressionListener);
new ExpressionCreator(model.getTable()).create(expressionListener);
@@ -529,7 +526,7 @@ public class TableDialog extends JDialog {
.append("\\\\\n");
if (createJK.isSelected())
- expressionListener=new ExpressionListenerJK(expressionListener);
+ expressionListener = new ExpressionListenerJK(expressionListener);
sb.append("\\begin{eqnarray*}\n");
new ExpressionCreator(model.getTable()).create(expressionListener);
diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml
index 561859877..023151749 100644
--- a/src/main/resources/lang/lang_de.xml
+++ b/src/main/resources/lang/lang_de.xml
@@ -309,7 +309,7 @@ Zur Analyse können Sie die Schaltung im Gatterschrittmodus ausführen.
Erzeugt eine CUPL Quelldatei welche die Schaltung beschreibt.
Schaltung
Erzeugt eine Schaltung, welche der Wahrheitstabelle entspricht.
- Schaltung JK
+ Schaltung mit JK Flipflops
Erzeugt eine Schaltung, welche der Wahrheitstabelle entspricht, Verwendet JK-Flipflops.
Schaltung mit NAnd-Gattern
Schaltung mit NAnd-Gattern mit zwei Eingängen
diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml
index 5eff76738..14f876696 100644
--- a/src/main/resources/lang/lang_en.xml
+++ b/src/main/resources/lang/lang_en.xml
@@ -116,7 +116,7 @@ The terminal opens its own window.
If high the output D is active and one keystroke is outputed.
The last pressed key, or null if no key is typed.
Error
- D-Flipflop has no label set
+ D-flip-flop has no label set
Pin {0} in element {1} is not a input or output
A single clock is necessary.
The circuit has no Inputs
@@ -132,7 +132,7 @@ The terminal opens its own window.
Pin {0} in element {1} exists twice
Element {0} not found
Exact {0} variables necessary, not {1}
- Flipflop needs to be connected to the clock.
+ Flip-flop needs to be connected to the clock.
Invalid file format
Logic is already initialized
A tunnel {0} is not connected!
@@ -309,8 +309,8 @@ To analyse you can run the circuit in single gate step mode.
Creates a CUPL source file containing the define circuit.
Circuit
Creates a circuit which reproduces the truth table.
- Circuit JK
- Creates a circuit which reproduces the truth table. Uses JK flipflops.
+ Circuit with JK flip-flops
+ Creates a circuit which reproduces the truth table. Uses JK flip-flops.
Circuit with NAnd gates
Circuit with NAnd gates with two inputs
Use only NAnd gates with two inputs.