From e506f057c4cc4611e683e067e2a7ba89b534be38 Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Tue, 1 Apr 2014 01:27:18 +0000
Subject: [PATCH] Restore slave power contacts folder Delete kindinformations:
 don't want power contacts in cross ref table Add new automatic label for text
 field Now these elements know positions of master coils add auto label Clean
 duplicates

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2952 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 .../normalement_fermes/com_puiss_nf1.elmt         | 10 ++++++++--
 .../normalement_fermes/com_puiss_nf4.elmt         |  4 ++--
 .../normalement_fermes/com_puiss_nf6.elmt         |  4 ++--
 .../puissance/normalement_fermes/qet_directory    |  0
 .../puissance/normalement_ouverts/com_puiss1.elmt | 10 ++++++++--
 .../puissance/normalement_ouverts/com_puiss4.elmt |  4 ++--
 .../puissance/normalement_ouverts/com_puiss6.elmt |  4 ++--
 .../puissance/normalement_ouverts/qet_directory   |  0
 .../03relayage/02esclaves/puissance/qet_directory | 15 +++++++++++++++
 9 files changed, 39 insertions(+), 12 deletions(-)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_fermes/com_puiss_nf1.elmt (79%)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_fermes/com_puiss_nf4.elmt (96%)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_fermes/com_puiss_nf6.elmt (97%)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_fermes/qet_directory (100%)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_ouverts/com_puiss1.elmt (77%)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_ouverts/com_puiss4.elmt (96%)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_ouverts/com_puiss6.elmt (96%)
 rename elements/03relayage/{contacts => 02esclaves}/puissance/normalement_ouverts/qet_directory (100%)
 create mode 100644 elements/03relayage/02esclaves/puissance/qet_directory

diff --git a/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt b/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf1.elmt
similarity index 79%
rename from elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt
rename to elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf1.elmt
index f323b1b5e..4fbb24688 100644
--- a/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt
+++ b/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf1.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="7" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
+<definition width="50" version="0.3" hotspot_x="7" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" link_type="slave">
     <names>
         <name lang="ar">مُلامس قدرة كونتكتور (NC)</name>
         <name lang="de">Leistungs Kontakt (NC)</name>
@@ -14,11 +14,17 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <kindInformations>
+        <kindInformation name="state" show="1">NC</kindInformation>
+        <kindInformation name="number" show="1">1</kindInformation>
+        <kindInformation name="type" show="1">puissance</kindInformation>
+        <kindInformation name="tempoType" show="0"></kindInformation>
+    </kindInformations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0"/>
         <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="-9" x1="0" y2="-9" x2="6"/>
         <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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="5.75" y="3" size="9" text="KM_"/>
+        <input x="5.75" y="3" size="9" text="_" tagg="label"/>
         <arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <terminal x="0" y="20" orientation="s"/>
         <terminal x="0" y="-20" orientation="n"/>
diff --git a/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt b/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf4.elmt
similarity index 96%
rename from elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt
rename to elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf4.elmt
index 9c91ab735..09f38ccfa 100644
--- a/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt
+++ b/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf4.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="27" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
+<definition width="90" version="0.3" hotspot_x="27" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
     <names>
         <name lang="ar">مُلامسات قدرة - كونتكتور (NC)</name>
         <name lang="de">Leistungs Kontakt (NC)</name>
@@ -25,7 +25,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-15" y2="10" x2="-20" y3="20" x3="-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="-9" x1="-20" y2="-9" x2="-14"/>
         <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="-20" x1="-20" y2="-9" x2="-20"/>
-        <input x="25" y="3" size="9" text="KM_"/>
+        <input x="25" y="3" size="9" text="_" tagg="label"/>
         <arc width="5" x="-22.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <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="-9" x1="0" y2="-9" x2="6"/>
         <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="-20" x1="0" y2="-9" x2="0"/>
diff --git a/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt b/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf6.elmt
similarity index 97%
rename from elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt
rename to elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf6.elmt
index ccfc35e8d..537b740b3 100644
--- a/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt
+++ b/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf6.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="37" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
+<definition width="110" version="0.3" hotspot_x="37" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور (NC)</name>
         <name lang="de">Leistungs Kontakt (NC)</name>
@@ -26,7 +26,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-25" y2="10" x2="-30" y3="20" x3="-30"/>
         <text x="-26" y="22" size="4" text="2"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="10" y3="20" x3="10"/>
