Tag version 0.61

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.61@5491 bfdf4180-ca20-0410-9c96-a3a8aa849046

ChangeLog

@@ -1,5 +1,22 @@
+====== ChangeLog from 0.6 to 0.61 ======
+
+* Backport HiDPI fix.
+* Backport commit 5284 : Fix bug N° 157.
+* Backport commit 5307 : Function for search conductor at the same potential.
+When the search function is searching in a terminal element, they search only for the first terminal found, no matter if the terminal element have more than two terminals.
+So the list of conductors at the same potential is missing some conductors.
+This commit fix it, now the search function search for every terminals of a terminal element 
+* Backport commit 5311, 5312 : elements connections change propertie to terminal, fixed by commit svn 5307 
+* GCC 8.1 fix
+
+
+
+
+
+
+
 ====== ChangeLog from 0.5 to 0.6 ======
-In the official collection, there are now 4081 elements, and 539 categoris for a total of 4620 files
+In the official collection, there are now 4106 elements, and 539 categoris for a total of 4645 files
 
 * Improved performance, added multithreading to speed up the loading of items when launching QET.
 * RAM consumption has been considerably reduced.
@@ -16,6 +33,11 @@ In the official collection, there are now 4081 elements, and 539 categoris for a
 * In the panel left split the view into a several docks.
 * High-DPI support (Qt 5.6.0)
 * new python plugin to generate terminal block.
+* Windows packages are now created on a Debian operating system using cross-compilation and targeted to make executable binary files for these operating systems. 
+This technical evolution allows a significant time saving during the creation of the packages. And we can provide also in the same time Windows XP and Vista packages by cross-compil with Qt 5.7.1 environment
+* The Mac OS X executable binary files are created on a virtual environment, moved compiler to latest LLVM clan version, improved dmg packages with added Info.plist.
+* An annoying memory leak has been found and solved. Afters hours of use, some users noticed that the RAM consumption growed steadily, up to 10GB or more. This problem is now solved.
+
 
 
 ====== ChangeLog from 0.4 to 0.5 ======

elements/10_electric/10_allpole/114_connections/combine.elmt

@@ -1,21 +1,25 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="11">
+<definition hotspot_x="11" hotspot_y="4" version="0.70" type="element" height="20" orientation="dyyy" link_type="terminal" width="30">
-    <uuid uuid="{8ef9d490-8db2-450a-ab89-22d2b35c01ed}"/>
+    <uuid uuid="{141e7e1e-4f7f-456d-9f04-52c32109b969}"/>
     <names>
-        <name lang="it">Collegamento</name>
         <name lang="en">Combine</name>
-        <name lang="ru">Соединение</name>
-        <name lang="pl">Połączenie 1</name>
         <name lang="fr">Jonction</name>
+        <name lang="es">Unión</name>
+        <name lang="it">Collegamento</name>
+        <name lang="pl">Połączenie 1</name>
+        <name lang="ar">وصلة</name>
+        <name lang="ru">Соединение</name>
         <name lang="cs">Spoj</name>
-		<name lang="es">Unión</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="7" y1="0" end2="none" x2="1" antialias="false" end1="none" length2="1.5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" x1="7" length1="1.5" x2="1" y2="0" length2="1.5" end1="none"/>
-        <input x="2" y="13.5" size="1" tagg="label" rotate="true" text="_"/>
+        <dynamic_text text_from="UserText" y="8.5" uuid="{43af2b14-2822-4ba2-988b-bda2005f69fd}" x="2" frame="false" z="2" rotation="0" text_width="-1" font_size="1">
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+            <text>_</text>
-        <terminal orientation="w" x="-4" y="0"/>
+        </dynamic_text>
-        <terminal orientation="s" x="0" y="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" antialias="false" x1="0" length1="1.5" x2="6" y2="0" length2="1.5" end1="none"/>
-        <terminal orientation="e" x="10" y="0"/>
+        <terminal y="0" x="-4" orientation="w"/>
+        <terminal y="10" x="0" orientation="s"/>
+        <terminal y="0" x="10" orientation="e"/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/corner.elmt

@@ -1,18 +1,22 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="7" width="20" hotspot_x="11">
+<definition hotspot_y="7" width="20" orientation="dyyy" type="element" height="20" version="0.70" hotspot_x="11" link_type="terminal">
-    <uuid uuid="{2c6c492e-8d8e-402e-a449-0cf5a7462ced}"/>
+    <uuid uuid="{2d505b61-db0f-4784-9b9c-189366058272}"/>
     <names>
+        <name lang="es">Esquina</name>
         <name lang="en">Corner</name>
-        <name lang="it">Angolo</name>
-        <name lang="ru">Угол</name>
-        <name lang="fr">Coin</name>
-        <name lang="pl">Narożnik</name>
         <name lang="cs">Roh</name>
