kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-19 14:50:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into terminal_strip

Browse Source
This commit is contained in:
joshua
2021-05-21 19:18:16 +02:00
parent 507c1b4f73 fdbfca9a8c
commit 6660caa70f
26 changed files with 250 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build-aux/flatpak/org.qelectrotech.QElectroTech.json
View File

@@ -78,18 +78,17 @@
] ]
}, },
{ {
"name": "python3.6.0", "name": "python3-PySimpleGUI",
"buildsystem": "simple",
"build-commands": [
"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
],
"sources": [ "sources": [
{ {
"type": "archive", "type": "file",
"url": "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz", "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
"sha256": "b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622" "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
} }
],
"config-opts": ["--enable-shared"],
"post-install": [
"chmod +w ${FLATPAK_DEST}/lib/libpython3.6m.so.1.0",
"chmod +w ${FLATPAK_DEST}/lib/libpython3.so"
] ]
}, },
{ {
@@ -101,25 +100,10 @@
"sources": [ "sources": [
{ {
"type": "file", "type": "file",
"url": "https://files.pythonhosted.org/packages/9e/c3/aaad3309a5f2ca08e2fa0ab01123bb6fafb15a92854bff88042039192a67/qet_tb_generator-1.1.7.tar.gz", "url": "https://files.pythonhosted.org/packages/45/be/d5940d365ebf256e490bc6c10837244e0b8dda08a7d790691767263c318d/qet_tb_generator-1.2.5.tar.gz",
"sha256": "f626ab7bf4d9091fc85f63d33136585e611272b347499b448ece4e33cc04eeed" "sha256": "37c3298602244f3152fbb7601caba9b4862bac782991fbb472eab91afb70d09c"
} }
] ]
},
{
"name": "DXFtoQET-2020-1",
"buildsystem": "qmake",
"sources": [
{
"type": "git",
"url": "https://github.com/qelectrotech/DXFtoQET-2020.git",
"commit": "01fbb2afe0fe66782cb1d1f901c73616c7d5299d"
}
],
"post-install": [
"mkdir -p ${FLATPAK_DEST}/bin",
"cp DXFtoQET ${FLATPAK_DEST}/bin/"
]
} }
] ]
} }

0
elements/10_electric/20_manufacturers_articles/gce/Wemos D1 ESP8266.elmt → elements/10_electric/20_manufacturers_articles/arduino/Wemos D1 ESP8266.elmt
View File

0
elements/10_electric/20_manufacturers_articles/gce/Wemos D1 Pro ESP8266.elmt → elements/10_electric/20_manufacturers_articles/arduino/Wemos D1 Pro ESP8266.elmt
View File

76
elements/10_electric/20_manufacturers_articles/arduino/esp8266.elmt Normal file
View File

@@ -0,0 +1,76 @@
<definition type="element" width="120" hotspot_y="93" height="190" version="0.90" link_type="simple" hotspot_x="59">
<uuid uuid="{cf96e002-281b-4d6c-b61e-99b1c3713b64}"/>
<names>
<name lang="de">ESP8266</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<circle antialias="false" x="15" diameter="5" y="78" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
<text rotation="0" x="32.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-66" text="D0"/>
<text rotation="0" x="32.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-56" text="D1"/>
<text rotation="0" x="32.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-46" text="D2"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-66" text="A0"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-56" text="RSV"/>
<text rotation="0" x="32.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-36" text="D3"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-46" text="RSV"/>
<text rotation="0" x="32.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-26" text="D4"/>
<text rotation="0" x="28" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-16" text="3V3"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-36" text="SD3"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-26" text="SD2"/>
<text rotation="0" x="25.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-6" text="GND"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-16" text="SD1"/>
<text rotation="0" x="32" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="4" text="D5"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="-6" text="CMD"/>
<text rotation="0" x="32" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="14" text="D6"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="4" text="SD0"/>
<text rotation="0" x="32" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="24" text="D7"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="14" text="CLK"/>
<text rotation="0" x="32" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="34" text="D8"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="24" text="GND"/>
<text rotation="0" x="33" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="44" text="RX"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="34" text="3.3V"/>
<text rotation="0" x="32.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="54" text="TX"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="44" text="EN"/>
<text rotation="0" x="25.7031" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="64" text="GND"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="54" text="RST"/>
<text rotation="0" x="28" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="74" text="3V3"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="64" text="GND"/>
<text rotation="0" x="-44" font="Sans Serif,9,-1,5,50,0,0,0,0,0" color="#000000" y="74" text="Vin"/>
<rect width="20" height="15" antialias="false" x="-10" y="78" ry="0" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<circle antialias="false" x="-20" diameter="5" y="78" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
<rect width="100" height="180" antialias="false" x="-50" y="-90" ry="0" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="40" height="60" antialias="false" x="-20" y="-80" ry="0" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text rotation="0" x="-19" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="-65" text="ESP 8266"/>
<terminal name="" orientation="w" type="Generic" uuid="{c3c81946-ef37-455e-8692-805e809c5fb4}" x="-54" y="-10"/>
<terminal name="" orientation="w" type="Generic" uuid="{d4386784-11e9-4b50-ac6d-8272c01e4a8c}" x="-54" y="-60"/>
<terminal name="" orientation="w" type="Generic" uuid="{49710fb4-49a0-471e-94f1-3c452ca0b60b}" x="-54" y="30"/>
<terminal name="" orientation="w" type="Generic" uuid="{2c12c463-3a5a-4fcf-9cc8-c576ea24bde6}" x="-54" y="20"/>
<terminal name="" orientation="e" type="Generic" uuid="{37a02815-1a54-4083-9205-f0c4fcac7414}" x="54" y="-50"/>
<terminal name="" orientation="w" type="Generic" uuid="{1c7b90a8-d35d-4da3-8e48-b92677c9522f}" x="-54" y="0"/>
<terminal name="" orientation="w" type="Generic" uuid="{de91c5d1-f33c-4f6f-95aa-719371d7f257}" x="-54" y="10"/>
<terminal name="" orientation="w" type="Generic" uuid="{e7bfa009-1274-4912-b47c-294de63919fd}" x="-54" y="-70"/>
<terminal name="" orientation="w" type="Generic" uuid="{5bea6ccb-69d9-4d7c-8389-07731e99d75b}" x="-54" y="60"/>
<terminal name="" orientation="e" type="Generic" uuid="{22bf1db0-8c38-409a-b2fd-5156e60846c1}" x="54" y="40"/>
<terminal name="" orientation="e" type="Generic" uuid="{4f235693-b78c-40fe-8f12-497760a5186e}" x="54" y="-20"/>
<terminal name="" orientation="e" type="Generic" uuid="{231357f9-710b-4b07-aa03-31c0a465dd9b}" x="54" y="50"/>
<terminal name="" orientation="e" type="Generic" uuid="{72eaac68-0ad0-4acf-9f0a-a9a051ca27e2}" x="54" y="-30"/>
<terminal name="" orientation="e" type="Generic" uuid="{952fe9c2-e21c-4cec-b90f-8468240ff795}" x="54" y="70"/>
<terminal name="" orientation="e" type="Generic" uuid="{2147ea04-39f3-46e8-a5b8-8d8f7898c683}" x="54" y="20"/>
<terminal name="" orientation="e" type="Generic" uuid="{a4d638fa-5c6f-4f19-8744-ca81793c765a}" x="54" y="0"/>
<terminal name="" orientation="e" type="Generic" uuid="{213414a2-a185-4c9b-accf-0ed313666201}" x="54" y="-60"/>
<terminal name="" orientation="e" type="Generic" uuid="{c2909154-4c79-4e06-88ce-2cf13443ab16}" x="54" y="-10"/>
<terminal name="" orientation="e" type="Generic" uuid="{af6b5b74-0433-4fd2-a4ff-526810f35bfc}" x="54" y="30"/>
<terminal name="" orientation="e" type="Generic" uuid="{49faf65e-a6cf-4332-b1b2-3016e5b38143}" x="54" y="10"/>
<terminal name="" orientation="e" type="Generic" uuid="{b809ba96-fc61-4466-ac23-055ed0148515}" x="54" y="-40"/>
<terminal name="" orientation="w" type="Generic" uuid="{dab53803-b282-42a7-948e-053aff11be64}" x="-54" y="-40"/>
<terminal name="" orientation="w" type="Generic" uuid="{22999d02-bc25-4357-9faf-f1ce9cb37e58}" x="-54" y="-20"/>
<terminal name="" orientation="w" type="Generic" uuid="{194293fb-34c8-4ff2-96cd-9fcebf9b516a}" x="-54" y="40"/>
<terminal name="" orientation="w" type="Generic" uuid="{cc20f24b-b335-4cc0-9dc7-6d23649dd724}" x="-54" y="50"/>
<terminal name="" orientation="w" type="Generic" uuid="{956be6a4-af84-4827-9c56-f145e18dc1b9}" x="-54" y="-30"/>
<terminal name="" orientation="e" type="Generic" uuid="{280f8366-f352-45a2-b241-a6306fb081bb}" x="54" y="-70"/>
<terminal name="" orientation="w" type="Generic" uuid="{d202e523-ceab-4b8d-9d9d-b5fffdbb55e6}" x="-54" y="-50"/>
<terminal name="" orientation="w" type="Generic" uuid="{5f18a1ee-1a83-4243-a475-87431d0f0c2d}" x="-54" y="70"/>
<terminal name="" orientation="e" type="Generic" uuid="{0df53f1e-5c2a-4a3e-9aa5-356ec618a384}" x="54" y="60"/>
</description>
</definition>

