Compare commits

...

5 Commits
0.6rc4 ... 0.6

Author SHA1 Message Date
scorpio810
876ad38ac0 Tag version 0.6
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.6@5256 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-06 12:30:10 +00:00
scorpio810
f0d0007a92 Change displayed version
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60@5255 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-06 12:28:07 +00:00
scorpio810
ee6524e0b2 Update changelog
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60@5254 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-06 12:26:14 +00:00
scorpio810
504a087386 Add new symbols, thanks Didierm
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60@5252 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-02 13:52:56 +00:00
scorpio810
15f1f5156d Minor
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60@5234 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-02-08 04:15:35 +00:00
6 changed files with 220 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
====== ChangeLog from 0.5 to 0.6 ====== ====== 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. * Improved performance, added multithreading to speed up the loading of items when launching QET.
* RAM consumption has been considerably reduced. * RAM consumption has been considerably reduced.
@@ -16,6 +16,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. * In the panel left split the view into a several docks.
* High-DPI support (Qt 5.6.0) * High-DPI support (Qt 5.6.0)
* new python plugin to generate terminal block. * 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 ====== ====== ChangeLog from 0.4 to 0.5 ======

View File

@@ -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>

View File

@@ -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>

Binary file not shown.

View File

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

View File

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