-		<name lang="es">Esquina</name>
+        <name lang="fr">Coin</name>
+        <name lang="ru">Угол</name>
+        <name lang="pl">Narożnik</name>
+        <name lang="ar">ركن</name>
+        <name lang="it">Angolo</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <input x="-0.5" y="-0.45" size="1" tagg="label" rotate="true" text="_"/>
+        <dynamic_text rotation="0" x="-0.5" y="-5.45" uuid="{9b8dd22d-096a-4989-b6f7-1de9e0339f53}" font_size="1" z="1" frame="false" text_from="UserText" text_width="-1">
-        <terminal orientation="s" x="0" y="4"/>
+            <text>_</text>
-        <terminal orientation="w" x="-4" y="0"/>
+        </dynamic_text>
+        <terminal x="0" y="4" orientation="s"/>
+        <terminal x="-4" y="0" orientation="w"/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/cross.elmt

@@ -1,21 +1,25 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="9" width="20" hotspot_x="9">
+<definition height="20" link_type="terminal" hotspot_x="9" width="20" orientation="dyyy" hotspot_y="9" version="0.70" type="element">
-    <uuid uuid="{eb8040c8-6998-4f43-818b-1d368825ffac}"/>
+    <uuid uuid="{8c0d3e9c-dc37-41d7-bfd5-fe4dbf8dc4fb}"/>
     <names>
-        <name lang="en">Cross</name>
-        <name lang="it">Croce</name>
         <name lang="ru">Пересечение</name>
-        <name lang="fr">Croix</name>
-        <name lang="pl">Połączenie 2</name>
         <name lang="cs">Kříž</name>
-		<name lang="es">Cruzar</name>
+        <name lang="pl">Połączenie 2</name>
+        <name lang="it">Croce</name>
+        <name lang="es">Cruzar</name>
+        <name lang="en">Cross</name>
+        <name lang="ar">صليب</name>
+        <name lang="fr">Croix</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <circle x="-1" y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="true" diameter="2"/>
+        <circle y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-1" antialias="true" diameter="2"/>
-        <input x="-0.5" y="-4.45" size="1" tagg="label" rotate="true" text="_"/>
+        <dynamic_text uuid="{fc5c039b-1fca-40d9-a6ff-a9e1775de38b}" text_width="-1" frame="false" y="-9.45" font_size="1" x="-0.5" z="2" rotation="0" text_from="UserText">
-        <terminal orientation="e" x="4" y="0"/>
+            <text>_</text>
-        <terminal orientation="s" x="0" y="4"/>
+        </dynamic_text>
-        <terminal orientation="n" x="0" y="-4"/>
+        <terminal y="0" orientation="e" x="4"/>
-        <terminal orientation="w" x="-4" y="0"/>
+        <terminal y="4" orientation="s" x="0"/>
+        <terminal y="-4" orientation="n" x="0"/>
+        <terminal y="0" orientation="w" x="-4"/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/jump.elmt

@@ -1,19 +1,23 @@
-<definition type="element" height="30" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="14" width="10" hotspot_x="5">
+<definition width="10" hotspot_y="14" hotspot_x="5" height="30" link_type="terminal" orientation="dyyy" version="0.70" type="element">
-    <uuid uuid="{cd8b3f5f-5eae-416c-9966-c7b5529b6e63}"/>
+    <uuid uuid="{b5abb4c2-455d-45ff-95f2-328521f4e2e1}"/>
     <names>
         <name lang="en">Jump</name>
-        <name lang="it">Salto</name>
-        <name lang="ru">Перемычка</name>
         <name lang="fr">Saut</name>
-        <name lang="pl">Brak połączenia</name>
+        <name lang="ar">قفز</name>
         <name lang="cs">Skok</name>
- 		<name lang="es">Puente</name>
+        <name lang="it">Salto</name>
+        <name lang="pl">Brak połączenia</name>
+        <name lang="ru">Перемычка</name>
+        <name lang="es">Puente</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <arc height="6" start="90" angle="-180" x="-3" y="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="6"/>
+        <arc x="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="90" y="-3" height="6" angle="-180"/>
-        <input x="1.5" y="-6.45" size="1" tagg="label" rotate="true" text="_"/>
+        <dynamic_text font_size="1" x="1.5" text_from="UserText" z="2" y="-11.45" rotation="0" uuid="{1a3e4d91-15cc-424b-99d0-25930d779fb6}" frame="false" text_width="-1">
-        <terminal orientation="n" x="0" y="-7"/>
+            <text>_</text>
-        <terminal orientation="s" x="0" y="7"/>
+        </dynamic_text>
+        <terminal x="0" y="-7" orientation="n"/>
+        <terminal x="0" y="7" orientation="s"/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/qet_directory

@@ -3,7 +3,6 @@
         <name lang="ru">Соединения</name>
         <name lang="de">Verbindungen</name>
         <name lang="en">Connections</name>
-        <name lang="es">Conexiones</name>
         <name lang="fr">Connections</name>
         <name lang="it">Collegamenti</name>
         <name lang="pl">Połączenia</name>

elements/10_electric/10_allpole/114_connections/splice.elmt