BIN
lang/qet_da.qm
View File

Binary file not shown.

26
lang/qet_da.ts
View File

@@ -1486,7 +1486,7 @@ Bemærk: Disse muligheder VIL IKKE tillade eller blokere autonummereringer, kun
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="110"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="110"/>
<source>Conserver la rotation visuel</source> <source>Conserver la rotation visuel</source>
<translation type="unfinished">Behold visuel rotation</translation> <translation>Behold visuel rotation</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="138"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="138"/>
@@ -1501,7 +1501,7 @@ Bemærk: Disse muligheder VIL IKKE tillade eller blokere autonummereringer, kun
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="210"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="210"/>
<source>Encadrer le texte</source> <source>Encadrer le texte</source>
<translation type="unfinished"></translation> <translation>Ramme om tekst</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="50"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="50"/>
@@ -1569,7 +1569,7 @@ Bemærk: Disse muligheder VIL IKKE tillade eller blokere autonummereringer, kun
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="448"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="448"/>
<source>Modifier la conservation de l&apos;angle</source> <source>Modifier la conservation de l&apos;angle</source>
<translation type="unfinished"></translation> <translation>Ændre vinkel bevarelse</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="311"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="311"/>
@@ -8787,7 +8787,7 @@ Voulez-vous la remplacer ?</source>
<message> <message>
<location filename="../sources/qetdiagrameditor.cpp" line="2392"/> <location filename="../sources/qetdiagrameditor.cpp" line="2392"/>
<source>To install the plugin qet_tb_generator&lt;br&gt;Visit :&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt; First install on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Install, if required, python 3.9 bundle only, &lt;br&gt;2 Run Profile.command script&lt;br&gt;because program use hardcoded PATH for localise qet-tb-generator plugin &lt;br&gt; Visit :&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;howto&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt; Update on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt; pip3 install --upgrade qet_tb_generator&lt;br&gt;</source> <source>To install the plugin qet_tb_generator&lt;br&gt;Visit :&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt; First install on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Install, if required, python 3.9 bundle only, &lt;br&gt;2 Run Profile.command script&lt;br&gt;because program use hardcoded PATH for localise qet-tb-generator plugin &lt;br&gt; Visit :&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;howto&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt; Update on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt; pip3 install --upgrade qet_tb_generator&lt;br&gt;</source>
<translation type="unfinished"></translation> <translation>For at installere udvidelsesmodul qet_tb_generator&lt;br&gt;Besøg:&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt;Første installaton på MacOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Installere, om nødvendigt, kun python 3.9 pakke&lt;br&gt;2 Kør Profile.command script&lt;br&gt;fordi programmet bruger hård kodet PATH til lokalisering af qet-tb-generator udvidelsesmodul&lt;br&gt;Besøg:&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;howto&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt;Opdatering på macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;pip3 install --upgrade qet_tb_generator&lt;br&gt;</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetdiagrameditor.cpp" line="2410"/> <location filename="../sources/qetdiagrameditor.cpp" line="2410"/>
@@ -8832,12 +8832,12 @@ Voulez-vous la remplacer ?</source>
<message> <message>
<location filename="../sources/machine_info.cpp" line="124"/> <location filename="../sources/machine_info.cpp" line="124"/>
<source>Compilation : </source> <source>Compilation : </source>
<translation type="unfinished">Kompilering: </translation> <translation>Kompilering: </translation>
</message> </message>
<message> <message>
<location filename="../sources/machine_info.cpp" line="342"/> <location filename="../sources/machine_info.cpp" line="342"/>
<source>Compilation : </source> <source>Compilation : </source>
<translation type="unfinished">Kompilering: </translation> <translation>Kompilering: </translation>
</message> </message>
</context> </context>
<context> <context>
@@ -11449,7 +11449,7 @@ De andre felter anvendes ikke.</translation>
<location filename="../sources/editor/styleeditor.cpp" line="293"/> <location filename="../sources/editor/styleeditor.cpp" line="293"/>
<source>Green : MediumAquamarine</source> <source>Green : MediumAquamarine</source>
<comment>element part filling</comment> <comment>element part filling</comment>
<translation type="unfinished">Grøn : Mellem havvand</translation> <translation>Grøn : Mellem havvand</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/styleeditor.cpp" line="294"/> <location filename="../sources/editor/styleeditor.cpp" line="294"/>
@@ -11533,7 +11533,7 @@ De andre felter anvendes ikke.</translation>
<location filename="../sources/editor/styleeditor.cpp" line="307"/> <location filename="../sources/editor/styleeditor.cpp" line="307"/>
<source>Cyan : LightSeaGreen</source> <source>Cyan : LightSeaGreen</source>
<comment>element part filling</comment> <comment>element part filling</comment>
<translation type="unfinished">Turkis : Lys havgrøn</translation> <translation>Turkis : Lys havgrøn</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/styleeditor.cpp" line="308"/> <location filename="../sources/editor/styleeditor.cpp" line="308"/>
@@ -11545,7 +11545,7 @@ De andre felter anvendes ikke.</translation>
<location filename="../sources/editor/styleeditor.cpp" line="309"/> <location filename="../sources/editor/styleeditor.cpp" line="309"/>
<source>Cyan : DarkCyan</source> <source>Cyan : DarkCyan</source>
<comment>element part filling</comment> <comment>element part filling</comment>
<translation type="unfinished">Turkis : Mørk turkis</translation> <translation>Turkis : Mørk turkis</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/styleeditor.cpp" line="310"/> <location filename="../sources/editor/styleeditor.cpp" line="310"/>
@@ -11791,13 +11791,13 @@ De andre felter anvendes ikke.</translation>
<location filename="../sources/editor/styleeditor.cpp" line="350"/> <location filename="../sources/editor/styleeditor.cpp" line="350"/>
<source>White : GhostWhite</source> <source>White : GhostWhite</source>
<comment>element part filling</comment> <comment>element part filling</comment>
<translation type="unfinished">Hvid : Spøgelse hvid</translation> <translation>Hvid : Spøgelse hvid</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/styleeditor.cpp" line="351"/> <location filename="../sources/editor/styleeditor.cpp" line="351"/>
<source>White : WhiteSmoke</source> <source>White : WhiteSmoke</source>
<comment>element part filling</comment> <comment>element part filling</comment>
<translation type="unfinished">Hvid : Hvid røg</translation> <translation>Hvid : Hvid røg</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/styleeditor.cpp" line="352"/> <location filename="../sources/editor/styleeditor.cpp" line="352"/>
@@ -11863,7 +11863,7 @@ De andre felter anvendes ikke.</translation>
<location filename="../sources/editor/styleeditor.cpp" line="362"/> <location filename="../sources/editor/styleeditor.cpp" line="362"/>
<source>Gray : LightGray</source> <source>Gray : LightGray</source>
<comment>element part filling</comment> <comment>element part filling</comment>
<translation type="unfinished">Grå : Lysegrå</translation> <translation>Grå : Lysegrå</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/styleeditor.cpp" line="363"/> <location filename="../sources/editor/styleeditor.cpp" line="363"/>
@@ -11893,7 +11893,7 @@ De andre felter anvendes ikke.</translation>
<location filename="../sources/editor/styleeditor.cpp" line="367"/> <location filename="../sources/editor/styleeditor.cpp" line="367"/>
<source>Gray : LightSlateGray</source> <source>Gray : LightSlateGray</source>
<comment>element part filling</comment> <comment>element part filling</comment>
<translation type="unfinished">Grå : Lys skifergrå</translation> <translation>Grå : Lys skifergrå</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/styleeditor.cpp" line="368"/> <location filename="../sources/editor/styleeditor.cpp" line="368"/>

