From 6fb7ae6b654d229e2f31e2117480a9175bed64cb Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 21 May 2017 17:03:51 +0200 Subject: [PATCH] added missing language key --- .../neemann/digital/draw/gif/GifExporter.java | 2 +- src/main/resources/lang/lang_de.xml | 1 + src/main/resources/lang/lang_en.xml | 1 + .../digital/integration/TestShapes.java | 1 + src/test/resources/dig/MS-JK-DIL.dig | 347 ++++++++++++++++++ src/test/resources/dig/shapes.dig | 5 + 6 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/dig/MS-JK-DIL.dig diff --git a/src/main/java/de/neemann/digital/draw/gif/GifExporter.java b/src/main/java/de/neemann/digital/draw/gif/GifExporter.java index b98284f3a..335de0af5 100644 --- a/src/main/java/de/neemann/digital/draw/gif/GifExporter.java +++ b/src/main/java/de/neemann/digital/draw/gif/GifExporter.java @@ -51,7 +51,7 @@ public class GifExporter extends JDialog implements ModelStateObserver, ModelMod * @param delayMs the delay between frames im milliseconds */ public GifExporter(JFrame parent, Circuit circuit, int delayMs) { - super(parent, "GIF-Export", false); + super(parent, Lang.get("msg_gifExport"), false); setDefaultCloseOperation(DISPOSE_ON_CLOSE); frameLabel = new JLabel(Lang.get("msg_framesWritten_N", frames)); frameLabel.setFont(Screen.getInstance().getFont(1.5f)); diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml index 13f1e7daf..5cbd74b25 100644 --- a/src/main/resources/lang/lang_de.xml +++ b/src/main/resources/lang/lang_de.xml @@ -862,6 +862,7 @@ Die Icons stammen aus dem Tango Desktop Project. Fehler beim Schreiben der GIF Datei! Fertig Die GIF-Datei wird abgeschlossen. + GIF-Export Ok 0° diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index a74d6480c..6dbdcadf0 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -851,6 +851,7 @@ The icons are taken from the Tango Desktop Project. Error writing to GIF file! Ready The GIF file is finalized and closed. + GIF Export Ok 0° diff --git a/src/test/java/de/neemann/digital/integration/TestShapes.java b/src/test/java/de/neemann/digital/integration/TestShapes.java index 0107f6e73..ce0a01659 100644 --- a/src/test/java/de/neemann/digital/integration/TestShapes.java +++ b/src/test/java/de/neemann/digital/integration/TestShapes.java @@ -32,6 +32,7 @@ public class TestShapes extends TestCase { private void useShapes(boolean ieee) throws Exception { File filename = new File(Resources.getRoot(), "dig/shapes.dig"); ElementLibrary library = new ElementLibrary(); + library.setRootFilePath(new File(Resources.getRoot(), "dig")); ShapeFactory shapeFactory = new ShapeFactory(library, ieee); Circuit circuit = Circuit.loadCircuit(filename, shapeFactory); diff --git a/src/test/resources/dig/MS-JK-DIL.dig b/src/test/resources/dig/MS-JK-DIL.dig new file mode 100644 index 000000000..0972fbfd0 --- /dev/null +++ b/src/test/resources/dig/MS-JK-DIL.dig @@ -0,0 +1,347 @@ + + + 1 + + + isDIL + true + + + + + And + + + Inputs + 3 + + + + + + And + + + Inputs + 3 + + + + + + Not + + + + + In + + + Label + J + + + pinNumber + 1 + + + Default + 1 + + + + + + In + + + Label + C + + + pinNumber + 2 + + + + + + NOr + + + + + NOr + + + + + And + + + + + And + + + + + NOr + + + + + NOr + + + + + Out + + + Label + Q + + + pinNumber + 7 + + + + + + Out + + + Label + ~Q + + + pinNumber + 6 + + + + + + In + + + Label + K + + + pinNumber + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/dig/shapes.dig b/src/test/resources/dig/shapes.dig index 32a90f124..e5c2be936 100644 --- a/src/test/resources/dig/shapes.dig +++ b/src/test/resources/dig/shapes.dig @@ -443,6 +443,11 @@ + + MS-JK-DIL.dig + + + \ No newline at end of file