@@ -1,21 +1,25 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
+<definition type="element" height="20" width="30" orientation="dyyy" version="0.70" hotspot_y="4" link_type="terminal" hotspot_x="17">
-    <uuid uuid="{0f807068-d5a4-4628-85f4-0644e6d3129f}"/>
+    <uuid uuid="{709e6400-adc2-4faf-ba46-aa513d1dcaf1}"/>
     <names>
-        <name lang="en">Splice</name>
-        <name lang="it">Spaziatura</name>
-        <name lang="ru">Сращивание</name>
         <name lang="fr">Epissure</name>
         <name lang="pl">Połączenie 3</name>
         <name lang="cs">Spojka</name>
-		<name lang="es">Empalme</name>
+        <name lang="en">Splice</name>
+        <name lang="it">Spaziatura</name>
+        <name lang="ru">Сращивание</name>
+        <name lang="es">Empalme</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
+        <dynamic_text text_width="-1" x="1.5" rotation="0" frame="false" uuid="{b653b162-d4c8-4660-a5ca-e6ca05a56de9}" font_size="1" z="1" text_from="ElementInfo" y="-1.45">
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
+            <text></text>
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1" y1="0" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+            <info_name>label</info_name>
-        <terminal orientation="s" x="0" y="10"/>
+        </dynamic_text>
-        <terminal orientation="w" x="-10" y="0"/>
+        <line x2="-6" antialias="false" x1="0" end2="none" y2="0" end1="none" length2="1.5" length1="1.5" y1="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal orientation="e" x="4" y="0"/>
+        <line x2="-5" antialias="false" x1="1" end2="none" y2="0" end1="none" length2="1.5" length1="1.5" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="0" orientation="s" y="10"/>
+        <terminal x="-10" orientation="w" y="0"/>
+        <terminal x="4" orientation="e" y="0"/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/thruleft.elmt

@@ -1,21 +1,25 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
+<definition hotspot_y="4" height="20" hotspot_x="17" type="element" width="30" link_type="terminal" orientation="dyyy" version="0.70">
-    <uuid uuid="{a1ced185-e98f-4cf1-8a62-3f8ea691bcb6}"/>
+    <uuid uuid="{9e88368e-1b20-4a56-8941-5d17a4cce2d4}"/>
     <names>
-        <name lang="en">Thru left</name>
+        <name lang="cs">Levé spojení</name>
-        <name lang="it">Collegamento sinistro</name>
         <name lang="ru">Справа налево</name>
         <name lang="fr">Liaison gauche</name>
+        <name lang="en">Thru left</name>
+        <name lang="ar">ربط يسار</name>
+        <name lang="it">Collegamento sinistro</name>
         <name lang="pl">Połączenie 4</name>
-        <name lang="cs">Levé spojení</name>
+        <name lang="es">A la izquierda</name>
-		<name lang="es">A la izquierda</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
+        <dynamic_text font_size="1" rotation="0" uuid="{5ff9bef8-b6a8-4cf8-ba82-4dabe7b1820f}" text_width="-1" frame="false" text_from="UserText" z="1" x="1.5" y="-1.45">
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
+            <text>_</text>
-        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
+        </dynamic_text>
-        <terminal orientation="e" x="4" y="0"/>
+        <line x1="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" y2="0" end1="none" antialias="false" x2="-6"/>
-        <terminal orientation="w" x="-10" y="0"/>
+        <line x1="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="5" end1="none" antialias="false" x2="0"/>
-        <terminal orientation="s" x="0" y="10"/>
+        <terminal x="4" orientation="e" y="0"/>
+        <terminal x="-10" orientation="w" y="0"/>
+        <terminal x="0" orientation="s" y="10"/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/thruright.elmt

@@ -1,22 +1,26 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="14">
+<definition link_type="terminal" width="30" hotspot_x="14" orientation="dyyy" height="20" version="0.70" hotspot_y="4" type="element">
-    <uuid uuid="{5d72394b-8aa0-4368-bc88-0f738478ca45}"/>
+    <uuid uuid="{6e40fff3-691c-4622-b9aa-4ff930a5b981}"/>
     <names>
         <name lang="en">Thru right</name>
-        <name lang="it">Collegamento destro</name>
         <name lang="ru">Слева направо</name>
-        <name lang="fr">Liaison droite</name>
-        <name lang="pl">Połączenie 5</name>
         <name lang="cs">Pravé spojení</name>
-		<name lang="es">A la derecha</name>
+        <name lang="fr">Liaison droite</name>
+        <name lang="it">Collegamento destro</name>
+        <name lang="es">A la derecha</name>
+        <name lang="ar">ربط يمين</name>
+        <name lang="pl">Połączenie 5</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <input x="5.5" y="4.55" size="1" tagg="label" rotate="true" text="_"/>
+        <dynamic_text text_width="-1" y="-0.45" rotation="0" uuid="{ab829572-e7d6-4e5c-9c6e-a0852fea788e}" x="5.5" frame="false" text_from="UserText" font_size="1" z="1">
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
+            <text>_</text>
-        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
+        </dynamic_text>
-        <line y2="6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="6" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
+        <line antialias="false" x1="0" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" end1="none" y2="0" length2="1.5" x2="-6"/>
-        <terminal orientation="s" x="0" y="10"/>
+        <line antialias="false" x1="0" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" end1="none" y2="5" length2="1.5" x2="0"/>
-        <terminal orientation="w" x="-10" y="0"/>
+        <line antialias="false" x1="6" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" end1="none" y2="6" length2="1.5" x2="0"/>
-        <terminal orientation="e" x="10" y="0"/>
+        <terminal orientation="s" y="10" x="0"/>
+        <terminal orientation="w" y="0" x="-10"/>
+        <terminal orientation="e" y="0" x="10"/>
     </description>
 </definition>