BIN
lang/qet_nl.qm
View File

Binary file not shown.

62
lang/qet_nl.ts
View File

@@ -384,7 +384,7 @@
<message> <message>
<location filename="../sources/factory/ui/addtabledialog.cpp" line="169"/> <location filename="../sources/factory/ui/addtabledialog.cpp" line="169"/>
<source>Sélectionner la police des en tête du tableau</source> <source>Sélectionner la police des en tête du tableau</source>
<translation>Selecteer het lettertype van de.kopteksten van de tabel</translation> <translation>Selecteer het lettertype van de kopteksten van de tabel</translation>
</message> </message>
<message> <message>
<location filename="../sources/factory/ui/addtabledialog.cpp" line="180"/> <location filename="../sources/factory/ui/addtabledialog.cpp" line="180"/>
@@ -594,12 +594,12 @@
-Update Only Existent: only existent Elements will be updated. New Elements will be assigned their formula but will not update once created. -Update Only Existent: only existent Elements will be updated. New Elements will be assigned their formula but will not update once created.
-Disable: both New and Existent Element labels will not be updated. This is valid for new folios as well. -Disable: both New and Existent Element labels will not be updated. This is valid for new folios as well.
Note: These options DO NOT allow or block Auto Numberings, only their Update Policy.</source> Note: These options DO NOT allow or block Auto Numberings, only their Update Policy.</source>
<translation>In dit menu kun je instellen of en wat automatische nummering moet updaten. Voor automatisch nummeren van elementen zijn 4 opties mogelijk: <translation>In dit menu kun je instellen of en wat een automatische nummering moet updaten. Voor het automatisch nummeren van elementen zijn 4 opties mogelijk:
-Beide: nieuwe en bestaande elementen zullen worden geüpdatet. Dit is de standaard instelling. -Beide: nieuwe en bestaande elementen zullen worden geüpdatet. Dit is de standaard instelling.
-Nieuwe: alleen nieuwe elementen zullen worden geüpdatet. Bestaande elementlabels blijven ongewijzigd. -Nieuwe: alleen nieuwe elementen zullen worden geüpdatet. Bestaande elementlabels blijven ongewijzigd.
-Bestaande: alleen bestaande elementen zullen worden geüpdatet. Nieuwe elementen krijgen hun formule toegewezen maar worden na aanmaken niet geüpdatet. -Bestaande: alleen bestaande elementen zullen worden geüpdatet. Nieuwe elementen krijgen hun formule toegewezen maar worden na het aanmaken niet geüpdatet.
-Uitgeschakeld: Nieuwe noch bestaande labels zullen worden geüpdatet. Dit geldt ook voor nieuwe bladen. -Uitgeschakeld: Nieuwe noch bestaande labels zullen worden geüpdatet. Dit geldt ook voor nieuwe bladen.
Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen het updatebeleid.</translation> Noot: Geen van deze opties bepalen het al of niet automatisch nummeren maar alleen het updatebeleid.</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -667,7 +667,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<location filename="../sources/ui/bomexportdialog.cpp" line="124"/> <location filename="../sources/ui/bomexportdialog.cpp" line="124"/>
<source>Quantité numéro d&apos;article</source> <source>Quantité numéro d&apos;article</source>
<comment>Special field with name : designation quantity</comment> <comment>Special field with name : designation quantity</comment>
<translation>Aantal itemnummer</translation> <translation>Aantal itemnummers</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -710,7 +710,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/ui/borderpropertieswidget.ui" line="20"/> <location filename="../sources/ui/borderpropertieswidget.ui" line="20"/>
<source>Dimensions du folio</source> <source>Dimensions du folio</source>
<translation>Stramien</translation> <translation>Bladafmetingen</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -813,7 +813,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/> <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
<source>Type</source> <source>Type</source>
<translation>Geleidertype</translation> <translation>Type</translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/> <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
@@ -1005,7 +1005,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="457"/> <location filename="../sources/ui/conductorpropertieswidget.ui" line="457"/>
<source>Apparence</source> <source>Apparence</source>
<translation>Geleiderweergave</translation> <translation>Weergave</translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="528"/> <location filename="../sources/ui/conductorpropertieswidget.ui" line="528"/>
@@ -1143,7 +1143,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/diagramview.cpp" line="118"/> <location filename="../sources/diagramview.cpp" line="118"/>
<source>Choisir la nouvelle couleur de ce conducteur</source> <source>Choisir la nouvelle couleur de ce conducteur</source>
<translation>Kies een nieuwe kleur voor deze geleider</translation> <translation>Kies de nieuwe kleur voor deze geleider</translation>
</message> </message>
<message> <message>
<location filename="../sources/diagramview.cpp" line="137"/> <location filename="../sources/diagramview.cpp" line="137"/>
@@ -1476,7 +1476,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="110"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="110"/>
<source>Conserver la rotation visuel</source> <source>Conserver la rotation visuel</source>
<translation type="unfinished">Oriëntatie behouden</translation> <translation>Oriëntatie behouden</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="138"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="138"/>
@@ -1491,7 +1491,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="210"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="210"/>
<source>Encadrer le texte</source> <source>Encadrer le texte</source>
<translation type="unfinished"></translation> <translation>Tekst omkaderen</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="50"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="50"/>
@@ -1569,7 +1569,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="448"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="448"/>
<source>Modifier la conservation de l&apos;angle</source> <source>Modifier la conservation de l&apos;angle</source>
<translation type="unfinished"></translation> <translation>De te bewaren hoek wijzigen</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="311"/> <location filename="../sources/editor/ui/dynamictextfieldeditor.cpp" line="311"/>
@@ -1821,7 +1821,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/editor/ui/elementpropertieseditorwidget.ui" line="113"/> <location filename="../sources/editor/ui/elementpropertieseditorwidget.ui" line="113"/>
<source>Élément bornier</source> <source>Élément bornier</source>
<translation>Elementaansluiting</translation> <translation>Element-aansluitingen</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/elementpropertieseditorwidget.ui" line="126"/> <location filename="../sources/editor/ui/elementpropertieseditorwidget.ui" line="126"/>
@@ -1847,7 +1847,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<location filename="../sources/editor/ui/elementpropertieseditorwidget.cpp" line="119"/> <location filename="../sources/editor/ui/elementpropertieseditorwidget.cpp" line="119"/>
<location filename="../sources/editor/ui/elementpropertieseditorwidget.cpp" line="130"/> <location filename="../sources/editor/ui/elementpropertieseditorwidget.cpp" line="130"/>
<source>Simple</source> <source>Simple</source>
<translation>Eenvoudig</translation> <translation>Enkelvoudig</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/elementpropertieseditorwidget.cpp" line="120"/> <location filename="../sources/editor/ui/elementpropertieseditorwidget.cpp" line="120"/>
@@ -2059,12 +2059,12 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/dataBase/ui/elementquerywidget.ui" line="35"/> <location filename="../sources/dataBase/ui/elementquerywidget.ui" line="35"/>
<source>Informations disponibles</source> <source>Informations disponibles</source>
<translation>Beschikbare informatie</translation> <translation>Beschikbare gegevens</translation>
</message> </message>
<message> <message>
<location filename="../sources/dataBase/ui/elementquerywidget.ui" line="45"/> <location filename="../sources/dataBase/ui/elementquerywidget.ui" line="45"/>
<source>Informations à exporter</source> <source>Informations à exporter</source>
<translation>Te exporteren informatie</translation> <translation>Te exporteren gegevens</translation>
</message> </message>
<message> <message>
<location filename="../sources/dataBase/ui/elementquerywidget.ui" line="85"/> <location filename="../sources/dataBase/ui/elementquerywidget.ui" line="85"/>
@@ -2129,12 +2129,12 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/dataBase/ui/elementquerywidget.ui" line="239"/> <location filename="../sources/dataBase/ui/elementquerywidget.ui" line="239"/>
<source>Type d&apos;éléments</source> <source>Type d&apos;éléments</source>
<translation>Elementtype</translation> <translation>Te exporteren elementen</translation>
</message> </message>
<message> <message>
<location filename="../sources/dataBase/ui/elementquerywidget.ui" line="248"/> <location filename="../sources/dataBase/ui/elementquerywidget.ui" line="248"/>
<source>Simples</source> <source>Simples</source>
<translation>Eenvoudige</translation> <translation>Enkelvoudige</translation>
</message> </message>
<message> <message>
<location filename="../sources/dataBase/ui/elementquerywidget.ui" line="258"/> <location filename="../sources/dataBase/ui/elementquerywidget.ui" line="258"/>
@@ -2228,7 +2228,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/editor/elementscene.cpp" line="904"/> <location filename="../sources/editor/elementscene.cpp" line="904"/>
<source>Vous pouvez spécifier le nom de l&apos;élément dans plusieurs langues.</source> <source>Vous pouvez spécifier le nom de l&apos;élément dans plusieurs langues.</source>
<translation>U kunt voor meerdere talen een elementnaam opgeven.</translation> <translation>U kunt de elementnaam in meerdere talen opgeven.</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/elementscene.cpp" line="902"/> <location filename="../sources/editor/elementscene.cpp" line="902"/>
@@ -2242,7 +2242,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/elementscategoryeditor.cpp" line="124"/> <location filename="../sources/elementscategoryeditor.cpp" line="124"/>
<source>Vous pouvez spécifier un nom par langue pour la catégorie.</source> <source>Vous pouvez spécifier un nom par langue pour la catégorie.</source>
<translation>U kunt voor elke taal een categorienaam opgeven.</translation> <translation>U kunt de categorienaam in meerdere talen opgeven.</translation>
</message> </message>
<message> <message>
<location filename="../sources/elementscategoryeditor.cpp" line="113"/> <location filename="../sources/elementscategoryeditor.cpp" line="113"/>
@@ -2345,7 +2345,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="149"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="149"/>
<source>Ouvrir le dossier correspondant</source> <source>Ouvrir le dossier correspondant</source>
<translation>Bestandsmap openen</translation> <translation>Bijbehorende map openen</translation>
</message> </message>
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="151"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="151"/>
@@ -2365,7 +2365,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="157"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="157"/>
<source>Recharger les collections</source> <source>Recharger les collections</source>
<translation>Herlaadt collecties</translation> <translation>Collecties opnieuw laden</translation>
</message> </message>
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="159"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="159"/>
@@ -2385,12 +2385,12 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="165"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="165"/>
<source>Afficher uniquement ce dossier</source> <source>Afficher uniquement ce dossier</source>
<translation>Alleen deze map tonen</translation> <translation>Alleen deze map weergeven</translation>
</message> </message>
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="168"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="168"/>
<source>Afficher tous les dossiers</source> <source>Afficher tous les dossiers</source>
<translation>Alle mappen tonen</translation> <translation>Alle mappen weergeven</translation>
</message> </message>
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="170"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="170"/>
@@ -2426,7 +2426,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="412"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="412"/>
<source>La suppression de l&apos;élément a échoué.</source> <source>La suppression de l&apos;élément a échoué.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>Verwijdering element mislukt.</translation> <translation>Element kon niet worden verwijdert.</translation>
</message> </message>
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="437"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="437"/>
@@ -2451,7 +2451,7 @@ Tout les éléments et les dossier contenus dans ce dossier seront supprimés.</
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="456"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="456"/>
<source>La suppression du dossier a échoué.</source> <source>La suppression du dossier a échoué.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>Map verwijderen mislukt.</translation> <translation>Map kon niet worden verwijdert.</translation>
</message> </message>
<message> <message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="595"/> <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="595"/>
@@ -2545,7 +2545,7 @@ Tout les éléments et les dossier contenus dans ce dossier seront supprimés.</
<message> <message>
<location filename="../sources/elementspanelwidget.cpp" line="54"/> <location filename="../sources/elementspanelwidget.cpp" line="54"/>
<source>Ouvrir le dossier correspondant</source> <source>Ouvrir le dossier correspondant</source>
<translation>Open de bestandsmap</translation> <translation>Open de bijbehorende map</translation>
</message> </message>
<message> <message>
<location filename="../sources/elementspanelwidget.cpp" line="55"/> <location filename="../sources/elementspanelwidget.cpp" line="55"/>
@@ -2663,7 +2663,7 @@ Tout les éléments et les dossier contenus dans ce dossier seront supprimés.</
<message> <message>
<location filename="../sources/editor/ui/ellipseeditor.ui" line="110"/> <location filename="../sources/editor/ui/ellipseeditor.ui" line="110"/>
<source>Diamètres :</source> <source>Diamètres :</source>
<translation>Doorsneden:</translation> <translation>Doorsnede:</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -8782,7 +8782,7 @@ Wilt u deze vervangen ?</translation>
<message> <message>
<location filename="../sources/qetdiagrameditor.cpp" line="2392"/> <location filename="../sources/qetdiagrameditor.cpp" line="2392"/>
<source>To install the plugin qet_tb_generator&lt;br&gt;Visit :&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt; First install on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Install, if required, python 3.9 bundle only, &lt;br&gt;2 Run Profile.command script&lt;br&gt;because program use hardcoded PATH for localise qet-tb-generator plugin &lt;br&gt; Visit :&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;howto&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt; Update on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt; pip3 install --upgrade qet_tb_generator&lt;br&gt;</source> <source>To install the plugin qet_tb_generator&lt;br&gt;Visit :&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt; First install on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Install, if required, python 3.9 bundle only, &lt;br&gt;2 Run Profile.command script&lt;br&gt;because program use hardcoded PATH for localise qet-tb-generator plugin &lt;br&gt; Visit :&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;howto&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt; Update on macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt; pip3 install --upgrade qet_tb_generator&lt;br&gt;</source>
<translation type="unfinished"></translation> <translation>Installatie van de qet_tb_generator&lt;br&gt;Ga naar:&lt;br&gt;&lt;a href=&apos;https://pypi.python.org/pypi/qet-tb-generator&apos;&gt;qet-tb-generator&lt;/a&gt;&lt;br&gt;&lt;B&gt;&lt;U&gt; Eerste installatie onder macOSX&lt;/B&gt;&lt;/U&gt;&lt;br&gt;1. Installeer indien nodig de Python 3.9 bundle, &lt;br&gt;2 Voer het Profile.commando uit&lt;br&gt;omdat het programma het hardcoded pad voor de locatie van de qet-tb-generator plugin gebruikt &lt;br&gt; Ga naar :&lt;br&gt;&lt;a href=&apos;https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674&apos;&gt;howto&lt;/a&gt;&lt;br&gt;2. pip3 install qet_tb_generator&lt;br&gt;&lt;B&gt;&lt;U&gt; Update onder macOSx&lt;/B&gt;&lt;/U&gt;&lt;br&gt; pip3 install --upgrade qet_tb_generator&lt;br&gt;</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetdiagrameditor.cpp" line="2410"/> <location filename="../sources/qetdiagrameditor.cpp" line="2410"/>
@@ -8827,12 +8827,12 @@ Wilt u deze vervangen ?</translation>
<message> <message>
<location filename="../sources/machine_info.cpp" line="124"/> <location filename="../sources/machine_info.cpp" line="124"/>
<source>Compilation : </source> <source>Compilation : </source>
<translation type="unfinished">Compilatie: </translation> <translation>Compilatie: </translation>
</message> </message>
<message> <message>
<location filename="../sources/machine_info.cpp" line="342"/> <location filename="../sources/machine_info.cpp" line="342"/>
<source>Compilation : </source> <source>Compilation : </source>
<translation type="unfinished">Compilatie : </translation> <translation>Compilatie : </translation>
</message> </message>
</context> </context>
<context> <context>

