TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-28 15:32:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

added missing language key

Browse Source
This commit is contained in:
hneemann 2017-05-21 17:03:51 +02:00
parent 77c14bec77
commit 6fb7ae6b65
6 changed files with 356 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/draw/gif/GifExporter.java
View File

@ -51,7 +51,7 @@ public class GifExporter extends JDialog implements ModelStateObserver, ModelMod
* @param delayMs the delay between frames im milliseconds * @param delayMs the delay between frames im milliseconds
*/ */
public GifExporter(JFrame parent, Circuit circuit, int delayMs) { public GifExporter(JFrame parent, Circuit circuit, int delayMs) {
super(parent, "GIF-Export", false); super(parent, Lang.get("msg_gifExport"), false);
setDefaultCloseOperation(DISPOSE_ON_CLOSE); setDefaultCloseOperation(DISPOSE_ON_CLOSE);
frameLabel = new JLabel(Lang.get("msg_framesWritten_N", frames)); frameLabel = new JLabel(Lang.get("msg_framesWritten_N", frames));
frameLabel.setFont(Screen.getInstance().getFont(1.5f)); frameLabel.setFont(Screen.getInstance().getFont(1.5f));

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

@ -862,6 +862,7 @@ Die Icons stammen aus dem Tango Desktop Project.</string>
<string name="msg_errorWritingGif">Fehler beim Schreiben der GIF Datei!</string> <string name="msg_errorWritingGif">Fehler beim Schreiben der GIF Datei!</string>
<string name="btn_gifComplete">Fertig</string> <string name="btn_gifComplete">Fertig</string>
<string name="btn_gifComplete_tt">Die GIF-Datei wird abgeschlossen.</string> <string name="btn_gifComplete_tt">Die GIF-Datei wird abgeschlossen.</string>
<string name="msg_gifExport">GIF-Export</string>
<string name="ok">Ok</string> <string name="ok">Ok</string>
<string name="rot_0">0°</string> <string name="rot_0">0°</string>

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

@ -851,6 +851,7 @@ The icons are taken from the Tango Desktop Project.</string>
<string name="msg_errorWritingGif">Error writing to GIF file!</string> <string name="msg_errorWritingGif">Error writing to GIF file!</string>
<string name="btn_gifComplete">Ready</string> <string name="btn_gifComplete">Ready</string>
<string name="btn_gifComplete_tt">The GIF file is finalized and closed.</string> <string name="btn_gifComplete_tt">The GIF file is finalized and closed.</string>
<string name="msg_gifExport">GIF Export</string>
<string name="ok">Ok</string> <string name="ok">Ok</string>
<string name="rot_0">0°</string> <string name="rot_0">0°</string>

1
src/test/java/de/neemann/digital/integration/TestShapes.java
View File

@ -32,6 +32,7 @@ public class TestShapes extends TestCase {
private void useShapes(boolean ieee) throws Exception { private void useShapes(boolean ieee) throws Exception {
File filename = new File(Resources.getRoot(), "dig/shapes.dig"); File filename = new File(Resources.getRoot(), "dig/shapes.dig");
ElementLibrary library = new ElementLibrary(); ElementLibrary library = new ElementLibrary();
library.setRootFilePath(new File(Resources.getRoot(), "dig"));
ShapeFactory shapeFactory = new ShapeFactory(library, ieee); ShapeFactory shapeFactory = new ShapeFactory(library, ieee);
Circuit circuit = Circuit.loadCircuit(filename, shapeFactory); Circuit circuit = Circuit.loadCircuit(filename, shapeFactory);

347
src/test/resources/dig/MS-JK-DIL.dig Normal file
View File

@ -0,0 +1,347 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
</entry>
</attributes>
<visualElements>
<visualElement>
<elementName>And</elementName>
<elementAttributes>
<entry>
<string>Inputs</string>
<int>3</int>
</entry>
</elementAttributes>
<pos x="160" y="80"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
<elementAttributes>
<entry>
<string>Inputs</string>
<int>3</int>
</entry>
</elementAttributes>
<pos x="160" y="240"/>
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="180" y="180"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>J</string>
</entry>
<entry>
<string>pinNumber</string>
<int>1</int>
</entry>
<entry>
<string>Default</string>
<int>1</int>
</entry>
</elementAttributes>
<pos x="100" y="100"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>C</string>
</entry>
<entry>
<string>pinNumber</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="100" y="180"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="260" y="100"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="260" y="220"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
<elementAttributes/>
<pos x="400" y="80"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
<elementAttributes/>
<pos x="400" y="240"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="500" y="100"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="500" y="220"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>Q</string>
</entry>
<entry>
<string>pinNumber</string>
<int>7</int>
</entry>
</elementAttributes>
<pos x="620" y="120"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>~Q</string>
</entry>
<entry>
<string>pinNumber</string>
<int>6</int>
</entry>
</elementAttributes>
<pos x="620" y="240"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>K</string>
</entry>
<entry>
<string>pinNumber</string>
<int>3</int>
</entry>
</elementAttributes>
<pos x="100" y="260"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="240" y="200"/>
<p2 x="360" y="160"/>
</wire>
<wire>
<p1 x="240" y="160"/>
<p2 x="360" y="200"/>
</wire>
<wire>
<p1 x="480" y="160"/>
<p2 x="600" y="200"/>
</wire>
<wire>
<p1 x="480" y="200"/>
<p2 x="600" y="160"/>
</wire>
<wire>
<p1 x="140" y="320"/>
<p2 x="480" y="320"/>
</wire>
<wire>
<p1 x="220" y="260"/>
<p2 x="260" y="260"/>
</wire>
<wire>
<p1 x="460" y="260"/>
<p2 x="500" y="260"/>
</wire>
<wire>
<p1 x="100" y="260"/>
<p2 x="160" y="260"/>
</wire>
<wire>
<p1 x="100" y="100"/>
<p2 x="160" y="100"/>
</wire>
<wire>
<p1 x="220" y="100"/>
<p2 x="260" y="100"/>
</wire>
<wire>
<p1 x="460" y="100"/>
<p2 x="500" y="100"/>
</wire>
<wire>
<p1 x="140" y="40"/>
<p2 x="480" y="40"/>
</wire>
<wire>
<p1 x="240" y="140"/>
<p2 x="260" y="140"/>
</wire>
<wire>
<p1 x="480" y="140"/>
<p2 x="500" y="140"/>
</wire>
<wire>
<p1 x="380" y="240"/>
<p2 x="400" y="240"/>
</wire>
<wire>
<p1 x="340" y="240"/>
<p2 x="360" y="240"/>
</wire>
<wire>
<p1 x="140" y="240"/>
<p2 x="160" y="240"/>
</wire>
<wire>
<p1 x="580" y="240"/>
<p2 x="600" y="240"/>
</wire>
<wire>
<p1 x="600" y="240"/>
<p2 x="620" y="240"/>
</wire>
<wire>
<p1 x="360" y="80"/>
<p2 x="400" y="80"/>
</wire>
<wire>
<p1 x="140" y="80"/>
<p2 x="160" y="80"/>
</wire>
<wire>
<p1 x="100" y="180"/>
<p2 x="140" y="180"/>
</wire>
<wire>
<p1 x="220" y="180"/>
<p2 x="380" y="180"/>
</wire>
<wire>
<p1 x="140" y="180"/>
<p2 x="180" y="180"/>
</wire>
<wire>
<p1 x="140" y="120"/>
<p2 x="160" y="120"/>
</wire>
<wire>
<p1 x="340" y="120"/>
<p2 x="360" y="120"/>
</wire>
<wire>
<p1 x="380" y="120"/>
<p2 x="400" y="120"/>
</wire>
<wire>
<p1 x="580" y="120"/>
<p2 x="600" y="120"/>
</wire>
<wire>
<p1 x="600" y="120"/>
<p2 x="620" y="120"/>
</wire>
<wire>
<p1 x="360" y="280"/>
<p2 x="400" y="280"/>
</wire>
<wire>
<p1 x="140" y="280"/>
<p2 x="160" y="280"/>
</wire>
<wire>
<p1 x="240" y="220"/>
<p2 x="260" y="220"/>
</wire>
<wire>
<p1 x="480" y="220"/>
<p2 x="500" y="220"/>
</wire>
<wire>
<p1 x="480" y="40"/>
<p2 x="480" y="140"/>
</wire>
<wire>
<p1 x="480" y="200"/>
<p2 x="480" y="220"/>
</wire>
<wire>
<p1 x="480" y="140"/>
<p2 x="480" y="160"/>
</wire>
<wire>
<p1 x="480" y="220"/>
<p2 x="480" y="320"/>
</wire>
<wire>
<p1 x="360" y="80"/>
<p2 x="360" y="120"/>
</wire>
<wire>
<p1 x="360" y="200"/>
<p2 x="360" y="240"/>
</wire>
<wire>
<p1 x="360" y="120"/>
<p2 x="360" y="160"/>
</wire>
<wire>
<p1 x="360" y="240"/>
<p2 x="360" y="280"/>
</wire>
<wire>
<p1 x="140" y="120"/>
<p2 x="140" y="180"/>
</wire>
<wire>
<p1 x="140" y="40"/>
<p2 x="140" y="80"/>
</wire>
<wire>
<p1 x="140" y="280"/>
<p2 x="140" y="320"/>
</wire>
<wire>
<p1 x="140" y="180"/>
<p2 x="140" y="240"/>
</wire>
<wire>
<p1 x="240" y="200"/>
<p2 x="240" y="220"/>
</wire>
<wire>
<p1 x="240" y="140"/>
<p2 x="240" y="160"/>
</wire>
<wire>
<p1 x="600" y="200"/>
<p2 x="600" y="240"/>
</wire>
<wire>
<p1 x="600" y="120"/>
<p2 x="600" y="160"/>
</wire>
<wire>
<p1 x="380" y="120"/>
<p2 x="380" y="180"/>
</wire>
<wire>
<p1 x="380" y="180"/>
<p2 x="380" y="240"/>
</wire>
</wires>
</circuit>

5
src/test/resources/dig/shapes.dig
View File

@ -443,6 +443,11 @@
<elementAttributes/> <elementAttributes/>
<pos x="1080" y="300"/> <pos x="1080" y="300"/>
</visualElement> </visualElement>
<visualElement>
<elementName>MS-JK-DIL.dig</elementName>
<elementAttributes/>
<pos x="780" y="460"/>
</visualElement>
</visualElements> </visualElements>
<wires/> <wires/>
</circuit> </circuit>