elements/10_electric/20_manufacturers_articles/gce/xd.elmt

@@ -0,0 +1,28 @@
+<definition type="element" hotspot_y="86" orientation="dyyy" height="100" width="100" version="0.70" link_type="simple" hotspot_x="50">
+    <uuid uuid="{38eb610f-8abb-4ee1-b298-d11e9e19e5e4}"/>
+    <names>
+        <name lang="fr">GCE-Xdisplay</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect height="95" x="-45" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" y="-84" antialias="false"/>
+        <text text="-" x="17" size="4" y="-60"/>
+        <text text="-" x="17" size="4" y="-40"/>
+        <text text="+" x="16" size="4" y="-26"/>
+        <text text="+" x="17" size="4" y="-46"/>
+        <rect height="20" x="4" style="line-style:normal;line-weight:normal;filling:none;color:black" width="10" y="-64" antialias="false"/>
+        <rect height="20" x="4" style="line-style:normal;line-weight:normal;filling:none;color:black" width="10" y="-44" antialias="false"/>
+        <text text="12 V" rotation="270" x="22" size="3" y="-50"/>
+        <text text="Bus" rotation="270" x="21" size="3" y="-31"/>
+        <polygon y4="-0.8" x4="-23" y1="-73" x6="-23" y3="-0.8" y8="-73" closed="false" y6="-73" x7="-23" x3="27" y5="-73" x5="-23" antialias="false" x1="-23" x8="-23" y7="-73" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="27" y2="-73"/>
+        <text text="GCE Electronics" rotation="270" x="26" size="2" y="-2"/>
+        <dynamic_text frame="false" rotation="0" x="-22" text_from="UserText" uuid="{a61d9150-b50e-47a2-b7e5-7d22eb5805fa}" y="-20" z="12" font_size="9">
+            <text>X-XD</text>
+        </dynamic_text>
+        <terminal orientation="e" x="14" y="-30"/>
+        <terminal orientation="e" x="14" y="-50"/>
+        <terminal orientation="e" x="14" y="-60"/>
+        <terminal orientation="e" x="14" y="-40"/>
+    </description>
+</definition>

elements/10_electric/20_manufacturers_articles/gce/xdimmer.elmt