2
sources/configdialog.cpp
View File

@@ -17,7 +17,7 @@
*/ */
#include <QScrollArea> #include <QScrollArea>
#include "configdialog.h" #include "configdialog.h"
#include "configpages.h" #include "ui/configpage/configpages.h"
#include "qetapp.h" #include "qetapp.h"
#include "machine_info.h" #include "machine_info.h"

12
sources/editor/ui/elementpropertieseditorwidget.cpp
View File

@@ -140,14 +140,14 @@ void ElementPropertiesEditorWidget::setUpInterface()
//Terminal option //Terminal option
ui->m_terminal_type_cb->addItem(tr("Générique"), ElementData::TTGeneric); ui->m_terminal_type_cb->addItem(tr("Générique"), ElementData::TTGeneric);
ui->m_terminal_type_cb->addItem(tr("Fusible"), ElementData::Fuse); ui->m_terminal_type_cb->addItem(tr("Fusible"), ElementData::TTFuse);
ui->m_terminal_type_cb->addItem(tr("Séctionnable"), ElementData::Sectional); ui->m_terminal_type_cb->addItem(tr("Séctionnable"), ElementData::TTSectional);
ui->m_terminal_type_cb->addItem(tr("Diode"), ElementData::Diode); ui->m_terminal_type_cb->addItem(tr("Diode"), ElementData::TTDiode);
ui->m_terminal_type_cb->addItem(tr("Terre"), ElementData::TTGround);
ui->m_terminal_func_cb->addItem(tr("Générique"), ElementData::TFGeneric); ui->m_terminal_func_cb->addItem(tr("Générique"), ElementData::TFGeneric);
ui->m_terminal_func_cb->addItem(tr("Phase"), ElementData::Phase); ui->m_terminal_func_cb->addItem(tr("Phase"), ElementData::TFPhase);
ui->m_terminal_func_cb->addItem(tr("Neutre"), ElementData::Neutral); ui->m_terminal_func_cb->addItem(tr("Neutre"), ElementData::TFNeutral);
ui->m_terminal_func_cb->addItem(tr("Terre"), ElementData::PE);
//Disable the edition of the first column of the information tree //Disable the edition of the first column of the information tree
//by this little workaround //by this little workaround