-        <input x="35" y="3" size="9" text="KM_"/>
+        <input x="35" y="3" size="9" text="_" tagg="label"/>
         <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="-9" x1="-30" y2="-9" x2="-24"/>
         <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="-20" x1="-30" y2="-9" x2="-30"/>
         <arc width="5" x="-32.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
diff --git a/elements/03relayage/contacts/puissance/normalement_fermes/qet_directory b/elements/03relayage/02esclaves/puissance/normalement_fermes/qet_directory
similarity index 100%
rename from elements/03relayage/contacts/puissance/normalement_fermes/qet_directory
rename to elements/03relayage/02esclaves/puissance/normalement_fermes/qet_directory
diff --git a/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss1.elmt b/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss1.elmt
similarity index 77%
rename from elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss1.elmt
rename to elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss1.elmt
index 627edce75..2be7268e1 100644
--- a/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss1.elmt
+++ b/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss1.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
+<definition width="50" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" link_type="slave">
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور (NO)</name>
         <name lang="de">Leistungs Kontakt</name>
@@ -14,10 +14,16 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <kindInformations>
+        <kindInformation name="state" show="1">NO</kindInformation>
+        <kindInformation name="number" show="1">1</kindInformation>
+        <kindInformation name="type" show="1">puissance</kindInformation>
+        <kindInformation name="tempoType" show="0"></kindInformation>
+    </kindInformations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
         <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="-20" x1="0" y2="-10" x2="0"/>
-        <input x="2.75" y="3" size="9" text="KM_"/>
+        <input x="2.75" y="3" size="9" text="_" tagg="label"/>
         <arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
diff --git a/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss4.elmt b/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss4.elmt
similarity index 96%
rename from elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss4.elmt
rename to elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss4.elmt
index 2110ee805..bb99fc089 100644
--- a/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss4.elmt
+++ b/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss4.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="29" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
+<definition width="90" version="0.3" hotspot_x="29" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
     <names>
         <name lang="ar">مُلامس قدرة- كونتكتور (NO)</name>
         <name lang="de">Leistungs Kontakt</name>
@@ -24,7 +24,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-25" y2="10" x2="-20" y3="20" x3="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
         <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="-20" x1="-20" y2="-10" x2="-20"/>
-        <input x="25" y="3" size="9" text="KM_"/>
+        <input x="25" y="3" size="9" text="_" tagg="label"/>
         <arc width="5" x="-22.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
         <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="-20" x1="0" y2="-10" x2="0"/>
         <arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
diff --git a/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss6.elmt b/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss6.elmt
similarity index 96%
rename from elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss6.elmt
rename to elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss6.elmt
index 25af7db1f..458ba91e8 100644
--- a/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss6.elmt
+++ b/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss6.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="39" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
+<definition width="110" version="0.3" hotspot_x="39" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور (NO)</name>
         <name lang="de">Leistungs Kontakt</name>
@@ -26,7 +26,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="30" y3="20" x3="30"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="10" y3="20" x3="10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-35" y2="10" x2="-30" y3="20" x3="-30"/>
-        <input x="35" y="3" size="9" text="KM_"/>
+        <input x="35" y="3" size="9" text="_" tagg="label"/>
         <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="-20" x1="-30" y2="-10" x2="-30"/>
         <arc width="5" x="-32.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
         <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="-20" x1="-10" y2="-10" x2="-10"/>
diff --git a/elements/03relayage/contacts/puissance/normalement_ouverts/qet_directory b/elements/03relayage/02esclaves/puissance/normalement_ouverts/qet_directory
similarity index 100%
rename from elements/03relayage/contacts/puissance/normalement_ouverts/qet_directory
rename to elements/03relayage/02esclaves/puissance/normalement_ouverts/qet_directory
diff --git a/elements/03relayage/02esclaves/puissance/qet_directory b/elements/03relayage/02esclaves/puissance/qet_directory
new file mode 100644
index 000000000..4bdc10784
--- /dev/null
+++ b/elements/03relayage/02esclaves/puissance/qet_directory
@@ -0,0 +1,15 @@
+<qet-directory>
+    <names>
+        <name lang="ar">قدرة</name>
+        <name lang="de">Leistung</name>
+        <name lang="ru">контактора</name>
+        <name lang="pt">Potência</name>
+        <name lang="en">Power</name>
+        <name lang="it">Potenza</name>
+        <name lang="fr">Puissance</name>
+        <name lang="pl">Styczniki</name>
+        <name lang="es">Potencia</name>
+        <name lang="cs">Síla</name>
+        <name lang="el">Ισχύος</name>
+    </names>
+</qet-directory>