@@ -0,0 +1,179 @@
+<definition width="370" version="0.4" hotspot_x="184" hotspot_y="105" height="210" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="be">X-dimmer</name>
+        <name lang="el">X-dimmer</name>
+        <name lang="en">X-dimmer</name>
+        <name lang="it">X-dimmer</name>
+        <name lang="fr">X-dimmer</name>
+        <name lang="pl">X-dimmer</name>
+        <name lang="es">X-dimmer</name>
+        <name lang="nl">X-dimmer</name>
+        <name lang="cs">X-dimmer</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <rect width="8" x="-80" y="20" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="8" x="-96" y="20" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="7" x="-112" y="25" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="8" x="-128" y="20" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="7" x="-96" y="25" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="7" x="-79" y="25" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <text x="-35" y="-60" size="6" text="Outputs2&#xa;1A max"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58" x1="-51" y2="-38" x2="-51"/>
+        <text x="53" y="-49" size="6" text="%"/>
+        <rect width="2" x="-21" y="-71" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="2" x="-80" y="-71" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <text x="-119" y="-49" size="6" text="%"/>
+        <rect width="2" x="-139" y="-71" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="40" x="114" y="70" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="152.5" y="-71" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80" x1="154" y2="-70" x2="154"/>
+        <rect width="7" x="-127" y="25" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="8" x="-112" y="20" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="112" y="-48" size="6" text="%"/>
+        <text x="-60" y="-49" size="6" text="%"/>
+        <rect width="2" x="92.5" y="-71" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="2" x="33.5" y="-71" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58" x1="121.5" y2="-38" x2="121.5"/>
+        <text x="137.5" y="-60" size="6" text="Outputs4&#xa;1A max"/>
+        <rect width="2" x="120.5" y="-38" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="2" x="61.5" y="-38" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <text x="76.5" y="-60" size="6" text="Outputs3&#xa;1A max"/>
+        <rect width="2" x="-52" y="-38" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <text x="16.5" y="-59" size="6" text="ALIM 2"/>
+        <text x="130.5" y="-82" size="6" text="L"/>
+        <rect width="20" x="142.5" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="-111" y="-38" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="20" x="22.5" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="2.5" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="82.5" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-79" y="-14" size="7" rotate="true" text="Stand Alone"/>
+        <rect width="20" x="62.5" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="55" y="78" size="6" text="GND"/>
+        <rect width="20" x="22.5" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="122.5" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="99" y="78" size="6" text="E2"/>
+        <rect width="20" x="2.5" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="62.5" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="138" y="78" size="6" text="E4"/>
+        <text x="119" y="78" size="6" text="E3"/>
+        <text x="6.5" y="-82" size="6" text="PH"/>
+        <rect width="20" x="122.5" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="155" y="78" size="6" text="GND"/>
+        <text x="80.1818" y="78" size="6" text="E1"/>
+        <rect width="20" x="82.5" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="66" y="68" size="6" text="Digital Inputs"/>
+        <rect width="20" x="142.5" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-36.0103" x1="12.5" y2="-79.0674" x2="12.5"/>
+        <text x="30.5" y="-82" size="6" text="N"/>
+        <text x="90.5" y="-82" size="6" text="N"/>
+        <text x="70.5" y="-82" size="6" text="L"/>
+        <text x="150.5" y="-82" size="6" text="N"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-69" x1="34.741" y2="-69" x2="151.905"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80" x1="93.5" y2="-70" x2="93.5"/>
+        <text x="-96" y="-60" size="6" text="Outputs1&#xa;1A max"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-79.8957" x1="33.5" y2="-70.113" x2="33.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-78.8588" x1="73.5" y2="-53.1529" x2="73.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-79.5733" x1="133.5" y2="-52.4622" x2="133.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="11.922" y2="-35" x2="134.043"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58" x1="62.5" y2="-38" x2="62.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="73.5" y2="-53" x2="63.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="133.5" y2="-53" x2="121.5"/>
+        <text x="-156" y="-59" size="6" text="ALIM 1"/>
+        <rect width="20" x="154" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="114" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="350" x="-174" y="-22" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="94" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-42" y="-82" size="6" text="L"/>
+        <rect width="20" x="134" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="134" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="154" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="114" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="94" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="142" y="88" size="6" text="7"/>
+        <text x="122" y="88" size="6" text="6"/>
+        <text x="162" y="88" size="6" text="8"/>
+        <text x="102" y="88" size="6" text="5"/>
+        <rect width="360" x="-179" y="-90" antialias="false" height="180" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="13" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="33" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="33" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="13" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="21" y="88" size="6" text="1"/>
+        <text x="42" y="88" size="6" text="2"/>
+        <rect width="20" x="-30" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-150" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="33" y="70" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-170" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-90" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-110" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-150" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-50" y="-100" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-170" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-110" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-166" y="-82" size="6" text="PH"/>
+        <rect width="20" x="54" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-50" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-90" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-30" y="-90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="54" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-36.0103" x1="-160" y2="-79.0674" x2="-160"/>
+        <text x="-142" y="-82" size="6" text="N"/>
+        <text x="-82" y="-82" size="6" text="N"/>
+        <text x="-102" y="-82" size="6" text="L"/>
+        <text x="62" y="88" size="6" text="3"/>
+        <rect width="20" x="74" y="80" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="74" y="90" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="82" y="88" size="6" text="4"/>
+        <text x="26" y="68" size="5" text="Bus"/>
+        <rect width="20" x="13" y="70" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="18" y="79" size="9" text="+"/>
+        <text x="41" y="79" size="9" text="-"/>
+        <text x="-22" y="-82" size="6" text="N"/>
+        <rect width="40" x="13" y="60" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="10" x="-170" y="-20" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:green;color:black"/>
+        <rect width="70" x="-155" y="-9" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <text x="-154" y="3" size="9" color="white" text="X Devices"/>
+        <rect width="140" x="30" y="30" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:green;color:black"/>
+        <text x="33" y="26" size="9" text="GCE Electronics"/>
+        <input x="-158" y="-15" size="9" rotate="true" text="X-Dimmer"/>
+        <rect width="40" x="54" y="70" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="40" x="74" y="70" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="40" x="134" y="70" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-69" x1="-137.759" y2="-69" x2="-20.5948"/>
+        <rect width="120" x="54" y="60" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-156" y="22" size="9" rotate="true" text="_"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80" x1="-20" y2="-70" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80" x1="-79" y2="-70" x2="-79"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-79.8957" x1="-139" y2="-70.113" x2="-139"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-78.8588" x1="-99" y2="-53.1529" x2="-99"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-79.5733" x1="-39" y2="-52.4622" x2="-39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="-160.578" y2="-35" x2="-38.4569"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58" x1="-110" y2="-38" x2="-110"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="-99" y2="-53" x2="-109"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="-39" y2="-53" x2="-51"/>
+        <rect width="75" x="-136" y="17" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-143" y="-75" size="9" rotate="true" text="_"/>
+        <terminal x="124" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="-160" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-140" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-100" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-80" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-40" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-20" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="64" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="84" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="164" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="104" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="23" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="43" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="144" y="100" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="12.5" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="32.5" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="72.5" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="92.5" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="132.5" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="152.5" y="-100" nameHidden="0" number="" name="" orientation="n"/>
+    </description>
+</definition>

lang/qet_fr.ts