10
sources/factory/elementpicturefactory.cpp
View File

@@ -237,14 +237,16 @@ bool ElementPictureFactory::build(const ElementsLocation &location,
painter.end(); painter.end();
low_painter.end(); low_painter.end();
const auto uuid_ = location.uuid();
if (!picture) { if (!picture) {
m_pictures_H.insert(location.uuid(), pic); m_pictures_H.insert(uuid_, pic);
m_primitives_H.insert(location.uuid(), primitives_); m_primitives_H.insert(uuid_, primitives_);
} }
if (!low_picture) { if (!low_picture) {
m_low_pictures_H.insert(location.uuid(), low_pic); m_low_pictures_H.insert(uuid_, low_pic);
m_primitives_H.insert(location.uuid(), primitives_); m_primitives_H.insert(uuid_, primitives_);
} }
return true; return true;
} }

29
sources/projectview.cpp
View File

@@ -810,30 +810,39 @@ void ProjectView::loadDiagrams()
setDisplayFallbackWidget(m_project -> diagrams().isEmpty()); setDisplayFallbackWidget(m_project -> diagrams().isEmpty());
DialogWaiting *dialog = nullptr; auto dialog = DialogWaiting::instance();
if(DialogWaiting::hasInstance()) if(dialog)
{ {
dialog = DialogWaiting::instance();
dialog->setTitle( tr("<p align=\"center\">" dialog->setTitle( tr("<p align=\"center\">"
"<b>Ouverture du projet en cours...</b><br/>" "<b>Ouverture du projet en cours...</b><br/>"
"Création des onglets de folio :" "Création des onglets de folio :"
"</p>")); "</p>"));
} }
for(Diagram *diagram : m_project->diagrams())
for(auto diagram : m_project->diagrams())
{ {
if(dialog) if(dialog)
{ {
dialog->setDetail(diagram->title()); dialog->setDetail(diagram->title());
dialog->setProgressBar(dialog->progressBarValue()+1); dialog->setProgressBar(dialog->progressBarValue()+1);
} }
diagramAdded(diagram);
auto dv = new DiagramView(diagram);
dv->setFrameStyle(QFrame::Plain | QFrame::NoFrame);
auto index = m_project->folioIndex(diagram);
m_tab->insertTab(index, dv, QET::Icons::Diagram, dv->title());
m_diagram_view_list.insert(index, dv);
connect(dv, &DiagramView::showDiagram, this, QOverload<Diagram*>::of(&ProjectView::showDiagram));
connect(dv, &DiagramView::titleChanged, this, &ProjectView::updateTabTitle);
connect(dv, &DiagramView::findElementRequired, this, &ProjectView::findElementRequired);
connect(&dv->diagram()->border_and_titleblock , &BorderTitleBlock::titleBlockFolioChanged, [this, dv]() {this->updateTabTitle(dv);});
} }
if (DiagramView *dv = currentDiagram()) rebuildDiagramsMap();
{ updateAllTabsTitle();
dv->diagram()->loadElmtFolioSeq();
dv->diagram()->loadCndFolioSeq();
}
m_tab->setCurrentWidget(firstDiagram()); m_tab->setCurrentWidget(firstDiagram());
} }

