Reverting deletion of branch 0.2, 0.3

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

CREDIT

@@ -1,6 +1,83 @@
-Merci <20> Trolltech pour la biblioth<74>que Qt ( http://trolltech.com/ ), sous
-licence GNU/GPL.
-Merci <20> Everaldo Coelho pour le th<EFBFBD>me d'ic<69>nes Crystal SVG (
-http://www.everaldo.com/crystal/ ) sous licence LGPL, ainsi qu'au projet KDE (
-http://www.kde.org/ ).
-Merci <20> Loic pour ses explications d'ordre math<74>matique.
+[en]
+Thanks to Qt Software for their Qt library ( http://www.qtsoftware.com/ ), licensed under GNU/GPL.
+Thanks to Everaldo Coelho for the Crystal SVG icons theme ( http://www.everaldo.com/crystal/ ) licensed under LGPL.
+Thanks to Nuno Pinheiro for the Oxygen icons theme ( http://www.oxygen-icons.org/ ) licensed under LGPL but also for the QElectroTech-dedicated icons.
+Thanks to the KDE project ( http://www.kde.org/ ).
+Thanks to Loic for his mathematics-related explanations.
+Thanks to Remi Collet for the Fedora packaging.
+Thanks to Laurent Trinques for the Debian packaging.
+Thanks to `trem' for the Mandriva packaging.
+Thanks to TuxFamily ( http://tuxfamily.org/ ) for hosting the project.
+Thanks to `Nishiki' for his elements and his support.
+Thanks to qtcentre.org for their SingleApplication class.
+Thanks to Alfredo Carreto for his Spanish translations and fixing Spanish translations ( http://electronicosmx.comxa.com )
+
+[fr]
+Merci à Qt Software pour la bibliothèque Qt ( http://www.qtsoftware.com/ ), sous licence GNU/GPL.
+Merci à Everaldo Coelho pour le thème d'icônes Crystal SVG ( http://www.everaldo.com/crystal/ ) sous licence LGPL.
+Merci à Nuno Pinheiro pour le thème d'icônes Oxygen ( http://www.oxygen-icons.org/ ) sous licence LGPL mais aussi pour les icônes dédiées à QElectroTech
+Merci au projet KDE ( http://www.kde.org/ ).
+Merci à Loic pour ses explications d'ordre mathématique.
+Merci à Remi Collet pour les paquets Fedora.
+Merci à Laurent Trinques pour les paquets Debian.
+Merci à `trem' pour les paquets Mandriva.
+Merci à TuxFamily ( http://tuxfamily.org/ ) pour l'hébergement du projet.
+Merci à `Nishiki' pour ses éléments et son soutien.
+Merci à qtcentre.org pour leur classe SingleApplication.
+Merci à Alfredo Carreto pour ses traductions et corrections en espagnol ( http://electronicosmx.comxa.com )
+
+[ru]
+Спасибо Qt Software за их библиотеку Qt ( http://www.qtsoftware.com/ ), лицензированную на условиях GNU/GPL.
+Спасибо Everaldo Coelho за тему значков Crystal SVG ( http://www.everaldo.com/crystal/ ) лицензированную на условиях LGPL.
+Спасибо Nuno Pinheiro за тему значков Oxygen ( http://www.oxygen-icons.org/ ) лицензированную на условиях LGPL, а также за значки связанные с QElectroTech.
+Спасибо проекту KDE ( http://www.kde.org/ ).
+Спасибо Loic за объяснения связанные с математикой.
+Спасибо Remi Collet за пакет для Fedora.
+Спасибо Laurent Trinques за пакет для Debian.
+Спасибо `trem' за пакет для Mandriva.
+Спасибо TuxFamily ( http://tuxfamily.org/ ) за хостинг для проекта.
+Спасибо `Nishiki' за элементы и поддержку.
+Спасибо qtcentre.org за их класс SingleApplication.
+Спасибо Alfredo Carreto за исправления и перевод на испанский ( http://electronicosmx.comxa.com )
+
+[pt]
+Agradecimentos a Qt Software pela sua biblioteca Qt ( http://www.qtsoftware.com/ ), licenciada de acordo com a GNU/GPL.
+Agradecimentos a Everaldo Coelho pelo tema de ícones Crystal SVG ( http://www.everaldo.com/crystal/ ), licenciado de acordo com a LGPL.
+Agradecimentos a Nuno Pinheiro pelo tema de ícones Oxygen e em especial pelos ícones dedicados ao programa QElectroTech ( http://www.oxygen-icons.org/ ), lincenciado de acordo com a LGPL.
+Agradecimentos ao projecto KDE ( http://www.kde.org/ ).
+Agradecimentos a Loic pelas suas explicações relacionadas com problemas matemáticos.
+Agradecimentos a Remi Collet pela criação dos pacotes para Fedora.
+Agradecimentos a Laurent Trinques pela criação dos pacotes para Debian.
+Agradecimentos a "trem" pela criação dos pacotes para Mandriva.
+Agradecimentos a TuxFamily ( http://tuxfamily.org/ ) por albergarem este projecto.
+Agradecimentos a "Nishiki" pela criação de elementos e o seu suporte.
+Agradecimentos a qtcentre.org pela classe SingleApplication.
+Agradecimentos a Alfredo Carreto pela tradução para Espanhol e pela correcção de traduções em Espanhol ( http://electronicosmx.comxa.com ).
+
+[es]
+Agradecimientos a Qt Software por su biblioteca Qt ( http://www.qtsoftware.com/ ), licenciada bajo GNU/GPL.
+Agradecimientos a Everaldo Coelho por el tema de icónos Crystal SVG ( http://www.everaldo.com/crystal/ ), licenciado bajo LGPL.
+Agradecimientos a Nuno Pinheiro por el tema de icónos Oxygen y especialmente por los icónos dedicados al programa QElectroTech ( http://www.oxygen-icons.org/ ), licenciado bajo LGPL.
+Agradecimientos al proyecto KDE ( http://www.kde.org/ ).
+Agradecimientos a Loic por sus explicaciones relacionadas con problemas matemáticos.
+Agradecimientos a Remi Collet por criación de paquetes para Fedora.
+Agradecimientos a Laurent Trinques por la creación de paquetes para Debian.
+Agradecimientos a "trem" por creación de paquetes para Mandriva.
+Agradecimientos a TuxFamily ( http://tuxfamily.org/ ) por el alojamiento de este proyecto.
+Agradecimientos a "Nishiki" por creación de elementos e de su suporte.
+Agradecimientos a qtcentre.org por classe SingleApplication.
+Agradecimientos a Alfredo Carreto por sus traducciones en español y correcciones de traducción en español ( http://electronicosmx.comxa.com)
+
+[cs]
+Díky Qt Software za jejich knihovnu Qt ( http://www.qtsoftware.com/ ), pod licencí GNU/GPL.
+Díky Everaldovi Coelho za téma Crystal SVG icons theme ( http://www.everaldo.com/crystal/ ) pod licencí LGPL.
+Díky Nunovi Pinheirovi za téma ikon Oxygen ( http://www.oxygen-icons.org/ ) pod licencí LGPL ale také za ikony věnované QElectroTech.
+Díky projektu KDE ( http://www.kde.org/ ).
+Díky Loicovi za jeho vysvětlení vztahující se k matematice.
+Díky Remi Colletovi za balíček pro Fedoru.
+Díky Laurentu Trinquesovi za balíček pro Debian.
+Díky `trem' za balíček pro Mandrivu.
+Díky TuxFamily ( http://tuxfamily.org/ ) za poskytování hostingu pro projekt.
+Díky `Nishiki' za jeho prvky a jeho podporu.
+Díky qtcentre.org za jejich třídu SingleApplication.
+Poděkování Alfredovi Carretovi za jeho španělský překlad a opravy španělského překladu ( http://electronicosmx.comxa.com )

ChangeLog

@@ -0,0 +1,86 @@
+====== Changelog 0.11 -> 0.2 ======
+À partir de la version 0.2, QElectroTech est disponible en français, anglais, mais aussi :
+  * en espagnol, grâce aux traductions de Youssef ;
+  * en russe, grâce aux traductions de Yuriy ;
+  * en portugais, grâce aux traductions de José.
+L'application utilise désormais le thème d'icônes Oxygen, réalisé par Nuno Pinheiro pour le projet KDE.
+
+===== Notion de fichier projet =====
+Un fichier .qet peut désormais contenir zéro, un ou plusieurs schémas électriques. Les éléments composant ces schémas sont embarqués dans le fichier projet au moment où ils sont posés sur un schéma. Le panel d'éléments affiche donc désormais :
+  * les projets ouverts, avec, sous chaque projet :
+    * les schémas de ce projet,
+    * la collection embarquée du projet (catégories et éléments utilisés dans les schémas)
+  * la collection commune fournie par QET,
+  * et la collection personnelle de l'utilisateur.
+
+===== Éditeur de schémas =====
+  * Il est désormais possible de déplacer et copier les catégories et éléments par simple glisser-déposer (drag'n drop) dans le panel d'éléments.
+  * La collection embarquée est manipulable au même titre que la collection utilisateur. Les éléments inutilisés dans le projet apparaissent sur fond rouge et un dialogue permet de les purger rapidement.
+  * Chaque projet embarque également (au niveau de ses propriétés) les paramétrages par défaut pour les nouveaux schémas, cartouches et conducteurs.
+  * Il est possible de changer l'ordre des schémas dans le projet en déplaçant les onglets qui les représente. Dans le champ "Folio" des cartouches, on peut se référer à la position du schéma courant ou au nombre total de schémas dans le projet en écrivant respectivement %id et %total.
+  * Lors du chargement d'un fichier .qet, si des éléments ne sont pas trouvés, ils sont remplacés par un élément "fantôme", ce qui évite de perdre certaines informations lors de l'enregistrement du fichier.
+  * Le rendu avec un zoom réduit a été amélioré.
+  * Enfin, le logiciel gère l'ouverture en lecture seule d'un fichier projet.
+
+==== Impression et export ====
+
+À partir de la version 0.2, QElectroTech :
+  * propose d'utiliser une imprimante réelle ou bien de générer un document PDF ou PostScript, et ce sous Windows comme sous X11.
+  * génère un aperçu avant l'impression d'un projet. Cet aperçu permet de choisir les options d'impression mais également les schémas à imprimer ou non.
+
+À noter toutefois une limitation pour les impressions PDF/PS sous Windows : le dialogue de mise en page, permettant de spécifier le format du papier ainsi que ses marges, n'est pas disponible.
+
+Le dialogue "Exporter" (pour générer un fichier image d'un schéma) a également été refait dans l'optique d'un export simultané de tous les schémas du projet.
+
+===== Éditeur d'éléments =====
+
+  * Lorsque l'on dessine une ligne dans l'éditeur d'éléments, il est possible de choisir un embout différent pour chaque extrémité, comme par exemple une flèche, un cercle, un carré ou, tout simplement, un bout de ligne normal.
+  * La forme "Rectangle" a été ajoutée.
+  * On peut enregistrer un élément en désignant un fichier (= comportement en 0.11) ou bien en choisissant un élément cible dans une liste reprenant l'arborescence du panel d'éléments.
+  * Si l'on maintient la touche Shift lorsque l'on ajoute une partie (droite, cercle, texte, ...), l'outil en cours est conservé après le dessin. Sinon l'éditeur repasse sur l'outil de sélection.
+  * La grille a été améliorée : sa densité varie en fonction du zoom ; les points correspondant à ceux de la grille de l'éditeur de schémas sont mis en valeur.
+  * L'accrochage à la grille (aka "snap to grid", également connu sous le nom de grille magnétique ou encore grille aimantée) a été ajouté. Le dessin s'y accroche désormais avec une précision de 1px. On peut travailler en coordonnées libres en maintenant la touche Ctrl enfoncée durant le dessin.
+  * Le copier-coller a été implémenté : il est possible de coller :
+     * avec le bouton du milieu de la souris
+     * en choisissant une "zone de collage" sur l'élément (Ctrl+Shift+V)
+     * directement (Ctrl+V) : les parties collées sont placées à côté des parties copiées ; si on recolle les parties, elles sont collées encore un cran à côté, et ce de manière incrémentale.
+  * Des contrôles sont désormais effectués à l'enregistrement : présence de bornes, respect du cadre, etc.
+  * Uniformisation des menus par rapport à l'éditeur de schémas
+
+====== Changelog 0.1 -> 0.11 ======
+
+===== Fonctionnalités et interface =====
+
+  * L'application est désormais capable d'ouvrir un fichier élément passe en paramètre
+  * L'application se lance désormais une seule fois par utilisateur
+  * Lors de l'ouverture d'un fichier en dehors de l'application alors que QET est déjà démarré celui-ci essaye de s'afficher ou d'attirer l'attention de l'utilisateur.
+  * L'application vérifie que ce fichier n'est pas déjà ouvert dans tous les éditeurs de schémas / éléments.
+  * Ajout de fichiers permettant d'automatiser les associations de fichiers sous Windows (.bat et .reg) et X11 (.desktop et .xml)
+  * Ajout de menus "Récemment ouverts" pour accéder aux fichiers récents dans les éditeurs de schémas et éléments.
+  * Ajout d'un splash screen
+  * La hauteur du schéma est désormais gérée via un système de lignes, dont le nombre et la hauteur sont ajustables.
+  * Il est également possible d'afficher ou non les en-têtes des lignes et/ou des colonnes.
+  * Ajout d'une option --lang-dir
+  * Ajout d'une description dans le dialogue des options d'impression
+  * Ajout de pages de manuel Unix (`man') en anglais et en français
+
+===== Corrections de bugs =====
+
+  * Bug #12 : QET provoquait une erreur de segmentation dès son démarrage dans un environnement sans systray
+  * Bug #14 : il manquait un / dans le chemin proposé lors de l'impression vers un PDF
+  * Bug #15 : Mauvais positionnement des champs de texte sur le schéma
+  * Bug #16 : Mauvaise gestion des modifications du texte d'un conducteur
+  * La classe DiagramView écrivait sur la sortie d'erreur sans fin de ligne
+  * L'option --config-dir était mal prise en compte
+  * Après fermeture d'un schema, le menu Fenêtres n'était pas correctement mis à jour
+  * Les textes des éléments, des conducteurs, du cartouche ainsi que les textes indépendants utilisent désormais tous la même police.
+  * Remise à niveau de l'impression suite au passage à Qt 4.4
+
+===== Code et détails techniques =====
+
+  * Corrections pour que QET compile avec gcc-4.3
+  * Les classes Conductor et Element héritent désormais de QObject (dépendance sur Qt 4.4)
+  * Affinage du constructeur de la classe QETApp
+  * Moins d'avertissements à la compilation (testé avec gcc 4.3)
+  * Moins d'inclusions non pertinentes
+  * Nettoyage du trunk : déplacement des sources dans un sous-répertoire

ELEMENTS.LICENSE

@@ -0,0 +1,83 @@
+[en]
+The elements collection provided along with QElectroTech is provided as is and
+without any warranty of fitness for your purpose or working.
+The usage, the modification and the integration of the elements into electric
+diagrams is allowed without any condition, whatever the final license of the
+diagrams is.
+If you redistribute all or a part of the QElectroTech collection, with or
+without any modification, out of an electric diagram, you must respect the
+conditions of the CC-BY license:
+This work is licensed under the Creative Commons Attribution 3.0 License.
+To view a copy of this license, visit
+http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
+Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+
+[fr]
+La collection d'éléments fournie avec QElectroTech est fournie telle quelle et
+sans la moindre garantie qu'elle convienne à votre utilisation ou qu'elle
+fonctionne.
+L'utilisation, la modification et l'intégration des éléments dans des schémas
+électriques est autorisée sans condition, quelle que soit la licence finale des
+schémas.
+Si vous redistribuez tout ou partie de la collection QElectroTech, avec ou sans
+modification, en dehors d'un schéma électrique, vous devrez respecter les
+conditions de la licence CC-BY :
+Cette création est mise à disposition selon le Contrat Paternité 3.0
+disponible en ligne http://creativecommons.org/licenses/by/3.0/ ou par
+courrier postal à Creative Commons, 171 Second Street, Suite 300, San Francisco,
+California 94105, USA.
+
+[ru]
+Коллекция элементов, поставляемая вместе с QElectroTech, поставляется "как есть"
+и без каких-либо гарантий пригодности для той или иной цели или работы.
+Использование, изменение и интеграция элементов в электрическую 
+схему разрешается без каких-либо условий, безотносительно конечной лицензии на 
+схему.
+Если Вы распространяете всю или часть коллекции QElectroTech, с или без
+изменений, отдельно от электрической схемы, Вы должны соблюдать условия лицензии
+CC-BY:
+Эта работа лицензирована на условиях Creative Commons Attribution 3.0 License.
+Чтобы увидеть копию этой лицензии, посетите
+http://creativecommons.org/licenses/by/3.0/ или отправте письмо в Creative
+Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+(данный перевод, на русский язык, является вольным и выполнен не юристом!)
+
+[pt]
+A colecção de elementos fornecida com o programa QElectroTech é fornecida como é
+e sem nenhuma garantia da aptidão para o seu uso e sem garantia de que funciona.
+É permitido, sem condição alguma, qualquer que seja a licença final, usar,
+editar e incluir estes elementos em esquemas eléctricos.
+Se você redistribuir uma parte ou toda a colecção de elementos do programa
+QElectroTech, tendo editado ou não os elementos, sem ser num esquema eléctrico,
+tem de respeitar as condições da licença CC-BY:
+Este trabalho está licenciado de acordo com os termos da licença Creative
+Commons Attribution 3.0 License.
+Para ver uma cópia da licença visite http://creativecommons.org/licenses/by/3.0/
+ou envie uma carta para o endereço Creative Commons, 171 Second Street, Suite
+300, San Francisco, California, 94105, USA.
+ 
+[es]
+La colección de elementos QElectrotech es distruibida tal cual y sin ninguna
+garantía a la conveniencia de su uso y sin garantía de que funciona.
+Se permite sin condicione alguna, cualquiera que sea la licencia final, usar,
+editar, e incluir estos elementos en esquemas eléctricos.
+Si usted redistribuye una parte de la colección o toda la collección de
+QElectrotech, con o sin ediciones, fuera de un esquema eléctrico, tiene que
+respetar las condiciones de la licencia CC-BY:
+Esta obra está bajo una licencia Reconocimiento 3.0 de Creative Commons.
+Para ver una copia de esta licencia, visite
+http://creativecommons.org/licenses/by/3.0/ o envie una carta a Creative
+Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
+
+[cs]
+Sbírka prvků poskytovaná společně s QElectroTechem je poskytována tak, jak je,
+bez záruky nebo vhodnosti pro váš účal nebo práci.
+Používání, úpravy a začlenění prvků do nákresů elektrických
+obvodů se povoluje bez jakýchkoli podmínek, cokoli je konečná licence nákresu.
+Pokud rozdáte celou nebo část ze sbírky QElectroTechu, s nebo bez
+jakýchkoli úprav, mimo elektrický nákres, musíte brát ohledy na podmínky
+licence CC-BY:
+tato práce je licencována pod licencí Creative Commons Attribution 3.0 License.
+Kopii této licence si můžete prohlédnout, navštivte
+http://creativecommons.org/licenses/by/3.0/ nebo pošlete dopis Creative
+Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.

INSTALL

@@ -0,0 +1,65 @@
+[en]
+Requirements :
+libQt4 (see packages libqt4*)
+cupsys-bsd for printing
+
+Howto compile :
+$ qmake (qmake-qt4 for Debian-based systems)
+$ make
+# umask 0022
+# make install
+
+[fr]
+Pré-requis :
+libQt4 (paquets libqt4*)
+cupsys-bsd pour l'impression
+
+Comment compiler :
+$ qmake (qmake-qt4 pour les systèmes basés sur Debian)
+$ make
+# umask 0022
+# make install
+
+[ru]
+Зависимости:
+libQt4 (пакет libqt4*)
+cupsys-bsd для печати
+
+Как компилировать?:
+$ qmake (qmake-qt4 для систем основанных на Debian)
+$ make
+# umask 0022
+# make install
+
+[pt]
+Dependências:
+libqt4 (ver pacotes libqt4*)
+cupsys-bsd para impressão
+
+Como compilar:
+$ qmake (qmake-qt4 para sistemas baseados em Debian)
+$ make
+# umask 0022
+# make install
+
+[es]
+Dependencias:
+libqt4 (paquetes libqt4*)
+cupsys-bsd para imprimir
+
+Cómo compilar:
+$ qmake (qmake-qt4 para los sistemas basados en Debian)
+$ make
+# umask 0022
+# make install
+
+[cs]
+Požadavky :
+libQt4 (viz balíček libqt4*)
+cupsys-bsd kvůli tisku
+
+Jak program sestavit :
+$ qmake (qmake-qt4 u systémů založených na Debianu)
+$ make
+# umask 0022
+# make install

README

@@ -0,0 +1,23 @@
+[en]
+QElectroTech is a Qt4 application to design electric diagrams.
+It uses XML files for elements and diagrams, and includes both a diagram editor and an element editor.
+
+[fr]
+QElectroTech est une application Qt4 pour réaliser des schémas électriques.
+QET utilise le format XML pour ses éléments et ses schémas et inclut un éditeur de schémas ainsi qu'un éditeur d'élément.
+
+[ru]
+QElectroTech - приложение написанное на Qt4 и предназначенное для разработки электрических схем.
+Оно использует XML-файлы для элементов и схем, и включает, как редактор схем, так и редактор элементов.
+
+[pt]
+QElectroTech é uma aplicação baseada em Qt4 para desenhar esquemas eléctricos.
+QET utiliza ficheiros XML para os elementos e para os esquemas e inclui um editor de esquemas e um editor de elementos.
+
+[es]
+QElectroTech es una aplicación Qt4 para diseñar esquemas eléctricos.
+Utiliza archivos XML para los elementos y esquemas, e incluye un editor de esquemas y un editor de elemento.
+
+[cs]
+QElectroTech je aplikací Qt4 určenou pro návrh nákresů elektrických obvodů.
+Pro prvky a nákresy používá soubory XML, a zahrnuje v sobě jak editor nákresů, tak editor prvků.

aboutqet.cpp

@@ -1,138 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "aboutqet.h"
-#include "qet.h"
-
-/**
-	Constructeur
-	@param parent Le QWidget parent de la boite de dialogue
-*/
-AboutQET::AboutQET(QWidget *parent) : QDialog(parent) {
-	// Titre, taille, comportement...
-	setWindowTitle(tr("\300 propos de QElectrotech"));
-	setMinimumWidth(680);
-	setMinimumHeight(350);
-	setModal(true);
-	
-	// Trois onglets
-	QTabWidget *onglets = new QTabWidget(this);
-	onglets -> addTab(ongletAPropos(), tr("\300 &propos"));
-	onglets -> addTab(ongletAuteurs(), tr("A&uteurs"));
-	onglets -> addTab(ongletLicence(), tr("&Accord de licence"));
-	
-	// Un bouton pour fermer la boite de dialogue
-	QDialogButtonBox *boutons = new QDialogButtonBox(QDialogButtonBox::Close);
-	connect(boutons, SIGNAL(accepted()), this, SLOT(accept()));
-	connect(boutons, SIGNAL(rejected()), this, SLOT(accept()));
-	
-	// Le tout dans une disposition verticale
-	QVBoxLayout *disposition = new QVBoxLayout();
-	disposition -> addWidget(titre());
-	disposition -> addWidget(onglets);
-	disposition -> addWidget(boutons);
-	setLayout(disposition);
-}
-
-/**
-	Destructeur
-*/
-AboutQET::~AboutQET() {
-}
-
-/**
-	@return Le titre QElectroTech avec son icone
-*/
-QWidget *AboutQET::titre() const {
-	QWidget *icone_et_titre = new QWidget();
-	// icone
-	QLabel *icone = new QLabel();
-	icone -> setPixmap(QIcon(":/ico/qelectrotech.png").pixmap(48, 48));
-	// label "QElectroTech"
-	QLabel *titre = new QLabel("<span style=\"font-weight:0;font-size:16pt;\">QElectroTech v" + QET::version + "</span>");
-	titre -> setTextFormat(Qt::RichText);
-	// le tout dans une grille
-	QGridLayout *dispo_horiz = new QGridLayout();
-	dispo_horiz -> addWidget(icone, 0, 0);
-	dispo_horiz -> addWidget(titre, 0, 1);
-	dispo_horiz -> setColumnStretch(0, 1);
-	dispo_horiz -> setColumnStretch(1, 100);
-	icone_et_titre -> setLayout(dispo_horiz);
-	return(icone_et_titre);
-}
-
-/**
-	@return Le widget contenu par l'onglet <20> A propos <20>
-*/
-QWidget *AboutQET::ongletAPropos() const {
-	QLabel *apropos = new QLabel(
-		tr("QElectroTech, une application de r\351alisation de sch\351mas \351lectriques.") +
-		"<br><br>" +
-		tr("\251 2006-2007 Les d\351veloppeurs de QElectroTech") +
-		"<br><br>"
-		"<a href=\"http://qelectrotech.tuxfamily.org/\">"
-		"http://qelectrotech.tuxfamily.org/</a>"
-	);
-	apropos -> setAlignment(Qt::AlignCenter);
-	apropos -> setOpenExternalLinks(true);
-	apropos -> setTextFormat(Qt::RichText);
-	return(apropos);
-}
-
-/**
-	@return Le widget contenu par l'onglet <20> Auteurs <20>
-*/
-QWidget *AboutQET::ongletAuteurs() const {
-	QLabel *auteurs = new QLabel(
-		"<span style=\"text-decoration: underline;\">" +
-		tr("Id\351e originale") +
-		"</span> : Beno\356t Ansieau "
-		"&lt;<a href=\"mailto:benoit.ansieau@gmail.com\">"
-		"benoit.ansieau@gmail.com</a>&gt;"
-		"<br><br>"
-		"<span style=\"text-decoration: underline;\">" +
-		tr("Programmation") +
-		"</span> : Xavier Guerrin "
-		"&lt;<a href=\"mailto:xavier.guerrin@gmail.com\">"
-		"xavier.guerrin@gmail.com</a>&gt;"
-	);
-	auteurs -> setAlignment(Qt::AlignCenter);
-	auteurs -> setOpenExternalLinks(true);
-	auteurs -> setTextFormat(Qt::RichText);
-	return(auteurs);
-}
-
-/**
-	@return Le widget contenu par l'onglet <20> Accord de Licence <20>
-*/
-QWidget *AboutQET::ongletLicence() const {
-	QWidget *licence = new QWidget();
-	// label
-	QLabel *titre_licence = new QLabel(tr("Ce programme est sous licence GNU/GPL."));
-	
-	// texte de la GNU/GPL dans une zone de texte scrollable non editable
-	QTextEdit *texte_licence = new QTextEdit();
-	texte_licence -> setPlainText(QET::license());
-	texte_licence -> setReadOnly(true);
-	
-	// le tout dans une disposition verticale
-	QVBoxLayout *dispo_licence = new QVBoxLayout();
-	dispo_licence -> addWidget(titre_licence);
-	dispo_licence -> addWidget(texte_licence);
-	licence -> setLayout(dispo_licence);
-	return(licence);
-}

borderinset.cpp

@@ -1,231 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "borderinset.h"
-#include "qetapp.h"
-
-/**
-	Constructeur simple : construit une bordure de 15 colonnes de 50x500 avec
-	un cartouche de 400x50.
-	@param parent QObject parent de ce BorderInset
-*/
-BorderInset::BorderInset(QObject *parent) : QObject(parent) {
-	nb_columns            = qMax(3, QETApp::settings().value("diagrameditor/defaultcols", 15).toInt());
-	min_nb_columns        = 3;
-	columns_width         = QETApp::settings().value("diagrameditor/defaultcolsize", 50.0).toDouble();
-	columns_height        = QETApp::settings().value("diagrameditor/defaultheight", 500.0).toDouble();
-	min_columns_height    = 80.0;
-	inset_width           = nb_columns * columns_width;
-	inset_height          = 50.0;
-	columns_header_height = 20.0;
-	display_inset         = true;
-	display_columns       = true;
-	display_border        = true;
-	updateRectangles();
-	
-	bi_author   = QETApp::settings().value("diagrameditor/defaultauthor").toString();
-	bi_title    = QETApp::settings().value("diagrameditor/defaulttitle").toString();
-	bi_folio    = QETApp::settings().value("diagrameditor/defaultfolio").toString();
-	bi_filename = QETApp::settings().value("diagrameditor/defaultfilename").toString();
-	QString settings_date = QETApp::settings().value("diagrameditor/defaultdate").toString();
-	if (settings_date == "now") bi_date = QDate::currentDate();
-	else if (settings_date.isEmpty() || settings_date == "null") bi_date = QDate();
-	else bi_date = QDate::fromString(settings_date, "yyyyMMdd");
-}
-
-/**
-	Destructeur - ne fait rien
-*/
-BorderInset::~BorderInset() {
-}
-
-/**
-	Methode recalculant les rectangles composant le cadre et le cartouche en
-	fonction des attributs de taille
-*/
-void BorderInset::updateRectangles() {
-	// rectangle delimitant le schema
-	QRectF previous_border = border;
-	border = QRectF(0, 0, nb_columns * columns_width, columns_height);
-	if (border != previous_border) emit(borderChanged(previous_border, border));
-	
-	// rectangles relatifs au cartouche
-	inset        = QRectF(border.bottomLeft().x(), border.bottomLeft().y(), inset_width, inset_height);
-	inset_author = QRectF(inset.topLeft(), QSizeF(2.0 * inset_width / 9.0, 0.5 * inset_height));
-	inset_date   = QRectF(inset_author.bottomLeft(), inset_author.size());
-	inset_title  = QRectF(inset_author.topRight(), QSizeF(5.0 * inset_width / 9.0, inset_height));
-	inset_file   = QRectF(inset_title.topRight(), inset_author.size());
-	inset_folio  = QRectF(inset_file.bottomLeft(), inset_author.size());
-}
-
-/**
-	Dessine le cadre et le cartouche
-	@param qp QPainter a utiliser pour dessiner le cadre et le cartouche
-	@param x  Abscisse du cadre
-	@param y  Ordonnee du cadre
-*/
-void BorderInset::draw(QPainter *qp, qreal x, qreal y) {
-	// translate tous les rectangles
-	border      .translate(x, y);
-	inset       .translate(x, y);
-	inset_author.translate(x, y);
-	inset_date  .translate(x, y);
-	inset_title .translate(x, y);
-	inset_file  .translate(x, y);
-	inset_folio .translate(x, y);
-	
-	// prepare le QPainter
-	qp -> save();
-	qp -> setPen(Qt::black);
-	qp -> setBrush(Qt::NoBrush);
-	
-	// dessine le cadre
-	if (display_border) qp -> drawRect(border);
-	
-	// dessine la numerotation des colonnes
-	if (display_columns) {
-		qp -> setBrush(Qt::white);
-		for (int i = 1 ; i <= nb_columns ; ++ i) {
-			QRectF numbered_rectangle = QRectF(
-				border.topLeft().x() + ((i - 1) * columns_width),
-				border.topLeft().y(),
-				columns_width,
-				columns_header_height
-			);
-			qp -> drawRect(numbered_rectangle);
-			qp -> drawText(numbered_rectangle, Qt::AlignVCenter | Qt::AlignCenter, QString("%1").arg(i));
-		}
-	}
-	
-	// dessine le cartouche
-	if (display_inset) {
-		qp -> setBrush(Qt::white);
-		qp -> drawRect(inset);
-		
-		qp -> drawRect(inset_author);
-		qp -> drawText(inset_author, Qt::AlignVCenter | Qt::AlignLeft,   tr(" Auteur : ") + bi_author);
-		
-		qp -> drawRect(inset_date);
-		qp -> drawText(inset_date,   Qt::AlignVCenter | Qt::AlignLeft,   tr(" Date : ") + bi_date.toString("dd/MM/yyyy"));
-		
-		qp -> drawRect(inset_title);
-		qp -> drawText(inset_title,  Qt::AlignVCenter | Qt::AlignCenter, tr("Titre du document : ") + bi_title);
-		
-		qp -> drawRect(inset_file);
-		qp -> drawText(inset_file,   Qt::AlignVCenter | Qt::AlignLeft,   tr(" Fichier : ") + bi_filename);
-		
-		qp -> drawRect(inset_folio);
-		qp -> drawText(inset_folio,  Qt::AlignVCenter | Qt::AlignLeft,   tr(" Folio : ") + bi_folio);
-	}
-	
-	qp -> restore();
-	
-	// annule la translation des rectangles
-	border      .translate(-x, -y);
-	inset       .translate(-x, -y);
-	inset_author.translate(-x, -y);
-	inset_date  .translate(-x, -y);
-	inset_title .translate(-x, -y);
-	inset_file  .translate(-x, -y);
-	inset_folio .translate(-x, -y);
-}
-
-/**
-	Ajoute une colonne.
-*/
-void BorderInset::addColumn() {
-	++ nb_columns;
-	setInsetWidth(nb_columns * columns_width);
-	updateRectangles();
-}
-
-/**
-	Enleve une colonne. Il doit rester au moins 3 colonnes.
-*/
-void BorderInset::removeColumn() {
-	if (nb_columns == min_nb_columns) return;
-	-- nb_columns;
-	setInsetWidth(nb_columns * columns_width);
-	updateRectangles();
-}
-
-/**
-	Permet de changer le nombre de colonnes.
-	Si ce nombre de colonnes est inferieur au minimum requis, cette fonction ne
-	fait rien
-	@param nb_c nouveau nombre de colonnes
-	@see minNbColumns()
-*/
-void BorderInset::setNbColumns(int nb_c) {
-	if (nb_c < min_nb_columns) return;
-	nb_columns = nb_c;
-	setInsetWidth(nb_columns * columns_width);
-	updateRectangles();
-}
-
-/**
-	Change la largeur des colonnes ; celle-ci doit rester comprise entre 10 et
-	200px.
-*/
-void BorderInset::setColumnsWidth(const qreal &new_cw) {
-	columns_width = qBound(10.0, new_cw, 200.0);
-	updateRectangles();
-}
-
-/**
-	Change la hauteur des en-tetes contenant les numeros de colonnes. Celle-ci
-	doit rester comprise entre 5 et 50 px.
-*/
-void BorderInset::setColumnsHeaderHeight(const qreal &new_chh) {
-	columns_header_height = qBound(5.0, new_chh, 50.0);
-	updateRectangles();
-}
-
-/**
-	Change la hauteur des colonnes (et donc du cadre). Cette hauteur doit
-	rester superieure a la hauteur des en-tetes de colonnes + 20px.
-*/
-void BorderInset::setColumnsHeight(const qreal &new_ch) {
-	columns_height = qMax(columns_header_height + min_columns_height, new_ch);
-	updateRectangles();
-}
-
-/**
-	Change la largeur du cartouche. Cette largeur doit rester comprise entre
-	100px et la largeur du cartouche
-*/
-void BorderInset::setInsetWidth(const qreal &new_iw) {
-	inset_width = qMax(100.0, qMin(nb_columns * columns_width, new_iw));
-	updateRectangles();
-}
-
-/**
-	Change la hauteur du cartouche. Cette largeur doit rester comprise entre
-	20px et la hauteur du cartouche.
-*/
-void BorderInset::setInsetHeight(const qreal &new_ih) {
-	inset_height = qMax(20.0, qMin(columns_height, new_ih));
-	updateRectangles();
-}
-
-/**
-	Ajuste la largeur du cartouche de facon a ce que celui-ci soit aussi large
-	que le schema
-*/
-void BorderInset::adjustInsetToColumns() {
-	setInsetWidth(nbColumn() * columnsWidth());
-}

configpages.cpp

@@ -1,136 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "configpages.h"
-#include "qetapp.h"
-
-/**
-	Constructeur
-	@param parent QWidget parent
-*/
-NewDiagramPage::NewDiagramPage(QWidget *parent) : ConfigPage(parent) {
-	
-	// acces a la configuration de QElectroTech
-	QSettings &settings = QETApp::settings();
-	
-	// recupere les dimensions du schema
-	int columns_count_value  = settings.value("diagrameditor/defaultcols",       15).toInt();
-	int columns_width_value  = qRound(settings.value("diagrameditor/defaultcolsize",  50.0).toDouble());
-	int columns_height_value = qRound(settings.value("diagrameditor/defaultheight",  500.0).toDouble());
-	
-	QVBoxLayout *vlayout1 = new QVBoxLayout();
-	
-	QLabel *title = new QLabel(tr("Nouveau sch\351ma"));
-	vlayout1 -> addWidget(title);
-	
-	QFrame *horiz_line = new QFrame();
-	horiz_line -> setFrameShape(QFrame::HLine);
-	vlayout1 -> addWidget(horiz_line);
-	
-	QHBoxLayout *hlayout1 = new QHBoxLayout();
-	QVBoxLayout *vlayout2 = new QVBoxLayout();
-	
-	QGroupBox *diagram_size_box = new QGroupBox(tr("Dimensions du sch\351ma"));
-	diagram_size_box -> setMinimumWidth(300);
-	QGridLayout *diagram_size_box_layout = new QGridLayout(diagram_size_box);
-	
-	QLabel *ds1 = new QLabel(tr("Colonnes :"));
-	
-	columns_count = new QSpinBox(diagram_size_box);
-	columns_count -> setMinimum(3); /// @todo methode statique pour recuperer ca
-	columns_count -> setValue(columns_count_value);
-	
-	columns_width = new QSpinBox(diagram_size_box);
-	columns_width -> setMinimum(1);
-	columns_width -> setSingleStep(10);
-	columns_width -> setValue(columns_width_value);
-	columns_width -> setPrefix(tr("\327"));
-	columns_width -> setSuffix(tr("px"));
-	
-	QLabel *ds2 = new QLabel(tr("Hauteur :"));
-	
-	columns_height = new QSpinBox(diagram_size_box);
-	columns_height -> setRange(80, 10000); /// @todo methode statique pour recuperer ca
-	columns_height -> setSingleStep(80);
-	columns_height -> setValue(columns_height_value);
-	
-	diagram_size_box_layout -> addWidget(ds1,            0, 0);
-	diagram_size_box_layout -> addWidget(columns_count,  0, 1);
-	diagram_size_box_layout -> addWidget(columns_width,  0, 2);
-	diagram_size_box_layout -> addWidget(ds2,            1, 0);
-	diagram_size_box_layout -> addWidget(columns_height, 1, 1);
-	
-	ipw = new InsetPropertiesWidget(QETDiagramEditor::defaultInsetProperties(), true, this);
-	
-	// proprietes par defaut des conducteurs
-	ConductorProperties cp;
-	cp.fromSettings(settings, "diagrameditor/defaultconductor");
-	cpw = new ConductorPropertiesWidget(cp);
-	
-	vlayout2 -> addWidget(diagram_size_box);
-	vlayout2 -> addWidget(ipw);
-	hlayout1 -> addLayout(vlayout2);
-	hlayout1 -> addWidget(cpw);
-	vlayout1 -> addLayout(hlayout1);
-	vlayout1 -> addStretch(1);
-	hlayout1 -> setAlignment(cpw, Qt::AlignTop);
-	setLayout(vlayout1);
-}
-
-/// Destructeur
-NewDiagramPage::~NewDiagramPage() {
-}
-
-/**
-	Applique la configuration de cette page
-*/
-void NewDiagramPage::applyConf() {
-	QSettings &settings = QETApp::settings();
-	
-	// dimensions des nouveaux schemas
-	settings.setValue("diagrameditor/defaultcols",    columns_count -> value());
-	settings.setValue("diagrameditor/defaultcolsize", columns_width -> value());
-	settings.setValue("diagrameditor/defaultheight",  columns_height -> value());
-	
-	// proprietes du cartouche
-	InsetProperties inset = ipw-> insetProperties();
-	settings.setValue("diagrameditor/defaulttitle",    inset.title);
-	settings.setValue("diagrameditor/defaultauthor",   inset.author);
-	settings.setValue("diagrameditor/defaultfilename", inset.filename);
-	settings.setValue("diagrameditor/defaultfolio",    inset.folio);
-	QString date_setting_value;
-	if (inset.useDate == InsetProperties::UseDateValue) {
-		if (inset.date.isNull()) date_setting_value = "null";
-		else date_setting_value = inset.date.toString("yyyyMMdd");
-	} else {
-		date_setting_value = "now";
-	}
-	settings.setValue("diagrameditor/defaultdate", date_setting_value);
-	
-	// proprietes par defaut des conducteurs
-	cpw -> conductorProperties().toSettings(settings, "diagrameditor/defaultconductor");
-}
-
-/// @return l'icone de cette page
-QIcon NewDiagramPage::icon() const {
-	return(QIcon(":/ico/conf_new_diagram.png"));
-}
-
-/// @return le titre de cette page
-QString NewDiagramPage::title() const {
-	return(tr("Nouveau sch\351ma"));
-}

editor/elementscene.cpp

@@ -1,732 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "elementscene.h"
-#include "qetelementeditor.h"
-#include <cmath>
-#include "partline.h"
-#include "partellipse.h"
-#include "partcircle.h"
-#include "partpolygon.h"
-#include "partterminal.h"
-#include "parttext.h"
-#include "parttextfield.h"
-#include "partarc.h"
-#include "hotspoteditor.h"
-#include "editorcommands.h"
-
-const int ElementScene::xGrid = 10;
-const int ElementScene::yGrid = 10;
-
-/**
-	Constructeur
-	@param editor L'editeur d'element concerne
-	@param parent le Widget parent
-*/
-ElementScene::ElementScene(QETElementEditor *editor, QObject *parent) :
-	QGraphicsScene(parent),
-	_width(3),
-	_height(7),
-	_hotspot(15, 35),
-	internal_connections(false),
-	qgi_manager(this),
-	element_editor(editor)
-{
-	current_polygon = NULL;
-	undo_stack.setClean();
-}
-
-/// Destructeur
-ElementScene::~ElementScene() {
-}
-
-/**
-	Passe la scene en mode "selection et deplacement de parties"
-*/
-void ElementScene::slot_move() {
-	behavior = Normal;
-}
-
-/**
-	Passe la scene en mode "ajout de ligne"
-*/
-void ElementScene::slot_addLine() {
-	behavior = Line;
-}
-
-/**
-	Passe la scene en mode "ajout de cercle"
-*/
-void ElementScene::slot_addCircle() {
-	behavior = Circle;
-}
-
-/**
-	Passe la scene en mode "ajout d'ellipse"
-*/
-void ElementScene::slot_addEllipse() {
-	behavior = Ellipse;
-}
-
-/**
-	Passe la scene en mode "ajout de polygone"
-*/
-void ElementScene::slot_addPolygon() {
-	behavior = Polygon;
-}
-
-
-/**
-	Passe la scene en mode "ajout de texte statique"
-*/
-void ElementScene::slot_addText() {
-	behavior = Text;
-}
-
-/**
-	Passe la scene en mode "ajout de borne"
-*/
-void ElementScene::slot_addTerminal() {
-	behavior = Terminal;
-}
-
-
-/**
-	Passe la scene en mode "ajout d'arc de cercle"
-*/
-void ElementScene::slot_addArc() {
-	behavior = Arc;
-}
-
-/**
-	Passe la scene en mode "ajout de champ de texte"
-*/
-void ElementScene::slot_addTextField() {
-	behavior = TextField;
-}
-
-/**
-	Gere les mouvements de la souris
-	@param e objet decrivant l'evenement
-*/
-void ElementScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
-	if (behavior != Polygon && current_polygon != NULL) current_polygon = NULL;
-	QRectF temp_rect;
-	qreal radius;
-	QPointF temp_point;
-	QPolygonF temp_polygon;
-	if (e -> buttons() & Qt::LeftButton) {
-		switch(behavior) {
-			case Line:
-				current_line -> setLine(QLineF(current_line -> line().p1(), e -> scenePos()));
-				break;
-			case Ellipse:
-				temp_rect = current_ellipse -> rect();
-				temp_rect.setBottomRight(e -> scenePos());
-				current_ellipse -> setRect(temp_rect);
-				break;
-			case Arc:
-				temp_rect = current_arc -> rect();
-				temp_rect.setBottomRight(e -> scenePos());
-				current_arc -> setRect(temp_rect);
-				break;
-			case Circle:
-				temp_rect = current_circle -> rect();
-				temp_point = e -> scenePos() - current_circle -> mapToScene(temp_rect.center());
-				radius = sqrt(pow(temp_point.x(), 2) + pow(temp_point.y(), 2));
-				temp_rect = QRectF(
-					temp_rect.center() - QPointF(radius, radius),
-					QSizeF(2.0 * radius, 2.0 * radius)
-				);
-				current_circle -> setRect(temp_rect);
-				break;
-			case Polygon:
-				if (current_polygon == NULL) break;
-				temp_polygon = current_polygon -> polygon();
-				temp_polygon.pop_back();
-				temp_polygon << e -> scenePos();
-				current_polygon -> setPolygon(temp_polygon);
-				break;
-			case Normal:
-			default:
-				QGraphicsScene::mouseMoveEvent(e);
-		}
-	} else if (behavior == Polygon && current_polygon != NULL) {
-		temp_polygon = current_polygon -> polygon();
-		temp_polygon.pop_back();
-		temp_polygon << e -> scenePos();
-		current_polygon -> setPolygon(temp_polygon);
-	} else QGraphicsScene::mouseMoveEvent(e);
-}
-
-/**
-	Gere les appuis sur les boutons de la souris
-	@param e objet decrivant l'evenement
-*/
-void ElementScene::mousePressEvent(QGraphicsSceneMouseEvent *e) {
-	if (behavior != Polygon && current_polygon != NULL) current_polygon = NULL;
-	QPolygonF temp_polygon;
-	if (e -> button() & Qt::LeftButton) {
-		switch(behavior) {
-			case Line:
-				current_line = new PartLine(element_editor, 0, this);
-				current_line -> setLine(QLineF(e -> scenePos(), e -> scenePos()));
-				break;
-			case Ellipse:
-				current_ellipse = new PartEllipse(element_editor, 0, this);
-				current_ellipse -> setRect(QRectF(e -> scenePos(), QSizeF(0.0, 0.0)));
-				current_ellipse -> setProperty("antialias", true);
-				break;
-			case Arc:
-				current_arc = new PartArc(element_editor, 0, this);
-				current_arc -> setRect(QRectF(e -> scenePos(), QSizeF(0.0, 0.0)));
-				current_arc -> setProperty("antialias", true);
-				break;
-			case Circle:
-				current_circle = new PartCircle(element_editor, 0, this);
-				current_circle -> setRect(QRectF(e -> scenePos(), QSizeF(0.0, 0.0)));
-				current_circle -> setProperty("antialias", true);
-				break;
-			case Polygon:
-				if (current_polygon == NULL) {
-					current_polygon = new PartPolygon(element_editor, 0, this);
-					temp_polygon = QPolygonF(0);
-				} else temp_polygon = current_polygon -> polygon();
-				// au debut, on insere deux points
-				if (!temp_polygon.count()) temp_polygon << e -> scenePos();
-				temp_polygon << e -> scenePos();
-				current_polygon -> setPolygon(temp_polygon);
-				break;
-			case Normal:
-			default:
-				QGraphicsScene::mousePressEvent(e);
-				if (!selectedItems().isEmpty()) fsi_pos = selectedItems().first() -> scenePos();
-		}
-	} else QGraphicsScene::mousePressEvent(e);
-}
-
-/**
-	Gere les relachements de boutons de la souris
-	@param e objet decrivant l'evenement
-*/
-void ElementScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {
-	PartTerminal *terminal;
-	PartText *text;
-	PartTextField *textfield;
-	if (behavior != Polygon && current_polygon != NULL) current_polygon = NULL;
-	if (e -> button() & Qt::LeftButton) {
-		switch(behavior) {
-			case Line:
-				if (qgiManager().manages(current_line)) break;
-				undo_stack.push(new AddPartCommand(tr("ligne"), this, current_line));
-				emit(partsAdded());
-				break;
-			case Ellipse:
-				if (qgiManager().manages(current_ellipse)) break;
-				current_ellipse -> setRect(current_ellipse -> rect().normalized());
-				undo_stack.push(new AddPartCommand(tr("ellipse"), this, current_ellipse));
-				emit(partsAdded());
-				break;
-			case Arc:
-				if (qgiManager().manages(current_arc)) break;
-				current_arc-> setRect(current_arc -> rect().normalized());
-				undo_stack.push(new AddPartCommand(tr("arc"), this, current_arc));
-				emit(partsAdded());
-				break;
-			case Circle:
-				if (qgiManager().manages(current_circle)) break;
-				current_circle -> setRect(current_circle -> rect().normalized());
-				undo_stack.push(new AddPartCommand(tr("cercle"), this, current_circle));
-				emit(partsAdded());
-				break;
-			case Terminal:
-				terminal = new PartTerminal(element_editor, 0, this);
-				terminal -> setPos(e -> scenePos());
-				undo_stack.push(new AddPartCommand(tr("borne"), this, terminal));
-				emit(partsAdded());
-				break;
-			case Text:
-				text = new PartText(element_editor, 0, this);
-				text -> setPos(e -> scenePos());
-				undo_stack.push(new AddPartCommand(tr("texte"), this, text));
-				emit(partsAdded());
-				break;
-			case TextField:
-				textfield = new PartTextField(element_editor, 0, this);
-				textfield -> setPos(e -> scenePos());
-				undo_stack.push(new AddPartCommand(tr("champ de texte"), this, textfield));
-				emit(partsAdded());
-				break;
-			case Normal:
-			default:
-				QGraphicsScene::mouseReleaseEvent(e);
-				// detecte les deplacements de parties
-				if (!selectedItems().isEmpty()) {
-					QPointF movement = selectedItems().first() -> scenePos() - fsi_pos;
-					if (!movement.isNull()) {
-						undo_stack.push(new MovePartsCommand(movement, this, selectedItems()));
-					}
-				}
-		}
-	} else if (e -> button() & Qt::RightButton) {
-		if (behavior == Polygon) {
-			behavior = Normal;
-			undo_stack.push(new AddPartCommand(tr("polygone"), this, current_polygon));
-			current_polygon = NULL;
-			emit(partsAdded());
-			emit(needNormalMode());
-		} else QGraphicsScene::mouseReleaseEvent(e);
-	} else QGraphicsScene::mouseReleaseEvent(e);
-}
-
-/**
-	Dessine l'arriere-plan de l'editeur, cad la grille.
-	@param p Le QPainter a utiliser pour dessiner
-	@param r Le rectangle de la zone a dessiner
-*/
-void ElementScene::drawBackground(QPainter *p, const QRectF &r) {
-	p -> save();
-	
-	// desactive tout antialiasing, sauf pour le texte
-	p -> setRenderHint(QPainter::Antialiasing, false);
-	p -> setRenderHint(QPainter::TextAntialiasing, true);
-	p -> setRenderHint(QPainter::SmoothPixmapTransform, false);
-	
-	// dessine un fond blanc
-	p -> setPen(Qt::NoPen);
-	p -> setBrush(Qt::white);
-	p -> drawRect(r);
-	
-	// encadre la zone dessinable de l'element
-	QRectF drawable_area(-_hotspot.x(), -_hotspot.y(), width(), height());
-	p -> setPen(Qt::black);
-	p -> setBrush(Qt::NoBrush);
-	p -> drawRect(drawable_area);
-	
-	if (r.width() < 2500 && r.height() < 2500) {
-		// dessine les points de la grille
-		p -> setPen(Qt::black);
-		p -> setBrush(Qt::NoBrush);
-		qreal limite_x = r.x() + r.width();
-		qreal limite_y = r.y() + r.height();
-		
-		int g_x = (int)ceil(r.x());
-		while (g_x % xGrid) ++ g_x;
-		int g_y = (int)ceil(r.y());
-		while (g_y % yGrid) ++ g_y;
-		
-		for (int gx = g_x ; gx < limite_x ; gx += xGrid) {
-			for (int gy = g_y ; gy < limite_y ; gy += yGrid) {
-				p -> drawPoint(gx, gy);
-			}
-		}
-	}
-	p -> restore();
-}
-
-/**
-	Dessine l'arriere-plan de l'editeur, cad l'indicateur de hotspot.
-	@param p Le QPainter a utiliser pour dessiner
-	@param r Le rectangle de la zone a dessiner
-*/
-void ElementScene::drawForeground(QPainter *p, const QRectF &) {
-	p -> save();
-	
-	// desactive tout antialiasing, sauf pour le texte
-	p -> setRenderHint(QPainter::Antialiasing, false);
-	p -> setRenderHint(QPainter::TextAntialiasing, true);
-	p -> setRenderHint(QPainter::SmoothPixmapTransform, false);
-	
-	p -> setPen(Qt::red);
-	p -> setBrush(Qt::NoBrush);
-	p -> drawLine(QLineF(0.0, -_hotspot.y(), 0.0, height() - _hotspot.y()));
-	p -> drawLine(QLineF(-_hotspot.x(), 0.0, width() - _hotspot.x(),  0.0));
-	p -> restore();
-}
-
-/**
-	Exporte l'element en XML
-	@return un document XML decrivant l'element
-*/
-const QDomDocument ElementScene::toXml() const {
-	// document XML
-	QDomDocument xml_document;
-	
-	// racine du document XML
-	QDomElement root = xml_document.createElement("definition");
-	root.setAttribute("type",        "element");
-	root.setAttribute("width",       QString("%1").arg(_width  * 10));
-	root.setAttribute("height",      QString("%1").arg(_height * 10));
-	root.setAttribute("hotspot_x",   QString("%1").arg(_hotspot.x()));
-	root.setAttribute("hotspot_y",   QString("%1").arg(_hotspot.y()));
-	root.setAttribute("orientation", ori.toString());
-	root.setAttribute("version", QET::version);
-	if (internal_connections) root.setAttribute("ic", "true");
-	
-	// noms de l'element
-	root.appendChild(_names.toXml(xml_document));
-	
-	QDomElement description = xml_document.createElement("description");
-	// description de l'element
-	foreach(QGraphicsItem *qgi, zItems(true)) {
-		if (CustomElementPart *ce = dynamic_cast<CustomElementPart *>(qgi)) {
-			if (ce -> isUseless()) continue;
-			description.appendChild(ce -> toXml(xml_document));
-		}
-	}
-	root.appendChild(description);
-	
-	xml_document.appendChild(root);
-	return(xml_document);
-}
-
-/**
-	Lit un element depuis un document XML
-	@param xml_document un document XML decrivant l'element
-*/
-void ElementScene::fromXml(const QDomDocument &xml_document) {
-	
-	QString error_message;
-	bool state = true;
-	
-	// la racine est supposee etre une definition d'element
-	QDomElement root = xml_document.documentElement();
-	if (root.tagName() != "definition" || root.attribute("type") != "element") {
-		state = false;
-		error_message = tr("Ce document XML n'est pas une definition d'\351l\351ment.");
-	}
-	
-	// dimensions et hotspot
-	if (state) {
-		// ces attributs doivent etre presents et valides
-		int w, h, hot_x, hot_y;
-		if (
-			!QET::attributeIsAnInteger(root, QString("width"),     &w) ||\
-			!QET::attributeIsAnInteger(root, QString("height"),    &h) ||\
-			!QET::attributeIsAnInteger(root, QString("hotspot_x"), &hot_x) ||\
-			!QET::attributeIsAnInteger(root, QString("hotspot_y"), &hot_y)
-		) {
-			state = false;
-			error_message = tr("Les dimensions ou le point de saisie ne sont pas valides.");
-		} else {
-			setWidth(w);
-			setHeight(h);
-			setHotspot(QPoint(hot_x, hot_y));
-		}
-	}
-	
-	// orientations et connexions internes
-	if (state) {
-		internal_connections = (root.attribute("ic") == "true");
-		
-		if (!ori.fromString(root.attribute("orientation"))) {
-			state = false;
-			error_message = tr("Les orientations ne sont pas valides.");
-		}
-	}
-	
-	// extrait les noms de la definition XML
-	if (state) {
-		_names.fromXml(root);
-	}
-	
-	// parcours des enfants de la definition : parties de l'element
-	if (state) {
-		for (QDomNode node = root.firstChild() ; !node.isNull() ; node = node.nextSibling()) {
-			QDomElement elmts = node.toElement();
-			if (elmts.isNull()) continue;
-			if (elmts.tagName() == "description") {
-				// gestion de la description graphique de l'element
-				//  = parcours des differentes parties du dessin
-				int z = 1;
-				for (QDomNode n = node.firstChild() ; !n.isNull() ; n = n.nextSibling()) {
-					QDomElement qde = n.toElement();
-					if (qde.isNull()) continue;
-					CustomElementPart *cep;
-					if      (qde.tagName() == "line")     cep = new PartLine     (element_editor, 0, this);
-					else if (qde.tagName() == "ellipse")  cep = new PartEllipse  (element_editor, 0, this);
-					else if (qde.tagName() == "circle")   cep = new PartCircle   (element_editor, 0, this);
-					else if (qde.tagName() == "polygon")  cep = new PartPolygon  (element_editor, 0, this);
-					else if (qde.tagName() == "terminal") cep = new PartTerminal (element_editor, 0, this);
-					else if (qde.tagName() == "text")     cep = new PartText     (element_editor, 0, this);
-					else if (qde.tagName() == "input")    cep = new PartTextField(element_editor, 0, this);
-					else if (qde.tagName() == "arc")      cep = new PartArc      (element_editor, 0, this);
-					else continue;
-					if (QGraphicsItem *qgi = dynamic_cast<QGraphicsItem *>(cep)) qgi -> setZValue(z++);
-					cep -> fromXml(qde);
-				}
-			}
-		}
-	}
-}
-
-/**
-	@return un rectangle englobant toutes les parties ainsi que le
-	"bounding rect" de l'element
-*/
-QRectF ElementScene::sceneContent() const {
-	return(itemsBoundingRect().unite(QRectF(-_hotspot, QSizeF(width(), height()))));
-}
-
-/**
-	@return la pile d'annulations de cet editeur d'element
-*/
-QUndoStack &ElementScene::undoStack() {
-	return(undo_stack);
-}
-
-/**
-	@return le gestionnaire de QGraphicsItem de cet editeur d'element
-*/
-QGIManager &ElementScene::qgiManager() {
-	return(qgi_manager);
-}
-
-/**
-	Selectionne tout
-*/
-void ElementScene::slot_selectAll() {
-	foreach(QGraphicsItem *qgi, items()) qgi -> setSelected(true);
-}
-
-/**
-	Deselectionne tout
-*/
-void ElementScene::slot_deselectAll() {
-	clearSelection();
-}
-
-/**
-	Inverse la selection
-*/
-void ElementScene::slot_invertSelection() {
-	foreach(QGraphicsItem *qgi, items()) qgi -> setSelected(!qgi -> isSelected());
-}
-
-/**
-	Supprime les elements selectionnes
-*/
-void ElementScene::slot_delete() {
-	// verifie qu'il y a qqc de selectionne
-	QList<QGraphicsItem *> selected_items = selectedItems();
-	if (selected_items.isEmpty()) return;
-	
-	// efface tout ce qui est selectionne
-	undo_stack.push(new DeletePartsCommand(this, selected_items));
-	emit(partsRemoved());
-}
-
-/**
-	Lance un dialogue pour editer les dimensions et le point de saisie
-	(hotspot) de l'element.
-*/
-void ElementScene::slot_editSizeHotSpot() {
-	// cree un dialogue
-	QDialog dialog_sh;
-	dialog_sh.setModal(true);
-	dialog_sh.setMinimumSize(400, 230);
-	dialog_sh.setWindowTitle(tr("\311diter la taille et le point de saisie"));
-	QVBoxLayout *dialog_layout = new QVBoxLayout(&dialog_sh);
-	
-	// ajoute un HotspotEditor au dialogue
-	HotspotEditor *hotspot_editor = new HotspotEditor();
-	hotspot_editor -> setElementWidth(static_cast<uint>(width() / 10));
-	hotspot_editor -> setElementHeight(static_cast<uint>(height() / 10));
-	hotspot_editor -> setHotspot(hotspot());
-	hotspot_editor -> setOldHotspot(hotspot());
-	hotspot_editor -> setPartsRect(itemsBoundingRect());
-	hotspot_editor -> setPartsRectEnabled(true);
-	dialog_layout -> addWidget(hotspot_editor);
-	
-	// ajoute deux boutons au dialogue
-	QDialogButtonBox *dialog_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-	dialog_layout -> addWidget(dialog_buttons);
-	connect(dialog_buttons, SIGNAL(accepted()),    &dialog_sh, SLOT(accept()));
-	connect(dialog_buttons, SIGNAL(rejected()),    &dialog_sh, SLOT(reject()));
-	
-	// lance le dialogue
-	if (dialog_sh.exec() != QDialog::Accepted) return;
-	QSize new_size(hotspot_editor -> elementSize());
-	QSize old_size(width(), height());
-	QPoint new_hotspot(hotspot_editor -> hotspot());
-	QPoint old_hotspot(_hotspot);
-	
-	if (new_size != old_size || new_hotspot != old_hotspot) {
-		undo_stack.push(new ChangeHotspotCommand(this, old_size, new_size, old_hotspot, new_hotspot, hotspot_editor -> offsetParts()));
-	}
-}
-
-/**
-	Lance un dialogue pour editer les noms de cete element
-*/
-void ElementScene::slot_editOrientations() {
-	
-	// cree un dialogue
-	QDialog dialog_ori;
-	dialog_ori.setModal(true);
-	dialog_ori.setMinimumSize(400, 260);
-	dialog_ori.setWindowTitle(tr("\311diter les orientations"));
-	QVBoxLayout *dialog_layout = new QVBoxLayout(&dialog_ori);
-	
-	// ajoute un champ explicatif au dialogue
-	QLabel *information_label = new QLabel(tr("L'orientation par d\351faut est l'orientation dans laquelle s'effectue la cr\351ation de l'\351l\351ment."));
-	information_label -> setAlignment(Qt::AlignJustify | Qt::AlignVCenter);
-	information_label -> setWordWrap(true);
-	dialog_layout -> addWidget(information_label);
-	
-	// ajoute un OrientationSetWidget au dialogue
-	OrientationSetWidget *ori_widget = new OrientationSetWidget();
-	ori_widget -> setOrientationSet(ori);
-	dialog_layout -> addWidget(ori_widget);
-	
-	// ajoute une case a cocher pour les connexions internes
-	QCheckBox *ic_checkbox = new QCheckBox(tr("Autoriser les connexions internes"));
-	ic_checkbox -> setChecked(internal_connections);
-	dialog_layout -> addWidget(ic_checkbox);
-	dialog_layout -> addStretch();
-	// ajoute deux boutons au dialogue
-	QDialogButtonBox *dialog_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-	dialog_layout -> addWidget(dialog_buttons);
-	connect(dialog_buttons, SIGNAL(accepted()),    &dialog_ori, SLOT(accept()));
-	connect(dialog_buttons, SIGNAL(rejected()),    &dialog_ori, SLOT(reject()));
-	
-	// lance le dialogue
-	if (dialog_ori.exec() == QDialog::Accepted) {
-		OrientationSet new_ori = ori_widget -> orientationSet();
-		if (new_ori != ori) {
-			undoStack().push(new ChangeOrientationsCommand(this, ori, new_ori));
-		}
-		if (ic_checkbox -> isChecked() != internal_connections) {
-			undoStack().push(new AllowInternalConnectionsCommand(this, ic_checkbox -> isChecked()));
-		}
-	}
-}
-
-/**
-	Lance un dialogue pour editer les noms de cet element
-*/
-void ElementScene::slot_editNames() {
-	
-	// cree un dialogue
-	QDialog dialog;
-	dialog.setModal(true);
-	dialog.setMinimumSize(400, 330);
-	dialog.setWindowTitle(tr("\311diter les noms"));
-	QVBoxLayout *dialog_layout = new QVBoxLayout(&dialog);
-	
-	// ajoute un champ explicatif au dialogue
-	QLabel *information_label = new QLabel(tr("Vous pouvez sp\351cifier le nom de l'\351l\351ment dans plusieurs langues."));
-	information_label -> setAlignment(Qt::AlignJustify | Qt::AlignVCenter);
-	information_label -> setWordWrap(true);
-	dialog_layout -> addWidget(information_label);
-	
-	// ajoute un NamesListWidget au dialogue
-	NamesListWidget *names_widget = new NamesListWidget();
-	names_widget -> setNames(_names);
-	dialog_layout -> addWidget(names_widget);
-	
-	// ajoute deux boutons au dialogue
-	QDialogButtonBox *dialog_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-	dialog_layout -> addWidget(dialog_buttons);
-	connect(dialog_buttons, SIGNAL(accepted()),     names_widget, SLOT(check()));
-	connect(names_widget,   SIGNAL(inputChecked()), &dialog,      SLOT(accept()));
-	connect(dialog_buttons, SIGNAL(rejected()),     &dialog,      SLOT(reject()));
-	
-	// lance le dialogue
-	if (dialog.exec() == QDialog::Accepted) {
-		NamesList new_names(names_widget -> names());
-		if (new_names != _names) undoStack().push(new ChangeNamesCommand(this, _names, new_names));
-	}
-}
-
-/**
-	Amene les elements selectionnes au premier plan
-*/
-void ElementScene::slot_bringForward() {
-	undoStack().push(new ChangeZValueCommand(this, ChangeZValueCommand::BringForward));
-	emit(partsZValueChanged());
-}
-
-/**
-	Remonte les elements selectionnes d'un plan
-*/
-void ElementScene::slot_raise() {
-	undoStack().push(new ChangeZValueCommand(this, ChangeZValueCommand::Raise));
-	emit(partsZValueChanged());
-}
-
-/**
-	Descend les elements selectionnes d'un plan
-*/
-void ElementScene::slot_lower() {
-	undoStack().push(new ChangeZValueCommand(this, ChangeZValueCommand::Lower));
-	emit(partsZValueChanged());
-}
-
-/**
-	Envoie les elements selectionnes au fond
-*/
-void ElementScene::slot_sendBackward() {
-	undoStack().push(new ChangeZValueCommand(this, ChangeZValueCommand::SendBackward));
-	emit(partsZValueChanged());
-}
-
-/**
-	@param include_terminals true pour inclure les bornes, false sinon
-	@return les parties de l'element ordonnes par zValue croissante
-*/
-QList<QGraphicsItem *> ElementScene::zItems(bool include_terminals) const {
-	// recupere les elements
-	QList<QGraphicsItem *> all_items_list(items());
-	
-	// enleve les bornes
-	QList<QGraphicsItem *> terminals;
-	foreach(QGraphicsItem *qgi, all_items_list) {
-		if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
-			all_items_list.removeAt(all_items_list.indexOf(qgi));
-			terminals << qgi;
-		}
-	}
-	
-	// ordonne les parties par leur zValue
-	QMultiMap<qreal, QGraphicsItem *> mm;
-	foreach(QGraphicsItem *qgi, all_items_list) mm.insert(qgi -> zValue(), qgi);
-	all_items_list.clear();
-	QMapIterator<qreal, QGraphicsItem *> i(mm);
-	while (i.hasNext()) {
-		i.next();
-		all_items_list << i.value();
-	}
-	
-	// rajoute eventuellement les bornes
-	if (include_terminals) all_items_list += terminals;
-	return(all_items_list);
-}
-
-/**
-	Supprime les parties de l'element et les objets d'annulations.
-	Les autres caracteristiques sont conservees.
-*/
-void ElementScene::reset() {
-	// supprime les objets d'annulation
-	undoStack().clear();
-	// enleve les elements de la scene
-	foreach (QGraphicsItem *qgi, items()) {
-		removeItem(qgi);
-		qgiManager().release(qgi);
-	}
-}

editor/elementview.cpp

@@ -1,66 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "elementview.h"
-/**
-	Constructeur
-	@param scene ElementScene visualisee par cette ElementView
-	@param parent QWidget parent de cette ElementView
-*/
-ElementView::ElementView(ElementScene *scene, QWidget *parent) :
-	QGraphicsView(scene, parent),
-	scene_(scene)
-{
-	setInteractive(true);
-	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-	//setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
-	setResizeAnchor(QGraphicsView::AnchorUnderMouse);
-	//setSceneRect(QRectF(0.0, 0.0, 50.0, 200.0));
-	scale(4.0, 4.0);
-}
-
-/// Destructeur
-ElementView::~ElementView() {
-}
-
-/// @return l'ElementScene visualisee par cette ElementView
-ElementScene *ElementView::scene() const {
-	return(scene_);
-}
-
-/**
-	Definit l'ElementScene visualisee par cette ElementView
-	@param s l'ElementScene visualisee par cette ElementView
-*/
-void ElementView::setScene(ElementScene *s) {
-	QGraphicsView::setScene(s);
-	scene_ = s;
-}
-
-/**
-	Gere les evenements envoyes a la vue.
-	Methode reimplentee pour gerer le conflit de raccourcis avec Suppr
-	(supprimer une partie ou supprimer le caractere suivant)
-	@param e evenement a gerer
-*/
-bool ElementView::event(QEvent *e) {
-	if (e -> type() == QEvent::ShortcutOverride && scene_ -> focusItem()) {
-		e -> accept();
-		return(true);
-	}
-	return(QGraphicsView::event(e));
-}

editor/lineeditor.cpp

@@ -1,115 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "lineeditor.h"
-#include "partline.h"
-
-/**
-	Constructeur
-	@param editor L'editeur d'element concerne
-	@param line La ligne a editer
-	@param parent le Widget parent
-*/
-LineEditor::LineEditor(QETElementEditor *editor, PartLine *line, QWidget *parent) : ElementItemEditor(editor, parent) {
-	
-	part = line;
-	
-	x1 = new QLineEdit();
-	y1 = new QLineEdit();
-	x2 = new QLineEdit();
-	y2 = new QLineEdit();
-	
-	x1 -> setValidator(new QDoubleValidator(x1));
-	y1 -> setValidator(new QDoubleValidator(y1));
-	x2 -> setValidator(new QDoubleValidator(x2));
-	y2 -> setValidator(new QDoubleValidator(y2));
-	
-	QGridLayout *grid = new QGridLayout(this);
-	grid -> addWidget(new QLabel("x1"), 0, 0);
-	grid -> addWidget(x1,               0, 1);
-	grid -> addWidget(new QLabel("y1"), 0, 2);
-	grid -> addWidget(y1,               0, 3);
-	grid -> addWidget(new QLabel("x2"), 1, 0);
-	grid -> addWidget(x2,               1, 1);
-	grid -> addWidget(new QLabel("y2"), 1, 2);
-	grid -> addWidget(y2,               1, 3);
-	
-	updateForm();
-}
-
-/// Destructeur
-LineEditor::~LineEditor() {
-}
-
-/**
-	Met a jour la ligne a partir des donnees du formulaire
-*/
-void LineEditor::updateLine() {
-	part -> setLine(
-		QLineF(
-			part -> mapFromScene(
-				x1 -> text().toDouble(),
-				y1 -> text().toDouble()
-			),
-			part -> mapFromScene(
-				x2 -> text().toDouble(),
-				y2 -> text().toDouble()
-			)
-		)
-	);
-}
-
-/// Met a jour l'abscisse du premier point de la ligne et cree un objet d'annulation
-void LineEditor::updateLineX1() { addChangePartCommand(tr("abscisse point 1"),    part, "x1", x1 -> text().toDouble()); }
-/// Met a jour l'ordonnee du premier point de la ligne et cree un objet d'annulation
-void LineEditor::updateLineY1() { addChangePartCommand(tr("ordonn\351e point 1"), part, "y1", y1 -> text().toDouble()); }
-/// Met a jour l'abscisse du second point de la ligne et cree un objet d'annulation
-void LineEditor::updateLineX2() { addChangePartCommand(tr("abscisse point 2"),    part, "x2", x2 -> text().toDouble()); }
-/// Met a jour l'ordonnee du second point de la ligne et cree un objet d'annulation
-void LineEditor::updateLineY2() { addChangePartCommand(tr("ordonn\351e point 2"), part, "y2", y2 -> text().toDouble()); }
-
-/**
-	Met a jour le formulaire d'edition
-*/
-void LineEditor::updateForm() {
-	activeConnections(false);
-	QPointF p1(part -> sceneP1());
-	QPointF p2(part -> sceneP2());
-	x1 -> setText(QString("%1").arg(p1.x()));
-	y1 -> setText(QString("%1").arg(p1.y()));
-	x2 -> setText(QString("%1").arg(p2.x()));
-	y2 -> setText(QString("%1").arg(p2.y()));
-	activeConnections(true);
-}
-
-/**
-	Active ou desactive les connexionx signaux/slots entre les widgets internes.
-	@param active true pour activer les connexions, false pour les desactiver
-*/
-void LineEditor::activeConnections(bool active) {
-	if (active) {
-		connect(x1, SIGNAL(editingFinished()), this, SLOT(updateLineX1()));
-		connect(y1, SIGNAL(editingFinished()), this, SLOT(updateLineY1()));
-		connect(x2, SIGNAL(editingFinished()), this, SLOT(updateLineX2()));
-		connect(y2, SIGNAL(editingFinished()), this, SLOT(updateLineY2()));
-	} else {
-		connect(x1, SIGNAL(editingFinished()), this, SLOT(updateLineX1()));
-		connect(y1, SIGNAL(editingFinished()), this, SLOT(updateLineY1()));
-		connect(x2, SIGNAL(editingFinished()), this, SLOT(updateLineX2()));
-		connect(y2, SIGNAL(editingFinished()), this, SLOT(updateLineY2()));
-	}
-}

editor/partline.cpp

@@ -1,254 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "partline.h"
-#include "lineeditor.h"
-#include <cmath>
-
-/**
-	Constructeur
-	@param editor L'editeur d'element concerne
-	@param parent Le QGraphicsItem parent de cette ligne
-	@param scene La scene sur laquelle figure cette ligne
-*/
-PartLine::PartLine(QETElementEditor *editor, QGraphicsItem *parent, QGraphicsScene *scene) : QGraphicsLineItem(parent, scene), CustomElementGraphicPart(editor) {
-	setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
-	setAcceptedMouseButtons(Qt::LeftButton);
-	informations = new LineEditor(elementEditor(), this);
-	informations -> setElementTypeName(name());
-	style_editor -> appendWidget(informations);
-	style_editor -> setElementTypeName(name());
-}
-
-/// Destructeur
-PartLine::~PartLine() {
-}
-
-/**
-	Dessine la ligne
-	@param painter QPainter a utiliser pour rendre le dessin
-	@param options Options pour affiner le rendu
-	@param widget Widget sur lequel le rendu est effectue
-*/
-void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem */*q*/, QWidget */*w*/) {
-	applyStylesToQPainter(*painter);
-	QPen t = painter -> pen();
-	if (isSelected()) {
-		t.setColor(Qt::red);
-		painter -> setPen(t);
-	}
-	painter -> setBrush(Qt::NoBrush);
-	painter -> drawLine(line());
-}
-
-/**
-	Exporte la ligne en XML
-	@param xml_document Document XML a utiliser pour creer l'element XML
-	@return un element XML decrivant la ligne
-*/
-const QDomElement PartLine::toXml(QDomDocument &xml_document) const {
-	
-	QPointF p1(sceneP1());
-	QPointF p2(sceneP2());
-	
-	QDomElement xml_element = xml_document.createElement("line");
-	xml_element.setAttribute("x1", p1.x());
-	xml_element.setAttribute("y1", p1.y());
-	xml_element.setAttribute("x2", p2.x());
-	xml_element.setAttribute("y2", p2.y());
-	stylesToXml(xml_element);
-	return(xml_element);
-}
-
-/**
-	Importe les proprietes d'une ligne depuis un element XML
-	@param qde Element XML a lire
-*/
-void PartLine::fromXml(const QDomElement &qde) {
-	stylesFromXml(qde);
-	setLine(
-		QLineF(
-			mapFromScene(
-				qde.attribute("x1", "0").toDouble(),
-				qde.attribute("y1", "0").toDouble()
-			),
-			mapFromScene(
-				qde.attribute("x2", "0").toDouble(),
-				qde.attribute("y2", "0").toDouble()
-			)
-		)
-	);
-}
-
-/**
-	Specifie la valeur d'une propriete donnee de la ligne
-	@param property propriete a modifier. Valeurs acceptees :
-		* x1 : abscisse du premier point
-		* y1 : ordonnee du second point
-		* x2 : abscisse du premier point
-		* y2 : ordonnee du second point
-	@param value Valeur a attribuer a la propriete
-*/
-void PartLine::setProperty(const QString &property, const QVariant &value) {
-	CustomElementGraphicPart::setProperty(property, value);
-	if (!value.canConvert(QVariant::Double)) return;
-	QPointF new_p1(sceneP1()), new_p2(sceneP2());
-	bool setline = true;
-	if (property == "x1") {
-		new_p1.setX(value.toDouble());
-	} else if (property == "y1") {
-		new_p1.setY(value.toDouble());
-	} else if (property == "x2") {
-		new_p2.setX(value.toDouble());
-	} else if (property == "y2") {
-		new_p2.setY(value.toDouble());
-	} else setline = false;
-	setLine(QLineF(mapFromScene(new_p1), mapFromScene(new_p2)));
-}
-
-/**
-	Permet d'acceder a la valeur d'une propriete donnee de la ligne
-	@param property propriete lue. Valeurs acceptees :
-		* x1 : abscisse du premier point
-		* y1 : ordonnee du second point
-		* x2 : abscisse du premier point
-		* y2 : ordonnee du second point
-	@return La valeur de la propriete property
-*/
-QVariant PartLine::property(const QString &property) {
-	// appelle la methode property de CustomElementGraphicpart pour les styles
-	QVariant style_property = CustomElementGraphicPart::property(property);
-	if (style_property != QVariant()) return(style_property);
-	
-	if (property == "x1") {
-		return(sceneP1().x());
-	} else if (property == "y1") {
-		return(sceneP1().y());
-	} else if (property == "x2") {
-		return(sceneP2().x());
-	} else if (property == "y2") {
-		return(sceneP2().y());
-	}
-	return(QVariant());
-}
-
-/**
-	Gere les changements intervenant sur cette partie
-	@param change Type de changement
-	@param value Valeur numerique relative au changement
-*/
-QVariant PartLine::itemChange(GraphicsItemChange change, const QVariant &value) {
-	if (scene()) {
-		if (change == QGraphicsItem::ItemPositionChange || change == QGraphicsItem::ItemSelectedChange) {
-			informations -> updateForm();
-		}
-	}
-	return(QGraphicsLineItem::itemChange(change, value));
-}
-
-/**
-	@return le premier point, dans les coordonnees de la scene.
-*/
-QPointF PartLine::sceneP1() const {
-	return(mapToScene(line().p1()));
-}
-
-/**
-	@return le second point, dans les coordonnees de la scene.
-*/
-QPointF PartLine::sceneP2() const {
-	return(mapToScene(line().p2()));
-}
-
-/**
-	@return la forme selectionnable de la ligne
-*/
-QPainterPath PartLine::shape() const {
-	QList<QPointF> points = fourShapePoints();
-	QPainterPath t;
-	t.setFillRule(Qt::WindingFill);
-	t.moveTo(points.at(0));
-	t.lineTo(points.at(1));
-	t.lineTo(points.at(2));
-	t.lineTo(points.at(3));
-	t.lineTo(points.at(0));
-	return(t);
-}
-
-/**
-	@return une liste contenant les deux points de la droite + les 4 points entourant ces deux points
-*/
-QList<QPointF> PartLine::fourShapePoints() const {
-	const qreal marge = 2.0;
-	// on a donc A(xa , ya) et B(xb, yb)
-	QPointF a = line().p1();
-	QPointF b = line().p2();
-	
-	QList<QPointF> result;
-	
-	// cas particulier : la droite se ramene a un point
-	if (a == b) {
-		result << QPointF(a.x() - marge, a.y() - marge);
-		result << QPointF(a.x() - marge, a.y() + marge);
-		result << QPointF(a.x() + marge, a.y() + marge);
-		result << QPointF(a.x() + marge, a.y() - marge);
-	} else {
-		
-		// on calcule le vecteur AB : (xb-xa, yb-ya)
-		QPointF v_ab = b - a;
-		
-		// et la distance AB : racine des coordonnees du vecteur au carre
-		qreal ab = sqrt(pow(v_ab.x(), 2) + pow(v_ab.y(), 2));
-		
-		// ensuite on definit le vecteur u(a, b) qui est egal au vecteur AB divise
-		// par sa longueur et multiplie par la longueur de la marge  que tu veux
-		// laisser
-		QPointF u = v_ab / ab * marge;
-		
-		// on definit le vecteur v(-b , a) qui est perpendiculaire a AB
-		QPointF v(-u.y(), u.x());
-		QPointF m = -u + v; // on a le vecteur M = -u + v
-		QPointF n = -u - v; // et le vecteur N=-u-v
-		QPointF h =  a + m; // H = A + M
-		QPointF k =  a + n; // K = A + N
-		QPointF i =  b - n; // I = B - N
-		QPointF j =  b - m; // J = B - M
-		
-		result << h << i << j << k;
-	}
-	return(result);
-}
-
-/**
-	@return le rectangle delimitant cette partie.
-*/
-QRectF PartLine::boundingRect() const {
-	qreal adjust = 1.5;
-	QRectF r(QGraphicsLineItem::boundingRect());
-	r.adjust(-adjust, -adjust, adjust, adjust);
-	return(r);
-}
-
-/**
-	@return true si cette partie n'est pas pertinente et ne merite pas d'etre
-	conservee / enregistree.
-	Une ligne est pertinente des lors que ses deux points sont differents
-*/
-bool PartLine::isUseless() const {
-	return(sceneP1() == sceneP2());
-}
-

editor/qetelementeditor.cpp

@@ -1,733 +0,0 @@
-/*
-	Copyright 2006-2007 Xavier Guerrin
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "qetelementeditor.h"
-#include "qetapp.h"
-#include "elementscene.h"
-#include "elementview.h"
-#include "customelementpart.h"
-#include "newelementwizard.h"
-#include "elementitemeditor.h"
-
-/**
-	Constructeur
-	@param parent QWidget parent
-*/
-QETElementEditor::QETElementEditor(QWidget *parent) :
-	QMainWindow(parent),
-	read_only(false),
-	min_title(tr("QElectroTech - \311diteur d'\351l\351ment")),
-	_filename(QString())
-{
-	setWindowTitle(min_title);
-	setWindowIcon(QIcon(":/ico/qet.png"));
-	
-	setupInterface();
-	setupActions();
-	setupMenus();
-	
-	// la fenetre est maximisee par defaut
-	setMinimumSize(QSize(500, 350));
-	setWindowState(Qt::WindowMaximized);
-	
-	// lecture des parametres
-	readSettings();
-	
-	// affichage
-	show();
-}
-
-/// Destructeur
-QETElementEditor::~QETElementEditor() {
-}
-
-/**
-	Met en place les actions
-*/
-void QETElementEditor::setupActions() {
-	new_element   = new QAction(QIcon(":/ico/new.png"),          tr("&Nouveau"),                    this);
-	open          = new QAction(QIcon(":/ico/open.png"),         tr("&Ouvrir"),                     this);
-	save          = new QAction(QIcon(":/ico/save.png"),         tr("&Enregistrer"),                this);
-	save_as       = new QAction(QIcon(":/ico/saveas.png"),       tr("Enregistrer sous"),            this);
-	reload        = new QAction(QIcon(":/ico/reload.png"),       tr("Recharger"),                   this);
-	quit          = new QAction(QIcon(":/ico/exit.png"),         tr("&Quitter"),                    this);
-	selectall     = new QAction(                                 tr("Tout s\351lectionner"),        this);
-	deselectall   = new QAction(                                 tr("D\351s\351lectionner tout"),   this);
-	inv_select    = new QAction(                                 tr("Inverser la s\351lection"),    this);
-	edit_delete   = new QAction(QIcon(":/ico/delete.png"),       tr("&Supprimer"),                  this);
-	edit_size_hs  = new QAction(QIcon(":/ico/hotspot.png"),      tr("\311diter la taille et le point de saisie"), this);
-	edit_names    = new QAction(QIcon(":/ico/names.png"),        tr("\311diter les noms"),          this);
-	edit_ori      = new QAction(QIcon(":/ico/orientations.png"), tr("\311diter les orientations"),  this);
-	edit_raise    = new QAction(QIcon(":/ico/raise.png"),        tr("Rapprocher"),                  this);
-	edit_lower    = new QAction(QIcon(":/ico/lower.png"),        tr("\311loigner"),                 this);
-	edit_backward = new QAction(QIcon(":/ico/send_backward.png"),tr("Envoyer au fond"),             this);
-	edit_forward  = new QAction(QIcon(":/ico/bring_forward.png"),tr("Amener au premier plan"),      this);
-	move          = new QAction(QIcon(":/ico/select.png"),       tr("D\351placer un objet"),        this);
-	add_line      = new QAction(QIcon(":/ico/line.png"),         tr("Ajouter une ligne"),           this);
-	add_ellipse   = new QAction(QIcon(":/ico/ellipse.png"),      tr("Ajouter une ellipse"),         this);
-	add_circle    = new QAction(QIcon(":/ico/circle.png"),       tr("Ajouter un cercle"),           this);
-	add_polygon   = new QAction(QIcon(":/ico/polygon.png"),      tr("Ajouter un polygone"),         this);
-	add_text      = new QAction(QIcon(":/ico/text.png"),         tr("Ajouter du texte"),            this);
-	add_arc       = new QAction(QIcon(":/ico/arc.png"),          tr("Ajouter un arc de cercle"),    this);
-	add_terminal  = new QAction(QIcon(":/ico/terminal.png"),     tr("Ajouter une borne"),           this);
-	add_textfield = new QAction(QIcon(":/ico/textfield.png"),    tr("Ajouter un champ de texte"),   this);
-	
-	undo = ce_scene -> undoStack().createUndoAction(this, tr("Annuler"));
-	redo = ce_scene -> undoStack().createRedoAction(this, tr("Refaire"));
-	undo -> setIcon(QIcon(":/ico/undo.png"));
-	redo -> setIcon(QIcon(":/ico/redo.png"));
-	undo -> setShortcuts(QKeySequence::Undo);
-	redo -> setShortcuts(QKeySequence::Redo);
-	
-	new_element       -> setShortcut(QKeySequence::New);
-	open              -> setShortcut(QKeySequence::Open);
-	save              -> setShortcut(QKeySequence::Save);
-	reload            -> setShortcut(QKeySequence::Refresh);
-	quit              -> setShortcut(QKeySequence(tr("Ctrl+Q")));
-	selectall         -> setShortcut(QKeySequence::SelectAll);
-	deselectall       -> setShortcut(QKeySequence(tr("Ctrl+Shift+A")));
-	inv_select        -> setShortcut(QKeySequence(tr("Ctrl+I")));
-	edit_delete       -> setShortcut(QKeySequence(tr("Suppr")));
-	edit_names        -> setShortcut(QKeySequence(tr("Ctrl+E")));
-	edit_size_hs      -> setShortcut(QKeySequence(tr("Ctrl+R")));
-	edit_ori          -> setShortcut(QKeySequence(tr("Ctrl+T")));
-	
-	edit_raise        -> setShortcut(QKeySequence(tr("Ctrl+Shift+Up")));
-	edit_lower        -> setShortcut(QKeySequence(tr("Ctrl+Shift+Down")));
-	edit_backward     -> setShortcut(QKeySequence(tr("Ctrl+Shift+End")));
-	edit_forward      -> setShortcut(QKeySequence(tr("Ctrl+Shift+Home")));
-	
-	connect(new_element,   SIGNAL(triggered()), this,     SLOT(slot_new()));
-	connect(open,          SIGNAL(triggered()), this,     SLOT(slot_open()));
-	connect(save,          SIGNAL(triggered()), this,     SLOT(slot_save()));
-	connect(save_as,       SIGNAL(triggered()), this,     SLOT(slot_saveAs()));
-	connect(reload,        SIGNAL(triggered()), this,     SLOT(slot_reload()));
-	connect(quit,          SIGNAL(triggered()), this,     SLOT(close()));
-	connect(selectall,     SIGNAL(triggered()), ce_scene, SLOT(slot_selectAll()));
-	connect(deselectall,   SIGNAL(triggered()), ce_scene, SLOT(slot_deselectAll()));
-	connect(inv_select,    SIGNAL(triggered()), ce_scene, SLOT(slot_invertSelection()));
-	connect(edit_delete,   SIGNAL(triggered()), ce_scene, SLOT(slot_delete()));
-	connect(edit_size_hs,  SIGNAL(triggered()), ce_scene, SLOT(slot_editSizeHotSpot()));
-	connect(edit_names,    SIGNAL(triggered()), ce_scene, SLOT(slot_editNames()));
-	connect(edit_ori,      SIGNAL(triggered()), ce_scene, SLOT(slot_editOrientations()));
-	connect(edit_forward,  SIGNAL(triggered()), ce_scene, SLOT(slot_bringForward()));
-	connect(edit_raise,    SIGNAL(triggered()), ce_scene, SLOT(slot_raise()));
-	connect(edit_lower,    SIGNAL(triggered()), ce_scene, SLOT(slot_lower()));
-	connect(edit_backward, SIGNAL(triggered()), ce_scene, SLOT(slot_sendBackward()));
-	connect(move,          SIGNAL(triggered()), ce_scene, SLOT(slot_move()));
-	connect(add_line,      SIGNAL(triggered()), ce_scene, SLOT(slot_addLine()));
-	connect(add_ellipse,   SIGNAL(triggered()), ce_scene, SLOT(slot_addEllipse()));
-	connect(add_circle,    SIGNAL(triggered()), ce_scene, SLOT(slot_addCircle()));
-	connect(add_polygon,   SIGNAL(triggered()), ce_scene, SLOT(slot_addPolygon()));
-	connect(add_text,      SIGNAL(triggered()), ce_scene, SLOT(slot_addText()));
-	connect(add_arc,       SIGNAL(triggered()), ce_scene, SLOT(slot_addArc()));
-	connect(add_terminal,  SIGNAL(triggered()), ce_scene, SLOT(slot_addTerminal()));
-	connect(add_textfield, SIGNAL(triggered()), ce_scene, SLOT(slot_addTextField()));
-	
-	connect(move,          SIGNAL(triggered()), this, SLOT(slot_setRubberBandToView()));
-	connect(add_line,      SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	connect(add_ellipse,   SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	connect(add_circle,    SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	connect(add_polygon,   SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	connect(add_text,      SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	connect(add_arc,       SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	connect(add_terminal,  SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	connect(add_textfield, SIGNAL(triggered()), this, SLOT(slot_setNoDragToView()));
-	
-	connect(ce_scene,      SIGNAL(needNormalMode()), this, SLOT(slot_setNormalMode()));
-	
-	move          -> setCheckable(true);
-	add_line      -> setCheckable(true);
-	add_ellipse   -> setCheckable(true);
-	add_circle    -> setCheckable(true);
-	add_polygon   -> setCheckable(true);
-	add_text      -> setCheckable(true);
-	add_arc       -> setCheckable(true);
-	add_terminal  -> setCheckable(true);
-	add_textfield -> setCheckable(true);
-	
-	parts = new QActionGroup(this);
-	parts -> addAction(move);
-	parts -> addAction(add_line);
-	parts -> addAction(add_ellipse);
-	parts -> addAction(add_circle);
-	parts -> addAction(add_polygon);
-	parts -> addAction(add_text);
-	parts -> addAction(add_arc);
-	parts -> addAction(add_textfield);
-	parts -> addAction(add_terminal);
-	parts -> setExclusive(true);
-	
-	parts_toolbar = new QToolBar(tr("Parties"), this);
-	parts_toolbar -> setObjectName("parts");
-	foreach (QAction *action, parts -> actions()) parts_toolbar -> addAction(action);
-	move -> setChecked(true);
-	parts_toolbar -> setAllowedAreas(Qt::AllToolBarAreas);
-	
-	/*
-	QAction *xml_preview = new QAction(QIcon(":/ico/info.png"), tr("XML"), this);
-	connect(xml_preview, SIGNAL(triggered()), this, SLOT(xmlPreview()));
-	parts_toolbar -> addAction(xml_preview);
-	*/
-	
-	addToolBar(Qt::LeftToolBarArea, parts_toolbar);
-	
-	connect(ce_scene, SIGNAL(selectionChanged()), this, SLOT(slot_updateInformations()));
-	connect(ce_scene, SIGNAL(selectionChanged()), this, SLOT(slot_updateMenus()));
-	connect(&(ce_scene -> undoStack()), SIGNAL(cleanChanged(bool)), this, SLOT(slot_updateMenus()));
-	connect(&(ce_scene -> undoStack()), SIGNAL(cleanChanged(bool)), this, SLOT(slot_updateTitle()));
-}
-
-/**
-	Met en place les menus.
-*/
-void QETElementEditor::setupMenus() {
-	file_menu    = new QMenu(tr("Fichier"),    this);
-	edit_menu    = new QMenu(tr("\311dition"), this);
-	display_menu = new QMenu(tr("Affichage"),  this);
-	tools_menu   = new QMenu(tr("Outils"),     this);
-	help_menu    = new QMenu(tr("Aide"),       this);
-	
-	file_menu    -> setTearOffEnabled(true);
-	edit_menu    -> setTearOffEnabled(true);
-	display_menu -> setTearOffEnabled(true);
-	tools_menu   -> setTearOffEnabled(true);
-	help_menu    -> setTearOffEnabled(true);
-	
-	file_menu    -> addAction(new_element);
-	file_menu    -> addAction(open);
-	file_menu    -> addAction(save);
-	file_menu    -> addAction(save_as);
-	file_menu    -> addSeparator();
-	file_menu    -> addAction(reload);
-	file_menu    -> addSeparator();
-	file_menu    -> addAction(quit);
-	
-	edit_menu -> addAction(undo);
-	edit_menu -> addAction(redo);
-	edit_menu -> addSeparator();
-	edit_menu -> addAction(selectall);
-	edit_menu -> addAction(deselectall);
-	edit_menu -> addAction(inv_select);
-	edit_menu -> addSeparator();
-	edit_menu -> addAction(edit_delete);
-	edit_menu -> addSeparator();
-	edit_menu -> addAction(edit_names);
-	edit_menu -> addAction(edit_size_hs);
-	edit_menu -> addAction(edit_ori);
-	edit_menu -> addSeparator();
-	edit_menu -> addAction(edit_forward);
-	edit_menu -> addAction(edit_raise);
-	edit_menu -> addAction(edit_lower);
-	edit_menu -> addAction(edit_backward);
-	
-	// menu Affichage > Afficher
-	QMenu *display_toolbars = createPopupMenu();
-	display_toolbars -> setTearOffEnabled(true);
-	display_toolbars -> setTitle(tr("Afficher"));
-	display_menu -> addMenu(display_toolbars);
-	
-	menuBar() -> addMenu(file_menu);
-	menuBar() -> addMenu(edit_menu);
-	menuBar() -> addMenu(display_menu);
-	
-	/*
-	menuBar() -> addMenu(tools_menu);
-	menuBar() -> addMenu(help_menu);
-	*/
-}
-
-/**
-	Met a jour les menus
-*/
-void QETElementEditor::slot_updateMenus() {
-	bool selected_items = !ce_scene -> selectedItems().isEmpty();
-	edit_delete   -> setEnabled(selected_items);
-	edit_forward  -> setEnabled(selected_items);
-	edit_raise    -> setEnabled(selected_items);
-	edit_lower    -> setEnabled(selected_items);
-	edit_backward -> setEnabled(selected_items);
-	save -> setEnabled(!ce_scene -> undoStack().isClean());
-}
-
-/**
-	Met a jour le titre de la fenetre
-*/
-void QETElementEditor::slot_updateTitle() {
-	QString title = min_title;
-	title += " - " + ce_scene -> names().name() + " ";
-	if (_filename != QString()) {
-		if (!ce_scene -> undoStack().isClean()) title += tr("[Modifi\351]");
-		if (isReadOnly()) title += tr(" [lecture seule]");
-	}
-	setWindowTitle(title);
-}
-
-/**
-	Met en place l'interface
-*/
-void QETElementEditor::setupInterface() {
-	// editeur
-	ce_scene = new ElementScene(this, this);
-	ce_scene -> slot_move();
-	ce_view = new ElementView(ce_scene, this);
-	slot_setRubberBandToView();
-	setCentralWidget(ce_view);
-	
-	// widget par defaut dans le QDockWidget
-	default_informations = new QLabel();
-	
-	// panel sur le cote pour editer les parties
-	tools_dock = new QDockWidget(tr("Informations"), this);
-	tools_dock -> setObjectName("informations");
-	tools_dock -> setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-	tools_dock -> setFeatures(QDockWidget::AllDockWidgetFeatures);
-	tools_dock -> setMinimumWidth(290);
-	addDockWidget(Qt::RightDockWidgetArea, tools_dock);
-	QWidget *info_widget = new QWidget();
-	info_widget -> setLayout(new QVBoxLayout(info_widget));
-	tools_dock -> setWidget(info_widget);
-	
-	// panel sur le cote pour les annulations
-	undo_dock = new QDockWidget(tr("Annulations"), this);
-	undo_dock -> setObjectName("undo");
-	undo_dock -> setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-	undo_dock -> setFeatures(QDockWidget::AllDockWidgetFeatures);
-	undo_dock -> setMinimumWidth(290);
-	addDockWidget(Qt::RightDockWidgetArea, undo_dock);
-	QUndoView* undo_view = new QUndoView(&(ce_scene -> undoStack()), this);
-	undo_view -> setEmptyLabel(tr("Aucune modification"));
-	undo_dock -> setWidget(undo_view);
-	
-	// panel sur le cote pour la liste des parties
-	parts_list = new QListWidget(this);
-	parts_list -> setSelectionMode(QAbstractItemView::ExtendedSelection);
-	connect(ce_scene,   SIGNAL(partsAdded()),           this, SLOT(slot_createPartsList()));
-	connect(ce_scene,   SIGNAL(partsRemoved()),         this, SLOT(slot_createPartsList()));
-	connect(ce_scene,   SIGNAL(partsZValueChanged()),   this, SLOT(slot_createPartsList()));
-	connect(ce_scene,   SIGNAL(selectionChanged()),     this, SLOT(slot_updatePartsList()));
-	connect(parts_list, SIGNAL(itemSelectionChanged()), this, SLOT(slot_updateSelectionFromPartsList()));
-	parts_dock = new QDockWidget(tr("Parties"), this);
-	parts_dock -> setObjectName("parts_list");
-	parts_dock -> setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-	parts_dock -> setFeatures(QDockWidget::AllDockWidgetFeatures);
-	parts_dock -> setMinimumWidth(290);
-	tabifyDockWidget(undo_dock, parts_dock);
-	parts_dock -> setWidget(parts_list);
-	
-	slot_updateInformations();
-	slot_createPartsList();
-	
-	// barre d'etat
-	statusBar() -> showMessage(tr("\311diteur d'\351l\351ments"));
-}
-
-/**
-	Passe l'editeur d'element en mode selection : le pointeur deplace les
-	elements selectionnes et il est possible d'utiliser un rectangle de selection.
-*/
-void QETElementEditor::slot_setRubberBandToView() {
-	ce_view -> setDragMode(QGraphicsView::RubberBandDrag);
-}
-
-/**
-	Passe l'editeur d'element en mode immobile (utilise pour la lecture seule)
-*/
-void QETElementEditor::slot_setNoDragToView() {
-	ce_view -> setDragMode(QGraphicsView::NoDrag);
-}
-
-/**
-	Passe l'editeur en mode normal
-*/
-void QETElementEditor::slot_setNormalMode() {
-	if (!move -> isChecked()) move -> setChecked(true);
-	ce_view -> setDragMode(QGraphicsView::RubberBandDrag);
-	ce_scene -> slot_move();
-}
-
-/**
-	Met a jour la zone d'information et d'edition.
-	Si plusieurs parties sont selectionnees, seul leur nombre est affiche.
-	Sinon, le widget d'edition de la partie est insere.
-	@see CustomElementPart::elementInformations()
-*/
-void QETElementEditor::slot_updateInformations() {
-	QList<QGraphicsItem *> selected_qgis = ce_scene -> selectedItems();
-	QList<CustomElementPart *> selected_parts;
-	foreach(QGraphicsItem *qgi, selected_qgis) {
-		if (CustomElementPart *cep = dynamic_cast<CustomElementPart *>(qgi)) {
-			selected_parts.append(cep);
-		}
-	}
-	
-	// recupere le layout
-	QLayout *layout = tools_dock -> widget() -> layout();
-	
-	// enleve les widgets deja presents
-	QLayoutItem *qli;
-	while ((qli = layout -> takeAt(0)) != 0) {
-		if (QWidget *w = qli -> widget()) {
-			layout -> removeWidget(w);
-			w -> setParent(0);
-			w -> hide();
-		}
-	}
-	if (selected_parts.size() == 1) {
-		// recupere le premier CustomElementPart et en ajoute le widget d'edition
-		QWidget *edit_widget = selected_parts.first() -> elementInformations();
-		layout -> addWidget(edit_widget);
-		edit_widget -> show();
-	} else {
-		default_informations -> setText(
-			selected_parts.size() ?
-			QString("%1").arg(selected_parts.size()) + tr(" parties s\351lectionn\351es.") :
-			tr("Aucune partie s\351lectionn\351e.")
-		);
-		layout -> addWidget(default_informations);
-		default_informations -> show();
-	}
-}
-
-/**
-	Affiche le code XML correspondant a l'element dans son etat actuel dans
-	une boite de dialogue.
-*/
-void QETElementEditor::xmlPreview() {
-	QMessageBox::information(
-		this,
-		"Export XML",
-		ce_scene -> toXml().toString(4)
-	);
-}
-
-/**
-	Charge un fichier
-	@param filepath Chemin du fichier a charger
-*/
-void QETElementEditor::fromFile(const QString &filepath) {
-	bool state = true;
-	QString error_message;
-	
-	// le fichier doit exister
-	QFileInfo infos_file(filepath);
-	if (!infos_file.exists() || !infos_file.isFile()) {
-		state = false;
-		error_message = tr("Le fichier ") + filepath + tr(" n'existe pas.");
-	}
-	
-	// le fichier doit etre lisible
-	QFile file(filepath);
-	if (state) {
-		if (!file.open(QIODevice::ReadOnly)) {
-			state = false;
-			error_message = tr("Impossible d'ouvrir le fichier ") + filepath + ".";
-		}
-	}
-	
-	// le fichier doit etre un document XML
-	QDomDocument document_xml;
-	if (state) {
-		if (!document_xml.setContent(&file)) {
-			state = false;
-			error_message = tr("Ce fichier n'est pas un document XML valide");
-		}
-		file.close();
-	}
-	
-	if (!state) {
-		QMessageBox::critical(this, tr("Erreur"), error_message);
-		return;
-	}
-	
-	// chargement de l'element
-	ce_scene -> fromXml(document_xml);
-	slot_createPartsList();
-	
-	// gestion de la lecture seule
-	if (!infos_file.isWritable()) {
-		QMessageBox::warning(
-			this,
-			tr("\311dition en lecture seule"),
-			tr("Vous n'avez pas les privil\350ges n\351cessaires pour modifier cet \351lement. Il sera donc ouvert en lecture seule.")
-		);
-		setReadOnly(true);
-	}
-	
-	// memorise le fichier
-	setFileName(filepath);
-}
-
-
-/**
-	Enregistre l'element vers un fichier
-	@param fn Chemin du fichier a enregistrer
-	@return true en cas de reussite, false sinon
-*/
-bool QETElementEditor::toFile(const QString &fn) {
-	QFile file(fn);
-	if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-		QMessageBox::warning(this, tr("Erreur"), tr("Impossible d'ecrire dans ce fichier"));
-		return(false);
-	}
-	QTextStream out(&file);
-	out.setCodec("UTF-8");
-	out << ce_scene -> toXml().toString(4);
-	file.close();
-	return(true);
-}
-
-/**
-	specifie si l'editeur d'element doit etre en mode lecture seule
-	@param ro true pour activer le mode lecture seule, false pour le desactiver
-*/
-void QETElementEditor::setReadOnly(bool ro) {
-	read_only = ro;
-	// active / desactive les actions
-	foreach (QAction *action, parts -> actions()) action -> setEnabled(!ro);
-	
-	// active / desactive les interactions avec la scene
-	ce_view -> setInteractive(!ro);
-	
-	// active / desactive l'edition de la taille, du hotspot, des noms et des orientations
-	selectall    -> setEnabled(!ro);
-	deselectall  -> setEnabled(!ro);
-	inv_select   -> setEnabled(!ro);
-	undo         -> setEnabled(!ro);
-	redo         -> setEnabled(!ro);
-	edit_delete  -> setEnabled(!ro);
-	edit_size_hs -> setEnabled(!ro);
-	edit_names   -> setEnabled(!ro);
-	edit_ori     -> setEnabled(!ro);
-	parts_list   -> setEnabled(!ro);
-}
-
-/**
-	@return true si l'editeur d'element est en mode lecture seule
-*/
-bool QETElementEditor::isReadOnly() const {
-	return(read_only);
-}
-
-/**
-	Lance l'assistant de creation d'un nouvel element.
-*/
-void QETElementEditor::slot_new() {
-	NewElementWizard new_element_wizard;
-	new_element_wizard.exec();
-}
-
-/**
-	Ouvre un fichier
-*/
-void QETElementEditor::slot_open() {
-	// demande un nom de fichier a ouvrir a l'utilisateur
-	QString user_filename = QFileDialog::getOpenFileName(
-		this,
-		tr("Ouvrir un fichier"),
-		_filename.isEmpty() ? QETApp::customElementsDir() : QDir(_filename).absolutePath(),
-		tr("\311l\351ments QElectroTech (*.elmt);;Fichiers XML (*.xml);;Tous les fichiers (*)")
-	);
-	if (user_filename.isEmpty()) return;
-	QETElementEditor *cee = new QETElementEditor();
-	cee -> fromFile(user_filename);
-	cee -> show();
-}
-
-/**
-	Recharge l'element edite
-*/
-void QETElementEditor::slot_reload() {
-	// impossible de recharger un element non enregistre
-	if (_filename.isEmpty()) return;
-	
-	// s'il ya des modifications, on demande a l'utilisateur s'il est certain
-	// de vouloir recharger
-	if (!ce_scene -> undoStack().isClean()) {
-		QMessageBox::StandardButton answer = QMessageBox::question(
-			this,
-			tr("Recharger l'\351l\351ment"),
-			tr("Vous avez efffectu\351 des modifications sur cet \351l\351ment. Si vous le rechargez, ces modifications seront perdues. Voulez-vous vraiment recharger l'\351l\351ment ?"),
-			QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel,
-			QMessageBox::Cancel
-		);
-		if (answer != QMessageBox::Yes) return;
-	}
-	
-	// recharge l'element
-	ce_scene -> reset();
-	fromFile(_filename);
-}
-
-/**
-	Enregistre l'element en cours d'edition.
-	Si le nom du fichier en cours n'est pas connu, cette methode equivaut a
-	l'action "Enregistrer sous"
-	@see slot_saveAs()
-*/
-bool QETElementEditor::slot_save() {
-	// si on ne connait pas le nom du fichier en cours, enregistrer revient a enregistrer sous
-	if (_filename.isEmpty()) return(slot_saveAs());
-	// sinon on enregistre dans le nom de fichier connu
-	bool result_save = toFile(_filename);
-	if (result_save) ce_scene -> undoStack().setClean();
-	return(result_save);
-}
-
-/**
-	Demande un nom de fichier a l'utilisateur et enregistre l'element
-*/
-bool QETElementEditor::slot_saveAs() {
-	// demande un nom de fichier a l'utilisateur pour enregistrer l'element
-	QString fn = QFileDialog::getSaveFileName(
-		this,
-		tr("Enregistrer sous"),
-		_filename.isEmpty() ? QETApp::customElementsDir() : QDir(_filename).absolutePath(),
-		tr("\311l\351ments QElectroTech (*.elmt)")
-	);
-	// si aucun nom n'est entre, renvoie faux.
-	if (fn.isEmpty()) return(false);
-	// si le nom ne se termine pas par l'extension .elmt, celle-ci est ajoutee
-	if (!fn.endsWith(".elmt", Qt::CaseInsensitive)) fn += ".elmt";
-	// tente d'enregistrer le fichier
-	bool result_save = toFile(fn);
-	// si l'enregistrement reussit, le nom du fichier est conserve
-	if (result_save) {
-		setFileName(fn);
-		ce_scene -> undoStack().setClean();
-	}
-	// retourne un booleen representatif de la reussite de l'enregistrement
-	return(result_save);
-}
-
-/**
-	@return true si l'element peut etre ferme.
-	Un element peut etre ferme s'il ne comporte aucune modification.
-	Si l'element comporte des modifications, la question est posee a
-	l'utilisateur.
-*/
-bool QETElementEditor::canClose() {
-	if (ce_scene -> undoStack().isClean()) return(true);
-	// demande d'abord a l'utilisateur s'il veut enregistrer l'element en cours
-	QMessageBox::StandardButton answer = QMessageBox::question(
-		this,
-		tr("Enregistrer l'\351l\351ment en cours ?"),
-		tr("Voulez-vous enregistrer l'\351l\351ment ") + ce_scene -> names().name() + tr(" ?"),
-		QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel,
-		QMessageBox::Cancel
-	);
-	bool result;
-	switch(answer) {
-		case QMessageBox::Cancel: result = false;         break; // l'utilisateur annule : echec de la fermeture
-		case QMessageBox::Yes:    result = slot_save();   break; // l'utilisateur dit oui : la reussite depend de l'enregistrement
-		default:                  result = true;                 // l'utilisateur dit non ou ferme le dialogue: c'est reussi
-	}
-	return(result);
-}
-
-/**
-	Permet de quitter l'editeur lors de la fermeture de la fenetre principale
-	@param qce Le QCloseEvent correspondant a l'evenement de fermeture
-*/
-void QETElementEditor::closeEvent(QCloseEvent *qce) {
-	if (canClose()) {
-		writeSettings();
-		setAttribute(Qt::WA_DeleteOnClose);
-		qce -> accept();
-	} else qce -> ignore();
-}
-
-/**
-	Remplit la liste des parties
-*/
-void QETElementEditor::slot_createPartsList() {
-	parts_list -> blockSignals(true);
-	parts_list -> clear();
-	QList<QGraphicsItem *> qgis = ce_scene -> zItems(true);
-	for (int j = qgis.count() - 1 ; j >= 0 ; -- j) {
-		QGraphicsItem *qgi = qgis[j];
-		if (CustomElementPart *cep = dynamic_cast<CustomElementPart *>(qgi)) {
-			QString part_desc = cep -> name();
-			QListWidgetItem *qlwi = new QListWidgetItem(part_desc);
-			QVariant v;
-			v.setValue<QGraphicsItem *>(qgi);
-			qlwi -> setData(42, v);
-			parts_list -> addItem(qlwi);
-			qlwi -> setSelected(qgi -> isSelected());
-		}
-	}
-	parts_list -> blockSignals(false);
-}
-
-/**
-	Met a jour la selection dans la liste des parties
-*/
-void QETElementEditor::slot_updatePartsList() {
-	if (parts_list -> count() != ce_scene -> items().count()) {
-		slot_createPartsList();
-	} else {
-		parts_list -> blockSignals(true);
-		int i = 0;
-		QList<QGraphicsItem *> items = ce_scene -> zItems(true);
-		for (int j = items.count() - 1 ; j >= 0 ; -- j) {
-			QGraphicsItem *qgi = items[j];
-			QListWidgetItem *qlwi = parts_list -> item(i);
-			if (qlwi) qlwi -> setSelected(qgi -> isSelected());
-			++ i;
-		}
-		parts_list -> blockSignals(false);
-	}
-}
-
-/**
-	Met a jour la selection des parties de l'element a partir de la liste des
-	parties
-*/
-void QETElementEditor::slot_updateSelectionFromPartsList() {
-	ce_scene  -> blockSignals(true);
-	parts_list -> blockSignals(true);
-	for (int i = 0 ; i < parts_list -> count() ; ++ i) {
-		QListWidgetItem *qlwi = parts_list -> item(i);
-		QGraphicsItem *qgi = qlwi -> data(42).value<QGraphicsItem *>();
-		if (qgi) {
-			qgi -> setSelected(qlwi -> isSelected());
-		}
-	}
-	parts_list -> blockSignals(false);
-	ce_scene -> blockSignals(false);
-	slot_updateInformations();
-}
-
-/// Lit les parametres de l'editeur d'element
-void QETElementEditor::readSettings() {
-	QSettings &settings = QETApp::settings();
-	
-	// dimensions et position de la fenetre
-	QVariant geometry = settings.value("elementeditor/geometry");
-	if (geometry.isValid()) restoreGeometry(geometry.toByteArray());
-	
-	// etat de la fenetre (barres d'outils, docks...)
-	QVariant state = settings.value("elementeditor/state");
-	if (state.isValid()) restoreState(state.toByteArray());
-}
-
-/// Enregistre les parametres de l'editeur d'element
-void QETElementEditor::writeSettings() {
-	QSettings &settings = QETApp::settings();
-	settings.setValue("elementeditor/geometry", saveGeometry());
-	settings.setValue("elementeditor/state", saveState());
-}

elements/automatisme/fonction/entree.elmt

@@ -0,0 +1,20 @@
+<definition width="80" version="0.2" hotspot_x="30" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Вход</name>
+        <name lang="en" >Input</name>
+        <name lang="fr" >Entrée</name>
+        <name lang="es" >Entrada</name>
+        <name lang="cs" >Vstup</name>
+        <name lang="pt" >Entrada</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="40" y2="0" x2="20" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-2" y="5" size="12" text="I" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+    </description>
+</definition>

elements/automatisme/fonction/et.elmt

@@ -0,0 +1,26 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >И</name>
+        <name lang="en" >AND</name>
+        <name lang="fr" >ET</name>
+        <name lang="es" >Y</name>
+        <name lang="cs" >A</name>
+        <name lang="pt" >E</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <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="0" x1="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-6" y="5" size="12" text="&amp;" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/et3entrees.elmt

@@ -0,0 +1,29 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >И, трёхвходовый</name>
+        <name lang="en" >AND 3 inputs</name>
+        <name lang="fr" >ET 3 entrées</name>
+        <name lang="es" >Y 3 entradas</name>
+        <name lang="cs" >A 3 vstupy</name>
+        <name lang="pt" >E 3 entradas</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-46" y="-10" size="8" 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="0" x1="-40" y2="0" x2="-20" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <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="0" x1="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-6" y="5" size="12" text="&amp;" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+        <terminal x="-40" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/nand.elmt

@@ -0,0 +1,27 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >И-НЕ</name>
+        <name lang="en" >NAND</name>
+        <name lang="fr" >NON-ET (NAND)</name>
+        <name lang="es" >NO-Y (NAND)</name>
+        <name lang="cs" >Ne-A (NAND)</name>
+        <name lang="pt" >NÃO-E (NAND)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-6" y="5" size="12" text="&amp;" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/non.elmt

@@ -0,0 +1,24 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >НЕ</name>
+        <name lang="en" >NOT</name>
+        <name lang="fr" >NON</name>
+        <name lang="es" >NO</name>
+        <name lang="cs" >Ne</name>
+        <name lang="pt" >NÃO</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="-10" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="0" x1="-39" y2="0" x2="-20" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-5" y="5" size="12" text="1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="-40" y="0" orientation="w" />
+        <terminal x="40" y="0" orientation="e" />
+    </description>
+</definition>

elements/automatisme/fonction/nor.elmt

@@ -0,0 +1,27 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >ИЛИ-НЕ</name>
+        <name lang="en" >NOR</name>
+        <name lang="fr" >NON-OU (NOR)</name>
+        <name lang="es" >NO-O (NOR)</name>
+        <name lang="cs" >Ne-NEBO (NOR)</name>
+        <name lang="pt" >NÃO-OU (NOR)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="≥1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/ou.elmt

@@ -0,0 +1,26 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >ИЛИ</name>
+        <name lang="en" >OR</name>
+        <name lang="fr" >OU</name>
+        <name lang="es" >O</name>
+        <name lang="cs" >NEBO</name>
+        <name lang="pt" >OU</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <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="0" x1="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="≥1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/ou3entrees.elmt

@@ -0,0 +1,29 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >ИЛИ, трёхвходовый</name>
+        <name lang="en" >OR 3 inputs</name>
+        <name lang="fr" >OU 3 entrées</name>
+        <name lang="es" >O 3 entradas</name>
+        <name lang="cs" >NEBO 3 vstupy</name>
+        <name lang="pt" >OU 3 entradas</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-46" y="-10" size="8" 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="0" x1="-40" y2="0" x2="-20" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <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="0" x1="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="≥1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+        <terminal x="-40" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Логические устройства</name>
+        <name lang="en" >Logic gates</name>
+        <name lang="fr" >Fonctions logiques</name>
+        <name lang="es" >Puertas lógicas</name>
+        <name lang="pt" >Portas lógicas</name>
+        <name lang="cs" >Logické funkce</name>
+    </names>
+</qet-directory>

elements/automatisme/fonction/report_entree.elmt

@@ -0,0 +1,16 @@
+<definition width="40" version="0.2" hotspot_x="20" hotspot_y="15" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="en" >Input Report</name>
+        <name lang="fr" >Report Entrée</name>
+        <name lang="cs" >Hlášení vstupu</name>
+        <name lang="pt" >Relatório Entrada</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-10" y="15" 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="0" x1="10" y2="0" x2="16" />
+        <polygon x4="-10" y5="0" x5="-5" y6="-5" x6="-10" y7="-5" x7="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-10" y2="-5" x2="10" y3="5" x3="10" y4="5" />
+        <terminal x="16" y="0" orientation="e" />
+    </description>
+</definition>

elements/automatisme/fonction/report_sortie.elmt

@@ -0,0 +1,16 @@
+<definition width="40" version="0.2" hotspot_x="25" hotspot_y="15" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="en" >Output Report</name>
+        <name lang="fr" >Report Sortie</name>
+        <name lang="cs" >Hlášení výstupu</name>
+        <name lang="pt" >Relatório saída</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-10" y="15" 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="0" x1="-16" y2="0" x2="-10" />
+        <polygon x4="5" y5="5" x5="-10" y6="-5" x6="-10" y7="-5" x7="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-10" y2="-5" x2="5" y3="0" x3="10" y4="5" />
+        <terminal x="-16" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/setreset.elmt

@@ -0,0 +1,28 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Установка/Сброс</name>
+        <name lang="en" >SET/RESET</name>
+        <name lang="fr" >SET/RESET</name>
+        <name lang="es" >SET/RESET</name>
+        <name lang="cs" >NASTAVIT/NASTAVIT ZNOVU</name>
+        <name lang="pt" >SET/RESET</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-46" y="-10" size="8" rotate="true" text="R" />
+        <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="0" x1="-40" y2="0" x2="-20" />
+        <input x="-46" y="15" size="8" rotate="true" text="Par" />
+        <input x="-46" y="-30" size="8" rotate="true" text="S" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <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="0" x1="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-10.5" y="5" size="12" text="RS" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/sortie.elmt

@@ -0,0 +1,19 @@
+<definition width="80" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Выход</name>
+        <name lang="en" >Output</name>
+        <name lang="fr" >Sortie</name>
+        <name lang="cs" >Výstup</name>
+        <name lang="pt" >Saída</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-46" y="-10" size="8" 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="0" x1="-39" y2="0" x2="-20" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-6.5" y="5" size="12" text="Q" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="-40" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/xnor.elmt

@@ -0,0 +1,27 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Инверсное исключающее ИЛИ</name>
+        <name lang="en" >XNOR</name>
+        <name lang="fr" >NON-OU excusif (XNOR)</name>
+        <name lang="es" >NO-O exclusiva (XNOR)</name>
+        <name lang="cs" > NE-NEBO výhradní (XNOR)</name>
+        <name lang="pt" >NÃO-OU exclusivo (XNOR)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="=1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+    </description>
+</definition>

elements/automatisme/fonction/xor.elmt

@@ -0,0 +1,26 @@
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Исключающее ИЛИ</name>
+        <name lang="en" >XOR</name>
+        <name lang="fr" >OU exclusif (XOR)</name>
+        <name lang="es" >O exclusiva (XOR)</name>
+        <name lang="cs" >NEBO výhradní (XOR)</name>
+        <name lang="pt" >OU exclusivo (XOR)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" 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="-20" x1="-40" y2="-20" x2="-21" />
+        <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="-40" y2="20" x2="-21" />
+        <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="0" x1="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="=1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/input/entree.elmt

@@ -0,0 +1,21 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Вход</name>
+        <name lang="en" >Input</name>
+        <name lang="fr" >Entrée</name>
+        <name lang="es" >Entrada</name>
+        <name lang="cs" >Vstup</name>
+        <name lang="pt" >Entrada</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="-18" y="-10" 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="5" x1="10" y2="-5" x2="10" />
+        <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="-5" x1="-10" y2="5" x2="-10" />
+        <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="0" x1="10" y2="0" 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="0" x1="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/input/entree_fn.elmt

@@ -0,0 +1,22 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Вход (задний фронт)</name>
+        <name lang="en" >Input (down front)</name>
+        <name lang="fr" >Entrée (front descendant)</name>
+        <name lang="es" >Entrada (descendente)</name>
+        <name lang="cs" >Vstup (klesající)</name>
+        <name lang="pt" >Entrada (descendente)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <text x="-4.25" y="5.25" size="9" text="N" />
+        <input x="-18" y="-10" 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="5" x1="10" y2="-5" x2="10" />
+        <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="-5" x1="-10" y2="5" x2="-10" />
+        <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="0" x1="10" y2="0" 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="0" x1="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/input/entree_fp.elmt

@@ -0,0 +1,22 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Вход (передний фронт)</name>
+        <name lang="en" >Input (up front)</name>
+        <name lang="fr" >Entrée (front montant)</name>
+        <name lang="es" >Entrada (ascendente)</name>
+        <name lang="cs" >Vstup (stoupající)</name>
+        <name lang="pt" >Entrada (ascendente)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <text x="-3.5" y="5.25" size="9" text="P" />
+        <input x="-18" y="-10" 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="5" x1="10" y2="-5" x2="10" />
+        <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="-5" x1="-10" y2="5" x2="-10" />
+        <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="0" x1="10" y2="0" 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="0" x1="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/input/entree_nf.elmt

@@ -0,0 +1,22 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Вход (отрицательная логика)</name>
+        <name lang="en" >Input (negative logic)</name>
+        <name lang="fr" >Entrée (NF)</name>
+        <name lang="es" >Entrada (lógica negativa)</name>
+        <name lang="cs" >Vstup (záporná logika)</name>
+        <name lang="pt" >Entrada (lógica negativa)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="-5" x2="7" />
+        <input x="-18" y="-10" 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="5" x1="10" y2="-5" x2="10" />
+        <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="-5" x1="-10" y2="5" x2="-10" />
+        <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="0" x1="10" y2="0" 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="0" x1="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/input/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Входы</name>
+        <name lang="en" >Inputs</name>
+        <name lang="fr" >Entrées</name>
+        <name lang="es" >Entradas</name>
+        <name lang="pt" >Entradas</name>
+        <name lang="cs" >Vstupy</name>
+    </names>
+</qet-directory>

elements/automatisme/lader/output/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Выходы</name>
+        <name lang="en" >Outputs</name>
+        <name lang="fr" >Sorties</name>
+        <name lang="es" >Salidas</name>
+        <name lang="pt" >Saídas</name>
+        <name lang="cs" >Výstupy</name>
+    </names>
+</qet-directory>

elements/automatisme/lader/output/sortie.elmt

@@ -0,0 +1,20 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Выход</name>
+        <name lang="en" >Output</name>
+        <name lang="fr" >Sortie</name>
+        <name lang="es" >Salida</name>
+        <name lang="cs" >Výstup</name>
+        <name lang="pt" >Saída</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
+        <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="0" x1="10" y2="0" 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="0" x1="-24" y2="0" x2="-10" />
+        <terminal x="-24" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/output/sortie_r.elmt

@@ -0,0 +1,21 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Выход (сброс)</name>
+        <name lang="en" >Output (reset)</name>
+        <name lang="fr" >Sortie (reset)</name>
+        <name lang="es" >Salida (reset)</name>
+        <name lang="cs" >Výstup (nastavit znovu)</name>
+        <name lang="pt" >Saída (reset)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <text x="-4.25" y="5.25" size="9" text="R" />
+        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
+        <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="0" x1="10" y2="0" 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="0" x1="-24" y2="0" x2="-10" />
+        <terminal x="-24" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/output/sortie_s.elmt

@@ -0,0 +1,21 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Выход (установка)</name>
+        <name lang="en" >Output (set)</name>
+        <name lang="fr" >Sortie (set)</name>
+        <name lang="es" >Salida (set)</name>
+        <name lang="cs" >Výstup (nastavit)</name>
+        <name lang="pt" >Saída (set)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
+        <text x="-4.25" y="5.25" size="9" text="S" />
+        <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="0" x1="10" y2="0" 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="0" x1="-24" y2="0" x2="-10" />
+        <terminal x="-24" y="0" orientation="w" />
+    </description>
+</definition>

elements/automatisme/lader/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Контактно-релейная схема</name>
+        <name lang="en" >Ladder</name>
+        <name lang="fr" >Ladder</name>
+        <name lang="es" >Ladder</name>
+        <name lang="pt" >Ladder</name>
+        <name lang="cs" >Žebřík</name>
+    </names>
+</qet-directory>

elements/automatisme/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Автоматика</name>
+        <name lang="en" >Automatism</name>
+        <name lang="fr" >Automatisme</name>
+        <name lang="es" >Automatismo</name>
+        <name lang="pt" >Automatismos</name>
+        <name lang="cs" >Automatika</name>
+    </names>
+</qet-directory>

elements/capteurs/appareils_de_mesure/amperemetre-h.elmt

@@ -0,0 +1,21 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Амперметр (горизонтальный)</name>
+        <name lang="en" >Horizontal ammeter</name>
+        <name lang="fr" >Ampèremètre horizontal</name>
+        <name lang="es" >Amperímetro horizontal</name>
+        <name lang="cs" >Vodorovný ampérmetr</name>
+        <name lang="pt" >Amperímetro horizontal</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="-1.75" y2="0" x2="1.75" />
+        <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="0" x1="10" y2="0" x2="21" />
+        <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="0" x1="-21" y2="0" x2="-10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
+    </description>
+</definition>

elements/capteurs/appareils_de_mesure/amperemetre-v.elmt

@@ -0,0 +1,21 @@
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Амперметр (вертикальный)</name>
+        <name lang="en" >Vertical ammeter</name>
+        <name lang="fr" >Ampèremètre vertical</name>
+        <name lang="es" >Amperímetro vertical</name>
+        <name lang="cs" >Svislý ampérmetr</name>
+        <name lang="pt" >Amperímetro vertical</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="-1.75" y2="0" x2="1.75" />
+        <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="10" x1="0" y2="21" x2="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="-21" x1="0" y2="-10" x2="0" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/capteurs/appareils_de_mesure/ohmmetre-h.elmt

@@ -0,0 +1,24 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Омметр (горизонтальный)</name>
+        <name lang="en" >Horizontal ohmmeter</name>
+        <name lang="fr" >Ohmmètre horizontal</name>
+        <name lang="es" >Óhmetro horizontal</name>
+        <name lang="cs" >Vodorovný ohmmetr</name>
+        <name lang="pt" >Ohmímetro horizontal</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="5" x1="-5" y2="5" x2="-3.25" />
+        <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="5" x1="3.25" y2="5" x2="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="5" x1="-3.25" y2="3" x2="-3.25" />
+        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270" />
+        <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="3" x1="3.25" y2="5" x2="3.25" />
+        <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="0" x1="10" y2="0" x2="21" />
+        <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="0" x1="-21" y2="0" x2="-10" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
+    </description>
+</definition>

elements/capteurs/appareils_de_mesure/ohmmetre-v.elmt

@@ -0,0 +1,24 @@
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Омметр (вертикальный)</name>
+        <name lang="en" >Vertical ohmmeter</name>
+        <name lang="fr" >Ohmmètre vertical</name>
+        <name lang="es" >Óhmetro vertical</name>
+        <name lang="cs" >Svislý ohmmetr</name>
+        <name lang="pt" >Ohmímetro vertical</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="5" x1="-5" y2="5" x2="-3.25" />
+        <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="5" x1="3.25" y2="5" x2="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="5" x1="-3.25" y2="3" x2="-3.25" />
+        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270" />
+        <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="3" x1="3.25" y2="5" x2="3.25" />
+        <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="10" x1="0" y2="21" x2="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="-21" x1="0" y2="-10" x2="0" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/capteurs/appareils_de_mesure/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Измеррительные приборы</name>
+        <name lang="en" >Measuring instruments</name>
+        <name lang="fr" >Appareils de mesure</name>
+        <name lang="es" >Instrumento de medición</name>
+        <name lang="pt" >Instrumentos de medição</name>
+        <name lang="cs" >Měřící přístroje</name>
+    </names>
+</qet-directory>

elements/capteurs/appareils_de_mesure/voltmetre-h.elmt

@@ -0,0 +1,20 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Вольтметр (горизонтальный)</name>
+        <name lang="en" >Horizontal voltmeter</name>
+        <name lang="fr" >Voltmètre horizontal</name>
+        <name lang="es" >Voltímetro horizontal</name>
+        <name lang="cs" >Vodorovný voltmetr</name>
+        <name lang="pt" >Voltímetro horizontal</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="0" x1="10" y2="0" x2="21" />
+        <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="0" x1="-21" y2="0" x2="-10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
+    </description>
+</definition>

elements/capteurs/appareils_de_mesure/voltmetre-v.elmt

@@ -0,0 +1,20 @@
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Вольтметр (вертикальный)</name>
+        <name lang="en" >Vertical voltmeter</name>
+        <name lang="fr" >Voltmètre vertical</name>
+        <name lang="es" >Voltímetro vertical</name>
+        <name lang="cs" >Svislý voltmetr</name>
+        <name lang="pt" >Voltímetro vertical</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="10" x1="0" y2="21" x2="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="-21" x1="0" y2="-10" x2="0" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/capteurs/appareils_de_mesure/wattmetre-h.elmt

@@ -0,0 +1,24 @@
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="40" type="element" ic="true" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Ватметр (горизонтальный)</name>
+        <name lang="en" >Horizontal wattmeter</name>
+        <name lang="fr" >Wattmètre horizontal</name>
+        <name lang="es" >Vatímetro horizontal</name>
+        <name lang="cs" >Vodorovný wattmetr</name>
+        <name lang="pt" >Wattímetro horizontal</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="15" x2="10" y3="20" x3="10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="-7.5" y2="15" x2="-10" y3="20" x3="-10" />
+        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="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="0" x1="10" y2="0" x2="21" />
+        <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="0" x1="-21" y2="0" x2="-10" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
+        <terminal x="-10" y="20" orientation="s" />
+        <terminal x="10" y="20" orientation="s" />
+    </description>
+</definition>

elements/capteurs/appareils_de_mesure/wattmetre-v.elmt

@@ -0,0 +1,24 @@
+<definition width="40" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" ic="true" orientation="dnnn" >
+    <names>
+        <name lang="ru" >Ватметр (вертикальный)</name>
+        <name lang="en" >Vertical wattmeter</name>
+        <name lang="fr" >Wattmètre vertical</name>
+        <name lang="es" >Vatímetro vertical</name>
+        <name lang="cs" >Svislý wattmetr</name>
+        <name lang="pt" >Wattímetro vertical</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="10" x2="15" y3="10" x3="20" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7.5" x1="7.5" y2="-10" x2="15" y3="-10" x3="20" />
+        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="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="10" x1="0" y2="21" x2="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="-21" x1="0" y2="-10" x2="0" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+        <terminal x="20" y="-10" orientation="e" />
+        <terminal x="20" y="10" orientation="e" />
+    </description>
+</definition>

elements/capteurs/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Датчики</name>
+        <name lang="en" >Transducers</name>
+        <name lang="fr" >Capteurs</name>
+        <name lang="es" >Sensores</name>
+        <name lang="pt" >Sensores</name>
+        <name lang="cs" >Snímače</name>
+    </names>
+</qet-directory>

elements/capteurs/sondes/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >Датчики</name>
+        <name lang="en" >Sensors</name>
+        <name lang="fr" >Sondes</name>
+        <name lang="es" >Sondeos</name>
+        <name lang="pt" >Sondas</name>
+        <name lang="cs" >Snímače</name>
+    </names>
+</qet-directory>

elements/capteurs/sondes/tores_de_courant/qet_directory

@@ -0,0 +1,9 @@
+<qet-directory>
+    <names>
+        <name lang="en" >Current toroidal core</name>
+        <name lang="fr" >Tores de courant</name>
+        <name lang="es" >Núcleos toroidales de corriente</name>
+        <name lang="pt" >Núcleos toroidais de corrente</name>
+        <name lang="cs" >Prstencové jádro střídavého proudu</name>
+    </names>
+</qet-directory>

elements/capteurs/sondes/tores_de_courant/tore1.elmt

@@ -0,0 +1,22 @@
+<definition width="40" version="0.1" hotspot_x="15" hotspot_y="25" height="40" type="element" orientation="dyyy" >
+    <names>
+        <name lang="en" >1-pole toroidal core</name>
+        <name lang="fr" >Tore 1 pôle</name>
+        <name lang="es" >Núcleo toroide 1 polo</name>
+        <name lang="cs" >Prstencové jádro s jedním pólem</name>
+        <name lang="pt" >Núcleo toroidal de 1 polo</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
+        <ellipse width="20" x="-10" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
+        <terminal x="0" y="-16" orientation="n" />
+        <terminal x="0" y="11" orientation="s" />
+        <terminal x="15" y="0" orientation="e" />
+        <terminal x="15" y="-10" orientation="e" />
+    </description>
+</definition>

elements/capteurs/sondes/tores_de_courant/tore2.elmt

@@ -0,0 +1,25 @@
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy" >
+    <names>
+        <name lang="en" >2-poles toroidal core</name>
+        <name lang="fr" >Tore 2 pôles</name>
+        <name lang="es" >Núcleo toroide 2 polos</name>
+        <name lang="cs" >Prstencové jádro se dvěma póly</name>
+        <name lang="pt" >Núcleo toroidal de 2 polos</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
+        <ellipse width="30" x="-20" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10" y2="10" x2="-10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
+        <terminal x="0" y="-16" orientation="n" />
+        <terminal x="0" y="11" orientation="s" />
+        <terminal x="15" y="0" orientation="e" />
+        <terminal x="15" y="-10" orientation="e" />
+        <terminal x="-10" y="-16" orientation="n" />
+        <terminal x="-10" y="11" orientation="s" />
+    </description>
+</definition>

elements/capteurs/sondes/tores_de_courant/tore3.elmt

@@ -0,0 +1,28 @@
+<definition width="60" version="0.1" hotspot_x="35" hotspot_y="25" height="40" type="element" orientation="dyyy" >
+    <names>
+        <name lang="en" >3-poles toroidal core</name>
+        <name lang="fr" >Tore 3 pôles</name>
+        <name lang="es" >Núcleo toroide 3 polos</name>
+        <name lang="cs" >Prstencové jádro se třemi póly</name>
+        <name lang="pt" >Núcleo toroidal de 3 polos</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
+        <ellipse width="40" x="-30" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10" y2="10" x2="-10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-20" y2="10" x2="-20" />
+        <terminal x="0" y="-16" orientation="n" />
+        <terminal x="0" y="11" orientation="s" />
+        <terminal x="15" y="0" orientation="e" />
+        <terminal x="15" y="-10" orientation="e" />
+        <terminal x="-10" y="-16" orientation="n" />
+        <terminal x="-10" y="11" orientation="s" />
+        <terminal x="-20" y="-16" orientation="n" />
+        <terminal x="-20" y="11" orientation="s" />
+    </description>
+</definition>

elements/capteurs/sondes/tores_de_courant/tore4.elmt

@@ -0,0 +1,31 @@
+<definition width="70" version="0.1" hotspot_x="45" hotspot_y="25" height="40" type="element" orientation="dyyy" >
+    <names>
+        <name lang="en" >4-poles toroidal core</name>
+        <name lang="fr" >Tore 4 pôles</name>
+        <name lang="es" >Núcleo toroide 4 polos</name>
+        <name lang="cs" >Prstencové jádro se čtyřmi póly</name>
+        <name lang="pt" >Núcleo toroidal de 4 polos</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
+        <ellipse width="50" x="-40" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10" y2="10" x2="-10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-30" y2="10" x2="-30" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-20" y2="10" x2="-20" />
+        <terminal x="0" y="-16" orientation="n" />
+        <terminal x="0" y="11" orientation="s" />
+        <terminal x="15" y="0" orientation="e" />
+        <terminal x="15" y="-10" orientation="e" />
+        <terminal x="-10" y="-16" orientation="n" />
+        <terminal x="-10" y="11" orientation="s" />
+        <terminal x="-30" y="-16" orientation="n" />
+        <terminal x="-20" y="-16" orientation="n" />
+        <terminal x="-30" y="11" orientation="s" />
+        <terminal x="-20" y="11" orientation="s" />
+    </description>
+</definition>

elements/contacts/bornes/Bornes_e.elmt

@@ -0,0 +1,17 @@
+<definition width="20" version="0.2" hotspot_x="10" hotspot_y="25" height="30" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Штырь (стар.)</name>
+        <name lang="en" >Input terminal</name>
+        <name lang="fr" >Borne entrée</name>
+        <name lang="es" >Terminal de entrada</name>
+        <name lang="cs" >Vstupní svorka</name>
+        <name lang="pt" >Terminal de entrada</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-4" y2="1" x2="0" y3="-5" x3="4" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="0" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
+    </description>
+</definition>

elements/contacts/bornes/Bornes_es.elmt

@@ -0,0 +1,20 @@
+<definition width="10" version="0.1" hotspot_x="5" hotspot_y="25" height="50" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Соединение (стар.)</name>
+        <name lang="en" >Dual terminal</name>
+        <name lang="fr" >Double borne</name>
+        <name lang="es" >Terminal doble</name>
+        <name lang="cs" >Dvojitá svorka</name>
+        <name lang="pt" >Terminal duplo</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="-4" y2="5" x2="0" y3="-1" x3="4" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-4" y2="1" x2="0" y3="-5" x3="4" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.5" x1="0" y2="20" x2="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="0" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/contacts/bornes/Bornes_s.elmt

@@ -0,0 +1,17 @@
+<definition width="10" version="0.1" hotspot_x="5" hotspot_y="5" height="30" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Гнездо (стар.)</name>
+        <name lang="en" >Output terminal</name>
+        <name lang="fr" >Borne sortie</name>
+        <name lang="es" >Terminal de salida</name>
+        <name lang="cs" >Výstupní svorka</name>
+        <name lang="pt" >Terminal de saída</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="-4" y2="5" x2="0" y3="-1" x3="4" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.5" x1="0" y2="20" x2="0" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/contacts/bornes/borne_continuite.elmt

@@ -0,0 +1,21 @@
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Клеммное соединение</name>
+        <name lang="en" >Terminal block</name>
+        <name lang="fr" >Borne continuité</name>
+        <name lang="es" >Punto de combinación</name>
+        <name lang="cs" >Spojovací svorka</name>
+        <name lang="pt" >Terminal de combinação</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="5" y="8" size="7" text="_" />
+        <input x="5" y="-5" size="10" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="3" x2="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0" />
+        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <terminal x="0" y="-10" orientation="n" />
+        <terminal x="0" y="10" orientation="s" />
+    </description>
+</definition>

elements/contacts/bornes/borne_finale.elmt

@@ -0,0 +1,19 @@
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Клеммник</name>
+        <name lang="en" >Terminal block</name>
+        <name lang="fr" >Borne finale</name>
+        <name lang="es" >Punto de unión</name>
+        <name lang="cs" >Koncová svorka</name>
+        <name lang="pt" >Terminal de fim</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="5" y="8" size="7" text="_" />
+        <input x="5" y="-5" size="10" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0" />
+        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <terminal x="0" y="-10" orientation="n" />
+    </description>
+</definition>

elements/contacts/bornes/connecteur_f.elmt

@@ -0,0 +1,19 @@
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="35" height="70" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Гнездо (нов.)</name>
+        <name lang="fr" >Connecteur femelle</name>
+        <name lang="en" >Female connector</name>
+        <name lang="es" >Connector hembra</name>
+        <name lang="cs" >Ženská spojka</name>
+        <name lang="pt" >Conector fêmea</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="4" y="-7.5" size="8" 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="-10" x1="0" y2="-1" x2="0" />
+        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-84" />
+        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="83" angle="-84" />
+        <terminal x="0" y="-11" orientation="n" />
+    </description>
+</definition>

elements/contacts/bornes/connecteur_m.elmt

@@ -0,0 +1,18 @@
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="35" height="70" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Штырь (нов.)</name>
+        <name lang="fr" >Connecteur mâle</name>
+        <name lang="en" >Male connector</name>
+        <name lang="es" >Connector macho</name>
+        <name lang="cs" >Mužská spojka</name>
+        <name lang="pt" >Conector macho</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <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="2" x1="-1" y2="9" x2="-1" />
+        <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="2" x1="1" y2="9" x2="1" />
+        <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="2" x1="0" y2="20" x2="0" />
+        <terminal x="0" y="19" orientation="n" />
+    </description>
+</definition>

elements/contacts/bornes/connecteur_mf.elmt

@@ -0,0 +1,22 @@
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="35" height="70" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Соединение (нов.)</name>
+        <name lang="fr" >Connecteur</name>
+        <name lang="en" >Connector</name>
+        <name lang="cs" >Spojka</name>
+        <name lang="pt" >Conector</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="4" y="-5.5" size="8" 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="2" x1="-1" y2="9" x2="-1" />
+        <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="2" x1="1" y2="9" x2="1" />
+        <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="2" x1="0" y2="20" x2="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="-10" x1="0" y2="-1" x2="0" />
+        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-84" />
+        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="83" angle="-84" />
+        <terminal x="0" y="-11" orientation="n" />
+        <terminal x="0" y="19" orientation="n" />
+    </description>
+</definition>

elements/contacts/bornes/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >соеденителей</name>
+        <name lang="en" >Terminals</name>
+        <name lang="fr" >Bornes</name>
+        <name lang="es" >Terminales</name>
+        <name lang="pt" >Terminais</name>
+        <name lang="cs" >Svorky</name>
+    </names>
+</qet-directory>

elements/contacts/etanches/con_simple_etanche.elmt

@@ -1,21 +1,26 @@
-<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
+        <name lang="ru" >Герметичный контакт (НР)</name>
         <name lang="en" >Simple contact (tight)</name>
         <name lang="fr" >Contact simple (étanche)</name>
+        <name lang="es" >Contactor simple (resistente al agua)</name>
+        <name lang="cs" >Jednoduché vodivé spojení (nepropustné)</name>
+        <name lang="pt" >Contacto simples NO (NO / resistente à água)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-8.5" y2="12" x2="-8.5" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="8.5" y2="12" x2="8.5" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5" x1="-6" y2="-14.5" x2="6" />
+        <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="-12" x1="-8.5" y2="12" x2="-8.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="-12" x1="8.5" y2="12" x2="8.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="-14.5" x1="-6" y2="-14.5" x2="6" />
         <arc width="5" x="3.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" />
         <arc width="5" x="-8.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90" />
         <arc width="5" x="-8.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14.5" x1="-6" y2="14.5" 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="14.5" x1="-6" y2="14.5" x2="6" />
         <arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
         <input x="12.75" y="3" size="9" text="_" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="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" />
         <terminal x="0" y="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />
     </description>

elements/contacts/etanches/con_simple_nf_etanche.elmt

@@ -1,22 +1,27 @@
-<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
+        <name lang="ru" >Герметичный контакт (НЗ)</name>
         <name lang="en" >Simple contact (NC / tight)</name>
         <name lang="fr" >Contact simple (NF / étanche)</name>
+        <name lang="es" >Contactor simple (NC / resistente al agua)</name>
+        <name lang="cs" >Jednoduché vodivé spojení (NC / nepropustné)</name>
+        <name lang="pt" >Contacto simples NC (NC / resistente à água)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-8.5" y2="12" x2="-8.5" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="8.5" y2="12" x2="8.5" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5" x1="-6" y2="-14.5" x2="6" />
+        <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="-12" x1="-8.5" y2="12" x2="-8.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="-12" x1="8.5" y2="12" x2="8.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="-14.5" x1="-6" y2="-14.5" x2="6" />
         <arc width="5" x="3.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" />
         <arc width="5" x="-8.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90" />
         <arc width="5" x="-8.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14.5" x1="-6" y2="14.5" 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="14.5" x1="-6" y2="14.5" x2="6" />
         <arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
         <input x="12.75" y="3" size="9" text="_" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="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="-9" x2="0" />
         <terminal x="0" y="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />
     </description>

elements/contacts/etanches/qet_directory

@@ -1,6 +1,10 @@
 <qet-directory>
     <names>
+        <name lang="ru" >герметичные</name>
         <name lang="en" >Tight</name>
         <name lang="fr" >Étanches</name>
+        <name lang="es" >Resistentes al agua</name>
+        <name lang="pt" >Resistentes à água</name>
+        <name lang="cs" >Vodotěsné</name>
     </names>
 </qet-directory>

elements/contacts/fin_de_course/findecourse_nf.elmt

@@ -0,0 +1,22 @@
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+    <names>
+        <name lang="ru" >Концевой контакт (НЗ)</name>
+        <name lang="en" >Limit (NC)</name>
+        <name lang="fr" >Fin de course (NF)</name>
+        <name lang="es" >Final de carrera (NC)</name>
+        <name lang="cs" >Konec vodivého spojení (NC)</name>
+        <name lang="pt" >Fim de curso (NC)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <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="-5.25" x1="1.25" y2="-5.25" x2="3.25" />
+        <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="4" x1="1.25" y2="-5.25" x2="1.25" />
+        <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="_" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/contacts/fin_de_course/findecourse_no.elmt

@@ -0,0 +1,20 @@
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+    <names>
+        <name lang="ru" >Концевой контакт (НР)</name>
+        <name lang="en" >Limit</name>
+        <name lang="fr" >Fin de course</name>
+        <name lang="es" >Final de carrera</name>
+        <name lang="cs" >Konec vodivého spojení</name>
+        <name lang="pt" >Fim de curso (NO)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <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" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-4" y2="-3" x2="-6.75" y3="4.85" x3="-1.55" />
+        <input x="2.75" y="3" size="9" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/contacts/fin_de_course/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >концевые</name>
+        <name lang="en" >Limits</name>
+        <name lang="fr" >Fins de courses</name>
+        <name lang="es" >Finales de carrera</name>
+        <name lang="pt" >Fins de curso</name>
+        <name lang="cs" >Konce vodivých spojení</name>
+    </names>
+</qet-directory>

elements/contacts/interupteur.elmt

@@ -1,15 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
-        <name lang="en" >On-off switch</name>
-        <name lang="fr" >Interrupteur</name>
-    </names>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-12.5" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
-        <input x="2.75" y="3" size="9" text="_" />
-        <circle x="-1.750000000000001" y="-11.75000000000002" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
-        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="21" orientation="s" />
-    </description>
-</definition>

elements/contacts/interupteur/inter_2.elmt

@@ -0,0 +1,25 @@
+<definition width="50" version="0.2" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Переключатель 2-х позиционный</name>
+        <name lang="en" >Switch 2 positions</name>
+        <name lang="fr" >Interrupteur 2 positions</name>
+        <name lang="es" >Interruptor 2 posiciones</name>
+        <name lang="cs" >Dvoupolohový spínač</name>
+        <name lang="pt" >Interruptor 2 posições</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="22" y="-7" size="9" text="_" />
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="9" y2="1" x2="2" />
+        <ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" 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="2" x1="0" y2="10" x2="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="2" x1="20" y2="10" 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="-17" x1="10" y2="-30" x2="10" />
+        <terminal x="0" y="10" orientation="s" />
+        <terminal x="20" y="10" orientation="s" />
+        <terminal x="10" y="-30" orientation="n" />
+    </description>
+</definition>

elements/contacts/interupteur/inter_2n.elmt

@@ -0,0 +1,26 @@
+<definition width="50" version="0.2" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Переключатель 3-х позиционный со средним положением</name>
+        <name lang="en" >Switch 3 positions including neutral</name>
+        <name lang="fr" >Interrupteur 3 positions dont neutre</name>
+        <name lang="es" >Interruptor 3 posiciones incluso neutro</name>
+        <name lang="cs" >Třípolohový spínač včetně nulové</name>
+        <name lang="pt" >Interruptor 3 posições com neutro</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="10" y2="4" x2="8" y3="4" x3="12" />
+        <input x="22" y="-7" size="9" 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="-13" x1="10" y2="1" x2="10" />
+        <ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" 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="2" x1="0" y2="10" x2="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="2" x1="20" y2="10" 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="-17" x1="10" y2="-30" x2="10" />
+        <terminal x="0" y="10" orientation="s" />
+        <terminal x="20" y="10" orientation="s" />
+        <terminal x="10" y="-30" orientation="n" />
+    </description>
+</definition>

elements/contacts/interupteur/interupteur.elmt

@@ -0,0 +1,20 @@
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+    <names>
+        <name lang="ru" >Переключатель</name>
+        <name lang="en" >Switch</name>
+        <name lang="fr" >Interrupteur</name>
+        <name lang="es" >Interruptor</name>
+        <name lang="cs" >Spínač</name>
+        <name lang="pt" >Interruptor</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <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="-12.5" x2="0" />
+        <input x="2.75" y="3" size="9" text="_" />
+        <circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/contacts/interupteur/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >переключателей</name>
+        <name lang="en" >Switchs</name>
+        <name lang="fr" >Interrupteurs</name>
+        <name lang="es" >Interruptores</name>
+        <name lang="pt" >Interruptores</name>
+        <name lang="cs" >Spínače</name>
+    </names>
+</qet-directory>

elements/contacts/poussoirs/poussoir.elmt

@@ -1,17 +1,22 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
+        <name lang="ru" >Кнопка (НР)</name>
         <name lang="en" >Push-button</name>
         <name lang="fr" >Bouton poussoir</name>
+        <name lang="es" >Pulsador</name>
+        <name lang="cs" >Tlačítko</name>
+        <name lang="pt" >Botão de pressão (NA)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
+        <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="_" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-3" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="-5" x2="-7" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-10" y2="5" x2="-7" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-3" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="-5" x2="-7" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-10" y2="5" x2="-7" />
         <terminal x="0" y="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />
     </description>

elements/contacts/poussoirs/poussoir_nf.elmt

@@ -1,18 +1,23 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
+        <name lang="ru" >Кнопка (НЗ)</name>
         <name lang="en" >Push-button (NC)</name>
         <name lang="fr" >Bouton poussoir (NF)</name>
+        <name lang="es" >Pulsador (NC)</name>
+        <name lang="cs" >Tlačítko (NC)</name>
+        <name lang="pt" >Botão de pressão (NC)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
+        <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="_" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="3" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="-5" x2="-7" />
-        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-10" y2="5" x2="-7" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="3" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="-5" x2="-7" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-10" y2="5" x2="-7" />
         <terminal x="0" y="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />
     </description>

elements/contacts/poussoirs/qet_directory

@@ -1,6 +1,10 @@
 <qet-directory>
     <names>
+        <name lang="ru" >кнопок</name>
         <name lang="en" >Push-buttons</name>
         <name lang="fr" >Poussoirs</name>
+        <name lang="es" >Pulsadores</name>
+        <name lang="pt" >Botões de pressão</name>
+        <name lang="cs" >Tlačítka</name>
     </names>
 </qet-directory>

elements/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt

@@ -1,13 +1,18 @@
-<definition width="50" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="50" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НЗ)</name>
         <name lang="en" >Contact power contactor (NC)</name>
         <name lang="fr" >Contact puissance contacteur (NF)</name>
+        <name lang="es" >Interruptor de potencia contactor (NC)</name>
+        <name lang="cs" >Stykač síly vodivého spojení (NC)</name>
+        <name lang="pt" >Interruptor de potência contactor (NC)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <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 antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
         <input x="5.75" y="3" size="9" text="KM_" />
         <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="21" orientation="s" />

elements/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt

@@ -1,24 +1,27 @@
-<definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НЗ)</name>
         <name lang="en" >Contact power contactor (NC)</name>
         <name lang="fr" >Contact puissance contacteur (NF)</name>
+        <name lang="es" >Interruptor de potencia contactor (NC)</name>
+        <name lang="cs" >Stykač síly vodivého spojení (NC)</name>
+        <name lang="pt" >Interruptor de potência contactor (NC)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
+        <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="15" 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="5" y2="10" x2="0" y3="20" x3="0" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
         <input x="25" y="3" size="9" text="KM_" />
         <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" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="10" y2="-9" x2="16" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="10" />
         <arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="20" />
         <arc width="5" x="17.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="21" orientation="s" />
         <terminal x="0" y="-21" orientation="n" />

elements/contacts/puissance/normalement_fermes/com_puiss_nf5.elmt

@@ -1,28 +1,30 @@
-<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НЗ)</name>
         <name lang="en" >Contact power contactor (NC)</name>
         <name lang="fr" >Contact puissance contacteur (NF)</name>
+        <name lang="es" >Interruptor de potencia contactor (NC)</name>
+        <name lang="cs" >Stykač síly vodivého spojení (NC)</name>
+        <name lang="pt" >Interruptor de potência contactor (NC)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <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" />
+        <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" />
+        <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" />
+        <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" />
         <input x="35" y="3" size="9" text="KM_" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="10" y2="-9" x2="16" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="10" />
         <arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="20" />
         <arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="30" y2="-9" x2="36" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-9" x2="30" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="35" y2="10" x2="30" />
         <arc width="5" x="27.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="21" orientation="s" />
         <terminal x="0" y="-21" orientation="n" />

elements/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt

@@ -1,29 +1,31 @@
-<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НЗ)</name>
         <name lang="en" >Contact power contactor (NC)</name>
         <name lang="fr" >Contact puissance contacteur (NF)</name>
+        <name lang="es" >Interruptor de potencia contactor (NC)</name>
+        <name lang="cs" >Stykač síly vodivého spojení (NC)</name>
+        <name lang="pt" >Interruptor de potência contactor (NC)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
+        <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" />
+        <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" />
+        <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" />
+        <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" />
         <input x="35" y="3" size="9" text="KM_" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" 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" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="10" y2="-9" x2="16" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="10" />
         <arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="20" />
         <arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="30" y2="-9" x2="36" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-9" x2="30" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="35" y2="10" x2="30" />
         <arc width="5" x="27.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="21" orientation="s" />
         <terminal x="0" y="-21" orientation="n" />

elements/contacts/puissance/normalement_fermes/qet_directory

@@ -1,6 +1,10 @@
 <qet-directory>
     <names>
+        <name lang="ru" >Нормально замкнутые</name>
         <name lang="en" >Normally closed</name>
         <name lang="fr" >Normalement fermés</name>
+        <name lang="es" >Normalmente cerrados</name>
+        <name lang="pt" >Normalmente fechados</name>
+        <name lang="cs" >Obvykle zavřené</name>
     </names>
 </qet-directory>

elements/contacts/puissance/normalement_ouverts/com_puiss1.elmt

@@ -1,12 +1,17 @@
-<definition width="40" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="40" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НР)</name>
         <name lang="en" >Contact power contactor</name>
         <name lang="fr" >Contact puissance contacteur</name>
+        <name lang="es" >Interruptor de potencia contactor</name>
+        <name lang="cs" >Stykač síly vodivého spojení</name>
+        <name lang="pt" >Interruptor de potência contactor</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <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 antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
         <input x="2.75" y="3" size="9" text="KM_" />
         <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="-21" orientation="n" />

elements/contacts/puissance/normalement_ouverts/com_puiss4.elmt

@@ -1,21 +1,24 @@
-<definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НР)</name>
         <name lang="en" >Contact power contactor</name>
         <name lang="fr" >Contact puissance contacteur</name>
+        <name lang="es" >Interruptor de potencia contactor</name>
+        <name lang="cs" >Stykač síly vodivého spojení</name>
+        <name lang="pt" >Interruptor de potência contactor</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
+        <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" />
+        <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" />
+        <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" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
         <input x="25" y="3" size="9" text="KM_" />
         <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" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-10" x2="10" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="10" />
         <arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-10" x2="20" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="20" />
         <arc width="5" x="17.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="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />

elements/contacts/puissance/normalement_ouverts/com_puiss5.elmt

@@ -1,24 +1,26 @@
-<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НР)</name>
         <name lang="en" >Contact power contactor</name>
         <name lang="fr" >Contact puissance contacteur</name>
+        <name lang="es" >Interruptor de potencia contactor</name>
+        <name lang="cs" >Stykač síly vodivého spojení</name>
+        <name lang="pt" >Interruptor de potência contactor</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
+        <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="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="15" 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" />
         <input x="35" y="3" size="9" text="KM_" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-10" x2="10" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="10" />
         <arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-10" x2="20" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="20" />
         <arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-10" x2="30" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="30" />
         <arc width="5" x="27.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="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />

elements/contacts/puissance/normalement_ouverts/com_puiss6.elmt

@@ -1,25 +1,27 @@
-<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
+        <name lang="ru" >Контакт контактора (НР)</name>
         <name lang="en" >Contact power contactor</name>
         <name lang="fr" >Contact puissance contacteur</name>
+        <name lang="es" >Interruptor de potencia contactor</name>
+        <name lang="cs" >Stykač síly vodivého spojení</name>
+        <name lang="pt" >Interruptor de potência contactor</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
+        <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="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="15" 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" />
         <input x="35" y="3" size="9" text="KM_" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" 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" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-10" x2="10" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="10" />
         <arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-10" x2="20" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="20" />
         <arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
         <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-10" x2="30" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="30" />
         <arc width="5" x="27.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="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />

elements/contacts/puissance/normalement_ouverts/qet_directory

@@ -1,6 +1,10 @@
 <qet-directory>
     <names>
+        <name lang="ru" >Нормально разомкнутые</name>
         <name lang="en" >Normally open</name>
         <name lang="fr" >Normalement ouverts</name>
+        <name lang="es" >Normalemente abiertos</name>
+        <name lang="pt" >Normalmente abertos</name>
+        <name lang="cs" >Obvykle otevřené</name>
     </names>
 </qet-directory>

elements/contacts/puissance/qet_directory

@@ -1,6 +1,10 @@
 <qet-directory>
     <names>
+        <name lang="ru" >контактора</name>
         <name lang="en" >Power</name>
         <name lang="fr" >Puissance</name>
+        <name lang="es" >Potencia</name>
+        <name lang="pt" >Potência</name>
+        <name lang="cs" >Síla</name>
     </names>
 </qet-directory>

elements/contacts/qet_directory

@@ -1,6 +1,10 @@
 <qet-directory>
     <names>
+        <name lang="ru" >Контакты</name>
         <name lang="en" >Contacts</name>
         <name lang="fr" >Contacts</name>
+        <name lang="es" >Terminales</name>
+        <name lang="pt" >Contactos</name>
+        <name lang="cs" >Kontakty</name>
     </names>
 </qet-directory>

elements/contacts/relais_thermique/contact_relais.elmt

@@ -0,0 +1,22 @@
+<definition width="40" version="0.2" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
+    <names>
+        <name lang="ru" >Контакт теплового реле (НР)</name>
+        <name lang="en" >Contact relais thermique (NO)</name>
+        <name lang="fr" >Contact relais thermique (NO)</name>
+        <name lang="es" >Contacto relé térmico (NA)</name>
+        <name lang="cs" >Tepelné spojovací relé (NO)</name>
+        <name lang="pt" >Contacto relé térmico (NO)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <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="0" x1="-9" y2="4" x2="-9" />
+        <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="0" x1="-7" y2="2" x2="-7" />
+        <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="0" x1="-3" y2="0" x2="-9" />
+        <input x="2.75" y="3" size="9" text="F_" />
+        <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" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/contacts/relais_thermique/contact_relais_nf.elmt

@@ -0,0 +1,23 @@
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+    <names>
+        <name lang="ru" >Контакт теплового реле (НЗ)</name>
+        <name lang="en" >Contact relais thermique (NC)</name>
+        <name lang="fr" >Contact relais thermique (NF)</name>
+        <name lang="es" >Contacto relé térmico (NC)</name>
+        <name lang="cs" >Tepelné spojovací relé (NC)</name>
+        <name lang="pt" >Contacto relé térmico (NC)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <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="0" x1="-4" y2="4" x2="-4" />
+        <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="0" x1="-2" y2="2" x2="-2" />
+        <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="0" x1="2" y2="0" x2="-4" />
+        <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="F_" />
+        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
+    </description>
+</definition>

elements/contacts/relais_thermique/qet_directory

@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="ru" >теплового реле</name>
+        <name lang="en" >Thermal relays</name>
+        <name lang="fr" >Relais thermiques</name>
+        <name lang="es" >Relés térmicos</name>
+        <name lang="pt" >Relés térmicos</name>
+        <name lang="cs" >Tepelné relé</name>
+    </names>
+</qet-directory>

elements/contacts/simples/con_simple.elmt

@@ -1,13 +1,18 @@
-<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
+        <name lang="ru" >Проктой контакт (НР)</name>
         <name lang="en" >Simple contact</name>
         <name lang="fr" >Contact simple</name>
+        <name lang="es" >Contactor simple</name>
+        <name lang="cs" >Jednoduché spojení</name>
+        <name lang="pt" >Contacto simples (NO)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <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" />
         <input x="2.75" y="3" size="9" text="_" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="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" />
         <terminal x="0" y="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />
     </description>

elements/contacts/simples/con_simple_nf.elmt

@@ -1,13 +1,18 @@
-<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
+        <name lang="ru" >Проктой контакт (НЗ)</name>
         <name lang="en" >Simple contact (NC)</name>
         <name lang="fr" >Contact simple (NF)</name>
+        <name lang="es" >Contactor simple (NC)</name>
+        <name lang="cs" >Jednoduché spojení (NC)</name>
+        <name lang="pt" >Contacto simples (NC)</name>
     </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
-        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
+        <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="_" />
         <terminal x="0" y="-21" orientation="n" />
         <terminal x="0" y="21" orientation="s" />