@@ -2342,32 +2342,32 @@ que vous créez. entrées de texte et nombres sont
     <message>
         <location filename="../sources/ui/importelementdialog.ui" line="14"/>
         <source>Intégration d&apos;un élément</source>
-        <translation></translation>
+        <translation>Intégration d&apos;un élément</translation>
     </message>
     <message>
         <location filename="../sources/ui/importelementdialog.ui" line="20"/>
         <source>L&apos;élément a déjà été intégré dans le projet. Toutefois, la version que vous tentez de poser semble différente. Que souhaitez-vous faire ?</source>
-        <translation></translation>
+        <translation>L&apos;élément a déjà été intégré dans le projet. Toutefois, la version que vous tentez de poser semble différente. Que souhaitez-vous faire ?</translation>
     </message>
     <message>
         <location filename="../sources/ui/importelementdialog.ui" line="27"/>
         <source>Utiliser l&apos;élément déjà integré</source>
-        <translation></translation>
+        <translation>Utiliser l&apos;élément déjà intégré</translation>
     </message>
     <message>
         <location filename="../sources/ui/importelementdialog.ui" line="34"/>
         <source>Intégrer l&apos;élément déposé</source>
-        <translation></translation>
+        <translation>Intégrer l&apos;élément déposé</translation>
     </message>
     <message>
         <location filename="../sources/ui/importelementdialog.ui" line="52"/>
         <source>Écraser l&apos;élément déjà intégé</source>
-        <translation></translation>
+        <translation>Écraser l&apos;élément déjà intégré</translation>
     </message>
     <message>
         <location filename="../sources/ui/importelementdialog.ui" line="59"/>
         <source>Faire cohabiter les deux éléments</source>
-        <translation></translation>
+        <translation>Faire cohabiter les deux éléments</translation>
     </message>
 </context>
 <context>

sources/diagramprintdialog.cpp