6
sources/projectview.h
View File

@@ -87,10 +87,14 @@ class ProjectView : public QWidget
private: private:
ProjectView(const ProjectView &); ProjectView(const ProjectView &);
//Method related to construction of this class
void setProject(QETProject *project);
// methods // methods
public: public:
QETProject *project(); QETProject *project();
void setProject(QETProject *);
QList<DiagramView *> diagram_views() const; QList<DiagramView *> diagram_views() const;
DiagramView *currentDiagram() const; DiagramView *currentDiagram() const;
void closeEvent(QCloseEvent *) override; void closeEvent(QCloseEvent *) override;

44
sources/properties/elementdata.cpp
View File

@@ -307,26 +307,30 @@ QString ElementData::terminalTypeToString(ElementData::TerminalType type)
{ {
switch (type) { switch (type) {
case ElementData::TTGeneric : case ElementData::TTGeneric :
return QString("generic"); return QStringLiteral("generic");
case ElementData::Fuse : case ElementData::TTFuse :
return QString("fuse"); return QStringLiteral("fuse");
case ElementData::Sectional: case ElementData::TTSectional:
return QString("sectional"); return QStringLiteral("sectional");
case ElementData::Diode: case ElementData::TTDiode:
return QString("diode"); return QStringLiteral("diode");
case ElementData::TTGround:
return QStringLiteral("ground");
} }
} }
ElementData::TerminalType ElementData::terminalTypeFromString(const QString &string) ElementData::TerminalType ElementData::terminalTypeFromString(const QString &string)
{ {
if (string == "generic") { if (string == QLatin1String("generic")) {
return ElementData::TTGeneric; return ElementData::TTGeneric;
} else if (string == "fuse") { } else if (string == QLatin1String("fuse")) {
return ElementData::Fuse; return ElementData::TTFuse;
} else if (string == "sectional") { } else if (string == QLatin1String("sectional")) {
return ElementData::Sectional; return ElementData::TTSectional;
} else if (string == "diode") { } else if (string == QLatin1String("diode")) {
return ElementData::Diode; return ElementData::TTDiode;
} else if (string == QLatin1String("ground")) {
return ElementData::TTGround;
} }
qDebug() << "ElementData::terminalTypeFromString : string : " qDebug() << "ElementData::terminalTypeFromString : string : "
@@ -340,12 +344,10 @@ QString ElementData::terminalFunctionToString(ElementData::TerminalFunction func
switch (function) { switch (function) {
case ElementData::TFGeneric: case ElementData::TFGeneric:
return QString("generic"); return QString("generic");
case ElementData::Phase: case ElementData::TFPhase:
return QString ("phase"); return QString ("phase");
case ElementData::Neutral: case ElementData::TFNeutral:
return QString("neutral"); return QString("neutral");
case ElementData::PE:
return QString("pe");
} }
} }
@@ -354,11 +356,9 @@ ElementData::TerminalFunction ElementData::terminalFunctionFromString(const QStr
if (string == "generic") { if (string == "generic") {
return ElementData::TFGeneric; return ElementData::TFGeneric;
} else if (string == "phase") { } else if (string == "phase") {
return ElementData::Phase; return ElementData::TFPhase;
} else if (string == "neutral") { } else if (string == "neutral") {
return ElementData::Neutral; return ElementData::TFNeutral;
} else if (string == "pe") {
return ElementData::PE;
} }
qDebug() << "ElementData::terminalFunctionFromString : string : " qDebug() << "ElementData::terminalFunctionFromString : string : "

12
sources/properties/elementdata.h
View File

@@ -68,17 +68,17 @@ class ElementData : public PropertiesInterface
enum TerminalType { enum TerminalType {
TTGeneric, TTGeneric,
Fuse, TTFuse,
Sectional, TTSectional,
Diode TTDiode,
TTGround
}; };
Q_ENUM(TerminalType) Q_ENUM(TerminalType)
enum TerminalFunction { enum TerminalFunction {
TFGeneric, TFGeneric,
Phase, TFPhase,
Neutral, TFNeutral,
PE
}; };
Q_ENUM(TerminalFunction) Q_ENUM(TerminalFunction)

3
sources/properties/terminaldata.cpp
View File

@@ -182,7 +182,8 @@ QString TerminalData::typeToString(TerminalData::Type type)
*/ */
TerminalData::Type TerminalData::typeFromString(const QString &string) TerminalData::Type TerminalData::typeFromString(const QString &string)
{ {
if (string == "Generic") { if (string.isEmpty() ||
string == "Generic") {
return TerminalData::Generic; return TerminalData::Generic;
} else if (string == "Inner") { } else if (string == "Inner") {
return TerminalData::Inner; return TerminalData::Inner;

15
sources/properties/xrefproperties.cpp
View File

@@ -187,13 +187,14 @@ QHash<QString, XRefProperties> XRefProperties::defaultProperties()
} }
bool XRefProperties::operator ==(const XRefProperties &xrp) const{ bool XRefProperties::operator ==(const XRefProperties &xrp) const{
return (m_show_power_ctc == xrp.m_show_power_ctc && return (m_show_power_ctc == xrp.m_show_power_ctc
m_display == xrp.m_display && && m_display == xrp.m_display
m_snap_to == xrp.m_snap_to && && m_snap_to == xrp.m_snap_to
m_prefix == xrp.m_prefix && && m_prefix == xrp.m_prefix
m_master_label == xrp.m_master_label && && m_master_label== xrp.m_master_label
m_offset == xrp.m_offset && && m_offset == xrp.m_offset
m_xref_pos == xrp.m_xref_pos ); && m_xref_pos == xrp.m_xref_pos
&& m_slave_label == xrp.m_slave_label);
} }
bool XRefProperties::operator !=(const XRefProperties &xrp) const bool XRefProperties::operator !=(const XRefProperties &xrp) const

2
sources/qetapp.cpp
View File

@@ -18,7 +18,7 @@
#include "qetapp.h" #include "qetapp.h"
#include "configdialog.h" #include "configdialog.h"
#include "configpages.h" #include "ui/configpage/configpages.h"
#include "editor/ui/qetelementeditor.h" #include "editor/ui/qetelementeditor.h"
#include "elementscollectioncache.h" #include "elementscollectioncache.h"
#include "factory/elementfactory.h" #include "factory/elementfactory.h"

16
sources/qetproject.cpp
View File

@@ -1420,15 +1420,13 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project)
QDomElement diagram_xml_element = diagram_nodes QDomElement diagram_xml_element = diagram_nodes
.at(i) .at(i)
.toElement(); .toElement();
Diagram *diagram = new Diagram(this); auto diagram = new Diagram(this);
m_diagrams_list << diagram;
int diagram_order = -1; connect(&diagram->border_and_titleblock, &BorderTitleBlock::needFolioData,
if (!QET::attributeIsAnInteger(diagram_xml_element, this, &QETProject::updateDiagramsFolioData);
QStringLiteral("order"), connect(diagram, &Diagram::usedTitleBlockTemplateChanged,
&diagram_order)) this, &QETProject::usedTitleBlockTemplateChanged);
diagram_order = 500000;
addDiagram(diagram, diagram_order-1);
diagram->initFromXml(diagram_xml_element); diagram->initFromXml(diagram_xml_element);
if(dlgWaiting) if(dlgWaiting)
@@ -1436,6 +1434,8 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project)
} }
} }
updateDiagramsFolioData();
//Initialise links between elements in this project //Initialise links between elements in this project
//and refresh the text of conductor //and refresh the text of conductor
if(dlgWaiting) if(dlgWaiting)

0
sources/configpage.h → sources/ui/configpage/configpage.h
View File

24
sources/configpages.cpp → sources/ui/configpage/configpages.cpp
View File

@@ -18,18 +18,18 @@
#include "configpages.h" #include "configpages.h"
#include "NameList/nameslist.h" #include "../NameList/nameslist.h"
#include "bordertitleblock.h" #include "../bordertitleblock.h"
#include "exportpropertieswidget.h" #include "../exportpropertieswidget.h"
#include "properties/reportproperties.h" #include "../properties/reportproperties.h"
#include "qetapp.h" #include "../qetapp.h"
#include "qeticons.h" #include "../qeticons.h"
#include "qetproject.h" #include "../qetproject.h"
#include "ui/borderpropertieswidget.h" #include "../borderpropertieswidget.h"
#include "ui/conductorpropertieswidget.h" #include "../conductorpropertieswidget.h"
#include "ui/reportpropertiewidget.h" #include "../reportpropertiewidget.h"
#include "ui/titleblockpropertieswidget.h" #include "../titleblockpropertieswidget.h"
#include "ui/xrefpropertieswidget.h" #include "../xrefpropertieswidget.h"
#include <QFont> #include <QFont>
#include <QFontDialog> #include <QFontDialog>

4
sources/configpages.h → sources/ui/configpage/configpages.h
View File