@@ -354,7 +354,25 @@ void DiagramPrintDialog::browseFilePrintTypeDialog() {
 */
 void DiagramPrintDialog::print(const QList<Diagram *> &diagrams, bool fit_page, const ExportProperties options) {
 	//qDebug() << "Demande d'impression de " << diagrams.count() << "schemas.";
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    #ifdef Q_OS_WIN
+        #ifdef QT_DEBUG
+            qDebug() << "--";
+            qDebug() << "DiagramPrintDialog::print  printer_->resolution() before " << printer_->resolution();
+            qDebug() << "DiagramPrintDialog::print  screennumber " << QApplication::desktop()->screenNumber();
+        #endif
 
+        QScreen *srn = QApplication::screens().at(QApplication::desktop()->screenNumber());
+        qreal dotsPerInch = (qreal)srn->logicalDotsPerInch();
+        printer_->setResolution(dotsPerInch);
+
+        #ifdef QT_DEBUG
+            qDebug() << "DiagramPrintDialog::print  dotsPerInch " << dotsPerInch;
+            qDebug() << "DiagramPrintDialog::print  printer_->resolution() after" << printer_->resolution();
+            qDebug() << "--";
+        #endif
+    #endif
+#endif
 	// QPainter utiliser pour effectuer le rendu
 	QPainter qp(printer_);
 	

sources/main.cpp

@@ -32,14 +32,10 @@ int main(int argc, char **argv)
 	QCoreApplication::setApplicationName("QElectroTech");
 		//Creation and execution of the application
 		//HighDPI
-#if QT_VERSION >= QT_VERSION_CHECK (5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-#if defined Q_OS_MAC
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
-#elif !defined(Q_OS_MAC)
-    QApplication::setAttribute (Qt::AA_DisableHighDpiScaling);
 #else
-    qputenv("QT_DEVICE_PIXEL_RATIO", QByteArray("1"));
+    qputenv("QT_DEVICE_PIXEL_RATIO", QByteArray("auto"));
-#endif
 #endif
 	return(QETApp(argc, argv).exec());
 }

sources/qet.h

@@ -25,9 +25,9 @@
 */
 namespace QET {
 	/// QElectroTech version (as string, used to mark projects and elements XML documents)
-	const QString version = "0.60";
+	const QString version = "0.61";
 	/// QElectroTech displayed version
-	const QString displayedVersion = "0.60-RC4";
+	const QString displayedVersion = "0.61";
 	QString license();
 	
 	/// Oriented movements

sources/qetdiagrameditor.cpp

@@ -310,16 +310,16 @@ void QETDiagramEditor::setUpActions()
 	QAction *open_file = m_file_actions_group.addAction( QET::Icons::DocumentOpen,    tr("&Ouvrir")							  );
 	save_file          = m_file_actions_group.addAction( QET::Icons::DocumentSave,    tr("&Enregistrer")					  );
 	save_file_as       = m_file_actions_group.addAction( QET::Icons::DocumentSaveAs,  tr("Enregistrer sous")				  );
-	close_file         = m_file_actions_group.addAction( QET::Icons::ProjectClose,   tr("&Fermer")							  );
+	m_close_file         = m_file_actions_group.addAction( QET::Icons::ProjectClose,   tr("&Fermer")							  );
 
 	new_file   -> setShortcut( QKeySequence::New   );
 	open_file  -> setShortcut( QKeySequence::Open  );
-	close_file -> setShortcut( QKeySequence::Close );
+	m_close_file -> setShortcut( QKeySequence::Close );
 	save_file  -> setShortcut( QKeySequence::Save  );
 
 	new_file         -> setStatusTip( tr("Crée un nouveau projet", "status bar tip")								 );
 	open_file        -> setStatusTip( tr("Ouvre un projet existant", "status bar tip")								 );
-	close_file       -> setStatusTip( tr("Ferme le projet courant", "status bar tip")								 );
+	m_close_file       -> setStatusTip( tr("Ferme le projet courant", "status bar tip")								 );
 	save_file        -> setStatusTip( tr("Enregistre le projet courant et tous ses folios", "status bar tip")		 );
 	save_file_as     -> setStatusTip( tr("Enregistre le projet courant avec un autre nom de fichier", "status bar tip") );
 
@@ -327,7 +327,7 @@ void QETDiagramEditor::setUpActions()
 	connect(save_file,        SIGNAL( triggered() ), this, SLOT( save()				   ) );
 	connect(new_file,         SIGNAL( triggered() ), this, SLOT( newProject()		   ) );
 	connect(open_file,        SIGNAL( triggered() ), this, SLOT( openProject()		   ) );
-	connect(close_file,       SIGNAL( triggered() ), this, SLOT( closeCurrentProject() ) );
+	connect(m_close_file,       SIGNAL( triggered() ), this, SLOT( closeCurrentProject() ) );
 
 		//Row and Column actions
 	QAction *add_column    = m_row_column_actions_group.addAction( QET::Icons::EditTableInsertColumnRight, tr("Ajouter une colonne") );
@@ -673,23 +673,12 @@ void QETDiagramEditor::closeEvent(QCloseEvent *qce) {
 /**
  * @brief QETDiagramEditor::event
  * Reimplemented to :
- * -avoid conflic with shortcut "Ctrl+W" (QKeySequence::Close)
  * -Load elements collection when WindowActivate.
  * @param e
  * @return 
  */
 bool QETDiagramEditor::event(QEvent *e)
 {
-	if (e -> type() == QEvent::ShortcutOverride)
-	{
-		QKeyEvent *shortcut_event = static_cast<QKeyEvent *>(e);
-		if (shortcut_event && shortcut_event -> matches(QKeySequence::Close))
-		{
-			close_file -> trigger();
-			e -> accept();
-			return(true);
-		}
-	}
 	if (m_first_show && e->type() == QEvent::WindowActivate)
 	{
 		m_first_show = false;
@@ -1320,7 +1309,7 @@ void QETDiagramEditor::slot_updateActions()
 	bool opened_diagram = dv;
 	bool editable_project = (pv && !pv -> project() -> isReadOnly());
 
-	close_file       -> setEnabled(opened_project);
+	m_close_file       -> setEnabled(opened_project);
 	save_file        -> setEnabled(opened_project);
 	save_file_as     -> setEnabled(opened_project);
 	prj_edit_prop    -> setEnabled(opened_project);
@@ -1541,6 +1530,15 @@ void QETDiagramEditor::addProjectView(ProjectView *project_view)
 	sub_window -> setWindowIcon(project_view -> windowIcon());
 	sub_window -> systemMenu() -> clear();
 	
+		//By defaut QMdiSubWindow have a QAction "close" with shortcut QKeySequence::Close
+		//But the QAction m_close_file of this class have the same shortcut too.
+		//We remove the shortcut of the QAction of QMdiSubWindow for avoid conflic
+	for(QAction *act : sub_window->actions())
+	{
+		if(act->shortcut() == QKeySequence::Close)
+			act->setShortcut(QKeySequence());
+	}
+
 		//Display the new window
 	if (maximise) project_view -> showMaximized();
 	else          project_view -> show();
@@ -1627,7 +1625,7 @@ void QETDiagramEditor::slot_updateWindowsMenu() {
 	foreach(QAction *a, windows_menu -> actions()) windows_menu -> removeAction(a);
 	
 	// actions de fermeture
-	windows_menu -> addAction(close_file);
+	windows_menu -> addAction(m_close_file);
 	//windows_menu -> addAction(closeAllAct);
 	
 	// actions de reorganisation des fenetres

sources/qetdiagrameditor.h

@@ -213,7 +213,7 @@ class QETDiagramEditor : public QETMainWindow {
 		QAction *find_element;					///< Find the selected element in the panel
 
 		QActionGroup m_file_actions_group; ///Actions related to file (open, close, save...)
-		QAction *close_file;			   ///< Close current project file
+		QAction *m_close_file;			   ///< Close current project file
 		QAction *save_file;				   ///< Save current project
 		QAction *save_file_as;			   ///< Save current project as a specific file
 

sources/qetgraphicsitem/conductor.cpp

@@ -1517,12 +1517,14 @@ void Conductor::displayedTextChanged()
  * part of the returned QSet.
  * @param all_diagram : if true search in all diagram of the project,
  * false search only in the parent diagram of this conductor
- * @param t_list, a list of terminal already cheched for the serach of potential.
+ * @param t_list, a list of terminal already found for this potential.
  * @return  a QSet of conductor at the same potential.
  */
-QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram, QList <Terminal *> *t_list) {
+QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram, QList <Terminal *> *t_list)
+{
 	bool declar_t_list = false;
-	if (t_list == 0) {
+	if (t_list == nullptr)
+	{
 		declar_t_list = true;
 		t_list = new QList <Terminal *>;
 	}
@@ -1531,23 +1533,29 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
 	QList <Terminal *> this_terminal;
 	this_terminal << terminal1 << terminal2;
 
-	// Return all conductor of terminal 1 and 2
+		// Return all conductors of terminal 1 and 2
-	foreach (Terminal *terminal, this_terminal) {
+	for (Terminal *terminal : this_terminal)
-		if (!t_list -> contains(terminal)) {
+	{
-			t_list -> append(terminal);
+		if (!t_list->contains(terminal))
-			QList <Conductor *> other_conductors_list_t = terminal -> conductors();
+		{
+			t_list->append(terminal);
+			QList <Conductor *> other_conductors_list_t = terminal->conductors();
 
-			//get terminal share the same potential of @terminal, of parent element
+				//Get the other terminals of the parent element of @terminal, who share the same potential
-			Terminal *t1_bis = relatedPotentialTerminal(terminal, all_diagram);
+				//This is use for element type "folio report" and "terminal element"
-			if (t1_bis && !t_list->contains(t1_bis)) {
+			for (Terminal *t : relatedPotentialTerminal(terminal, all_diagram))
-				t_list -> append(t1_bis);
+			{
-				other_conductors_list_t += t1_bis->conductors();
+				if (!t_list->contains(t))
+				{
+					t_list -> append(t);
+					other_conductors_list_t += t->conductors();
+				}
 			}
 
 			other_conductors_list_t.removeAll(this);
-			// Research the conductors connected to conductors already found
+				//Get the conductors at the same potential for each conductors of other_conductors_list_t
-			foreach (Conductor *c, other_conductors_list_t) {
+			for (Conductor *c : other_conductors_list_t) {
-				other_conductors += c -> relatedPotentialConductors(all_diagram, t_list);
+				other_conductors += c->relatedPotentialConductors(all_diagram, t_list);
 			}
 			other_conductors += other_conductors_list_t.toSet();
 		}

sources/qetgraphicsitem/terminal.cpp

@@ -765,24 +765,27 @@ Element *Terminal::parentElement() const {
  * @param t terminal to start search
  * @param all_diagram :if true return all related terminal,
  * false return only terminal in the same diagram of @t
- * @return
+ * @return the list of terminal at the same potential
  */
-Terminal * relatedPotentialTerminal (const Terminal *terminal, const bool all_diagram) {
+QList<Terminal *> relatedPotentialTerminal (const Terminal *terminal, const bool all_diagram)
-	// If terminal parent element is a folio report.
+{
-	if (all_diagram && terminal -> parentElement() -> linkType() & Element::AllReport) {
+		// If terminal parent element is a folio report.
+	if (all_diagram && terminal -> parentElement() -> linkType() & Element::AllReport)
+	{
 		QList <Element *> elmt_list = terminal -> parentElement() -> linkedElements();
-		if (!elmt_list.isEmpty()) {
+		if (!elmt_list.isEmpty())
-			return (elmt_list.first() -> terminals().first());
+		{
+			return (elmt_list.first()->terminals());
 		}
 	}
-	// If terminal parent element is a Terminal element.
+		// If terminal parent element is a Terminal element.
-	else if (terminal -> parentElement() -> linkType() & Element::Terminale) {
+	else if (terminal -> parentElement() -> linkType() & Element::Terminale)
-		QList <Terminal *> terminals = terminal -> parentElement() -> terminals();
+	{
-		terminals.removeAll(const_cast<Terminal *> (terminal));
+		QList <Terminal *> terminals = terminal->parentElement()->terminals();
-		if (!terminals.isEmpty())
+		terminals.removeAll(const_cast<Terminal *>(terminal));
-			return terminals.first();
+		return terminals;
 	}
 
-	return nullptr;
+	return QList<Terminal *>();
 }
 

sources/qetgraphicsitem/terminal.h

@@ -169,6 +169,6 @@ inline QString Terminal::name() const {
 	return(name_terminal_);
 }
 
-Terminal * relatedPotentialTerminal (const Terminal *terminal, const bool all_diagram = true);
+QList<Terminal *> relatedPotentialTerminal (const Terminal *terminal, const bool all_diagram = true);
 
 #endif

sources/ui/importelementdialog.cpp

@@ -17,6 +17,7 @@
 */
 #include "importelementdialog.h"
 #include "ui_importelementdialog.h"
+#include <QButtonGroup>
 
 ImportElementDialog::ImportElementDialog(QWidget *parent) :
 	QDialog(parent),