@@ -18,8 +18,8 @@
#ifndef CONFIG_PAGES_H #ifndef CONFIG_PAGES_H
#define CONFIG_PAGES_H #define CONFIG_PAGES_H
#include "configpage.h" #include "configpage.h"
#include "ui/projectpropertiesdialog.h" #include "../projectpropertiesdialog.h"
#include "ui/titleblockpropertieswidget.h" #include "../titleblockpropertieswidget.h"
#include <QDialog> #include <QDialog>
#include <QtWidgets> #include <QtWidgets>

2
sources/ui/configpage/generalconfigurationpage.h
View File

@@ -18,7 +18,7 @@
#ifndef GENERALCONFIGURATIONPAGE_H #ifndef GENERALCONFIGURATIONPAGE_H
#define GENERALCONFIGURATIONPAGE_H #define GENERALCONFIGURATIONPAGE_H
#include "../../configpage.h" #include "configpage.h"
#include <QWidget> #include <QWidget>

26
sources/projectconfigpages.cpp → sources/ui/configpage/projectconfigpages.cpp
View File

@@ -17,19 +17,19 @@
*/ */
#include "projectconfigpages.h" #include "projectconfigpages.h"
#include "autoNum/numerotationcontext.h" #include "../autoNum/numerotationcontext.h"
#include "autoNum/ui/autonumberingmanagementw.h" #include "../autoNum/ui/autonumberingmanagementw.h"
#include "autoNum/ui/folioautonumbering.h" #include "../autoNum/ui/folioautonumbering.h"
#include "autoNum/ui/formulaautonumberingw.h" #include "../autoNum/ui/formulaautonumberingw.h"
#include "autoNum/ui/selectautonumw.h" #include "../autoNum/ui/selectautonumw.h"
#include "qeticons.h" #include "../qeticons.h"
#include "qetproject.h" #include "../qetproject.h"
#include "ui/borderpropertieswidget.h" #include "../borderpropertieswidget.h"
#include "ui/conductorpropertieswidget.h" #include "../conductorpropertieswidget.h"
#include "ui/diagramcontextwidget.h" #include "../diagramcontextwidget.h"
#include "ui/reportpropertiewidget.h" #include "../reportpropertiewidget.h"
#include "ui/titleblockpropertieswidget.h" #include "../titleblockpropertieswidget.h"
#include "ui/xrefpropertieswidget.h" #include "../xrefpropertieswidget.h"
//#include "ui_autonumberingmanagementw.h" //#include "ui_autonumberingmanagementw.h"

0
sources/projectconfigpages.h → sources/ui/configpage/projectconfigpages.h
View File

4
sources/ui/projectpropertiesdialog.cpp
View File

@@ -18,8 +18,8 @@
#include "projectpropertiesdialog.h" #include "projectpropertiesdialog.h"
#include "../configdialog.h" #include "../configdialog.h"
#include "../configpages.h" #include "configpage/configpages.h"
#include "../projectconfigpages.h" #include "configpage/projectconfigpages.h"
#include <QObject> #include <QObject>