Merge branch 'XMLProperties' of ssh://git.tuxfamily.org/gitroot/qet/qet into XMLProperties

- move inital values to header file

.gitignore

@@ -1 +1,2 @@
 *.snap
+.flatpak-builder

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# How to contribute
+ 
+I'm really glad you're reading this, because we need volunteer developers to help this project come to fruition.
+
+
+Here are some important resources:
+
+* [wiki](https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet)Qet code style
+
+## Testing
+
+## Submitting changes
+
+Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:
+
+    $ git commit -m "A brief summary of the commit
+    > 
+    > A paragraph describing what changed and its impact."
+
+## Coding conventions
+
+Start reading our code and you'll get the hang of it. We optimize for readability:
+
+  * We indent using tab, see https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet
+
+Thanks,
+QElectroTech

ChangeLog

@@ -1,3 +1,75 @@
+====== ChangeLog from 0.7 to 0.8 ======
+
+* Element editor :
+* with Ctrl key you can moving by keyboard primitives selected by 0.1 point instead by 1 points, added the same feature for moving the selected aera.
+* Improve polygon widget editor on elements editor.
+
+* Diagram editor :
+* User can choose now folio list emplacement in project by select position number in settings :
+1 for the first position
+2 for the second position
+etc
+0 for always at the end of project
+Because index folio is 0 and not 1 we apply -1 in formula to not complicate your life..
+
+
+
+
+
+* macOS :
+* Add Fusion style and fix tilesets tab bar size
+* Enable mouse wheel on tilesets tab bar with command keyboard, thanks Giovanni.
+(removed by Qt upstream) https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=ea47d152b35158ba07a55d009f57df0e4c2a048f;hp=08cc9b9991ae9ab51bed5b857b6257401401ff6f
+
+
+
+* For the Flatpak package : remove the file name extension added
+automatically to the saved files even if the user sets an unknown file
+extension for the program.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ====== ChangeLog from 0.6 to 0.7 ======
 
 

Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = QElectroTech
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.70
+PROJECT_NUMBER         = 0.80
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -47,7 +47,7 @@ OUTPUT_DIRECTORY       = doc
 # source files, where putting all generated files in the same directory would 
 # otherwise cause performance problems for the file system.
 
-CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS         = YES
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
@@ -124,7 +124,7 @@ FULL_PATH_NAMES        = NO
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = /home/laurent/Qet-svn/git/qet/
+STRIP_FROM_PATH        = 
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -890,19 +890,19 @@ TOC_EXPAND             = NO
 # Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
 # HTML documentation.
 
-GENERATE_QHP           = NO
+GENERATE_QHP           = YES
 
 # If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
 # be used to specify the file name of the resulting .qch file. 
 # The path specified is relative to the HTML output folder.
 
-QCH_FILE               = 
+QCH_FILE               = "QElectroTech.qch"
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating 
 # Qt Help Project output. For more information please see 
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
-QHP_NAMESPACE          = 
+QHP_NAMESPACE          = "my_namespace"
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
 # Qt Help Project output. For more information please see 
@@ -932,7 +932,7 @@ QHP_SECT_FILTER_ATTRS  =
 # If non-empty doxygen will try to run qhelpgenerator on the generated 
 # .qhp file.
 
-QHG_LOCATION           = 
+QHG_LOCATION           = "/usr/lib/x86_64-linux-gnu/qt5/bin/qhelpgenerator"
 
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
 # top of each HTML page. The value NO (the default) enables the index and 

README.md

@@ -0,0 +1,178 @@
+![](logo.png)
+
+
+# QElectroTech
+
+### What it is
+
+QElectroTech, or QET in short, is a libre and open source desktop application to create diagrams and schematics.  
+The software is primarily intended to create electrical documentation but it can also be used to draw any kinds of diagrams, such as those made in pneumatics, hydraulics, process industries, electronics...  
+Generally speaking, QET is a **CAD/CAE editor focusing on schematics drawing features**.  
+
+This means that there are no embedded simulating or calculating functionalities and it is not planned to implement them.
+
+The main goal of the developers is to provide a libre, easy to use and effective software for **schematics drawing purposes**.
+
+### Version
+
+The current stable version is 0.70 and was released on 2019.07.13.  
+Once it has been officialy released, the stable version is always frozen and is no longer developed.
+
+New functionalities, bug and issue fixings are further made in the development version (currently 0.8), which can also be [downloaded](https://qelectrotech.org/download.html).
+
+Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partialy implemented until they are done!
+
+### License
+
+The software is licensed under [GNU/GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).  
+You are free to use, copy, modify and redistribute it under the terms of the license.
+
+
+Like many other open source softwares, QElectroTech is provided as it is, without any warranty.
+
+### Development / technical choices
+
+The development follows the classical way of free and open source software: the source code, written by a community of users, is freely accessible.
+
+Here are the technical choices made for the software development:
+
+*   Integrated development environment: [Qt Framework](https://www.qt.io/ide/)
+*   Libraries: Qt 5.x
+*   [KF5 Framework](https://github.com/KDE)  
+    [Cmake](https://cmake.org/install/)   
+    [kcoreaddons](https://github.com/KDE/kcoreaddons)   
+    [kwidgetsaddons](https://github.com/KDE/kwidgetsaddons).  
+*   Coding language: [C++](https://en.wikipedia.org/wiki/C%2B%2B)
+*   GUI translations: [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html)
+*   Version control: [GIT](https://git.tuxfamily.org/qet/qet.git/)
+*   File format for projects, elements and titleblocks: [XML](http://www.w3schools.com/xml/xml_whatis.asp)
+*   Main development platform: [GNU/Linux](http://getgnulinux.org/en/linux/)
+*   Targeted platforms: Windows, GNU/Linux, Mac OS X, BSDs
+*   [Forum](https://qelectrotech.org/forum/index.php)
+*   [Wiki](https://qelectrotech.org/wiki_new/)
+*   [Mantis_bugtracker](https://qelectrotech.org/bugtracker/my_view_page.php)
+
+If you wish to be informed of the latest developments, browse the [archive](https://listengine.tuxfamily.org/lists.tuxfamily.org/qet/) of the project mailing list where all commits (changes) are registered. This archive is publicly available, you don't need any account to access it.
+
+
+# Features
+
+QElectroTech is a free and open source software.  
+No need to worry about restrictive licensing, privacy violation or dependency on a company.  
+Zero cost and no licensing fees!  
+But you are welcome to make a donation to support the development
+
+QElectroTech runs on the 3 most widespread operating systems for desktop computers in the world.  
+Files that were created on an OS can be edited on another OS without any conversion or restriction.  
+MS Windows users can even run the "ready-to-use" version of QElectroTech from an external medium with no need to install it on an access restricted computer.
+
+
+Take advantage of the modern GUI
+
+Toolbars and panels can be enabled/disabled, moved and displayed the way you want to work.  
+Panels can be stacked on each other (as tabs) or docked on the sides (as docks) or completely separated from the main window (as windows).  
+The GUI can fit to small or big screens, and even to multi-display configurations.
+![](https://download.tuxfamily.org/qet/images-features/0030.png "GUI overview")
+
+
+The GUI of QElectroTech is translated in 19 languages.  
+You only need to restart the application for the new selected language to take effect.
+![](https://download.tuxfamily.org/qet/images-features/0040.png "Lang menu")
+
+Create technical documentation in professional quality
+
+Size, look and informations of the folios (sheets) are fully configurable.  
+You can set vertical and horizontal headers (printed rulers) individually on and off, set number of columns and rows, and set width/height of each column/row.
+
+Titlebocks can be created and edited with the embedded titleblock editor to perfectly suit your needs.  
+Custom variables can be defined to display the informations you wish in the titleblock.
+![](https://download.tuxfamily.org/qet/images-features/0055.png "Titleblock editor")
+
+With only 2 mouse clicks you can add a full automatic generated table of content.  
+Changes in the documentation are updated on the fly.
+![](https://download.tuxfamily.org/qet/images-features/0060.png "Table of content")
+
+Choose from more than 7.000 symbols...
+The embedded QET collection contains a rich library of electric, logic, pneumatic, hydraulic and fluid symbols.  
+The library grows at every new release thanks to an active user community.
+![](https://download.tuxfamily.org/qet/images-features/0070.png "Collections")
+
+...or create your own collection
+
+The embedded element editor is a nice tool to create your own elements (symbols or anything else).  
+Your own elements are stored in the user collection.
+![](https://download.tuxfamily.org/qet/images-features/0080.png "Element editor")
+
+Quickly find what you need
+
+All collections can quickly be searched with the integrated search engine.  
+Furthermore, the search request can be restricted to the folder of your choice.
+![](https://download.tuxfamily.org/qet/images-features/0090.png "Search engine")
+
+Easily draw complex schematics
+
+To add an element on the drawing area, it only needs a drag & drop from the collection panel.
+![](https://download.tuxfamily.org/qet/images-features/0102.png "Drag and drop")
+
+Elements are automatically connected if they are aligned, or connected from point to point by pulling a conductor with the mouse.
+![](https://download.tuxfamily.org/qet/images-features/0105.png "Conductor connections")
+
+The path of every conductor can be modified by moving its handles with the mouse.
+![](https://download.tuxfamily.org/qet/images-features/0107.png "Conductor handles")
+And of course, you can accurately zoom with the mouse wheel over the drawing area to catch the smallest details.
+
+Link elements together to create cross references
+
+Several types of element can be linked together to display a cross reference text.  
+All types of cross references are automatically updated on the fly, you don't need to think about them if you make changes.
+![](https://download.tuxfamily.org/qet/images-features/0112.png "Cross ref elements")
+To speed up your work, linkable elements are easily searched and shown.
+![](https://download.tuxfamily.org/qet/images-features/0115.png  "Cross ref search")
+
+
+Export informations to a parts list
+Informations of all elements in the project can be exported to a .csv file that can be read and edited by any spreadsheet application.
+![](https://download.tuxfamily.org/qet/images-features/0122.png "Element informations")
+
+This way, you can make your own parts list or bill of material using the full power of a spreadsheet program.
+![](https://download.tuxfamily.org/qet/images-features/0125.png "Spreadsheet")
+Print to pdf and/or export your work to images
+
+Your whole documentation or only selected parts of it can be printed to a real printer or to a pdf file.  
+Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format images.
+
+### And much more:
+
+*   open and edit several projects at the same time
+*   import images (.bmp, .jpg, .png, .svg) in your diagrams
+*   add basic shapes (lines, rectangles, ellipses, polygons) to your drawings
+*   edit the thickness, the line style and the color of conductors
+*   define some autonum patterns for conductors, symbols and folios
+*   take advantage of the open xml standard of elements and projects to create custom tools
+*   search and replace Widget (Ctrl + F) in entire project
+*   conductors num can be exported to csv file.
+*   ***
+
+### Story
+
+The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.  
+Xavier developed the base application itself and made all technical choices about the development.  
+The first version of QET (0.1) was released on 09.03.2008.  
+However, both Xavier and Benoit do not participate anymore in the project since 2013.
+
+Following this period, new developers and contributors took over the project and kept it alive.  
+The development and the many translations are actively maintained.  
+New functionalities and evolutions are planned to make QET ever better.
+
+Nowadays, QET is not only used by many individuals, teachers and students but also by professional electricians and companies all over the world.
+
+  
+### Donate Money
+
+If you love QElectroTech, you can help developers to buy new hardware to test
+and implement new features. Thanks in advance for your generous donations.
+
+For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)  
+or at [leetchi.com](https://www.leetchi.com/c/qelectroteck)
+
+

SingleApplication/CHANGELOG.md

@@ -1,6 +1,54 @@
 Changelog
 =========
 
+__3.0.18__
+----------
+
+* Fallback to standard QApplication class on iOS and Android systems where
+  the library is not supported.
+  
+* Added Build CI tests to verify the library builds successfully on Linux, Windows and MacOS  across multiple Qt versions.
+
+  _Anton Filimonov_
+
+__3.0.17__
+----------
+
+* Fixed compilation warning/error caused by `geteuid()` on unix based systems.
+
+   _Iakov Kirilenko_
+
+* Added CMake support
+
+   _Hennadii Chernyshchyk_
+
+__3.0.16__
+----------
+
+* Use geteuid and getpwuid to get username on Unix, fallback to environment variable.
+
+   _Jonas Kvinge_
+
+__3.0.15__
+----------
+
+* Bug Fix: sendMessage() might return false even though data was actually written.
+
+   _Jonas Kvinge_
+
+__3.0.14__
+----------
+
+* Fixed uninitialised variables in the `SingleApplicationPrivate` constructor.
+
+__3.0.13a__
+----------
+
+* Process socket events asynchronously
+* Fix undefined variable error on Windows
+
+   _Francis Giraldeau_
+
 __3.0.12a__
 ----------
 
@@ -113,7 +161,7 @@ __3.0.1a__
 __v3.0a__
 ---------
 
-*   Depricated secondary instances count.
+*   Deprecated secondary instances count.
 *   Added a sendMessage() method to send a message to the primary instance.
 *   Added a receivedMessage() signal, emitted when a message is received from a
     secondary instance.

SingleApplication/CMakeLists.txt

@@ -0,0 +1,43 @@
+cmake_minimum_required(VERSION 3.1.0)
+
+project(SingleApplication)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+# SingleApplication base class
+set(QAPPLICATION_CLASS QCoreApplication CACHE STRING "Inheritance class for SingleApplication")
+set_property(CACHE QAPPLICATION_CLASS PROPERTY STRINGS QApplication QGuiApplication QCoreApplication)
+
+# Libary target
+add_library(${PROJECT_NAME} STATIC
+    singleapplication.cpp
+    singleapplication_p.cpp
+    )
+
+# Find dependencies
+find_package(Qt5Network)
+if(QAPPLICATION_CLASS STREQUAL QApplication)
+    find_package(Qt5 COMPONENTS Widgets REQUIRED)
+elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
+    find_package(Qt5 COMPONENTS Gui REQUIRED)
+else()
+    find_package(Qt5 COMPONENTS Core REQUIRED)
+endif()
+add_compile_definitions(QAPPLICATION_CLASS=${QAPPLICATION_CLASS})
+
+# Link dependencies
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Network)
+if(QAPPLICATION_CLASS STREQUAL QApplication)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
+elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Gui)
+else()
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core)
+endif()
+
+if(WIN32)
+    target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
+endif()
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

SingleApplication/README.md

@@ -50,15 +50,27 @@ how:
 git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
 ```
 
-Then include the `singleapplication.pri` file in your `.pro` project file. Also
+**Qmake:**
-don't forget to specify which `QCoreApplication` class your app is using if it
+
-is not `QCoreApplication`.
+Then include the `singleapplication.pri` file in your `.pro` project file.
 
 ```qmake
 include(singleapplication/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
 ```
 
+**CMake:**
+
+Then include the subdirectory in your `CMakeLists.txt` project file.
+
+```cmake
+set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
+add_subdirectory(src/third-party/singleapplication)
+```
+
+Also don't forget to specify which `QCoreApplication` class your app is using if it
+is not `QCoreApplication` as in examples above.
+
 The `Instance Started` signal
 ------------------------
 

SingleApplication/Windows.md

@@ -24,7 +24,7 @@ Here is an example:
 ```cpp
 if( app.isSecondary() ) {
     // This API requires LIBS += User32.lib to be added to the project
-    AllowSetForegroundWindow( DWORD( app.getPrimaryPid() ) );
+    AllowSetForegroundWindow( DWORD( app.primaryPid() ) );
 }
 
 if( app.isPrimary() ) {

SingleApplication/singleapplication.cpp

@@ -25,7 +25,10 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QByteArray>
 #include <QtCore/QSharedMemory>
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
+#else
+#include <QRandomGenerator>
+#endif
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
@@ -37,91 +40,103 @@
  * @param {bool} allowSecondaryInstances
  */
 SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout )
-    : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
+	: app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
 	
-    // Store the current mode of the program
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    d->options = options;
+	// On Android and iOS since the library is not supported fallback to
+	// standard QApplication behaviour by simply returning at this point.
+	qWarning() << "SingleApplication is not supported on Android and iOS systems.";
+	return;
+#endif
 	
-    // Generating an application ID used for identifying the shared memory
+	// Store the current mode of the program
-    // block and QLocalServer
+	d->options = options;
-    d->genBlockServerName();
+	
+	// Generating an application ID used for identifying the shared memory
+	// block and QLocalServer
+	d->genBlockServerName();
 	
 #ifdef Q_OS_UNIX
-    // By explicitly attaching it and then deleting it we make sure that the
+	// By explicitly attaching it and then deleting it we make sure that the
-    // memory is deleted even after the process has crashed on Unix.
+	// memory is deleted even after the process has crashed on Unix.
-    d->memory = new QSharedMemory( d->blockServerName );
+	d->memory = new QSharedMemory( d->blockServerName );
-    d->memory->attach();
+	d->memory->attach();
-    delete d->memory;
+	delete d->memory;
 #endif
-    // Guarantee thread safe behaviour with a shared memory block.
+	// Guarantee thread safe behaviour with a shared memory block.
-    d->memory = new QSharedMemory( d->blockServerName );
+	d->memory = new QSharedMemory( d->blockServerName );
 	
-    // Create a shared memory block
+	// Create a shared memory block
-    if( d->memory->create( sizeof( InstancesInfo ) ) ) {
+	if( d->memory->create( sizeof( InstancesInfo ) ) ) {
-        // Initialize the shared memory block
+		// Initialize the shared memory block
-        d->memory->lock();
+		d->memory->lock();
-        d->initializeMemoryBlock();
+		d->initializeMemoryBlock();
-        d->memory->unlock();
+		d->memory->unlock();
-    } else {
+	} else {
-        // Attempt to attach to the memory segment
+		// Attempt to attach to the memory segment
-        if( ! d->memory->attach() ) {
+		if( ! d->memory->attach() ) {
-            qCritical() << "SingleApplication: Unable to attach to shared memory block.";
+			qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-            qCritical() << d->memory->errorString();
+			qCritical() << d->memory->errorString();
-            delete d;
+			delete d;
-            ::exit( EXIT_FAILURE );
+			::exit( EXIT_FAILURE );
-        }
+		}
-    }
+	}
 	
-    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
+	InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QTime time;
+	QElapsedTimer time;
-    time.start();
+	time.start();
 	
-    // Make sure the shared memory block is initialised and in consistent state
+	// Make sure the shared memory block is initialised and in consistent state
-    while( true ) {
+	while( true ) {
-        d->memory->lock();
+		d->memory->lock();
 		
-        if( d->blockChecksum() == inst->checksum ) break;
+		if( d->blockChecksum() == inst->checksum ) break;
 		
-        if( time.elapsed() > 5000 ) {
+		if( time.elapsed() > 5000 ) {
-            qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
+			qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
-            d->initializeMemoryBlock();
+			d->initializeMemoryBlock();
-        }
+		}
 		
-        d->memory->unlock();
+		d->memory->unlock();
 		
-        // Random sleep here limits the probability of a collision between two racing apps
+		// Random sleep here limits the probability of a collision between two racing apps
-        qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
-        QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
+		qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
-    }
+		QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
+#else
+		quint32 value = QRandomGenerator::global()->generate();
+		QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( value ) / RAND_MAX * 10 ) );
+#endif
+	}
 	
-    if( inst->primary == false) {
+	if( inst->primary == false) {
-        d->startPrimary();
+		d->startPrimary();
-        d->memory->unlock();
+		d->memory->unlock();
-        return;
+		return;
-    }
+	}
 	
-    // Check if another instance can be started
+	// Check if another instance can be started
-    if( allowSecondary ) {
+	if( allowSecondary ) {
-        inst->secondary += 1;
+		inst->secondary += 1;
-        inst->checksum = d->blockChecksum();
+		inst->checksum = d->blockChecksum();
-        d->instanceNumber = inst->secondary;
+		d->instanceNumber = inst->secondary;
-        d->startSecondary();
+		d->startSecondary();
-        if( d->options & Mode::SecondaryNotification ) {
+		if( d->options & Mode::SecondaryNotification ) {
-            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
+			d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
-        }
+		}
-        d->memory->unlock();
+		d->memory->unlock();
-        return;
+		return;
-    }
+	}
 	
-    d->memory->unlock();
+	d->memory->unlock();
 	
-    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+	d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
 	
-    delete d;
+	delete d;
 	
-    ::exit( EXIT_SUCCESS );
+	::exit( EXIT_SUCCESS );
 }
 
 /**
@@ -129,46 +144,46 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
  */
 SingleApplication::~SingleApplication()
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
-    delete d;
+	delete d;
 }
 
 bool SingleApplication::isPrimary()
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
-    return d->server != nullptr;
+	return d->server != nullptr;
 }
 
 bool SingleApplication::isSecondary()
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
-    return d->server == nullptr;
+	return d->server == nullptr;
 }
 
 quint32 SingleApplication::instanceId()
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
-    return d->instanceNumber;
+	return d->instanceNumber;
 }
 
 qint64 SingleApplication::primaryPid()
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
-    return d->primaryPid();
+	return d->primaryPid();
 }
 
 bool SingleApplication::sendMessage( QByteArray message, int timeout )
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
 	
-    // Nobody to connect to
+	// Nobody to connect to
-    if( isPrimary() ) return false;
+	if( isPrimary() ) return false;
 	
-    // Make sure the socket is connected
+	// Make sure the socket is connected
-    d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
+	d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
 	
-    d->socket->write( message );
+	d->socket->write( message );
-    bool dataWritten = d->socket->flush();
+	bool dataWritten = d->socket->waitForBytesWritten( timeout );
-    d->socket->waitForBytesWritten( timeout );
+	d->socket->flush();
-    return dataWritten;
+	return dataWritten;
 }

SingleApplication/singleapplication.h

@@ -25,6 +25,7 @@
 
 #include <QtCore/QtGlobal>
 #include <QtNetwork/QLocalSocket>
+#include <QElapsedTimer>
 
 #ifndef QAPPLICATION_CLASS
   #define QAPPLICATION_CLASS QCoreApplication
@@ -35,99 +36,99 @@
 class SingleApplicationPrivate;
 
 /**
- * @brief The SingleApplication class handles multipe instances of the same
+ * @brief The SingleApplication class handles multiple instances of the same
  * Application
  * @see QCoreApplication
  */
 class SingleApplication : public QAPPLICATION_CLASS
 {
-    Q_OBJECT
+	Q_OBJECT
 	
-    typedef QAPPLICATION_CLASS app_t;
+	typedef QAPPLICATION_CLASS app_t;
 	
-public:
+	public:
-    /**
+	/**
-     * @brief Mode of operation of SingleApplication.
+	 * @brief Mode of operation of SingleApplication.
-     * Whether the block should be user-wide or system-wide and whether the
+	 * Whether the block should be user-wide or system-wide and whether the
-     * primary instance should be notified when a secondary instance had been
+	 * primary instance should be notified when a secondary instance had been
-     * started.
+	 * started.
-     * @note Operating system can restrict the shared memory blocks to the same
+	 * @note Operating system can restrict the shared memory blocks to the same
-     * user, in which case the User/System modes will have no effect and the
+	 * user, in which case the User/System modes will have no effect and the
-     * block will be user wide.
+	 * block will be user wide.
-     * @enum
+	 * @enum
-     */
+	 */
-    enum Mode {
+	enum Mode {
-        User                    = 1 << 0,
+		User                    = 1 << 0,
-        System                  = 1 << 1,
+		System                  = 1 << 1,
-        SecondaryNotification   = 1 << 2,
+		SecondaryNotification   = 1 << 2,
-        ExcludeAppVersion       = 1 << 3,
+		ExcludeAppVersion       = 1 << 3,
-        ExcludeAppPath          = 1 << 4
+		ExcludeAppPath          = 1 << 4
-    };
+	};
-    Q_DECLARE_FLAGS(Options, Mode)
+	Q_DECLARE_FLAGS(Options, Mode)
 	
-    /**
+	/**
-     * @brief Intitializes a SingleApplication instance with argc command line
+	 * @brief Intitializes a SingleApplication instance with argc command line
-     * arguments in argv
+	 * arguments in argv
-     * @arg {int &} argc - Number of arguments in argv
+	 * @arg {int &} argc - Number of arguments in argv
-     * @arg {const char *[]} argv - Supplied command line arguments
+	 * @arg {const char *[]} argv - Supplied command line arguments
-     * @arg {bool} allowSecondary - Whether to start the instance as secondary
+	 * @arg {bool} allowSecondary - Whether to start the instance as secondary
-     * if there is already a primary instance.
+	 * if there is already a primary instance.
-     * @arg {Mode} mode - Whether for the SingleApplication block to be applied
+	 * @arg {Mode} mode - Whether for the SingleApplication block to be applied
-     * User wide or System wide.
+	 * User wide or System wide.
-     * @arg {int} timeout - Timeout to wait in miliseconds.
+	 * @arg {int} timeout - Timeout to wait in milliseconds.
-     * @note argc and argv may be changed as Qt removes arguments that it
+	 * @note argc and argv may be changed as Qt removes arguments that it
-     * recognizes
+	 * recognizes
-     * @note Mode::SecondaryNotification only works if set on both the primary
+	 * @note Mode::SecondaryNotification only works if set on both the primary
-     * instance and the secondary instance.
+	 * instance and the secondary instance.
-     * @note The timeout is just a hint for the maximum time of blocking
+	 * @note The timeout is just a hint for the maximum time of blocking
-     * operations. It does not guarantee that the SingleApplication
+	 * operations. It does not guarantee that the SingleApplication
-     * initialisation will be completed in given time, though is a good hint.
+	 * initialisation will be completed in given time, though is a good hint.
-     * Usually 4*timeout would be the worst case (fail) scenario.
+	 * Usually 4*timeout would be the worst case (fail) scenario.
-     * @see See the corresponding QAPPLICATION_CLASS constructor for reference
+	 * @see See the corresponding QAPPLICATION_CLASS constructor for reference
-     */
+	 */
-    explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
+	explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
-    ~SingleApplication();
+	~SingleApplication();
 	
-    /**
+	/**
-     * @brief Returns if the instance is the primary instance
+	 * @brief Returns if the instance is the primary instance
-     * @returns {bool}
+	 * @returns {bool}
-     */
+	 */
-    bool isPrimary();
+	bool isPrimary();
 	
-    /**
+	/**
-     * @brief Returns if the instance is a secondary instance
+	 * @brief Returns if the instance is a secondary instance
-     * @returns {bool}
+	 * @returns {bool}
-     */
+	 */
-    bool isSecondary();
+	bool isSecondary();
 	
-    /**
+	/**
-     * @brief Returns a unique identifier for the current instance
+	 * @brief Returns a unique identifier for the current instance
-     * @returns {qint32}
+	 * @returns {qint32}
-     */
+	 */
-    quint32 instanceId();
+	quint32 instanceId();
 	
-    /**
+	/**
-     * @brief Returns the process ID (PID) of the primary instance
+	 * @brief Returns the process ID (PID) of the primary instance
-     * @returns {qint64}
+	 * @returns {qint64}
-     */
+	 */
-    qint64 primaryPid();
+	qint64 primaryPid();
 	
-    /**
+	/**
-     * @brief Sends a message to the primary instance. Returns true on success.
+	 * @brief Sends a message to the primary instance. Returns true on success.
-     * @param {int} timeout - Timeout for connecting
+	 * @param {int} timeout - Timeout for connecting
-     * @returns {bool}
+	 * @returns {bool}
-     * @note sendMessage() will return false if invoked from the primary
+	 * @note sendMessage() will return false if invoked from the primary
-     * instance.
+	 * instance.
-     */
+	 */
-    bool sendMessage( QByteArray message, int timeout = 100 );
+	bool sendMessage( QByteArray message, int timeout = 100 );
 	
-Q_SIGNALS:
+	Q_SIGNALS:
-    void instanceStarted();
+	void instanceStarted();
-    void receivedMessage( quint32 instanceId, QByteArray message );
+	void receivedMessage( quint32 instanceId, QByteArray message );
 	
-private:
+	private:
-    SingleApplicationPrivate *d_ptr;
+	SingleApplicationPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(SingleApplication)
+	Q_DECLARE_PRIVATE(SingleApplication)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)

SingleApplication/singleapplication_p.cpp

@@ -33,11 +33,8 @@
 #include <cstddef>
 
 #include <QtCore/QDir>
-#include <QtCore/QProcess>
 #include <QtCore/QByteArray>
-#include <QtCore/QSemaphore>
 #include <QtCore/QDataStream>
-#include <QtCore/QStandardPaths>
 #include <QtCore/QCryptographicHash>
 #include <QtNetwork/QLocalServer>
 #include <QtNetwork/QLocalSocket>
@@ -45,134 +42,140 @@
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
+#ifdef Q_OS_UNIX
+    #include <unistd.h>
+    #include <sys/types.h>
+    #include <pwd.h>
+#endif
+
 #ifdef Q_OS_WIN
-    #include <windows.h>
+#include <windows.h>
-    #include <lmcons.h>
+#include <lmcons.h>
 #endif
 
 SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
-    : q_ptr( q_ptr )
+	: q_ptr( q_ptr )
 {
-    server = nullptr;
+	server = nullptr;
-    socket = nullptr;
+	socket = nullptr;
+	memory = nullptr;
+	instanceNumber = -1;
 }
 
 SingleApplicationPrivate::~SingleApplicationPrivate()
 {
-    if( socket != nullptr ) {
+	if( socket != nullptr ) {
-        socket->close();
+		socket->close();
-        delete socket;
+		delete socket;
-    }
+	}
 	
-    memory->lock();
+	memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+	InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-    if( server != nullptr ) {
+	if( server != nullptr ) {
-        server->close();
+		server->close();
-        delete server;
+		delete server;
-        inst->primary = false;
+		inst->primary = false;
-        inst->primaryPid = -1;
+		inst->primaryPid = -1;
-        inst->checksum = blockChecksum();
+		inst->checksum = blockChecksum();
-    }
+	}
-    memory->unlock();
+	memory->unlock();
 	
-    delete memory;
+	delete memory;
 }
 
 void SingleApplicationPrivate::genBlockServerName()
 {
-    QCryptographicHash appData( QCryptographicHash::Sha256 );
+	QCryptographicHash appData( QCryptographicHash::Sha256 );
-    appData.addData( "SingleApplication", 17 );
+	appData.addData( "SingleApplication", 17 );
-    appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
+	appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
-    appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
+	appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
-    appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
+	appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
 	
-    if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ) {
+	if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ) {
-        appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
+		appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
-    }
+	}
 	
-    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
+	if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
 #ifdef Q_OS_WIN
-        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
+		appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
 #else
-        appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
+		appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
 #endif
-    }
+	}
 	
-    // User level block requires a user specific data in the hash
+	// User level block requires a user specific data in the hash
-    if( options & SingleApplication::Mode::User ) {
+	if( options & SingleApplication::Mode::User ) {
 #ifdef Q_OS_WIN
-        wchar_t username [ UNLEN + 1 ];
+		wchar_t username [ UNLEN + 1 ];
-        // Specifies size of the buffer on input
+		// Specifies size of the buffer on input
-        DWORD usernameLength = UNLEN + 1;
+		DWORD usernameLength = UNLEN + 1;
-        if( GetUserNameW( username, &usernameLength ) ) {
+		if( GetUserNameW( username, &usernameLength ) ) {
-            appData.addData( QString::fromWCharArray(username).toUtf8() );
+			appData.addData( QString::fromWCharArray(username).toUtf8() );
-        } else {
+		} else {
-            appData.addData( QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).join("").toUtf8() );
+			appData.addData( qgetenv("USERNAME") );
-        }
+		}
 #endif
 #ifdef Q_OS_UNIX
-        QProcess process;
+		QByteArray username;
-        process.start( "whoami" );
+		uid_t uid = geteuid();
-        if( process.waitForFinished( 100 ) &&
+		struct passwd *pw = getpwuid(uid);
-            process.exitCode() == QProcess::NormalExit) {
+		if( pw ) {
-            appData.addData( process.readLine() );
+			username = pw->pw_name;
-        } else {
+		}
-            appData.addData(
+		if( username.isEmpty() ) {
-                QDir(
+			username = qgetenv("USER");
-                    QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
+		}
-                ).absolutePath().toUtf8()
+		appData.addData(username);
-            );
-        }
 #endif
-    }
+	}
 	
-    // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
+	// Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
-    // server naming requirements.
+	// server naming requirements.
-    blockServerName = appData.result().toBase64().replace("/", "_");
+	blockServerName = appData.result().toBase64().replace("/", "_");
 }
 
 void SingleApplicationPrivate::initializeMemoryBlock()
 {
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-    inst->primary = false;
+	inst->primary = false;
-    inst->secondary = 0;
+	inst->secondary = 0;
-    inst->primaryPid = -1;
+	inst->primaryPid = -1;
-    inst->checksum = blockChecksum();
+	inst->checksum = blockChecksum();
 }
 
 void SingleApplicationPrivate::startPrimary()
 {
-    Q_Q(SingleApplication);
+	Q_Q(SingleApplication);
 	
-    // Successful creation means that no main process exists
+	// Successful creation means that no main process exists
-    // So we start a QLocalServer to listen for connections
+	// So we start a QLocalServer to listen for connections
-    QLocalServer::removeServer( blockServerName );
+	QLocalServer::removeServer( blockServerName );
-    server = new QLocalServer();
+	server = new QLocalServer();
 	
-    // Restrict access to the socket according to the
+	// Restrict access to the socket according to the
-    // SingleApplication::Mode::User flag on User level or no restrictions
+	// SingleApplication::Mode::User flag on User level or no restrictions
-    if( options & SingleApplication::Mode::User ) {
+	if( options & SingleApplication::Mode::User ) {
-      server->setSocketOptions( QLocalServer::UserAccessOption );
+		server->setSocketOptions( QLocalServer::UserAccessOption );
-    } else {
+	} else {
-      server->setSocketOptions( QLocalServer::WorldAccessOption );
+		server->setSocketOptions( QLocalServer::WorldAccessOption );
-    }
+	}
 	
-    server->listen( blockServerName );
+	server->listen( blockServerName );
-    QObject::connect(
+	QObject::connect(
-        server,
+				server,
-        &QLocalServer::newConnection,
+				&QLocalServer::newConnection,
-        this,
+				this,
-        &SingleApplicationPrivate::slotConnectionEstablished
+				&SingleApplicationPrivate::slotConnectionEstablished
-    );
+				);
 	
-    // Reset the number of connections
+	// Reset the number of connections
-    InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
+	InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
 	
-    inst->primary = true;
+	inst->primary = true;
-    inst->primaryPid = q->applicationPid();
+	inst->primaryPid = q->applicationPid();
-    inst->checksum = blockChecksum();
+	inst->checksum = blockChecksum();
 	
-    instanceNumber = 0;
+	instanceNumber = 0;
 }
 
 void SingleApplicationPrivate::startSecondary()
@@ -181,77 +184,77 @@ void SingleApplicationPrivate::startSecondary()
 
 void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
 {
-    // Connect to the Local Server of the Primary Instance if not already
+	// Connect to the Local Server of the Primary Instance if not already
-    // connected.
+	// connected.
-    if( socket == nullptr ) {
+	if( socket == nullptr ) {
-        socket = new QLocalSocket();
+		socket = new QLocalSocket();
-    }
+	}
 	
-    // If already connected - we are done;
+	// If already connected - we are done;
-    if( socket->state() == QLocalSocket::ConnectedState )
+	if( socket->state() == QLocalSocket::ConnectedState )
-        return;
+		return;
 	
-    // If not connect
+	// If not connect
-    if( socket->state() == QLocalSocket::UnconnectedState ||
+	if( socket->state() == QLocalSocket::UnconnectedState ||
-        socket->state() == QLocalSocket::ClosingState ) {
+		socket->state() == QLocalSocket::ClosingState ) {
-        socket->connectToServer( blockServerName );
+		socket->connectToServer( blockServerName );
-    }
+	}
 	
-    // Wait for being connected
+	// Wait for being connected
-    if( socket->state() == QLocalSocket::ConnectingState ) {
+	if( socket->state() == QLocalSocket::ConnectingState ) {
-        socket->waitForConnected( msecs );
+		socket->waitForConnected( msecs );
-    }
+	}
 	
-    // Initialisation message according to the SingleApplication protocol
+	// Initialisation message according to the SingleApplication protocol
-    if( socket->state() == QLocalSocket::ConnectedState ) {
+	if( socket->state() == QLocalSocket::ConnectedState ) {
-        // Notify the parent that a new instance had been started;
+		// Notify the parent that a new instance had been started;
-        QByteArray initMsg;
+		QByteArray initMsg;
-        QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+		QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
 		
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        writeStream.setVersion(QDataStream::Qt_5_6);
+		writeStream.setVersion(QDataStream::Qt_5_6);
 #endif
 		
-        writeStream << blockServerName.toLatin1();
+		writeStream << blockServerName.toLatin1();
-        writeStream << static_cast<quint8>(connectionType);
+		writeStream << static_cast<quint8>(connectionType);
-        writeStream << instanceNumber;
+		writeStream << instanceNumber;
-        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
+		quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-        writeStream << checksum;
+		writeStream << checksum;
 		
-        // The header indicates the message length that follows
+		// The header indicates the message length that follows
-        QByteArray header;
+		QByteArray header;
-        QDataStream headerStream(&header, QIODevice::WriteOnly);
+		QDataStream headerStream(&header, QIODevice::WriteOnly);
 		
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        headerStream.setVersion(QDataStream::Qt_5_6);
+		headerStream.setVersion(QDataStream::Qt_5_6);
 #endif
-        headerStream << static_cast <quint64>( initMsg.length() );
+		headerStream << static_cast <quint64>( initMsg.length() );
 		
-        socket->write( header );
+		socket->write( header );
-        socket->write( initMsg );
+		socket->write( initMsg );
-        socket->flush();
+		socket->flush();
-        socket->waitForBytesWritten( msecs );
+		socket->waitForBytesWritten( msecs );
-    }
+	}
 }
 
 quint16 SingleApplicationPrivate::blockChecksum()
 {
-    return qChecksum(
+	return qChecksum(
-       static_cast <const char *>( memory->data() ),
+				static_cast <const char *>( memory->data() ),
-       offsetof( InstancesInfo, checksum )
+				offsetof( InstancesInfo, checksum )
-   );
+				);
 }
 
 qint64 SingleApplicationPrivate::primaryPid()
 {
-    qint64 pid;
+	qint64 pid;
 	
-    memory->lock();
+	memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-    pid = inst->primaryPid;
+	pid = inst->primaryPid;
-    memory->unlock();
+	memory->unlock();
 	
-    return pid;
+	return pid;
 }
 
 /**
@@ -259,145 +262,144 @@ qint64 SingleApplicationPrivate::primaryPid()
  */
 void SingleApplicationPrivate::slotConnectionEstablished()
 {
-    QLocalSocket *nextConnSocket = server->nextPendingConnection();
+	QLocalSocket *nextConnSocket = server->nextPendingConnection();
-    connectionMap.insert(nextConnSocket, ConnectionInfo());
+	connectionMap.insert(nextConnSocket, ConnectionInfo());
 	
-    QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
+	QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-        [nextConnSocket, this]() {
+					 [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
+		auto &info = connectionMap[nextConnSocket];
-            Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
+		Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
-        }
+	}
-    );
+	);
 	
-    QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
+	QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-        [nextConnSocket, this](){
+					 [nextConnSocket, this](){
-            connectionMap.remove(nextConnSocket);
+		connectionMap.remove(nextConnSocket);
-            nextConnSocket->deleteLater();
+		nextConnSocket->deleteLater();
-        }
+	}
-    );
+	);
 	
-    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
+	QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-        [nextConnSocket, this]() {
+					 [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
+		auto &info = connectionMap[nextConnSocket];
-            switch(info.stage) {
+		switch(info.stage) {
-            case StageHeader:
+			case StageHeader:
-                readInitMessageHeader(nextConnSocket);
+				readInitMessageHeader(nextConnSocket);
-                break;
+				break;
-            case StageBody:
+			case StageBody:
-                readInitMessageBody(nextConnSocket);
+				readInitMessageBody(nextConnSocket);
-                break;
+				break;
-            case StageConnected:
+			case StageConnected:
-                Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
+				Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
-                break;
+				break;
-            default:
+			default:
-                break;
+				break;
-            };
+		};
-        }
+	}
-    );
+	);
 }
 
 void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
 {
-    if (!connectionMap.contains( sock )) {
+	if (!connectionMap.contains( sock )) {
-        return;
+		return;
-    }
+	}
 	
-    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
+	if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
-        return;
+		return;
-    }
+	}
 	
-    QDataStream headerStream( sock );
+	QDataStream headerStream( sock );
 	
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
+	headerStream.setVersion( QDataStream::Qt_5_6 );
 #endif
 	
-    // Read the header to know the message length
+	// Read the header to know the message length
-    quint64 msgLen = 0;
+	quint64 msgLen = 0;
-    headerStream >> msgLen;
+	headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
+	ConnectionInfo &info = connectionMap[sock];
-    info.stage = StageBody;
+	info.stage = StageBody;
-    info.msgLen = msgLen;
+	info.msgLen = msgLen;
 	
-    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
+	if ( sock->bytesAvailable() >= (qint64) msgLen ) {
-        readInitMessageBody( sock );
+		readInitMessageBody( sock );
-    }
+	}
 }
 
 void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
 {
-    Q_Q(SingleApplication);
+	Q_Q(SingleApplication);
 	
-    if (!connectionMap.contains( sock )) {
+	if (!connectionMap.contains( sock )) {
-        return;
+		return;
-    }
+	}
 	
-    ConnectionInfo &info = connectionMap[sock];
+	ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
+	if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
-        return;
+		return;
-    }
+	}
 	
-    // Read the message body
+	// Read the message body
-    QByteArray msgBytes = sock->read(info.msgLen);
+	QByteArray msgBytes = sock->read(info.msgLen);
-    QDataStream readStream(msgBytes);
+	QDataStream readStream(msgBytes);
 	
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
+	readStream.setVersion( QDataStream::Qt_5_6 );
 #endif
 	
-    // server name
+	// server name
-    QByteArray latin1Name;
+	QByteArray latin1Name;
-    readStream >> latin1Name;
+	readStream >> latin1Name;
 	
-    // connection type
+	// connection type
-    ConnectionType connectionType = InvalidConnection;
+	ConnectionType connectionType = InvalidConnection;
-    quint8 connTypeVal = InvalidConnection;
+	quint8 connTypeVal = InvalidConnection;
-    readStream >> connTypeVal;
+	readStream >> connTypeVal;
-    connectionType = static_cast <ConnectionType>( connTypeVal );
+	connectionType = static_cast <ConnectionType>( connTypeVal );
 	
-    // instance id
+	// instance id
-    quint32 instanceId = 0;
+	quint32 instanceId = 0;
-    readStream >> instanceId;
+	readStream >> instanceId;
 	
-    // checksum
+	// checksum
-    quint16 msgChecksum = 0;
+	quint16 msgChecksum = 0;
-    readStream >> msgChecksum;
+	readStream >> msgChecksum;
 	
-    const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
+	const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
 	
-    bool isValid = readStream.status() == QDataStream::Ok &&
+	bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
+			QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
+			msgChecksum == actualChecksum;
 	
-    if( !isValid ) {
+	if( !isValid ) {
-        sock->close();
+		sock->close();
-        return;
+		return;
-    }
+	}
 	
-    info.instanceId = instanceId;
+	info.instanceId = instanceId;
-    info.stage = StageConnected;
+	info.stage = StageConnected;
 	
-    if( connectionType == NewInstance ||
+	if( connectionType == NewInstance ||
-        ( connectionType == SecondaryInstance &&
+		( connectionType == SecondaryInstance &&
-          options & SingleApplication::Mode::SecondaryNotification ) )
+		  options & SingleApplication::Mode::SecondaryNotification ) )
-    {
+	{
-        Q_EMIT q->instanceStarted();
+		Q_EMIT q->instanceStarted();
-    }
+	}
 	
-    if (sock->bytesAvailable() > 0) {
+	if (sock->bytesAvailable() > 0) {
-			//This line crash
+		Q_EMIT this->slotDataAvailable( sock, instanceId );
-        //Q_EMIT this->slotDataAvailable( sock, instanceId );
+	}
-    }
 }
 
 void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
 {
-    Q_Q(SingleApplication);
+	Q_Q(SingleApplication);
-    Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
+	Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
 }
 
 void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
 {
-    if( closedSocket->bytesAvailable() > 0 )
+	if( closedSocket->bytesAvailable() > 0 )
-        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
+		Q_EMIT slotDataAvailable( closedSocket, instanceId  );
 }

SingleApplication/singleapplication_p.h

@@ -38,62 +38,62 @@
 #include "singleapplication.h"
 
 struct InstancesInfo {
-    bool primary;
+	bool primary;
-    quint32 secondary;
+	quint32 secondary;
-    qint64 primaryPid;
+	qint64 primaryPid;
-    quint16 checksum;
+	quint16 checksum;
 };
 
 struct ConnectionInfo {
-    explicit ConnectionInfo() :
+	explicit ConnectionInfo() :
-        msgLen(0), instanceId(0), stage(0) {}
+		msgLen(0), instanceId(0), stage(0) {}
-    qint64 msgLen;
+	qint64 msgLen;
-    quint32 instanceId;
+	quint32 instanceId;
-    quint8 stage;
+	quint8 stage;
 };
 
 class SingleApplicationPrivate : public QObject {
-Q_OBJECT
+	Q_OBJECT
-public:
+	public:
-    enum ConnectionType : quint8 {
+	enum ConnectionType : quint8 {
-        InvalidConnection = 0,
+		InvalidConnection = 0,
-        NewInstance = 1,
+		NewInstance = 1,
-        SecondaryInstance = 2,
+		SecondaryInstance = 2,
-        Reconnect = 3
+		Reconnect = 3
-    };
+	};
-    enum ConnectionStage : quint8 {
+	enum ConnectionStage : quint8 {
-        StageHeader = 0,
+		StageHeader = 0,
-        StageBody = 1,
+		StageBody = 1,
-        StageConnected = 2,
+		StageConnected = 2,
-    };
+	};
-    Q_DECLARE_PUBLIC(SingleApplication)
+	Q_DECLARE_PUBLIC(SingleApplication)
 	
-    SingleApplicationPrivate( SingleApplication *q_ptr );
+	SingleApplicationPrivate( SingleApplication *q_ptr );
-     ~SingleApplicationPrivate();
+	~SingleApplicationPrivate();
 	
-    void genBlockServerName();
+	void genBlockServerName();
-    void initializeMemoryBlock();
+	void initializeMemoryBlock();
-    void startPrimary();
+	void startPrimary();
-    void startSecondary();
+	void startSecondary();
-    void connectToPrimary(int msecs, ConnectionType connectionType );
+	void connectToPrimary(int msecs, ConnectionType connectionType );
-    quint16 blockChecksum();
+	quint16 blockChecksum();
-    qint64 primaryPid();
+	qint64 primaryPid();
-    void readInitMessageHeader(QLocalSocket *socket);
+	void readInitMessageHeader(QLocalSocket *socket);
-    void readInitMessageBody(QLocalSocket *socket);
+	void readInitMessageBody(QLocalSocket *socket);
 	
-    SingleApplication *q_ptr;
+	SingleApplication *q_ptr;
-    QSharedMemory *memory;
+	QSharedMemory *memory;
-    QLocalSocket *socket;
+	QLocalSocket *socket;
-    QLocalServer *server;
+	QLocalServer *server;
-    quint32 instanceNumber;
+	quint32 instanceNumber;
-    QString blockServerName;
+	QString blockServerName;
-    SingleApplication::Options options;
+	SingleApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+	QMap<QLocalSocket*, ConnectionInfo> connectionMap;
 	
-public Q_SLOTS:
+	public Q_SLOTS:
-    void slotConnectionEstablished();
+	void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
+	void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+	void slotClientConnectionClosed( QLocalSocket*, quint32 );
 };
 
 #endif // SINGLEAPPLICATION_P_H

build-aux/flatpak/org.qelectrotech.QElectroTech.json

@@ -0,0 +1,37 @@
+{
+  "id": "org.qelectrotech.QElectroTech",
+  "runtime": "org.kde.Platform",
+  "runtime-version": "5.14",
+  "sdk": "org.kde.Sdk",
+  "command": "qelectrotech",
+  "rename-desktop-file": "qelectrotech.desktop",
+  "rename-appdata-file": "qelectrotech.appdata.xml",
+  "rename-icon": "qelectrotech",
+  "copy-icon": true,
+  "finish-args": [
+    "--socket=wayland",
+    "--socket=x11",
+    "--device=dri",
+    "--share=ipc",
+    "--filesystem=host"
+  ],
+  "modules": [
+    {
+      "name": "qelectrotech",
+      "buildsystem": "qmake",
+      "post-install": [
+        "mv /app/share/mime/packages/qelectrotech.xml /app/share/mime/packages/org.qelectrotech.QElectroTech.xml"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "../.."
+        },
+        {
+          "type": "patch",
+          "path": "patches/0001-build-Fix-the-installation-paths.patch"
+        }
+      ]
+    }
+  ]
+}

build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch

@@ -0,0 +1,44 @@
+From 579ee22f1d2bef560ec90d324a0e476b81faf495 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <mathieu@hashbang.fr>
+Date: Tue, 7 Jan 2020 14:39:08 +0100
+Subject: [PATCH] build: Fix the installation paths
+
+---
+ qelectrotech.pro | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/qelectrotech.pro b/qelectrotech.pro
+index 07e51fb..2a86b91 100644
+--- a/qelectrotech.pro
++++ b/qelectrotech.pro
+@@ -5,20 +5,20 @@
+ # Chemins utilises pour la compilation et l'installation de QET
+ unix {
+ 	# Chemins UNIX
+-	COMPIL_PREFIX              = '/usr/local/'
+-	INSTALL_PREFIX             = '/usr/local/'
++	COMPIL_PREFIX              = '/app/'
++	INSTALL_PREFIX             = '/app/'
+ 	QET_BINARY_PATH            = 'bin/'
+ 	QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
+ 	QET_COMMON_TBT_PATH        = 'share/qelectrotech/titleblocks/'
+ 	QET_LANG_PATH              = 'share/qelectrotech/lang/'
+ 	QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
+-	QET_LICENSE_PATH           = 'doc/qelectrotech/'
+-	QET_MIME_XML_PATH          = '../share/mime/application/'
+-	QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
+-	QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
++	QET_LICENSE_PATH           = 'share/doc/qelectrotech/'
++	QET_MIME_XML_PATH          = 'share/mime/application/'
++	QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
++	QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
+ 	QET_DESKTOP_PATH           = 'share/applications/'
+ 	QET_ICONS_PATH             = 'share/icons/hicolor/'
+-	QET_MAN_PATH               = 'man/'
++	QET_MAN_PATH               = 'share/man/'
+ 	QET_APPDATA_PATH           = 'share/appdata'
+ }
+ win32 {
+-- 
+2.24.1
+

build-aux/snap/local/launchers/qelectrotech-launch

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# a KDE session forces the KDE Plasma platformtheme which is incompatible with QET
+# unset the ENV vars in that case to prevent loading of the theme
+if [ ! -z "$KDE_FULL_SESSION" ]; then
+  unset KDE_FULL_SESSION
+fi
+
+if echo "$XDG_CURRENT_DESKTOP" | grep -q KDE; then
+  unset XDG_CURRENT_DESKTOP
+fi
+
+# migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
+from="$SNAP_USER_DATA/.qet"
+to="$SNAP_USER_COMMON/.qet"
+if [ ! -d "$to" ] && [ -d "$from" ]; then
+  echo "Migrating user data from $from to $to"
+  mkdir "$to"
+  cp -av "$from/." "$to"
+fi
+
+# link DXFtoQET so that QET finds it
+mkdir -p "$HOME/.qet"
+ln -snf "$SNAP/bin/DXFtoQET" "$HOME/.qet/DXFtoQET"
+
+# start desktop portal. Open & save dialogs might fail if it is not running
+dbus-send --print-reply \
+  --dest=org.freedesktop.DBus \
+  /org/freedesktop/DBus \
+  org.freedesktop.DBus.StartServiceByName \
+  string:org.freedesktop.portal.Desktop \
+  uint32:0
+
+exec "${@}"

build-aux/snap/snapcraft.yaml

@@ -0,0 +1,122 @@
+name: qelectrotech
+title: QElectroTech
+base: core18
+adopt-info: qelectrotech
+license: GPL-2.0
+summary: Electrical diagram editor
+description: |
+  QElectroTech, or QET in short, is a libre and open source desktop application 
+  to create diagrams and schematics.
+
+grade: stable
+confinement: strict
+
+architectures:
+  - build-on: amd64
+    run-on: amd64
+
+layout:
+  /usr/local/share/qelectrotech:
+    symlink: $SNAP/usr/local/share/qelectrotech
+  /usr/share/libdrm/amdgpu.ids:
+    symlink: $SNAP/kf5/usr/share/libdrm/amdgpu.ids
+
+apps:
+  qelectrotech:
+    command: usr/local/bin/qelectrotech
+    command-chain:
+      - bin/qelectrotech-launch
+    desktop: usr/local/share/applications/qelectrotech.desktop
+    extensions: [kde-neon]
+    plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
+    environment: &env
+      __EGL_VENDOR_LIBRARY_DIRS: $SNAP/kf5/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
+      TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
+      QT_QPA_PLATFORMTHEME: gtk3
+      QT_AUTO_SCREEN_SCALE_FACTOR: 1
+      HOME: $SNAP_USER_COMMON
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.6/site-packages:$SNAP/usr/lib/python3.6:$SNAP/usr/lib/python3.6/lib-dynload
+
+  qet-tb-generator:
+    command: bin/qelectrotech-launch $SNAP/bin/qet_tb_generator
+    extensions: [kde-neon]
+    plugs: *plugs
+    environment: *env
+      
+  dxf-to-qet:
+    command: bin/DXFtoQET
+    extensions: [kde-neon]
+    plugs: *plugs
+    environment: *env
+
+parts:
+  launchers:
+    plugin: dump
+    source: build-aux/snap/local/launchers
+    organize:
+      '*': bin/
+
+  qet-tb-generator:
+    plugin: python
+    python-version: python3
+    source: https://github.com/qelectrotech/qet_tb_generator.git
+    stage-packages: 
+      - python3-lxml
+      - python3-tk
+      - libtk8.6
+
+  kde-sdk-setup:
+    plugin: nil
+    build-snaps:
+      - kde-frameworks-5-core18-sdk
+    build-packages:
+      - g++
+      - mesa-common-dev
+      - libglvnd-dev
+      - rsync
+    override-build: |
+      rsync -a --ignore-existing /snap/kde-frameworks-5-core18-sdk/current/ /
+      
+  dxf-to-qet:
+    after: [kde-sdk-setup]
+    plugin: nil
+    source: https://github.com/qelectrotech/DXFtoQET-2020.git
+    override-build: |
+      qmake "$SNAPCRAFT_PART_SRC/DXFtoQET.pro"
+      make -j$(nproc)
+      mkdir -p "$SNAPCRAFT_PART_INSTALL/bin"
+      cp DXFtoQET "$SNAPCRAFT_PART_INSTALL/bin/"
+
+  qelectrotech:
+    after: [kde-sdk-setup]
+    plugin: nil
+    source: .
+    build-packages:
+      - git
+    override-pull: |
+      snapcraftctl pull
+      snap_version=$(git describe --dirty)
+      modified_displayed_version=$snap_version".snap"
+      sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
+      snapcraftctl set-version "$snap_version"
+    override-build: |
+      qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
+      make -j$(nproc)
+      make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
+    override-stage: |
+      snapcraftctl stage
+      # patch desktop file with correct icon path
+      SED_CMD="sed -i -E s|^Icon=(.*)|Icon=\${SNAP}/usr/local/share/icons/hicolor/128x128/apps/\1.png|g" 
+      $SED_CMD usr/local/share/applications/qelectrotech.desktop
+
+  cleanup:
+    after: [qelectrotech, dxf-to-qet, qet-tb-generator]
+    plugin: nil
+    build-snaps: [core18, kde-frameworks-5-core18]
+    override-prime: |
+      # Remove all files from snap that are already included in the base snap or in
+      # any connected content snaps
+      set -eux
+      for snap in "core18" "kde-frameworks-5-core18"; do  # List all content-snaps and base snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      done

dev_doc/enum_type_of_QGraphicsItem

@@ -1,16 +1,16 @@
 		Type = UserType + ???
 ###DIAGRAM EDITOR###
-Element + 1000
+Element             + 1000
-Conductor + 1001
+Conductor           + 1001
-Terminal + 1002
+Terminal            + 1002
-ElementTextItem + 1003
+ElementTextItem     + 1003
-DiagramTextItem + 1004
+DiagramTextItem     + 1004
 IndependentTextItem + 1005
-ConductorTextItem + 1006
+ConductorTextItem   + 1006
-DiagramImageItem + 1007
+DiagramImageItem    + 1007
-QetShapItem + 1008
+QetShapItem         + 1008
-crossRefItem + 1009
+crossRefItem        + 1009
-DynamiqueElementTextItem + 1010
+DynamiqueElementTextItem  + 1010
 ElementPrimitiveDecorator + 2200
 
 ###ELEMENT EDITOR###
@@ -25,4 +25,8 @@ part rectangle  + 1109
 part dynamic text field + 1110
 
 ###QetGraphicsHandlerItem###
-QetGraphicsHandlerItem = 1200
+QetGraphicsHandlerItem + 1200
+
+###VIEW ITEMS###
+QetGraphicsTableItem  + 1300
+QetGraphicsHeaderItem + 1301

elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt

@@ -0,0 +1,37 @@
+<definition type="element" orientation="dyyy" height="80" hotspot_y="40" version="0.70" width="50" hotspot_x="23" link_type="simple">
+    <uuid uuid="{65b9e889-c2eb-4d85-aa9e-c1dff55678f5}"/>
+    <names>
+        <name lang="en">Three-pole source + PEN</name>
+        <name lang="el">Τριφασικό + PEN</name>
+        <name lang="es">Fuente tripolar + PEN</name>
+        <name lang="nl">driefasen + aardenul</name>
+        <name lang="pl">Linia trójfazowa (PEN)</name>
+        <name lang="it">Sorgente tripolare + PEN</name>
+        <name lang="de">Drehstrom + PEN</name>
+        <name lang="ru">Трёхполюсный + PEN</name>
+        <name lang="fr">Source tripolaire + PEN</name>
+        <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
+        <name lang="cs">3 fáze + PEN pravý</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <dynamic_text z="1" Valignment="AlignTop" x="-7" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{7c68cf51-b979-4e89-97b2-a93b5ad61f95}" y="-60.45" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="33" text="PEN" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="13" text="L3" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-7" text="L2" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-27" text="L1" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-14" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <terminal orientation="w" x="-15" y="-30"/>
+        <terminal orientation="w" x="-15" y="-10"/>
+        <terminal orientation="w" x="-15" y="30"/>
+        <terminal orientation="w" x="-15" y="10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/110_network_supplies/3f_n_pe_pravy.elmt

@@ -0,0 +1,40 @@
+<definition type="element" orientation="dyyy" height="100" hotspot_y="40" version="0.70" width="40" hotspot_x="20" link_type="simple">
+    <uuid uuid="{b4b70d3d-8784-4323-b17b-d8ff3677cdc1}"/>
+    <names>
+        <name lang="en">Three-pole source + PEN</name>
+        <name lang="el">Τριφασικό + PEN</name>
+        <name lang="es">Fuente tripolar + PEN</name>
+        <name lang="nl">driefasen + aardenul</name>
+        <name lang="pl">Linia trójfazowa (PEN)</name>
+        <name lang="it">Sorgente tripolare + PEN</name>
+        <name lang="de">Drehstrom + PEN</name>
+        <name lang="ru">Трёхполюсный + PEN</name>
+        <name lang="fr">Source tripolaire + PEN</name>
+        <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
+        <name lang="cs">3 fáze + N+PE pravý</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <dynamic_text z="1" Valignment="AlignTop" x="-7" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{1955f25e-b33b-4106-8b36-46862006122c}" y="-60.45" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="53" text="PE" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="33" text="N" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="50" end1="none" y1="50" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="13" text="L3" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-7" text="L2" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-27" text="L1" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <terminal orientation="w" x="-15" y="50"/>
+        <terminal orientation="w" x="-15" y="-30"/>
+        <terminal orientation="w" x="-15" y="-10"/>
+        <terminal orientation="w" x="-15" y="30"/>
+        <terminal orientation="w" x="-15" y="10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/110_network_supplies/ground1.elmt

@@ -1,26 +1,42 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="50" hotspot_y="29" type="element">
+<definition height="50" width="30" link_type="terminal" hotspot_x="16" version="0.80" orientation="dyyy" type="element" hotspot_y="29">
-    <uuid uuid="{75d4e5ef-6080-4118-9eab-afb53220b9ef}"/>
+    <uuid uuid="{a98ac40d-9055-4b9b-88ab-cffe6b08ed37}"/>
     <names>
+        <name lang="ro">Masă</name>
         <name lang="pt">Massa</name>
-        <name lang="es">Masa</name>
+        <name lang="cs">Kostra</name>
+        <name lang="it">Massa</name>
         <name lang="nl">Massa</name>
         <name lang="el">Γείωση</name>
+        <name lang="ru">Шасси</name>
         <name lang="de">Masse</name>
-        <name lang="cs">Kostra</name>
-        <name lang="pl">Masa</name>
-        <name lang="ro">Masă</name>
-        <name lang="it">Massa</name>
         <name lang="en">Ground</name>
+        <name lang="pl">Masa</name>
+        <name lang="es">Masa</name>
         <name lang="ar">هيكل معدني</name>
         <name lang="fr">Masse</name>
-        <name lang="ru">Шасси</name>
     </names>
-    <informations>titus
+    <elementInformations>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+    </elementInformations>
+    <informations>titus&#xd;
 titus0818@yahoo.com</informations>
     <description>
-        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="-16"/>
+        <line y1="-16" x1="0" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="13" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>
-        <line antialias="false" length1="1.5" x2="12.62" end2="none" x1="-13.6493" end1="none" y2="14" length2="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="14"/>
+        <line y1="14" x1="-13.6493" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="14" length2="1.5" length1="1.5" x2="12.62" end1="none" antialias="false"/>
-        <input x="8" y="2" tagg="label" size="9" rotate="true" text="_"/>
+        <dynamic_text uuid="{7f02ce13-533d-4501-980d-6cb67bd1110d}" Halignment="AlignLeft" frame="false" x="8" Valignment="AlignTop" text_from="ElementInfo" y="-9" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="3" rotation="0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
         <terminal x="0" y="-20" orientation="n"/>
     </description>
 </definition>

elements/10_electric/10_allpole/110_network_supplies/terre.elmt

@@ -1,27 +1,43 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="30" hotspot_y="19" type="element">
+<definition height="30" width="20" link_type="terminal" hotspot_x="10" version="0.80" orientation="dyyy" type="element" hotspot_y="19">
-    <uuid uuid="{93eafb79-a84a-45e3-b43b-327d0944591b}"/>
+    <uuid uuid="{e4e753a8-9fde-4e8e-9256-0cf99d67e3de}"/>
     <names>
         <name lang="pt">Terra</name>
-        <name lang="el">Γείωση</name>
-        <name lang="es">Tierra</name>
-        <name lang="nl">Aarde</name>
-        <name lang="de">Erde</name>
         <name lang="cs">Země</name>
-        <name lang="pl">Uziemienie</name>
         <name lang="it">Terra</name>
-        <name lang="ar">تأريض</name>
+        <name lang="el">Γείωση</name>
-        <name lang="en">Ground</name>
+        <name lang="nl">Aarde</name>
-        <name lang="fr">Terre</name>
         <name lang="ru">Земля</name>
+        <name lang="de">Erde</name>
+        <name lang="en">Ground</name>
+        <name lang="pl">Uziemienie</name>
+        <name lang="es">Tierra</name>
+        <name lang="ar">تأريض</name>
+        <name lang="fr">Terre</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <elementInformations>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+    </elementInformations>
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="2" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
+        <dynamic_text uuid="{0af57a27-1887-4576-8b51-200ca996e582}" Halignment="AlignLeft" frame="false" x="2" Valignment="AlignTop" text_from="ElementInfo" y="-22.5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="1" rotation="0" text_width="-1">
-        <line antialias="false" length1="1.5" x2="3" end2="none" x1="-3" end1="none" y2="4" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4"/>
+            <text></text>
-        <line antialias="false" length1="1.5" x2="5" end2="none" x1="-5" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2"/>
+            <info_name>label</info_name>
-        <line antialias="false" length1="1.5" x2="7" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
+        </dynamic_text>
-        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
+        <line y1="4" x1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="4" length2="1.5" length1="1.5" x2="3" end1="none" antialias="false"/>
+        <line y1="2" x1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="2" length2="1.5" length1="1.5" x2="5" end1="none" antialias="false"/>
+        <line y1="0" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="0" length2="1.5" length1="1.5" x2="7" end1="none" antialias="false"/>
+        <line y1="-10" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="0" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>
         <terminal x="0" y="-11" orientation="n"/>
     </description>
 </definition>

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

@@ -0,0 +1,15 @@
+<definition width="20" height="20" hotspot_y="9" type="element" orientation="dyyy" link_type="simple" hotspot_x="9" version="0.60">
+    <uuid uuid="{079913f8-18b5-4524-84bd-aadf75dfefbf}"/>
+    <names>
+        <name lang="cs">Bod</name>
+    </names>
+    <informations></informations>
+    <description>
+        <circle diameter="4" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-2" x="-2"/>
+        <input rotate="true" text=" " tagg="label" size="9" y="-3" x="-11"/>
+        <terminal orientation="e" y="0" x="2"/>
+        <terminal orientation="w" y="0" x="-2"/>
+        <terminal orientation="s" y="2" x="0"/>
+        <terminal orientation="n" y="-2" x="0"/>
+    </description>
+</definition>

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

@@ -0,0 +1,19 @@
+<definition version="0.70" height="30" type="element" width="30" hotspot_x="14" link_type="simple" hotspot_y="12" orientation="dyyy">
+    <uuid uuid="{3015326e-2599-495e-8ef0-c12ff5313dd0}"/>
+    <names>
+        <name lang="cs">Všestranný spoj</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <polygon x6="6" x2="-5" x8="6" y5="5" y2="0" closed="false" x10="0" x3="0" x7="10" y7="0" y4="10" y11="-5" antialias="false" x9="0" x11="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="0" y9="5" y10="-5" y1="0" y6="0" x4="0" x1="-10" y8="0" y3="5"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-13" text_from="ElementInfo" y="-12" z="2" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{14c0b70c-c028-49ef-bf72-3c3c9cd64669}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="0" y="-5" orientation="n"/>
+        <terminal x="0" y="10" orientation="s"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>

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

@@ -0,0 +1,17 @@
+<definition type="element" hotspot_x="35" orientation="dyyy" version="0.80" width="70" height="80" hotspot_y="46" link_type="simple">
+    <uuid uuid="{e5a46987-e259-4ca4-9e40-eedc3652f738}"/>
+    <names>
+        <name lang="cs">Pokus</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect width="60" x="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" height="65" rx="0" y="-35" antialias="false" ry="0"/>
+        <dynamic_text z="3" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" Valignment="AlignTop" uuid="{cec75afa-b854-41b8-aed8-6edba82c76ff}" text_from="ElementInfo" x="-45" text_width="-1" y="-20" frame="false" rotation="0" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal orientation="n" x="20" y="-40"/>
+        <terminal orientation="n" x="-20" y="-40"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/120_cables&wiring/kabel3g.elmt

@@ -0,0 +1,33 @@
+<definition width="70" hotspot_x="35" hotspot_y="5" orientation="dyyy" version="0.80" type="element" height="10" link_type="simple">
+    <uuid uuid="{3cfdc90d-f114-4ecd-9ab2-37786c279287}"/>
+    <names>
+        <name lang="de">Kabel 3G</name>
+        <name lang="fr">Cable 3G</name>
+        <name lang="cs">Kabel 3G</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team&#xd;
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line x2="1.95" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05" length2="1.5" antialias="true" y2="1.95" end2="none" x1="-2.05" length1="1.5"/>
+        <line x2="22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" length2="1.5" antialias="true" y2="2" end2="none" x1="18" length1="1.5"/>
+        <dynamic_text text_width="-1" font="Sans Serif,7,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" z="3" Valignment="AlignTop" frame="false" x="-50" uuid="{fe752adf-2e2b-4005-a272-42dd6976c493}" y="0.5" text_from="UserText" rotation="0">
+            <text>3G</text>
+        </dynamic_text>
+        <line x2="30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" length2="1.5" antialias="false" y2="0" end2="none" x1="-29.9373" length1="1.5"/>
+        <line x2="-18" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" length2="1.5" antialias="true" y2="2" end2="none" x1="-22" length1="1.5"/>
+        <dynamic_text text_width="-1" font="Sans Serif,7,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" z="6" Valignment="AlignTop" frame="false" x="-51" uuid="{65bfd07e-7af5-4193-a5ba-b3dc967da121}" y="-18.5" text_from="ElementInfo" rotation="0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" z="7" Valignment="AlignTop" frame="false" x="-22" uuid="{df01c7dd-b2e7-4b24-9057-b8bc3478ff67}" y="-11" text_from="UserText" rotation="0">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" z="8" Valignment="AlignTop" frame="false" x="-2" uuid="{ce5a0030-5247-47ab-a975-63256db0d2bd}" y="-11" text_from="UserText" rotation="0">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" z="9" Valignment="AlignTop" frame="false" x="18" uuid="{e0a00f86-dd76-48fe-be8b-8ff6f510e651}" y="-11" text_from="UserText" rotation="0">
+            <text>PE</text>
+        </dynamic_text>
+    </description>
+</definition>

elements/10_electric/10_allpole/120_cables&wiring/kabel4g.elmt

@@ -0,0 +1,27 @@
+<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="36" hotspot_y="5" orientation="dyyy" width="90">
+    <uuid uuid="{e02f4582-b5dd-4f81-ba71-e3d5521b4152}"/>
+    <names>
+        <name lang="ru">Кабель 3 жилы + PE</name>
+        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
+        <name lang="cs">Kabel 4G</name>
+        <name lang="de">Kabel 4G</name>
+        <name lang="es">Cable 3 fases+tierra</name>
+        <name lang="it">Cavo 3 fasi + terra</name>
+        <name lang="fr">Cable 3 phases+terre</name>
+    </names>
+    <informations>Author: The QElectroTech team&#xd;
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line x1="-2.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="1.95" y2="1.95" antialias="true"/>
+        <line x1="37.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="41.95" y2="1.95" antialias="true"/>
+        <line x1="18" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="22" y2="2" antialias="true"/>
+        <input size="7" tagg="none" rotate="true" x="-50" y="10" text="4G"/>
+        <line x1="-29.9373" y1="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="47.932" y2="0" antialias="false"/>
+        <line x1="-22" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-18" y2="2" antialias="true"/>
+        <input size="7" tagg="label" rotate="true" x="-51" y="-9" text="_"/>
+        <input size="4" tagg="none" rotate="true" x="-22" y="-4" text="1"/>
+        <input size="4" tagg="none" rotate="true" x="-2" y="-4" text="2"/>
+        <input size="4" tagg="none" rotate="true" x="18" y="-4" text="3"/>
+        <input size="4" tagg="none" rotate="true" x="38" y="-4" text="PE"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/120_cables&wiring/kabel7g.elmt

@@ -0,0 +1,33 @@
+<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="73" hotspot_y="5" orientation="dyyy" width="150">
+    <uuid uuid="{d1007c67-032b-4925-8560-aac9e547d6ae}"/>
+    <names>
+        <name lang="ru">Кабель 6 жилы + PE</name>
+        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
+        <name lang="cs">Kabel 7G</name>
+        <name lang="de">Kabel 7G</name>
+        <name lang="es">Cable 6 fases+tierra</name>
+        <name lang="it">Cavo  fasi + terra</name>
+        <name lang="fr">Cable 6 phases+terre</name>
+    </names>
+    <informations>Author: The QElectroTech team&#xd;
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input size="4" tagg="none" rotate="true" x="38" y="-4" text="6"/>
+        <input size="4" tagg="none" rotate="true" x="18" y="-4" text="5"/>
+        <input size="4" tagg="none" rotate="true" x="-2" y="-4" text="4"/>
+        <line x1="57.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="61.95" y2="1.95" antialias="true"/>
+        <line x1="-42.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-38.05" y2="1.95" antialias="true"/>
+        <line x1="37.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="41.95" y2="1.95" antialias="true"/>
+        <line x1="17.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="21.95" y2="1.95" antialias="true"/>
+        <line x1="-2.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="1.95" y2="1.95" antialias="true"/>
+        <line x1="-22" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-18" y2="2" antialias="true"/>
+        <input size="7" tagg="none" rotate="true" x="-89" y="10" text="7G"/>
+        <line x1="-67.9373" y1="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="71" y2="0" antialias="false"/>
+        <line x1="-62" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-58" y2="2" antialias="true"/>
+        <input size="7" tagg="label" rotate="true" x="-90" y="-9" text="_"/>
+        <input size="4" tagg="none" rotate="true" x="-62" y="-4" text="1"/>
+        <input size="4" tagg="none" rotate="true" x="-42" y="-4" text="2"/>
+        <input size="4" tagg="none" rotate="true" x="-22" y="-4" text="3"/>
+        <input size="4" tagg="none" rotate="true" x="58" y="-4" text="PE"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/cable.elmt

@@ -0,0 +1,17 @@
+<definition version="0.80" link_type="simple" hotspot_y="13" type="element" height="250" hotspot_x="15" width="30" orientation="dyyy">
+    <uuid uuid="{bb4c314c-2020-4c8a-b465-632eb562e1f7}"/>
+    <names>
+        <name lang="fr">Cable</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect ry="0" y="0" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="230" rx="0" width="20" antialias="false"/>
+        <dynamic_text uuid="{3a1faa81-e74a-4640-af5a-3fb5c454f467}" rotation="270" text_width="-1" text_from="ElementInfo" font="Sans Serif,7,-1,5,50,0,0,0,0,0" frame="false" Valignment="AlignTop" y="200" x="-10" Halignment="AlignLeft" z="2">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line x1="0" x2="0" end1="none" end2="none" y2="0" length1="1.5" y1="-4" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <terminal y="-4" x="0" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c091a_3p_fem.elmt

@@ -0,0 +1,31 @@
+<definition height="30" hotspot_y="13" orientation="dyyy" width="60" hotspot_x="38" type="element" version="0.70" link_type="simple">
+    <uuid uuid="{b227d208-45f2-417b-af50-eedad266c492}"/>
+    <names>
+        <name lang="cs">C091D 3p fem</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="10" x2="7" end1="none" y2="13" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-13" end1="none" y2="13" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-5" x2="-30" end1="none" y2="10" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-7" end1="none" y2="13" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="13" end1="none" y2="13" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-5" x2="-10" end1="none" y2="10" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-5" x2="10" end1="none" y2="10" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="5" x2="10" end1="none" y2="5" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="8" x2="10" end1="none" y2="8" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-33" end1="none" y2="13" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-27" end1="none" y2="13" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <text x="-28" y="-1" color="#000000" text="1" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="-8" y="-1" color="#000000" text="2" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="12" y="-1" color="#000000" text="3" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <dynamic_text x="-60" uuid="{dffe6cad-58c7-478b-9e86-5bce11c771f8}" y="-5" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" Halignment="AlignLeft" z="19" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="-10" y="-5" orientation="n"/>
+        <terminal x="-30" y="-5" orientation="n"/>
+        <terminal x="10" y="-5" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c091a_3p_male.elmt

@@ -0,0 +1,31 @@
+<definition height="30" hotspot_y="11" orientation="dyyy" width="60" hotspot_x="38" type="element" version="0.70" link_type="simple">
+    <uuid uuid="{4d574353-1963-46a7-80b4-f3bdd9e8e018}"/>
+    <names>
+        <name lang="cs">C091A 3p male</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="-1" x2="10" end1="none" y2="-4" x1="7" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-1" x2="-10" end1="none" y2="-4" x1="-13" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-4" x2="13" end1="none" y2="-1" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-4" x2="-7" end1="none" y2="-1" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-10" end1="none" y2="-3" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="10" end1="none" y2="-3" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-1" x2="-30" end1="none" y2="-4" x1="-33" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-4" x2="-27" end1="none" y2="-1" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-30" end1="none" y2="-3" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="1" x2="10" end1="none" y2="1" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="3" x2="10" end1="none" y2="3" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <text x="-28" y="10" color="#000000" text="1" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="-8" y="10" color="#000000" text="2" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="12" y="10" color="#000000" text="3" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <dynamic_text x="-64" uuid="{1640ef0e-7d5c-4342-a5c8-90b708c32e4c}" y="-9" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" Halignment="AlignLeft" z="19" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="-10" y="10" orientation="s"/>
+        <terminal x="-30" y="10" orientation="s"/>
+        <terminal x="10" y="10" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c091a_male.elmt

@@ -0,0 +1,36 @@
+<definition height="30" hotspot_y="11" orientation="dyyy" width="80" hotspot_x="38" type="element" version="0.70" link_type="simple">
+    <uuid uuid="{d5abdd14-98c0-41c8-b2f7-8d46e176f5a2}"/>
+    <names>
+        <name lang="cs">C091A 4p male</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="-1" x2="30" end1="none" y2="-4" x1="27" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-1" x2="10" end1="none" y2="-4" x1="7" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-1" x2="-10" end1="none" y2="-4" x1="-13" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-4" x2="13" end1="none" y2="-1" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-4" x2="-7" end1="none" y2="-1" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-4" x2="33" end1="none" y2="-1" x1="30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="30" end1="none" y2="-3" x1="30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-10" end1="none" y2="-3" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="10" end1="none" y2="-3" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-1" x2="-30" end1="none" y2="-4" x1="-33" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-4" x2="-27" end1="none" y2="-1" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-30" end1="none" y2="-3" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="1" x2="30" end1="none" y2="1" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="3" x2="30" end1="none" y2="3" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <text x="-28" y="10" color="#000000" text="1" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="-8" y="10" color="#000000" text="2" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="12" y="10" color="#000000" text="3" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="32" y="10" color="#000000" text="4" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <dynamic_text x="-64" uuid="{1640ef0e-7d5c-4342-a5c8-90b708c32e4c}" y="-9" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" Halignment="AlignLeft" z="19" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="10" y="10" orientation="s"/>
+        <terminal x="-30" y="10" orientation="s"/>
+        <terminal x="30" y="10" orientation="s"/>
+        <terminal x="-10" y="10" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c091d_fem.elmt

@@ -0,0 +1,36 @@
+<definition height="30" hotspot_y="13" orientation="dyyy" width="80" hotspot_x="38" type="element" version="0.70" link_type="simple">
+    <uuid uuid="{fef81b16-3fcc-48f3-a3f3-55cedf052d7e}"/>
+    <names>
+        <name lang="cs">C091D 4p fem</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="10" x2="27" end1="none" y2="13" x1="30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="7" end1="none" y2="13" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-13" end1="none" y2="13" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-5" x2="-30" end1="none" y2="10" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="33" end1="none" y2="13" x1="30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-7" end1="none" y2="13" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="13" end1="none" y2="13" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-5" x2="-10" end1="none" y2="10" x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-5" x2="10" end1="none" y2="10" x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="-5" x2="30" end1="none" y2="10" x1="30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="5" x2="30" end1="none" y2="5" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="8" x2="30" end1="none" y2="8" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-33" end1="none" y2="13" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <line y1="10" x2="-27" end1="none" y2="13" x1="-30" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none"/>
+        <text x="-28" y="-1" color="#000000" text="1" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="-8" y="-1" color="#000000" text="2" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="12" y="-1" color="#000000" text="3" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="32" y="-1" color="#000000" text="4" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <dynamic_text x="-60" uuid="{dffe6cad-58c7-478b-9e86-5bce11c771f8}" y="-5" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" Halignment="AlignLeft" z="19" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="-10" y="-5" orientation="n"/>
+        <terminal x="10" y="-5" orientation="n"/>
+        <terminal x="30" y="-5" orientation="n"/>
+        <terminal x="-30" y="-5" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c16_4p_f.elmt

@@ -0,0 +1,36 @@
+<definition version="0.70" height="30" type="element" width="80" hotspot_x="36" link_type="simple" hotspot_y="12" orientation="dyyy">
+    <uuid uuid="{31f82044-30db-4191-9619-12ba7924322a}"/>
+    <names>
+        <name lang="cs">C16 4p fem</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="27"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="7"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="-13"/>
+        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-30"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="33"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="-7"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="13"/>
+        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-10"/>
+        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="10"/>
+        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="30"/>
+        <line y1="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="5" end1="none" x2="30"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="30"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="-33"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="-27"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-28" color="#000000" text="1" y="-1" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-8" color="#000000" text="2" y="-1" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="12" color="#000000" text="3" y="-1" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="32" color="#000000" text="PE" y="-1" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-60" text_from="ElementInfo" y="-5" z="19" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{dffe6cad-58c7-478b-9e86-5bce11c771f8}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="-10" y="-5" orientation="n"/>
+        <terminal x="10" y="-5" orientation="n"/>
+        <terminal x="30" y="-5" orientation="n"/>
+        <terminal x="-30" y="-5" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c16_4p_m.elmt

@@ -0,0 +1,36 @@
+<definition version="0.70" height="30" type="element" width="80" hotspot_x="36" link_type="simple" hotspot_y="10" orientation="dyyy">
+    <uuid uuid="{975dd87a-7ff8-439e-a7d3-f61f02bd5f6a}"/>
+    <names>
+        <name lang="cs">C16 4p male</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="27" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-4" end1="none" x2="30"/>
+        <line y1="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-4" end1="none" x2="10"/>
+        <line y1="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-13" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-4" end1="none" x2="-10"/>
+        <line y1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-1" end1="none" x2="13"/>
+        <line y1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-1" end1="none" x2="-7"/>
+        <line y1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-1" end1="none" x2="33"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="30"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="-10"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="10"/>
+        <line y1="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-33" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-4" end1="none" x2="-30"/>
+        <line y1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-1" end1="none" x2="-27"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="-30"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="1" end1="none" x2="30"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="30"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-28" color="#000000" text="1" y="10" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-8" color="#000000" text="2" y="10" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="12" color="#000000" text="3" y="10" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="32" color="#000000" text="PE" y="10" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-64" text_from="ElementInfo" y="-9" z="19" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{1640ef0e-7d5c-4342-a5c8-90b708c32e4c}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="10" y="10" orientation="s"/>
+        <terminal x="-30" y="10" orientation="s"/>
+        <terminal x="30" y="10" orientation="s"/>
+        <terminal x="-10" y="10" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c16_7p_fem.elmt

@@ -0,0 +1,51 @@
+<definition version="0.70" height="30" type="element" width="140" hotspot_x="66" link_type="simple" hotspot_y="14" orientation="dyyy">
+    <uuid uuid="{2ce35704-86b4-4002-a3cb-bed1b0c22249}"/>
+    <names>
+        <name lang="cs">C16 7p fem</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-3" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="0"/>
+        <line y1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="57" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="60"/>
+        <line y1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="17" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="20"/>
+        <line y1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-23" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-20"/>
+        <line y1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-43" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-40"/>
+        <line y1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="37" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="40"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="63"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="23"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="3"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-60"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="43"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="-37"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="-17"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-40"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-20"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="0"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="20"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="40"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="60"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="60"/>
+        <line y1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="4" end1="none" x2="-60"/>
+        <line y1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-63" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-60"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="13" end1="none" x2="-57"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-58" color="#000000" text="1" y="-5" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-38" color="#000000" text="2" y="-5" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-18" color="#000000" text="3" y="-5" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="2" color="#000000" text="4" y="-5" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="22" color="#000000" text="5" y="-5" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="42" color="#000000" text="6" y="-5" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="62" color="#000000" text="PE" y="-5" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-100" text_from="ElementInfo" y="-6" z="31" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{2af59052-6066-4b7a-92bd-8d8f01cfe3cf}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="60" y="-10" orientation="n"/>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="-40" y="-10" orientation="n"/>
+        <terminal x="-60" y="-10" orientation="n"/>
+        <terminal x="40" y="-10" orientation="n"/>
+        <terminal x="20" y="-10" orientation="n"/>
+        <terminal x="-20" y="-10" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/c16_7p_male.elmt

@@ -0,0 +1,51 @@
+<definition version="0.70" height="30" type="element" width="140" hotspot_x="66" link_type="simple" hotspot_y="7" orientation="dyyy">
+    <uuid uuid="{4c2b787a-ceed-4e87-a370-5e698f7ba2da}"/>
+    <names>
+        <name lang="cs">C16 7p male</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="20"/>
+        <line y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="0"/>
+        <line y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="-20"/>
+        <line y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="60"/>
+        <line y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="40"/>
+        <line y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="-40"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="37"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="17"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="57"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-3"/>
+        <line y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="-60"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-43"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-23"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-63"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="23"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="3"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-17"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-37"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="63"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="43"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-57"/>
+        <line y1="2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="2" end1="none" x2="60"/>
+        <line y1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length2="1.5" antialias="false" length1="1.5" end2="none" y2="4" end1="none" x2="-60"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-59" color="#000000" text="1" y="14" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-38" color="#000000" text="2" y="14" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-18" color="#000000" text="3" y="14" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="2" color="#000000" text="4" y="14" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="22" color="#000000" text="5" y="14" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="42" color="#000000" text="6" y="14" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="62" color="#000000" text="PE" y="14" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-95" text_from="ElementInfo" y="-9" z="31" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{cbfbb7a8-1d5b-4474-a071-295c178401c2}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="0" y="15" orientation="s"/>
+        <terminal x="-40" y="15" orientation="s"/>
+        <terminal x="-20" y="15" orientation="s"/>
+        <terminal x="60" y="15" orientation="s"/>
+        <terminal x="20" y="15" orientation="s"/>
+        <terminal x="-60" y="15" orientation="s"/>
+        <terminal x="40" y="15" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/kon10pin_pravy.elmt

@@ -0,0 +1,66 @@
+<definition type="element" orientation="dyyy" height="110" hotspot_y="73" version="0.70" width="40" hotspot_x="18" link_type="simple">
+    <uuid uuid="{f97a8793-ff72-4408-9a5d-432b2ed9ce13}"/>
+    <names>
+        <name lang="cs">Konektor 10 pin pravý</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="13" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="9" text="8" color="#000000"/>
+        <text x="-4" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="29" text="10" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-21" text="5" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-27" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-47" end1="none" y1="-50" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-37" end1="none" y1="-40" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-11" text="6" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-51" text="2" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-42" text="3" color="#000000"/>
+        <text x="-1.82692" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-31" text="4" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-1" text="7" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="19" text="9" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-57" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-53" end1="none" y1="-50" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-43" end1="none" y1="-40" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="33" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-7" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-33" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-50" end1="none" y1="-50" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="3" end1="none" y1="0" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-63" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-40" end1="none" y1="-40" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-60" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="23" end1="none" y1="20" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-17" end1="none" y1="-20" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="7" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-3" end1="none" y1="0" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-13" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="27" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="0" end1="none" y1="0" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="-23" end1="none" y1="-20" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="15" y2="17" end1="none" y1="20" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-20" end1="none" y1="-20" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="20" end1="none" y1="20" length1="1.5" length2="1.5" antialias="false" x2="15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="5" y2="30" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="8" y2="30" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="8"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-61" text="1" color="#000000"/>
+        <dynamic_text z="43" Valignment="AlignTop" x="0" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{caa73b80-7618-492a-86de-52ab2469a058}" y="-86" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal orientation="w" x="-10" y="-50"/>
+        <terminal orientation="w" x="-10" y="-30"/>
+        <terminal orientation="w" x="-10" y="-20"/>
+        <terminal orientation="w" x="-10" y="-60"/>
+        <terminal orientation="w" x="-10" y="-40"/>
+        <terminal orientation="w" x="-10" y="0"/>
+        <terminal orientation="w" x="-10" y="20"/>
+        <terminal orientation="w" x="-10" y="-10"/>
+        <terminal orientation="w" x="-10" y="30"/>
+        <terminal orientation="w" x="-10" y="10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/konektor10pin.elmt

@@ -0,0 +1,66 @@
+<definition type="element" orientation="dyyy" height="110" hotspot_y="73" version="0.70" width="40" hotspot_x="21" link_type="simple">
+    <uuid uuid="{c438e710-e5c3-4a82-ae4d-3d1dfe111c13}"/>
+    <names>
+        <name lang="cs">Konektor 10 pin</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="10" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="9" text="8" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="29" text="10" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-21" text="5" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-30" end1="none" y1="-33" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-50" end1="none" y1="-53" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-40" end1="none" y1="-43" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-11" text="6" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-51" text="2" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-42" text="3" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-31" text="4" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-1" text="7" color="#000000"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="19" text="9" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-60" end1="none" y1="-63" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-50" end1="none" y1="-47" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-40" end1="none" y1="-37" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="30" end1="none" y1="27" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-10" end1="none" y1="-13" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-30" end1="none" y1="-27" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-50" end1="none" y1="-50" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="0" end1="none" y1="-3" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-60" end1="none" y1="-57" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-40" end1="none" y1="-40" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-60" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="20" end1="none" y1="17" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-20" end1="none" y1="-23" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="10" end1="none" y1="13" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="0" end1="none" y1="3" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-10" end1="none" y1="-7" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="30" end1="none" y1="33" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="0" end1="none" y1="0" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-20" end1="none" y1="-17" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="20" end1="none" y1="23" length1="1.5" length2="1.5" antialias="false" x2="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-20" end1="none" y1="-20" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="20" end1="none" y1="20" length1="1.5" length2="1.5" antialias="false" x2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-5" y2="30" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-8" y2="30" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="-8"/>
+        <text x="-2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-61" text="1" color="#000000"/>
+        <dynamic_text z="43" Valignment="AlignTop" x="-30" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{4721a341-3fd5-411f-bacd-6a15692a0719}" y="-85" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal orientation="e" x="10" y="-60"/>
+        <terminal orientation="e" x="10" y="-50"/>
+        <terminal orientation="e" x="10" y="-40"/>
+        <terminal orientation="e" x="10" y="-30"/>
+        <terminal orientation="e" x="10" y="10"/>
+        <terminal orientation="e" x="10" y="0"/>
+        <terminal orientation="e" x="10" y="-10"/>
+        <terminal orientation="e" x="10" y="-20"/>
+        <terminal orientation="e" x="10" y="30"/>
+        <terminal orientation="e" x="10" y="20"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/pin_m_fm.elmt

@@ -0,0 +1,26 @@
+<definition version="0.70" height="40" type="element" width="10" hotspot_x="5" link_type="simple" hotspot_y="14" orientation="dyyy">
+    <uuid uuid="{3a906aab-bfdf-43b8-97d1-61dd36477b0a}"/>
+    <names>
+        <name lang="cs">Pin konektoru</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <dynamic_text font="Sans Serif,8,-1,5,50,0,0,0,0,0" frame="false" x="-23" text_from="ElementInfo" y="-11.5" z="1" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{678859fa-88de-44b5-b142-7f1d3692566d}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="-1"/>
+        <line y1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="1"/>
+        <line y1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="0"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="0"/>
+        <arc height="6" x="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-84" y="0" width="6" start="-180" antialias="true"/>
+        <arc height="6" x="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-84" y="0" width="6" start="83" antialias="true"/>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-3" text_from="UserText" y="-12" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{834fd33c-baf9-4d10-9a3a-0e9887fbf191}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/vidlice_5p.elmt

@@ -0,0 +1,50 @@
+<definition version="0.70" height="40" type="element" width="60" hotspot_x="26" link_type="simple" hotspot_y="25" orientation="dyyy">
+    <uuid uuid="{53b03e02-5180-493e-88dd-74291bffa0b6}"/>
+    <names>
+        <name lang="cs">Vidlice 3f 5p</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="1" end1="none" x2="-20"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-21" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="-21"/>
+        <line y1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-19" length2="1.5" antialias="false" length1="1.5" end2="none" y2="1" end1="none" x2="-19"/>
+        <line y1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="1" end1="none" x2="-10"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-11" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="-11"/>
+        <line y1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-9" length2="1.5" antialias="false" length1="1.5" end2="none" y2="1" end1="none" x2="-9"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="-1"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="0"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="1"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="9" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="9"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="10"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="11" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="11"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="19" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="19"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="20"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="21" length2="1.5" antialias="false" length1="1.5" end2="none" y2="11" end1="none" x2="21"/>
+        <line y1="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-1" end1="none" x2="20"/>
+        <line y1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-3" end1="none" x2="20"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="-20"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="-10"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="0"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="10"/>
+        <line y1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="20"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-19" color="#000000" text="L1" y="-6" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-9" color="#000000" text="L2" y="-6" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="L3" y="-6" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="11.0338" color="#000000" text="N" y="-6" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="21" color="#000000" text="PE" y="-6" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-44" text_from="ElementInfo" y="-15" z="28" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{a140fb51-d49b-4cd4-ac03-7e50fb952ebc}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-36" text_from="ElementInfo" y="27" z="29" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{fac882df-99ed-4478-9caf-b17da41163c5}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>tension-protocol</info_name>
+        </dynamic_text>
+        <terminal x="20" y="-20" orientation="n"/>
+        <terminal x="-20" y="-20" orientation="n"/>
+        <terminal x="10" y="-20" orientation="n"/>
+        <terminal x="0" y="-20" orientation="n"/>
+        <terminal x="-10" y="-20" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/zas_schurter.elmt

@@ -0,0 +1,72 @@
+<definition type="element" orientation="dyyy" height="200" hotspot_y="98" version="0.70" width="90" hotspot_x="50" link_type="simple">
+    <uuid uuid="{ed05e9b2-7e41-48c8-911c-b9deb67dcfac}"/>
+    <names>
+        <name lang="cs">Zásuvka s vypínačem Schurter</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="0" end1="none" y1="80" length1="1.5" length2="1.5" antialias="false" x2="-20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="19" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="19"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-21" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="-21"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="-20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="20" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="0" end1="none" y1="80" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-19" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="-19"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="21" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="21"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="20" y2="0" end1="none" y1="85" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-1" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="-1"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-21" y2="80" end1="none" y1="90" length1="1.5" length2="1.5" antialias="false" x2="-21"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="80" end1="none" y1="90" length1="1.5" length2="1.5" antialias="false" x2="-20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-19" y2="80" end1="none" y1="90" length1="1.5" length2="1.5" antialias="false" x2="-19"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="1" y2="-15" end1="none" y1="-5" length1="1.5" length2="1.5" antialias="false" x2="1"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-1" y2="80" end1="none" y1="90" length1="1.5" length2="1.5" antialias="false" x2="-1"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="80" end1="none" y1="90" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="1" y2="80" end1="none" y1="90" length1="1.5" length2="1.5" antialias="false" x2="1"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="15" height="10" width="10" start="90" angle="90" y="85" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="15" height="10" width="10" start="0" angle="90" y="85" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-25" height="10" width="10" start="270" angle="90" y="-10" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-25" height="10" width="10" start="180" angle="90" y="-10" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-5" height="10" width="10" start="270" angle="90" y="-10" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-5" height="10" width="10" start="180" angle="90" y="-10" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="15" height="10" width="10" start="270" angle="90" y="-10" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="15" height="10" width="10" start="180" angle="90" y="-10" antialias="true"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="78" end1="none" y1="78" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="76" end1="none" y1="76" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="2" end1="none" y1="2" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="4" end1="none" y1="4" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-18" end1="none" y1="-18" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-20" end1="none" y1="-20" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-60" end1="none" y1="-15" length1="1.5" length2="1.5" antialias="false" x2="-20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-60" end1="none" y1="-15" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="20" y2="-90" end1="none" y1="-15" length1="1.5" length2="1.5" antialias="false" x2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-70" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="-24"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-70" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="-4"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-90" end1="none" y1="-70" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-90" end1="none" y1="-70" length1="1.5" length2="1.5" antialias="false" x2="-20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-40" y2="-60" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="-35"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-35" y2="-70" end1="none" y1="-60" length1="1.5" length2="1.5" antialias="false" x2="-35"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-35" y2="-70" end1="none" y1="-70" length1="1.5" length2="1.5" antialias="false" x2="-30"/>
+        <line style="line-style:dashed;line-weight:normal;filling:none;color:black" end2="none" x1="-35" y2="-65" end1="none" y1="-65" length1="1.5" length2="1.5" antialias="false" x2="-4"/>
+        <text x="-18" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-78" text="L" color="#000000"/>
+        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-78" text="N" color="#000000"/>
+        <text x="22" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-78" text="PE" color="#000000"/>
+        <dynamic_text z="47" Valignment="AlignTop" x="-75" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{5aacdb73-7ec2-43ee-88b0-86c08eb2e70d}" y="-76" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text z="48" Valignment="AlignTop" x="-48" text_from="ElementInfo" font="Sans Serif,7,-1,5,50,0,0,0,0,0" rotation="0" uuid="{942b1344-5162-4c74-b50a-4e3438266e10}" y="-49.5" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>tension-protocol</info_name>
+        </dynamic_text>
+        <rect style="line-style:dashdotted;line-weight:normal;filling:none;color:black" x="-46" height="71" rx="0" width="81" y="-85" ry="0" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-23" height="20" rx="0" width="6" y="-50" ry="0" antialias="false"/>
+        <text x="-18.8229" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="73.7507" text="L" color="#000000"/>
+        <text x="1.17705" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="73.7507" text="N" color="#000000"/>
+        <text x="21" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="74.1048" text="PE" color="#000000"/>
+        <terminal orientation="n" x="-20" y="-90"/>
+        <terminal orientation="n" x="20" y="-90"/>
+        <terminal orientation="n" x="0" y="-90"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc16pnt.elmt

@@ -0,0 +1,37 @@
+<definition hotspot_x="20" width="40" version="0.80" orientation="dyyy" hotspot_y="28" type="element" height="60" link_type="simple">
+    <uuid uuid="{d662a17e-3d5d-4833-967b-51f763ef4688}"/>
+    <names>
+        <name lang="it">Presa monofase</name>
+        <name lang="cs">Zásuvka jednopólová</name>
+        <name lang="ar">مقبس أحادي الوجه</name>
+        <name lang="en">Outlet 3 poles</name>
+        <name lang="pl">Gniazdo wtyczkowe</name>
+        <name lang="fr">PC mono</name>
+        <name lang="de">Steckdose 3-polig</name>
+        <name lang="nl">Contact AC + aarde</name>
+        <name lang="es">Toma corriente 3P</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <dynamic_text frame="false" text_width="-1" rotation="0" uuid="{9a66ab1b-c9d8-4de6-a786-a16ba182d28f}" x="19.3725" text_from="ElementInfo" Valignment="AlignTop" y="-19.7" z="1" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line antialias="false" length1="1.5" y2="22" x1="0" y1="14" end1="none" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <circle antialias="true" diameter="30" x="-15" y="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" y2="-18" x1="-10" y1="-11" end1="none" x2="-10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <circle antialias="true" diameter="5" x="-7.5" y="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle antialias="true" diameter="5" x="-2.5" y="7.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <line antialias="false" length1="1.5" y2="-18" x1="10" y1="-11" end1="none" x2="10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <circle antialias="true" diameter="5" x="3.5" y="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" y2="3" x1="0" y1="5" end1="none" x2="0" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line antialias="false" length1="1.5" y2="0.7" x1="2" y1="0.7" end1="none" x2="-2" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line antialias="false" length1="1.5" y2="2.5" x1="-3" y1="2.5" end1="none" x2="3" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line antialias="false" length1="1.5" y2="-1.1" x1="-1" y1="-1.1" end1="none" x2="1" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <terminal x="-10" orientation="n" y="-20"/>
+        <terminal x="0" orientation="s" y="22"/>
+        <terminal x="10" orientation="n" y="-20"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_mono2.elmt

@@ -0,0 +1,49 @@
+<definition height="50" hotspot_x="15" hotspot_y="23" orientation="dyyy" link_type="simple" type="element" version="0.80" width="30">
+    <uuid uuid="{f09c1826-5deb-4e5d-a565-992b010a8007}"/>
+    <names>
+        <name lang="it">Presa monofase</name>
+        <name lang="nl">Contact AC + aarde</name>
+        <name lang="pl">Gniazdo wtyczkowe</name>
+        <name lang="cs">Zásuvka jednopólová</name>
+        <name lang="de">Steckdose 3-polig</name>
+        <name lang="ar">مقبس أحادي الوجه</name>
+        <name lang="fr">PC mono 2P+ Terre</name>
+        <name lang="en">Outlet 3 poles</name>
+        <name lang="es">Toma corriente 3P</name>
+    </names>
+    <elementInformations>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+    </elementInformations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <dynamic_text z="1" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="13" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-16" uuid="{9a66ab1b-c9d8-4de6-a786-a16ba182d28f}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="18"/>
+        <circle x="-10.0499" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20.0998" y="-10.0499"/>
+        <line end1="none" x1="-6" x2="-6" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14"/>
+        <circle x="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" y="-6"/>
+        <circle x="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="4" y="4"/>
+        <line end1="none" x1="6" x2="6" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14"/>
+        <circle x="2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" y="-6"/>
+        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3"/>
+        <line end1="none" x1="1.3" x2="-1.3" end2="none" length1="1.5" length2="1.5" antialias="false" y1="1" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1"/>
+        <line end1="none" x1="-2.3" x2="2.3" end2="none" length1="1.5" length2="1.5" antialias="false" y1="2.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2.5"/>
+        <line end1="none" x1="-0.6" x2="0.6" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-0.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-0.5"/>
+        <terminal x="6" orientation="n" y="-15"/>
+        <terminal x="-6" orientation="n" y="-15"/>
+        <terminal x="0" orientation="s" y="17"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac.elmt

@@ -0,0 +1,42 @@
+<definition hotspot_y="19" link_type="simple" hotspot_x="13" orientation="dyyy" version="0.80" width="20" height="40" type="element">
+    <uuid uuid="{db0d94b0-30de-4477-b693-49af4da70f3e}"/>
+    <names>
+        <name lang="fr">Porte fusible</name>
+        <name lang="cs">Pojistkový odpínač</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="manufacturer"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="designation"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-3" z="1" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{d3f026c2-4718-4cf6-b783-49b6080d3ec3}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="4" x="-2" z="2" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{f3c9c54f-bc4f-44b6-a691-e28a08f857d2}" Halignment="AlignLeft">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="-15" x="-28" z="3" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{0e5e65df-6f92-4dc2-a46e-040c5e3e1d6c}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <polygon x3="-8.77479" y2="10.8817" y3="-6.81657" y1="8.87394" y4="-8.81219" x5="2.8423" x1="2.82578" x4="-3.13713" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-2.92493" closed="false" y5="8.89046" antialias="true"/>
+        <line y2="10.0885" length2="1.5" y1="-7.79981" x1="-5.91596" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0.01823" antialias="true"/>
+        <line y2="-10" length2="1.5" y1="-10" x1="-3" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="3" antialias="false"/>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="2" x="-34" z="7" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{f61998ec-d878-4737-9e74-8679a306af5a}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <line y2="-15" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <line y2="15" length2="1.5" y1="10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <terminal y="15" orientation="s" x="0"/>
+        <terminal y="-15" orientation="n" x="0"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac_2p.elmt

@@ -0,0 +1,46 @@
+<definition hotspot_y="23" link_type="simple" hotspot_x="13" orientation="dyyy" version="0.80" width="40" height="50" type="element">
+    <uuid uuid="{c05b1ed0-3c90-4883-b55e-5ce37456066e}"/>
+    <names>
+        <name lang="fr">Porte fusible 2p</name>
+        <name lang="cs">Pojistkový odpínač 2p</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-2" z="1" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{f3c93a63-d77b-424b-9c18-d153bea32786}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="18" z="2" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{38a6df9a-8413-46c8-aa7d-d1d5ef63881a}" Halignment="AlignLeft">
+            <text>3</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="6" x="-3" z="3" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{b31fc96e-a908-411c-b40a-b3a7f22198d5}" Halignment="AlignLeft">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="6" x="17" z="4" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{466cd65b-73e6-45a3-8814-f355c2932228}" Halignment="AlignLeft">
+            <text>4</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="-17" x="-37" z="5" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{889abca0-c07a-45fb-8316-336ef36bf18d}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <polygon x3="10.8698" y2="12.4573" y3="-6.75574" y1="10.2834" y4="-8.81219" x5="22.7384" x1="22.4446" x4="16.8629" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="17.0979" closed="false" y5="9.98961" antialias="true"/>
+        <polygon x3="-9.13021" y2="12.4573" y3="-6.75574" y1="10.2834" y4="-8.81219" x5="2.73843" x1="2.44465" x4="-3.13713" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-2.90211" closed="false" y5="9.98961" antialias="true"/>
+        <line y2="11.0885" length2="1.5" y1="-7.51957" x1="13.8663" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20.0182" antialias="true"/>
+        <line y2="-10" length2="1.5" y1="-10" x1="17" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="23" antialias="false"/>
+        <line y2="11.0885" length2="1.5" y1="-7.51957" x1="-6.13367" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0.01823" antialias="true"/>
+        <line y2="-10" length2="1.5" y1="-10" x1="-3" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="3" antialias="false"/>
+        <line y2="0" length2="1.5" y1="0" x1="0" end2="none" end1="none" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="12" antialias="false"/>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="-1" x="-43" z="13" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{26a975c5-2a42-4c0b-b887-0c1879ae28bc}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <line y2="-16" length2="1.5" y1="-10" x1="20" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" antialias="false"/>
+        <line y2="-16" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <line y2="18" length2="1.5" y1="12" x1="20" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" antialias="false"/>
+        <line y2="18" length2="1.5" y1="12" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <terminal y="18" orientation="s" x="0"/>
+        <terminal y="-16" orientation="n" x="20"/>
+        <terminal y="18" orientation="s" x="20"/>
+        <terminal y="-16" orientation="n" x="0"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac_3p.elmt

@@ -0,0 +1,60 @@
+<definition type="element" link_type="simple" hotspot_y="18" orientation="dyyy" hotspot_x="13" width="60" height="40" version="0.80">
+    <uuid uuid="{bdaf5ba8-ac37-4518-b0ae-6e98828eaa6d}"/>
+    <names>
+        <name lang="cs">Pojistkový odpínač 3p</name>
+        <name lang="fr">Porte Fusible 3p</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="1" frame="false" uuid="{a1bea68c-2f6b-47e9-95cb-796c23035510}" rotation="0" x="37" Halignment="AlignLeft" text_from="UserText" y="-22" text_width="-1" Valignment="AlignTop">
+            <text>5</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="2" frame="false" uuid="{fea18f19-a064-4c5f-89d3-394f1556c09f}" rotation="0" x="17" Halignment="AlignLeft" text_from="UserText" y="-22" text_width="-1" Valignment="AlignTop">
+            <text>3</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="3" frame="false" uuid="{73eb4bf8-0b8d-4ef4-8608-ecf1dcb5ce68}" rotation="0" x="-3" Halignment="AlignLeft" text_from="UserText" y="-22" text_width="-1" Valignment="AlignTop">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="4" frame="false" uuid="{79b7fc2c-af09-4355-8472-41f49d3cbf41}" rotation="0" x="17" Halignment="AlignLeft" text_from="UserText" y="5" text_width="-1" Valignment="AlignTop">
+            <text>4</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="5" frame="false" uuid="{a8895b11-8d45-40bd-a211-fe80d05f254e}" rotation="0" x="37" Halignment="AlignLeft" text_from="UserText" y="5" text_width="-1" Valignment="AlignTop">
+            <text>6</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="6" frame="false" uuid="{7e5d1555-4bd8-4e16-97fa-41d95ed212b7}" rotation="0" x="-3" Halignment="AlignLeft" text_from="UserText" y="6" text_width="-1" Valignment="AlignTop">
+            <text>2</text>
+        </dynamic_text>
+        <polygon y1="10.2834" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="22.7384" closed="false" y3="-6.75574" x3="10.8698" y5="9.98961" x1="22.4446" y2="12.4573" x4="16.8629" y4="-8.81219" x2="17.0979" antialias="true"/>
+        <polygon y1="10.2834" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="42.7384" closed="false" y3="-6.75574" x3="30.8698" y5="9.98961" x1="42.4447" y2="12.4573" x4="36.8629" y4="-8.81219" x2="37.0979" antialias="true"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="9" frame="false" uuid="{f497d4a7-97ed-478a-8d51-e7712d3da71a}" rotation="0" x="-37" Halignment="AlignLeft" text_from="ElementInfo" y="-17" text_width="-1" Valignment="AlignTop">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="-7.51957" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="13.8663" y2="11.0885" length2="1.5" x2="20.0182" antialias="true"/>
+        <line y1="-7.51957" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="33.8663" y2="11.0885" length2="1.5" x2="40.0182" antialias="true"/>
+        <polygon y1="10.2834" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="2.73843" closed="false" y3="-6.75574" x3="-9.13021" y5="9.98961" x1="2.44465" y2="12.4573" x4="-3.13713" y4="-8.81219" x2="-2.90211" antialias="true"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="17" y2="-10" length2="1.5" x2="23" antialias="false"/>
+        <line y1="-7.51957" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="-6.13367" y2="11.0885" length2="1.5" x2="0.01823" antialias="true"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="37" y2="-10" length2="1.5" x2="43" antialias="false"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="-3" y2="-10" length2="1.5" x2="3" antialias="false"/>
+        <line y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="0" y2="0" length2="1.5" x2="12" antialias="false"/>
+        <line y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="0" length2="1.5" x2="32" antialias="false"/>
+        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" z="19" frame="false" uuid="{f70a1441-9e9b-40ca-b09f-35d65dfdd582}" rotation="0" x="-44" Halignment="AlignLeft" text_from="ElementInfo" y="0" text_width="-1" Valignment="AlignTop">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="0" y2="-14" length2="1.5" x2="0" antialias="false"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="-14" length2="1.5" x2="20" antialias="false"/>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="40" y2="-14" length2="1.5" x2="40" antialias="false"/>
+        <line y1="12" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="40" y2="16" length2="1.5" x2="40" antialias="false"/>
+        <line y1="12" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="16" length2="1.5" x2="20" antialias="false"/>
+        <line y1="12" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="0" y2="16" length2="1.5" x2="0" antialias="false"/>
+        <terminal x="40" orientation="s" y="16"/>
+        <terminal x="0" orientation="n" y="-14"/>
+        <terminal x="40" orientation="n" y="-14"/>
+        <terminal x="0" orientation="s" y="16"/>
+        <terminal x="20" orientation="n" y="-14"/>
+        <terminal x="20" orientation="s" y="16"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/pojistka1p.elmt

@@ -0,0 +1,32 @@
+<definition hotspot_y="19" link_type="simple" hotspot_x="5" orientation="dyyy" version="0.80" width="10" height="40" type="element">
+    <uuid uuid="{82d755cf-7766-41ec-847a-6e23987685d5}"/>
+    <names>
+        <name lang="fr">Fusible</name>
+        <name lang="cs">Pojistka</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect y="-10" ry="0" x="-3" width="6" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false"/>
+        <line y2="10" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-2" z="3" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{bfbf3256-ac23-4ce9-b4e0-729aa7338739}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="5" x="-2" z="4" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{b12232a5-c73b-4559-ba54-076c7a50bef5}" Halignment="AlignLeft">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="-17" x="-30" z="5" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{dd6f5b99-eca8-4928-89f0-eb8204fb8854}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="-1" x="-35" z="6" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{77ff60fb-d245-4681-8f5e-ac827f675bab}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <line y2="-15" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <line y2="15" length2="1.5" y1="10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <line y2="15" length2="1.5" y1="-15" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <terminal y="-15" orientation="n" x="0"/>
+        <terminal y="15" orientation="s" x="0"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/pojistka2p.elmt

@@ -0,0 +1,43 @@
+<definition hotspot_y="19" link_type="simple" hotspot_x="5" orientation="dyyy" version="0.80" width="20" height="40" type="element">
+    <uuid uuid="{329f82a5-7029-4192-ab32-2e8b11615564}"/>
+    <names>
+        <name lang="fr">Fusible 2p</name>
+        <name lang="cs">Pojistka 2p</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect y="-10" ry="0" x="7" width="6" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false"/>
+        <rect y="-10" ry="0" x="-3" width="6" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false"/>
+        <line y2="10" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <line y2="10" length2="1.5" y1="-10" x1="10" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="false"/>
+        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="7" z="5" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{c37aa946-efa6-4e46-b228-9c8b1d8ce193}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-3" z="6" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{6190ce78-54fe-49ae-85b3-915fd3bcf431}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="5" x="7" z="7" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{caa6bbc0-5cda-4bd6-8c5d-14a8b1a19f5d}" Halignment="AlignLeft">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="UserText" y="5" x="-3" z="8" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{9f060a2d-d66b-4b5b-b86b-d4c0c872f605}" Halignment="AlignLeft">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="-17" x="-30" z="9" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{c8fdb551-ba1e-4910-9293-206116b3640f}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text text_width="-1" text_from="ElementInfo" y="0" x="-36" z="10" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{9a3517e6-3bbf-4a00-8ebb-198952257b50}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <line y2="-15" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <line y2="-15" length2="1.5" y1="-10" x1="10" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="false"/>
+        <line y2="15" length2="1.5" y1="10" x1="10" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="false"/>
+        <line y2="15" length2="1.5" y1="10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
+        <terminal y="15" orientation="s" x="0"/>
+        <terminal y="-15" orientation="n" x="0"/>
+        <terminal y="15" orientation="s" x="10"/>
+        <terminal y="-15" orientation="n" x="10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_2f2.elmt

@@ -0,0 +1,67 @@
+<definition version="0.70" height="60" type="element" width="40" hotspot_x="30" link_type="master" hotspot_y="34" orientation="dyyy">
+    <uuid uuid="{315bc1e6-0466-4d2f-a6e4-547252f6bd16}"/>
+    <names>
+        <name lang="ar">قطب ثنائي القطبية قطبين محميين</name>
+        <name lang="de">Leitungsschutzschalter 2P</name>
+        <name lang="en">Circuit-breaker</name>
+        <name lang="es">Disyuntor termico magnetico en 2P</name>
+        <name lang="it">Int. Aut. Magneto-termico 2P</name>
+        <name lang="fr">Disjoncteur bipolaire 2 poles proteges</name>
+        <name lang="pl">Wyłącznik</name>
+        <name lang="nl">Lastscheider 2</name>
+        <name lang="cs">Dvojpólový jistič 2 póly chránící</name>
+    </names>>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line y1="-10" style="line-style:dashed;line-weight:thin;filling:none;color:black" x1="-23" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="-3"/>
+        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="0"/>
+        <arc height="5" x="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
+        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="-20"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="0"/>
+        <arc height="5" x="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
+        <polygon x3="-5" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="true" y2="0" closed="false" x2="0"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-20"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
+        <polygon x3="-25" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" antialias="true" y2="0" closed="false" x2="-20"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="5"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
+        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="0"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="-15"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-2"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="2"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-50.8598" text_from="ElementInfo" y="-20.6932" z="19" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{eb3e61e9-605d-4992-b5ea-7f0f84509000}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="-20"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-18" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-22"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-18"/>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-22" text_from="UserText" y="-36" z="23" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{73b5a968-8936-4cd5-8ecc-cd7ab85d42a1}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-2" text_from="UserText" y="-36" z="24" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{20a7e985-c1d2-44e7-bb18-76aa73849729}" Halignment="AlignLeft">
+            <text>3</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-21" text_from="UserText" y="9" z="25" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{1c2a2b8e-1f38-49b3-9a86-61004e06cf0d}" Halignment="AlignLeft">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-1" text_from="UserText" y="9" z="26" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{471cb447-49c7-4d4b-8e37-fe17d6251401}" Halignment="AlignLeft">
+            <text>4</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" frame="false" x="-50" text_from="ElementInfo" y="-2" z="27" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{8d5fdb0a-e44b-4d3f-b448-ddb983b2658d}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <terminal x="0" y="20" orientation="s"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="-20" y="20" orientation="s"/>
+        <terminal x="-20" y="-30" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/jistic_3p.elmt

@@ -0,0 +1,84 @@
+<definition version="0.70" height="60" type="element" width="60" hotspot_x="30" link_type="master" hotspot_y="34" orientation="dyyy">
+    <uuid uuid="{458bcb69-d51d-4add-ab45-1830d8f42c0f}"/>
+    <names>
+        <name lang="cs">Trojpólový jistič</name>
+        <name lang="ar">قاطع ثلاثي القطبية</name>
+        <name lang="en">Circuit-breaker</name>
+        <name lang="nl">Lastscheider 3</name>
+        <name lang="pl">Wyłącznik</name>
+        <name lang="it">Int. Aut. Magneto-termico 3P</name>
+        <name lang="de">Leitungsschutzschalter 3P</name>
+        <name lang="fr">Disjoncteur tripolaire</name>
+    </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line y1="-10" style="line-style:dashed;line-weight:thin;filling:none;color:black" x1="-23" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="17"/>
+        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="0"/>
+        <arc height="5" x="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
+        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="-20"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="0"/>
+        <arc height="5" x="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
+        <polygon x3="-5" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="true" y2="0" closed="false" x2="0"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-20"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
+        <polygon x3="-25" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" antialias="true" y2="0" closed="false" x2="-20"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="5"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
+        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="0"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="-15"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-2"/>
+        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="20"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="2"/>
+        <polygon x3="15" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" antialias="true" y2="0" closed="false" x2="20"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-58" text_from="ElementInfo" y="-17" z="21" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{c1498517-6b83-4819-acf9-40e73beeed6e}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <arc height="5" x="16" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
+        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="-20"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="20"/>
+        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="25"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="25" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="25"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-18" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-22"/>
+        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="25"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-18"/>
+        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="20"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="22" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="18"/>
+        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="18" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="22"/>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-22" text_from="UserText" y="-36" z="33" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{a2e86dba-725c-4b0c-903a-67538d17bc4e}" Halignment="AlignLeft">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-2" text_from="UserText" y="-36" z="34" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{dad2c45a-8585-46a9-a90c-a8fd0d67cb27}" Halignment="AlignLeft">
+            <text>3</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="18" text_from="UserText" y="-36" z="35" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{885a15ae-5164-4b25-b69d-ae08df7f26e6}" Halignment="AlignLeft">
+            <text>5</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-21" text_from="UserText" y="9" z="36" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{192b9597-f3e8-4a9c-9b67-e46d9e7a645c}" Halignment="AlignLeft">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-1" text_from="UserText" y="9" z="37" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{3c3c969f-f7f0-4606-afc2-14fec241addc}" Halignment="AlignLeft">
+            <text>4</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="19" text_from="UserText" y="9" z="38" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{37c0d3b1-0e66-4d8c-b068-202e17d9c204}" Halignment="AlignLeft">
+            <text>6</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" frame="false" x="-60" text_from="ElementInfo" y="0" z="39" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{2773a71b-e557-4b99-bdaf-be7d85d0257f}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>comment</info_name>
+        </dynamic_text>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="-20" y="20" orientation="s"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="-20" y="-30" orientation="n"/>
+        <terminal x="20" y="20" orientation="s"/>
+        <terminal x="0" y="20" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/20_disconnecting_switches/inter-sectionneur_tetra.elmt

@@ -13,11 +13,11 @@
         <elementInformation show="1" name="label"></elementInformation>
         <elementInformation show="1" name="supplier"></elementInformation>
         <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="manufacturer_reference"></elementInformation>
         <elementInformation show="1" name="designation"></elementInformation>
         <elementInformation show="1" name="comment"></elementInformation>
         <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="machine-manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
         <elementInformation show="1" name="description"></elementInformation>
     </elementInformations>
     <informations>Author: The QElectroTech team

elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interdiff_40a.elmt

@@ -0,0 +1,69 @@
+<definition orientation="dyyy" link_type="master" width="100" version="0.80" hotspot_y="34" type="element" height="80" hotspot_x="42">
+    <uuid uuid="{8bb0ba6c-cdca-4b77-9ecc-f3fe070bcd34}"/>
+    <names>
+        <name lang="nl">Lastscheider 1P+N</name>
+        <name lang="es">Disyuntor termico magnetico en polo P+N</name>
+        <name lang="ar">قاطع ثنائي القطبية - 1 قطب محمي</name>
+        <name lang="cs">Dvojpólový jistič 1 pól chránící</name>
+        <name lang="en">Circuit-breaker</name>
+        <name lang="pl">Wyłącznik</name>
+        <name lang="it">Int. Aut. Magneto-termico 1P+N</name>
+        <name lang="de">Leitungsschutzschalter 1P+N</name>
+        <name lang="fr">Interrupteur différentiel  40A 30mA </name>
+    </names>
+    <kindInformations>
+        <kindInformation show="1" name="number">1</kindInformation>
+        <kindInformation show="1" name="state">NO</kindInformation>
+        <kindInformation show="1" name="type">protection</kindInformation>
+    </kindInformations>
+    <elementInformations>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="designation"></elementInformation>
+        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
+        <elementInformation show="1" name="manufacturer"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="manufacturer_reference"></elementInformation>
+    </elementInformations>
+    <informations>S.DEFFAUX
+Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" length2="1.5" antialias="false" y1="4" y2="40" x1="10"/>
+        <polygon x3="-35" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" antialias="true" y1="3" y3="-20" closed="false" y2="0" x1="-30"/>
+        <polygon x3="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-20" antialias="true" y1="5" y3="-20" closed="false" y2="0" x1="-20"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-10" length2="1.5" antialias="false" y1="4" y2="40" x1="-10"/>
+        <dynamic_text y="-18" text_from="ElementInfo" z="6" frame="false" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" Valignment="AlignTop" Halignment="AlignLeft" x="20" text_width="-1" uuid="{7c189aba-a86c-4286-964d-b437612ed744}">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line length1="1.5" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="8" length2="1.5" antialias="false" y1="-10" y2="-10" x1="-22"/>
+        <polygon x3="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-10" antialias="true" y1="3" y3="-20" closed="false" y2="0" x1="-10"/>
+        <polygon x3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="true" y1="3" y3="-20" closed="false" y2="0" x1="10"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-10" length2="1.5" antialias="false" y1="-30" y2="-20" x1="-10"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-12" length2="1.5" antialias="true" y1="-22" y2="-18" x1="-8"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-8" length2="1.5" antialias="true" y1="-22" y2="-18" x1="-12"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" length2="1.5" antialias="false" y1="-30" y2="-20" x1="10"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="8" length2="1.5" antialias="true" y1="-22" y2="-18" x1="12"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="12" length2="1.5" antialias="true" y1="-22" y2="-18" x1="8"/>
+        <text y="20" text="40A" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" x="22" color="#000000"/>
+        <text y="34" text="30mA" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" x="22" color="#000000"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" length2="1.5" antialias="false" y1="35" y2="35" x1="-10"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" length2="1.5" antialias="false" y1="35" y2="20" x1="-30"/>
+        <rect y="10" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4" rx="0" height="10" x="-32" antialias="false" ry="0"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" length2="1.5" antialias="false" y1="10" y2="3" x1="-30"/>
+        <polygon x3="-20" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" y5="-20" x5="-20" antialias="false" x4="-20" y1="-20" y3="-25" y4="-20" closed="false" y2="-25" x1="-30"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="10" length2="1.5" antialias="false" y1="5" y2="5" x1="-20"/>
+        <line length1="1.5" end1="none" end2="none" style="line-style:dashdotted;line-weight:thin;filling:none;color:black" x2="-35" length2="1.5" antialias="false" y1="-10" y2="-10" x1="-40"/>
+        <polygon x3="-40" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-40" y5="-7" x5="-38" antialias="false" x4="-38" y1="-13" y3="-7" y4="-7" closed="false" y2="-13" x1="-38"/>
+        <rect y="20" style="line-style:normal;line-weight:normal;filling:none;color:black" width="40" rx="5" height="10" x="-20" antialias="false" ry="5"/>
+        <terminal orientation="n" y="-30" x="10"/>
+        <terminal orientation="n" y="-30" x="-10"/>
+        <terminal orientation="s" y="40" x="-10"/>
+        <terminal orientation="s" y="40" x="10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interrupteur_differentiel.elmt

@@ -17,14 +17,14 @@
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
     <elementInformations>
-        <elementInformation name="machine-manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
         <elementInformation name="description" show="1"></elementInformation>
         <elementInformation name="manufacturer" show="1"></elementInformation>
         <elementInformation name="designation" show="1"></elementInformation>
         <elementInformation name="unity" show="1"></elementInformation>
         <elementInformation name="comment" show="1"></elementInformation>
         <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
         <elementInformation name="quantity" show="1"></elementInformation>
         <elementInformation name="label" show="1"></elementInformation>
         <elementInformation name="supplier" show="1"></elementInformation>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre-2.elmt

@@ -1,33 +1,37 @@
-<definition height="60" version="0.5" link_type="simple" width="40" orientation="dyyy" hotspot_x="18" hotspot_y="30" type="element">
+<definition height="60" hotspot_x="18" hotspot_y="30" orientation="dyyy" link_type="simple" type="element" version="0.80" width="40">
-    <uuid uuid="{a091ae1e-5e4f-4afe-a478-25d13dc34e61}"/>
+    <uuid uuid="{2aad9da5-665a-4189-9034-2bd6e1b00386}"/>
     <names>
-        <name lang="de">Blitz-/Überspannungsschutz</name>
-        <name lang="el">Προστασία από υπέρταση</name>
-        <name lang="pl">Ogranicznik przepięć</name>
-        <name lang="ar">حامي من الصواعق</name>
         <name lang="it">Protez. alimentazione</name>
+        <name lang="nl">Overspanning beveiligig</name>
+        <name lang="pl">Ogranicznik przepięć</name>
+        <name lang="de">Blitz-/Überspannungsschutz</name>
+        <name lang="cs">Bleskojistka, ochrana proti nárazu</name>
+        <name lang="ar">حامي من الصواعق</name>
+        <name lang="el">Προστασία από υπέρταση</name>
+        <name lang="fr">Parafoudre</name>
         <name lang="en">Surge protection</name>
         <name lang="es">Protección contra descargas 2</name>
-        <name lang="cs">Bleskojistka, ochrana proti nárazu</name>
-        <name lang="fr">Parafoudre</name>
-        <name lang="nl">Overspanning beveiligig</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <elementInformations/>
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input tagg="label" y="-4.45" size="9" rotate="true" text="_" x="18"/>
+        <dynamic_text z="1" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="18" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-15.45" uuid="{daef117a-d243-49f7-b089-6a8ffe076f69}" Halignment="AlignLeft">
-        <text y="-16.6667" size="4" text="N" x="-10"/>
+            <text></text>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" length1="1.5" antialias="false" end2="none" length2="1.5" x2="14" x1="8" end1="none" y2="24"/>
+            <info_name>label</info_name>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" length1="1.5" antialias="false" end2="none" length2="1.5" x2="16" x1="6" end1="none" y2="22"/>
+        </dynamic_text>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" length1="1.5" antialias="false" end2="none" length2="1.5" x2="18" x1="4" end1="none" y2="20"/>
+        <text rotation="0" x="-10" text="N" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="-16.6667"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" length1="1.5" antialias="false" end2="none" length2="1.5" x2="-11" x1="-11" end1="none" y2="-20"/>
+        <line end1="none" x1="8" x2="14" end2="none" length1="1.5" length2="1.5" antialias="false" y1="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="24"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" y="-10" antialias="false" width="30" x="-15"/>
+        <line end1="none" x1="6" x2="16" end2="none" length1="1.5" length2="1.5" antialias="false" y1="22" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="22"/>
-        <text y="14.3333" size="4" text="T" x="12.5"/>
+        <line end1="none" x1="4" x2="18" end2="none" length1="1.5" length2="1.5" antialias="false" y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20"/>
-        <text y="-16.6667" size="4" text="L1" x="11"/>
+        <line end1="none" x1="-11" x2="-11" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" length1="1.5" antialias="false" end2="none" length2="1.5" x2="11" x1="11" end1="none" y2="10"/>
+        <rect height="20" x="-15" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0" y="-10" width="30"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" length1="1.5" antialias="false" end2="none" length2="1.5" x2="10" x1="10" end1="none" y2="-20"/>
+        <text rotation="0" x="10" text="T" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="15"/>
-        <terminal y="-21" orientation="n" x="10"/>
+        <text rotation="0" x="11" text="L1" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="-16.6667"/>
-        <terminal y="17" orientation="s" x="11"/>
+        <line end1="none" x1="11" x2="11" end2="none" length1="1.5" length2="1.5" antialias="false" y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
-        <terminal y="-21" orientation="n" x="-11"/>
+        <line end1="none" x1="10" x2="10" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
+        <terminal x="10" orientation="n" y="-21"/>
+        <terminal x="11" orientation="s" y="17"/>
+        <terminal x="-11" orientation="n" y="-21"/>
     </description>
 </definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre4.elmt

@@ -0,0 +1,51 @@
+<definition height="60" orientation="dyyy" hotspot_x="17" version="0.80" link_type="simple" type="element" width="40" hotspot_y="29">
+    <uuid uuid="{be4fd303-d4a8-4222-ab41-18fff7abb2b9}"/>
+    <names>
+        <name lang="de">Blitz-/Überspannungsschutz</name>
+        <name lang="nl">Overspanning beveiligig</name>
+        <name lang="fr">Parafoudre</name>
+        <name lang="it">Protez. alimentazione</name>
+        <name lang="es">Protección contra descargas 2</name>
+        <name lang="el">Προστασία από υπέρταση</name>
+        <name lang="cs">Bleskojistka, ochrana proti nárazu</name>
+        <name lang="pl">Ogranicznik przepięć</name>
+        <name lang="ar">حامي من الصواعق</name>
+        <name lang="en">Surge protection</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="manufacturer">SOFREL</elementInformation>
+        <elementInformation show="1" name="machine-manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+        <elementInformation show="1" name="designation"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+    </elementInformations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <dynamic_text font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" y="15" rotation="0" Halignment="AlignLeft" text_width="0" z="1" frame="false" x="-105" Valignment="AlignTop" text_from="ElementInfo" uuid="{5e606185-3322-4161-9d6b-df27dc27e33e}">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line length1="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="-10" length2="1" y1="-20" end2="triangle" x2="-10" y2="-1" antialias="false"/>
+        <line length1="1" end1="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="-10" length2="0.5" y1="1" end2="none" x2="-10" y2="12" antialias="false"/>
+        <text font="Arial,4,-1,5,50,0,0,0,0,0,Normal" y="-17" rotation="0" x="-9" text="N" color="#000000"/>
+        <text font="Sans Serif,4,-1,5,50,0,0,0,0,0" y="29" rotation="0" x="1" text="T" color="#000000"/>
+        <text font="Arial,4,-1,5,50,0,0,0,0,0,Normal" y="-16.6667" rotation="0" x="11" text="L1" color="#000000"/>
+        <line length1="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" y1="20" end2="none" x2="0" y2="12" antialias="false"/>
+        <line length1="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="10" length2="1" y1="-19" end2="triangle" x2="10" y2="-1" antialias="false"/>
+        <line length1="1" end1="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="10" length2="0.5" y1="1" end2="none" x2="10" y2="7" antialias="false"/>
+        <rect rx="0" y="-8" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0" x="-13" width="6" antialias="false"/>
+        <rect rx="0" y="-8" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0" x="7" width="6" antialias="false"/>
+        <line length1="2.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" y1="8" end2="none" x2="10" y2="11" antialias="false"/>
+        <line length1="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" y1="12" end2="none" x2="-9" y2="12" antialias="false"/>
+        <terminal y="22" orientation="s" x="0"/>
+        <terminal y="-21" orientation="n" x="-10"/>
+        <terminal y="-21" orientation="n" x="10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre_3.elmt

@@ -0,0 +1,51 @@
+<definition height="50" hotspot_x="30" hotspot_y="25" orientation="dyyy" link_type="simple" type="element" version="0.80" width="40">
+    <uuid uuid="{1a8ba1ea-6c13-41d0-996b-74c83bfdb91b}"/>
+    <names>
+        <name lang="it">Scaricatore</name>
+        <name lang="nl">Overspanning beveiliging</name>
+        <name lang="pl">Ogranicznik przepięć</name>
+        <name lang="de">Blitzschutz</name>
+        <name lang="cs">Bleskojistka, ochrana proti přepětí</name>
+        <name lang="fr">Parafoudre</name>
+        <name lang="en">Surge protector</name>
+        <name lang="es">Protección contra descargas</name>
+    </names>
+    <elementInformations>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+    </elementInformations>
+    <informations>EN 60617: 07-22-03</informations>
+    <description>
+        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
+        <line end1="none" x1="-20" x2="-20" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
+        <polygon y3="-8" x1="-2" x2="-2" antialias="true" x3="2" y1="-8" style="line-style:normal;line-weight:thin;filling:black;color:black" y2="-8" x5="-2" y5="-8" y4="-2" x4="0"/>
+        <polygon y3="-8" x1="-22" x2="-22" antialias="true" x3="-18" y1="-8" style="line-style:normal;line-weight:thin;filling:black;color:black" y2="-8" x5="-22" y5="-8" y4="-2" x4="-20"/>
+        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15"/>
+        <line end1="none" x1="-20" x2="-20" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15"/>
+        <dynamic_text z="4" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="7" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-7.3334" uuid="{11a32e77-08cb-463c-9e17-0ac6633307ae}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line end1="none" x1="4" x2="4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
+        <line end1="none" x1="-16" x2="-16" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
+        <line end1="none" x1="-4" x2="4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
+        <line end1="none" x1="-24" x2="-16" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
+        <line end1="none" x1="4" x2="-4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
+        <line end1="none" x1="-16" x2="-24" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
+        <line end1="none" x1="-24" x2="-24" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
+        <line end1="none" x1="-4" x2="-4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
+        <line end1="none" x1="0" x2="-20" end2="none" length1="1.5" length2="1.5" antialias="false" y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15"/>
+        <terminal x="-20" orientation="n" y="-21"/>
+        <terminal x="-10" orientation="s" y="20"/>
+        <terminal x="0" orientation="n" y="-21"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/casak.elmt

@@ -0,0 +1,31 @@
+<definition type="element" orientation="dyyy" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
+    <uuid uuid="{45a179e7-866e-4756-965f-d2445ced8dd2}"/>
+    <names>
+        <name lang="cs">Časové relé</name>
+    </names>
+    <kindInformations>
+        <kindInformation show="1" name="type">coil</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" height="15" rx="0" width="28" y="-8" ry="0" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" x="-20" height="15" rx="0" width="5" y="-8" ry="0" antialias="false"/>
+        <dynamic_text z="3" Valignment="AlignTop" x="-45" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{bf273769-c856-4d5c-a56a-6a014b357999}" y="-12" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="A1" color="#000000"/>
+        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="A2" color="#000000"/>
+        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="S" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="15" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
+        <dynamic_text z="10" Valignment="AlignTop" x="-9" text_from="UserText" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" uuid="{02030033-c6b1-4a95-b990-74fa2f7d147d}" y="-9" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text>g</text>
+        </dynamic_text>
+        <terminal orientation="s" x="0" y="15"/>
+        <terminal orientation="n" x="0" y="-15"/>
+        <terminal orientation="n" x="-10" y="-15"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/timer816.elmt

@@ -0,0 +1,28 @@
+<definition type="element" orientation="dyyy" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
+    <uuid uuid="{2abf6e68-2359-4b1b-b468-f7842007f956}"/>
+    <names>
+        <name lang="cs">Timer T 816</name>
+    </names>
+    <kindInformations>
+        <kindInformation show="1" name="type">coil</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" height="15" rx="0" width="28" y="-8" ry="0" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" x="-20" height="15" rx="0" width="5" y="-8" ry="0" antialias="false"/>
+        <dynamic_text z="3" Valignment="AlignTop" x="-45" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{9b8efa95-7359-4c1f-84ce-b9787d530cd9}" y="-12" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="2" color="#000000"/>
+        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="10" color="#000000"/>
+        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="5" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="15" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
+        <terminal orientation="n" x="-10" y="-15"/>
+        <terminal orientation="n" x="0" y="-15"/>
+        <terminal orientation="s" x="0" y="15"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/tmr48.elmt

@@ -0,0 +1,28 @@
+<definition type="element" orientation="dyyy" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
+    <uuid uuid="{996f934d-7b3d-40fd-81a5-c62b585d5319}"/>
+    <names>
+        <name lang="cs">Timer TMR48</name>
+    </names>
+    <kindInformations>
+        <kindInformation show="1" name="type">coil</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" height="15" rx="0" width="28" y="-8" ry="0" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" x="-20" height="15" rx="0" width="5" y="-8" ry="0" antialias="false"/>
+        <dynamic_text z="3" Valignment="AlignTop" x="-45" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{ec3ddd44-7d10-4947-93f2-d66496e14415}" y="-12" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="2" color="#000000"/>
+        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="10" color="#000000"/>
+        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="6" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="15" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
+        <terminal orientation="n" x="0" y="-15"/>
+        <terminal orientation="n" x="-10" y="-15"/>
+        <terminal orientation="s" x="0" y="15"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/zpozdeny_odpad.elmt

@@ -0,0 +1,31 @@
+<definition version="0.70" height="50" type="element" width="30" hotspot_x="12" link_type="slave" hotspot_y="24" orientation="dyyy">
+    <uuid uuid="{90fe1aa6-d017-4064-8ce7-242a4b7b416a}"/>
+    <names>
+        <name lang="cs">Zpožděný odpad </name>
+    </names>
+    <kindInformations>
+        <kindInformation name="state" show="1">NO</kindInformation>
+        <kindInformation name="number" show="1">1</kindInformation>
+        <kindInformation name="type" show="1">delayOff</kindInformation>
+    </kindInformations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon x3="10" y1="-10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" antialias="true" y2="10" closed="false" x2="10"/>
+        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="10"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-23" text_from="ElementInfo" y="-12" z="3" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{87554fe0-c02a-4473-81d1-4cb89205402c}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="7" text_from="UserText" y="-26" z="4" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{07fe6bcb-92fd-4fef-bef4-595fab066fa2}" Halignment="AlignLeft">
+            <text>15</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="7" text_from="UserText" y="9" z="5" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{bbc34c0f-1331-4499-8663-978b944c8287}" Halignment="AlignLeft">
+            <text>18</text>
+        </dynamic_text>
+        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="3"/>
+        <arc height="10" x="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" y="-5" width="10" start="270" antialias="true"/>
+        <terminal x="10" y="20" orientation="s"/>
+        <terminal x="10" y="-20" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/15_protection_contacts/contact_gv_no.elmt

@@ -1,26 +1,29 @@
-<definition type="element" hotspot_y="44" version="0.60" hotspot_x="42" link_type="slave" orientation="dyyy" width="50" height="60">
+<definition orientation="dyyy" type="element" width="50" height="60" link_type="slave" version="0.80" hotspot_x="42" hotspot_y="44">
-    <uuid uuid="{ad62e994-1c20-42c4-8a2f-40519cc56f5c}"/>
+    <uuid uuid="{9856a744-050c-4144-9743-a935fcd245ae}"/>
     <names>
-        <name lang="fr">Contact NO disjoncteur magnéto-thermique GV</name>
         <name lang="es">Contacto de disyuntor termico magnetico NA</name>
+        <name lang="fr">Contact NO disjoncteur magnéto-thermique GV</name>
     </names>
     <kindInformations>
-        <kindInformation name="number" show="1">1</kindInformation>
-        <kindInformation name="state" show="1">NC</kindInformation>
         <kindInformation name="type" show="1">simple</kindInformation>
+        <kindInformation name="number" show="1">1</kindInformation>
+        <kindInformation name="state" show="1">NO</kindInformation>
     </kindInformations>
     <informations></informations>
     <description>
-        <polygon x3="-22" x6="-27" y4="-26" y2="-20" closed="false" x5="-27" y5="-26" y6="-30" x7="-27" x4="-22" x2="-27" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y1="-16" x1="-27" y7="-30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x3="-22" y2="-20" y6="-30" y7="-30" closed="false" x5="-27" y5="-26" x2="-27" x4="-22" y1="-16" x6="-27" x7="-27" x1="-27" y4="-26" y3="-20"/>
-        <rect y="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-37" width="20" height="28"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" ry="0" rx="0" x="-37" width="20" height="28" y="-30"/>
-        <text y="-5" text="I>" size="9" x="-34"/>
+        <text font="Sans Serif,9,-1,5,50,0,0,0,0,0" text="I>" x="-34" rotation="0" y="-5" color="#000000"/>
-        <input y="-13.5" text="_" size="8" tagg="label" rotate="true" x="4"/>
+        <dynamic_text font="Sans Serif,8,-1,5,50,0,0,0,0,0" x="4" Valignment="AlignTop" rotation="0" text_from="ElementInfo" y="-24.5" Halignment="AlignLeft" uuid="{56a6a9aa-83b0-4fb3-9934-c55a1d9f5d7e}" z="4" frame="false" text_width="-1">
-        <line length1="1.5" length2="1.5" y2="-16" end2="none" x2="-17" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-16" x1="-37"/>
+            <text></text>
-        <line length1="1.5" length2="1.5" y2="-40" end2="none" x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-25" x1="0"/>
+            <info_name>label</info_name>
-        <line length1="1.5" length2="1.5" y2="-25" end2="none" x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-5" x1="0"/>
+        </dynamic_text>
-        <line length1="1.5" length2="1.5" y2="-5" end2="none" x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="10" x1="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-16" end2="none" x2="-17" length2="1.5" y1="-16" end1="none" x1="-37" length1="1.5"/>
-        <line length1="1.5" length2="1.5" y2="-15" end2="none" x2="-7" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y1="-15" x1="-15"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-40" end2="none" x2="0" length2="1.5" y1="-25" end1="none" x1="0" length1="1.5"/>
-        <terminal y="-40" orientation="n" x="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-25" end2="none" x2="-10" length2="1.5" y1="-5" end1="none" x1="0" length1="1.5"/>
-        <terminal y="10" orientation="s" x="0"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-5" end2="none" x2="0" length2="1.5" y1="10" end1="none" x1="0" length1="1.5"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y2="-15" end2="none" x2="-7" length2="1.5" y1="-15" end1="none" x1="-15" length1="1.5"/>
+        <terminal orientation="n" x="0" y="-40"/>
+        <terminal orientation="s" x="0" y="10"/>
     </description>
 </definition>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/tranfo230_400_12_24.elmt

@@ -0,0 +1,72 @@
+<definition hotspot_x="4" height="40" type="element" version="0.80" orientation="dyyy" link_type="simple" width="50" hotspot_y="25">
+    <uuid uuid="{f09cb4f3-8977-48d7-9996-e27c3cfc2414}"/>
+    <names>
+        <name lang="fr">Transformateur 230/400-12/24V</name>
+        <name lang="cs">Trafo se třemi vinutími</name>
+    </names>
+    <elementInformations>
+        <elementInformation name="description" show="1">Transformateur 230/400-12/24V</elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <arc antialias="true" height="10.0649" style="line-style:normal;line-weight:normal;filling:none;color:black" x="30" y="-0.103806" angle="180" width="10" start="0"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="0" y="0" angle="180" width="10" start="0"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="10" y="0" angle="180" width="10" start="0"/>
+        <arc antialias="true" height="10.0649" style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" y="-0.103806" angle="180" width="10" start="0"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="0" y="-20" angle="90" width="10" start="270"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="0" y="-20" angle="90" width="10" start="180"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="10" y="-20" angle="90" width="10" start="270"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="10" y="-20" angle="90" width="10" start="180"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" y="-20" angle="90" width="10" start="270"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" y="-20" angle="90" width="10" start="180"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="30" y="-20" angle="90" width="10" start="270"/>
+        <arc antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x="30" y="-20" angle="90" width="10" start="180"/>
+        <line antialias="false" y1="-6" length1="1.5" style="line-style:normal;line-weight:eleve;filling:none;color:black" y2="-6" x2="40" x1="0" end1="none" end2="none" length2="1.5"/>
+        <line antialias="false" y1="-15" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" x2="0" x1="0" end1="none" end2="none" length2="1.5"/>
+        <line antialias="false" y1="-15" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" x2="20" x1="20" end1="none" end2="none" length2="1.5"/>
+        <line antialias="false" y1="-15" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" x2="40" x1="40" end1="none" end2="none" length2="1.5"/>
+        <line antialias="false" y1="4.92863" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9.96107" x2="40" x1="40" end1="none" end2="none" length2="1.5"/>
+        <line antialias="false" y1="4.92863" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9.96107" x2="20" x1="20" end1="none" end2="none" length2="1.5"/>
+        <line antialias="false" y1="5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x2="20" x1="20" end1="none" end2="none" length2="1.5"/>
+        <line antialias="false" y1="5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x2="0" x1="0" end1="none" end2="none" length2="1.5"/>
+        <dynamic_text rotation="0" z="21" x="65" y="-10" frame="false" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" text_from="ElementInfo" uuid="{2070a050-464b-40d5-ba88-7b98dc7dc15f}" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text rotation="270" z="26" x="10" y="15" frame="false" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" text_from="UserText" uuid="{6eaa911a-6dc2-4851-a347-e1a35e77ec31}" text_width="-1">
+            <text>12V</text>
+        </dynamic_text>
+        <dynamic_text rotation="270" z="27" x="30" y="15" frame="false" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" text_from="UserText" uuid="{418e2800-549d-4af3-9720-7bff12dbe7fb}" text_width="-1">
+            <text>24V</text>
+        </dynamic_text>
+        <dynamic_text rotation="270" z="28" x="9" y="-12" frame="false" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" text_from="UserText" uuid="{b57864dc-0c10-406c-9df6-a421b99dfdd9}" text_width="-1">
+            <text>230V</text>
+        </dynamic_text>
+        <dynamic_text rotation="270" z="28" x="30" y="-10" frame="false" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" text_from="UserText" uuid="{b57864dc-0c10-406c-9df6-a421b99dfdd9}" text_width="-1">
+            <text>400V</text>
+        </dynamic_text>
+        <dynamic_text rotation="270" z="29" x="-4" y="15" frame="false" Valignment="AlignTop" font="MS Shell Dlg 2,4,-1,5,50,0,0,0,0,0,Normal" Halignment="AlignLeft" text_from="UserText" uuid="{b306c581-73a2-4d80-a62a-1cb812327b9e}" text_width="-1">
+            <text>0V</text>
+        </dynamic_text>
+        <dynamic_text rotation="270" z="29" x="-4" y="-12" frame="false" Valignment="AlignTop" font="MS Shell Dlg 2,4,-1,5,50,0,0,0,0,0,Normal" Halignment="AlignLeft" text_from="UserText" uuid="{b306c581-73a2-4d80-a62a-1cb812327b9e}" text_width="-1">
+            <text>0V</text>
+        </dynamic_text>
+        <terminal name="" x="0" y="-20" orientation="n" uuid="{3df8699b-43a1-49c1-b3fa-7d796925f1ba}"/>
+        <terminal name="" x="20" y="-20" orientation="n" uuid="{982f8530-4d05-4898-98d8-eff984bdee69}"/>
+        <terminal name="" x="40" y="-21" orientation="n" uuid="{c2f4a1a9-a2d0-4b8c-bfcf-21b3fc086a1a}"/>
+        <terminal name="" x="20" y="10" orientation="s" uuid="{4f7f506e-bf2f-4d24-ba5b-c00b97944b25}"/>
+        <terminal name="" x="0" y="10" orientation="s" uuid="{0aaa2455-818f-4d41-a60a-7c49c97624fa}"/>
+        <terminal name="" x="40" y="9.96107" orientation="s" uuid="{854f00a1-93ca-48e3-9084-f000c7d94518}"/>
+        <terminal name="" x="20" y="9.96107" orientation="s" uuid="{c3b19e93-736b-4fd4-9575-1ab895e8b007}"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/abl8rps24050.elmt

@@ -10,10 +10,10 @@
     <elementInformations>
         <elementInformation name="unity" show="1"></elementInformation>
         <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
         <elementInformation name="label" show="1"></elementInformation>
         <elementInformation name="designation" show="1">ABL8RPS24050</elementInformation>
-        <elementInformation name="machine-manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
         <elementInformation name="comment" show="1"></elementInformation>
         <elementInformation name="plant" show="1"></elementInformation>
         <elementInformation name="manufacturer" show="1">schneider</elementInformation>

elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/power_supply_1_phase_ac_dc.elmt

@@ -9,11 +9,11 @@
         <elementInformation show="1" name="plant"></elementInformation>
         <elementInformation show="1" name="quantity"></elementInformation>
         <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="machine-manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
         <elementInformation show="1" name="manufacturer"></elementInformation>
         <elementInformation show="1" name="description"></elementInformation>
         <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="manufacturer_reference"></elementInformation>
         <elementInformation show="1" name="designation"></elementInformation>
         <elementInformation show="1" name="comment"></elementInformation>
     </elementInformations>

elements/10_electric/10_allpole/340_converters&inverters/10_converters/prev_232_485.elmt

@@ -0,0 +1,52 @@
+<definition link_type="simple" height="110" width="90" orientation="dyyy" version="0.80" type="element" hotspot_y="54" hotspot_x="45">
+    <uuid uuid="{80191a66-3b5f-465e-99b1-3479764a0b30}"/>
+    <names>
+        <name lang="cs">Převodník RS232/485 </name>
+        <name lang="fr">Convertiseur RS232/RS485</name>
+    </names>
+    <elementInformations>
+        <elementInformation name="machine-manufacturer-reference" show="1"></elementInformation>
+        <elementInformation name="label" show="1">A</elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="manufacturer-reference" show="1"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <rect ry="0" y="-45" rx="0" height="90" style="line-style:normal;line-weight:normal;filling:white;color:black" width="80" antialias="false" x="-40"/>
+        <line x2="40" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" y1="45" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
+        <text y="-30" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="RX" color="#000000" rotation="270" x="-26.75"/>
+        <text y="-22" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="GND" color="#000000" rotation="270" x="-13.5"/>
+        <text y="-30" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="TX" color="#000000" rotation="270" x="-3.75"/>
+        <text y="-22.5" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="+Ub" color="#000000" rotation="270" x="16"/>
+        <text y="-26.75" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="-Ub" color="#000000" rotation="270" x="25.25"/>
+        <text y="43" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="DATA+" color="#000000" rotation="270" x="16.25"/>
+        <text y="42.75" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="DATA-" color="#000000" rotation="270" x="23.5"/>
+        <text y="-5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text="RS232" color="#000000" rotation="0" x="-35"/>
+        <text y="6.75" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text="RS485" color="#000000" rotation="0" x="2.25"/>
+        <line x2="-30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
+        <line x2="-20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
+        <line x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
+        <line x2="10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
+        <line x2="20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
+        <line x2="10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y1="50" length2="1.5" y2="45" antialias="false" length1="1.5" end2="none"/>
+        <line x2="20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" y1="50" length2="1.5" y2="45" antialias="false" length1="1.5" end2="none"/>
+        <dynamic_text text_width="-1" y="-50" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" text_from="ElementInfo" Halignment="AlignLeft" Valignment="AlignTop" uuid="{ef5d8163-a0af-4a7a-86ea-0f5ef18f6e7e}" frame="false" rotation="0" x="-60" z="19">
+            <text>A</text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="50" orientation="s" x="20"/>
+        <terminal y="-50" orientation="n" x="-30"/>
+        <terminal y="-50" orientation="n" x="-20"/>
+        <terminal y="-50" orientation="n" x="20"/>
+        <terminal y="50" orientation="s" x="10"/>
+        <terminal y="-50" orientation="n" x="-10"/>
+        <terminal y="-50" orientation="n" x="10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/340_converters&inverters/10_converters/prevod_i2c_485.elmt

@@ -0,0 +1,63 @@
+<definition hotspot_x="45" link_type="simple" height="100" type="element" width="90" version="0.80" hotspot_y="49" orientation="dyyy">
+    <uuid uuid="{a9abc5f7-020e-4b5e-b4e8-c0d39290d384}"/>
+    <names>
+        <name lang="cs">Převodník RS485 na I2C</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="designation"></elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="machine-manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="manufacturer"></elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="manufacturer-reference"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <rect antialias="false" y="-40" ry="0" height="80" style="line-style:normal;line-weight:normal;filling:white;color:black" width="80" x="-40" rx="0"/>
+        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-45" y2="-40" end2="none" length2="1.5"/>
+        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="-45" y2="-40" end2="none" length2="1.5"/>
+        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="-45" y2="-40" end2="none" length2="1.5"/>
+        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="-45" y2="-40" end2="none" length2="1.5"/>
+        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="40" y2="45" end2="none" length2="1.5"/>
+        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="40" y2="45" end2="none" length2="1.5"/>
+        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="40" y2="45" end2="none" length2="1.5"/>
+        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="40" y2="45" end2="none" length2="1.5"/>
+        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="40" y2="45" end2="none" length2="1.5"/>
+        <text y="-5.25" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-17.25" rotation="270" text="DATA+" color="#000000"/>
+        <text y="-5.25" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-4" rotation="270" text="DATA-" color="#000000"/>
+        <text y="-17.75" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="15.5" rotation="270" text="+Ub" color="#000000"/>
+        <text y="-21.5" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="25.75" rotation="270" text="-Ub" color="#000000"/>
+        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-25" rotation="0" text="1" color="#000000"/>
+        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-15" rotation="0" text="2" color="#000000"/>
+        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-5" rotation="0" text="3" color="#000000"/>
+        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="5" rotation="0" text="4" color="#000000"/>
+        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="15" rotation="0" text="5" color="#000000"/>
+        <text y="10" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-30" rotation="0" text="RS485/I2C" color="#000000"/>
+        <dynamic_text y="-40" z="21" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{a709e01c-eb4a-44af-9b5d-c57f1350b98b}" frame="false" x="-65" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text y="-35" z="22" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{ac9ea9a8-85a3-4a84-89c5-9f3af69804b3}" frame="false" x="-65" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text y="-45" z="23" Valignment="AlignTop" text_from="UserText" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{40770369-fcd3-40e2-ac97-1f3b0b903e5e}" frame="false" x="-65" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>A</text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="-45" orientation="n" x="10"/>
+        <terminal y="45" orientation="s" x="-10"/>
+        <terminal y="-45" orientation="n" x="20"/>
+        <terminal y="45" orientation="s" x="-20"/>
+        <terminal y="-45" orientation="n" x="-20"/>
+        <terminal y="45" orientation="s" x="10"/>
+        <terminal y="45" orientation="s" x="0"/>
+        <terminal y="-45" orientation="n" x="-10"/>
+        <terminal y="45" orientation="s" x="20"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/qet_directory

@@ -1,5 +1,5 @@
 <qet-directory>
     <names>
-        <name lang="fr">Carte TM3DM24R</name>
+        <name lang="cs">Almeto</name>
     </names>
 </qet-directory>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/ts_811.elmt

@@ -0,0 +1,61 @@
+<definition hotspot_x="26" link_type="simple" height="60" type="element" width="60" version="0.80" hotspot_y="29" orientation="dyyy">
+    <uuid uuid="{f199d479-3cac-4ce9-ac7a-0459fe8fa72e}"/>
+    <names>
+        <name lang="cs">Filtr TS 811 1751</name>
+        <name lang="fr">Filtr TS 811 1751</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="designation">Filtr TS 811 1751</elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="manufacturer">Almeto</elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <rect antialias="false" y="-20" ry="0" height="40" style="line-style:normal;line-weight:normal;filling:white;color:black" width="40" x="-20" rx="0"/>
+        <arc antialias="true" y="-5" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="90" x="-8"/>
+        <dynamic_text y="-26" z="3" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{aa988639-f6d4-4274-acc5-6887be575636}" frame="false" x="-45" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <arc antialias="true" y="-5" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="0" x="-8"/>
+        <arc antialias="true" y="-3" height="4" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="180" x="0"/>
+        <arc antialias="true" y="1" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="90" x="-8"/>
+        <arc antialias="true" y="-5" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="270" x="1"/>
+        <arc antialias="true" y="1" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="0" x="-8"/>
+        <arc antialias="true" y="3" height="4" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="180" x="0"/>
+        <arc antialias="true" y="1" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="270" x="1"/>
+        <line antialias="false" x2="1" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-3.94712" y1="-0.90022" y2="-6" end2="none" length2="1.5"/>
+        <line antialias="false" x2="4.70884" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-1.17721" y1="0.276991" y2="-5.88606" end2="none" length2="1.5"/>
+        <dynamic_text y="-31" z="13" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{da9a679c-f119-40fe-acfb-ea8d8c2f5d35}" frame="false" x="-12" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>L'</text>
+        </dynamic_text>
+        <dynamic_text y="-31" z="14" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{283d6346-7d17-40a7-b723-a59101b0b0cc}" frame="false" x="8" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>N'</text>
+        </dynamic_text>
+        <dynamic_text y="17" z="15" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{2b8ed13b-fa20-4e97-94c6-06a03b313872}" frame="false" x="8" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>N</text>
+        </dynamic_text>
+        <dynamic_text y="17" z="16" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{484182d6-2f59-49b0-8887-b832af7ae015}" frame="false" x="-12" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>L</text>
+        </dynamic_text>
+        <dynamic_text y="-3" z="17" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{84aa21a5-df3f-4e52-990c-85873ab34d15}" frame="false" x="18" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>PE</text>
+        </dynamic_text>
+        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="-20" y2="-25" end2="none" length2="1.5"/>
+        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="-20" y2="-25" end2="none" length2="1.5"/>
+        <line antialias="false" x2="25" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="0" y2="0" end2="none" length2="1.5"/>
+        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="20" y2="25" end2="none" length2="1.5"/>
+        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="20" y2="25" end2="none" length2="1.5"/>
+        <terminal y="-25" orientation="n" x="10"/>
+        <terminal y="25" orientation="s" x="-10"/>
+        <terminal y="-25" orientation="n" x="-10"/>
+        <terminal y="25" orientation="s" x="10"/>
+        <terminal y="0" orientation="e" x="25"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/tsk6711.elmt

@@ -0,0 +1,42 @@
+<definition hotspot_x="35" link_type="simple" height="80" type="element" width="70" version="0.80" hotspot_y="38" orientation="dyyy">
+    <uuid uuid="{ea7ba465-17d2-4dd0-96f8-4abef454aa76}"/>
+    <names>
+        <name lang="cs">TSK 6711</name>
+        <name lang="fr">TSK 6711</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="designation">TSK 6711</elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="manufacturer">Almeto</elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <rect antialias="false" y="-28" ry="0" height="58" style="line-style:normal;line-weight:normal;filling:white;color:black" width="60" x="-30" rx="0"/>
+        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-22" rotation="0" text="L" color="#000000"/>
+        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-3" rotation="0" text="N" color="#000000"/>
+        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="14" rotation="0" text="PE" color="#000000"/>
+        <text y="27" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-12" rotation="0" text="L'" color="#000000"/>
+        <text y="27" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="6" rotation="0" text="N'" color="#000000"/>
+        <text y="-2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-24" rotation="0" text="RFI Filter&#xa;TSK6711" color="#000000"/>
+        <dynamic_text y="-33" z="8" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{73313bd0-f4e7-438c-a074-0d733181576d}" frame="false" x="-48" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-28" y2="-32" end2="none" length2="1.5"/>
+        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="-28" y2="-32" end2="none" length2="1.5"/>
+        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="-28" y2="-32" end2="none" length2="1.5"/>
+        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="30" y2="34" end2="none" length2="1.5"/>
+        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="30" y2="34" end2="none" length2="1.5"/>
+        <terminal y="-32" orientation="n" x="0"/>
+        <terminal y="-32" orientation="n" x="-20"/>
+        <terminal y="-32" orientation="n" x="20"/>
+        <terminal y="34" orientation="s" x="10"/>
+        <terminal y="34" orientation="s" x="-10"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/tsk_6741.elmt

@@ -0,0 +1,42 @@
+<definition hotspot_x="35" link_type="simple" height="80" type="element" width="70" version="0.80" hotspot_y="38" orientation="dyyy">
+    <uuid uuid="{9b6d7261-76a5-46a0-90a4-243589f7ff6d}"/>
+    <names>
+        <name lang="cs">TSK 6741</name>
+        <name lang="fr">TSK 6741</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="designation">TSK 6741</elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="manufacturer">Almeto</elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <rect antialias="false" y="-28" ry="0" height="58" style="line-style:normal;line-weight:normal;filling:white;color:black" width="60" x="-30" rx="0"/>
+        <text y="26" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-22" rotation="0" text="L" color="#000000"/>
+        <text y="26" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-4" rotation="0" text="N" color="#000000"/>
+        <text y="26" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="14" rotation="0" text="PE" color="#000000"/>
+        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-22" rotation="0" text="L'" color="#000000"/>
+        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-4" rotation="0" text="N'" color="#000000"/>
+        <text y="-2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-24" rotation="0" text="RFI Filter&#xa;TSK6741" color="#000000"/>
+        <dynamic_text y="-33" z="8" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{2ad88ce9-f1f1-425d-a05f-1a50118ebbc9}" frame="false" x="-48" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-28" y2="-32" end2="none" length2="1.5"/>
+        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="-28" y2="-32" end2="none" length2="1.5"/>
+        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="30" y2="34" end2="none" length2="1.5"/>
+        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="30" y2="34" end2="none" length2="1.5"/>
+        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="30" y2="34" end2="none" length2="1.5"/>
+        <terminal y="34" orientation="s" x="0"/>
+        <terminal y="-32" orientation="n" x="0"/>
+        <terminal y="34" orientation="s" x="20"/>
+        <terminal y="-32" orientation="n" x="-20"/>
+        <terminal y="34" orientation="s" x="-20"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/schurter/kfs4300.elmt

@@ -0,0 +1,58 @@
+<definition hotspot_x="35" link_type="simple" height="80" type="element" width="70" version="0.80" hotspot_y="40" orientation="dyyy">
+    <uuid uuid="{617264c1-5351-4e5e-9a43-eeb1077403ce}"/>
+    <names>
+        <name lang="cs">Filtr KFS 4300</name>
+        <name lang="fr">Filtre KFS 4300</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="designation"></elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="manufacturer"></elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <rect antialias="false" y="-30" ry="0" height="60" style="line-style:normal;line-weight:normal;filling:white;color:black" width="60" x="-30" rx="0"/>
+        <arc antialias="true" y="30" height="6" angle="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="0" x="-3"/>
+        <dynamic_text y="-33" z="3" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{2a587053-e9d5-486e-8426-2ce8b00de2b3}" frame="false" x="-6" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>N</text>
+        </dynamic_text>
+        <arc antialias="true" y="30" height="6" angle="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="0" x="17"/>
+        <dynamic_text y="19" z="5" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{cc5bfc34-c77d-40f2-963e-4415896c4644}" frame="false" x="-6" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>N</text>
+        </dynamic_text>
+        <dynamic_text y="19" z="6" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{044badff-81f8-42b3-ad05-ae83e0130580}" frame="false" x="12" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>PE</text>
+        </dynamic_text>
+        <arc antialias="true" y="30" height="6" angle="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="0" x="-23"/>
+        <dynamic_text y="-33" z="8" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{ac22be33-0c3a-4800-a4ee-c972333c01ab}" frame="false" x="12" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>PE</text>
+        </dynamic_text>
+        <dynamic_text y="-33" z="9" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{33de4ed1-00ff-4393-80f9-f2fa8047f4ed}" frame="false" x="-26" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>L</text>
+        </dynamic_text>
+        <dynamic_text y="19" z="10" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{51c4bfff-f3a0-487e-b5c5-a62d5fafd0de}" frame="false" x="-26" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>L</text>
+        </dynamic_text>
+        <dynamic_text y="-16" z="11" Valignment="AlignTop" text_from="UserText" font="Sans Serif,5,-1,5,50,0,0,0,0,0" uuid="{0d659559-bd21-47e3-b9f9-09a21cf1c7ee}" frame="false" x="-18" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text>Schurter
+KFS4300
+5055</text>
+        </dynamic_text>
+        <dynamic_text y="-33" z="12" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{f309ca0f-77ef-4b89-99ae-1b82b81affb3}" frame="false" x="-50" Halignment="AlignLeft" rotation="0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-30" y2="-34" end2="none" length2="1.5"/>
+        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="-30" y2="-34" end2="none" length2="1.5"/>
+        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="-30" y2="-34" end2="none" length2="1.5"/>
+        <terminal y="-34" orientation="n" x="0"/>
+        <terminal y="-34" orientation="n" x="20"/>
+        <terminal y="-34" orientation="n" x="-20"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/schurter/qet_directory

@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="cs">Schurter</name>
+    </names>
+</qet-directory>

elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/carte_voyant.elmt

@@ -0,0 +1,135 @@
+<definition version="0.70" orientation="dyyy" type="element" width="450" height="90" hotspot_y="44" hotspot_x="225" link_type="simple">
+    <uuid uuid="{202b43e9-7b17-4df1-8a21-b0bbdd57c9ab}"/>
+    <names>
+        <name lang="fr">Carte à voyant</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="-23.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-170" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="16.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-150" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="16.5"/>
+        <text x="-100" color="#000000" text="RD2" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="16.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="80" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="-23.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-90" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-190" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-130" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-130" rx="0" antialias="false" ry="0" width="40" height="10" y="-25"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-40" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-183.535" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="16.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="-23.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-40" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="-23.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="80" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="-23.5"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="-23.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="140" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="140" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="-23.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-220" rx="0" antialias="false" ry="0" width="440" height="80" y="-40"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="16.5"/>
+        <text x="-180" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-160" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-140" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-160" color="#000000" text="RD1" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <text x="-120" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-100" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-79" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-29.8553" color="#000000" text="24" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-10" color="#000000" text="23" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="10" color="#000000" text="22" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="30" color="#000000" text="21" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="50" color="#000000" text="20" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="70" color="#000000" text="19" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="90" color="#000000" text="18" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="110" color="#000000" text="17" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="130" color="#000000" text="16" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="150" color="#000000" text="15" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="170" color="#000000" text="14" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="190" color="#000000" text="13" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-30.9073" color="#000000" text="01" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-10" color="#000000" text="02" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="30" color="#000000" text="04" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="50" color="#000000" text="05" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="70" color="#000000" text="06" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="90" color="#000000" text="07" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="110" color="#000000" text="08" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="130" color="#000000" text="09" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="150" color="#000000" text="10" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="170" color="#000000" text="11" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="190" color="#000000" text="12" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="10" color="#000000" text="03" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-165" color="#000000" text="24VTp" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-145" color="#000000" text="+24V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-126" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-106" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <text x="-83" color="#000000" text="0V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
+        <line x1="-199.776" y2="0" length2="1.5" length1="1.5" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end2="none" x2="-199.776" end1="none"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-204" rx="0" antialias="false" ry="0" width="0" height="1" y="-17"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-204" rx="0" antialias="false" ry="0" width="8.4474" height="15" y="-17"/>
+        <terminal x="-29.8553" orientation="s" y="40"/>
+        <terminal x="10" orientation="n" y="-40"/>
+        <terminal x="-79.8553" orientation="s" y="40"/>
+        <terminal x="70.1447" orientation="s" y="40"/>
+        <terminal x="-9.8553" orientation="s" y="40"/>
+        <terminal x="-140" orientation="n" y="-40"/>
+        <terminal x="150" orientation="n" y="-40"/>
+        <terminal x="-120" orientation="n" y="-39"/>
+        <terminal x="50.1447" orientation="s" y="40"/>
+        <terminal x="70" orientation="n" y="-40"/>
+        <terminal x="-30" orientation="n" y="-40"/>
+        <terminal x="110" orientation="n" y="-40"/>
+        <terminal x="-119.855" orientation="s" y="40"/>
+        <terminal x="30" orientation="n" y="-40"/>
+        <terminal x="-99.8553" orientation="s" y="40"/>
+        <terminal x="-100" orientation="n" y="-40"/>
+        <terminal x="10.1447" orientation="s" y="40"/>
+        <terminal x="-160" orientation="n" y="-40"/>
+        <terminal x="130.145" orientation="s" y="40"/>
+        <terminal x="190" orientation="n" y="-40"/>
+        <terminal x="-139.855" orientation="s" y="40"/>
+        <terminal x="130" orientation="n" y="-40"/>
+        <terminal x="-180" orientation="s" y="40"/>
+        <terminal x="-160" orientation="s" y="40"/>
+        <terminal x="30.1447" orientation="s" y="40"/>
+        <terminal x="150.145" orientation="s" y="40"/>
+        <terminal x="90" orientation="n" y="-40"/>
+        <terminal x="109.883" orientation="s" y="40"/>
+        <terminal x="-80" orientation="n" y="-39"/>
+        <terminal x="90.1447" orientation="s" y="40"/>
+        <terminal x="50" orientation="n" y="-40"/>
+        <terminal x="170" orientation="n" y="-40"/>
+        <terminal x="190" orientation="s" y="40"/>
+        <terminal x="170.145" orientation="s" y="40"/>
+        <terminal x="-10" orientation="n" y="-40"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/carte_voyant2.elmt

@@ -0,0 +1,147 @@
+<definition hotspot_y="4" orientation="dyyy" hotspot_x="5" width="560" link_type="simple" type="element" height="150" version="0.70">
+    <uuid uuid="{0393ed13-81ec-405e-ad5b-5f99855e2cf6}"/>
+    <names>
+        <name lang="fr">Carte à voyant</name>
+    </names>
+    <elementInformations>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1">Best</elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <circle diameter="15" x="182.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="182.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="362.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="362.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="452.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="452.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="272.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="272.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="302.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="482.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="302.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="482.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="212.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="212.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="392.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="392.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="422.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="512.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="422.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="332.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="512.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="355" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="76.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="445" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="332.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="355" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="265" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="242.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="445" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="175" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="265" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="50" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="96.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="70" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="136.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="120" color="#000000" y="107" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD2"/>
+        <circle diameter="7" x="136.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="76.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="15" x="242.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="116.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="56.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="130" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="30" y="110" width="60" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="90" y="110" width="60" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="90" y="20" width="40" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="56.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="96.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="116.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="7" x="36.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="175" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="0" y="0" width="550" height="140" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="40" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO"/>
+        <text x="60" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C"/>
+        <text x="80" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF"/>
+        <text x="60" color="#000000" y="107" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD1"/>
+        <text x="100" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO"/>
+        <text x="120" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C"/>
+        <text x="140" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF"/>
+        <text x="190" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24"/>
+        <text x="220" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="23"/>
+        <text x="250" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="22"/>
+        <text x="280" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="21"/>
+        <text x="310" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="20"/>
+        <text x="340" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="19"/>
+        <text x="370" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="18"/>
+        <text x="400" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="17"/>
+        <text x="430" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="16"/>
+        <text x="460" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="15"/>
+        <text x="490" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="14"/>
+        <text x="520" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="13"/>
+        <text x="190" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="01"/>
+        <text x="220" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="02"/>
+        <text x="280" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="04"/>
+        <text x="310" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="05"/>
+        <text x="340" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="06"/>
+        <text x="370" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="07"/>
+        <text x="400" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="08"/>
+        <text x="430" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="09"/>
+        <text x="460" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="10"/>
+        <text x="490" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="11"/>
+        <text x="520" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="12"/>
+        <text x="250" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="03"/>
+        <text x="60" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VTp"/>
+        <text x="80" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="+24V"/>
+        <text x="100" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC"/>
+        <text x="120" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC"/>
+        <text x="140" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="0V"/>
+        <line end1="none" end2="none" y1="22" length1="1.5" x2="20" y2="43" length2="1.5" antialias="false" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="16" y="25" width="0" height="1" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect ry="0" x="16" y="25" width="8" height="15" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal orientation="s" x="400" y="140"/>
+        <terminal orientation="s" x="250" y="140"/>
+        <terminal orientation="s" x="190" y="140"/>
+        <terminal orientation="n" x="100" y="0"/>
+        <terminal orientation="s" x="490" y="140"/>
+        <terminal orientation="n" x="80" y="0"/>
+        <terminal orientation="n" x="280" y="0"/>
+        <terminal orientation="s" x="460" y="140"/>
+        <terminal orientation="n" x="340" y="0"/>
+        <terminal orientation="n" x="370" y="0"/>
+        <terminal orientation="s" x="340" y="140"/>
+        <terminal orientation="n" x="220" y="0"/>
+        <terminal orientation="s" x="280" y="140"/>
+        <terminal orientation="n" x="400" y="0"/>
+        <terminal orientation="n" x="490" y="0"/>
+        <terminal orientation="s" x="140" y="140"/>
+        <terminal orientation="n" x="120" y="0"/>
+        <terminal orientation="n" x="430" y="0"/>
+        <terminal orientation="n" x="310" y="0"/>
+        <terminal orientation="s" x="370" y="140"/>
+        <terminal orientation="n" x="460" y="0"/>
+        <terminal orientation="n" x="190" y="0"/>
+        <terminal orientation="s" x="80" y="140"/>
+        <terminal orientation="s" x="40" y="140"/>
+        <terminal orientation="s" x="220" y="140"/>
+        <terminal orientation="s" x="60" y="140"/>
+        <terminal orientation="s" x="310" y="140"/>
+        <terminal orientation="s" x="100" y="140"/>
+        <terminal orientation="n" x="60" y="0"/>
+        <terminal orientation="s" x="520" y="140"/>
+        <terminal orientation="n" x="140" y="0"/>
+        <terminal orientation="s" x="430" y="140"/>
+        <terminal orientation="n" x="520" y="0"/>
+        <terminal orientation="n" x="250" y="0"/>
+        <terminal orientation="s" x="120" y="140"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/e-stop3p.elmt

@@ -0,0 +1,56 @@
+<definition version="0.70" height="60" type="element" width="70" hotspot_x="17" link_type="master" hotspot_y="30" orientation="dyyy">
+    <uuid uuid="{33213f58-54db-423e-9c10-89ca3adf538b}"/>
+    <names>
+        <name lang="cs">Nouzové zastavení</name>
+        <name lang="ar">زرّ توقف طارئ (NC)</name>
+        <name lang="pt">Paragem de emergência (NC)</name>
+        <name lang="en">Emergency stop (NC)</name>
+        <name lang="nl">Noodstop drukknop (NC)</name>
+        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
+        <name lang="ru">Аварийный стоп</name>
+        <name lang="it">Arresto d'emergenza</name>
+        <name lang="de">Pilzdrucktaster Öffner</name>
+        <name lang="fr">Arrêt d'urgence (NF)</name>
+        <name lang="es">Parada de emergencia (NC)</name>
+    </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">commutator</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="21" color="#000000" text="1" y="-17" rotation="0"/>
+        <polygon x3="0" y1="-10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" antialias="true" y2="10" closed="false" x2="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="21" color="#000000" text="2" y="18" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="41" color="#000000" text="3" y="-17" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="2" y="18" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="41" color="#000000" text="4" y="18" rotation="0"/>
+        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="true" length1="1.5" end2="none" y2="0" end1="none" x2="-1"/>
+        <arc height="10" x="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="-5" width="8" start="-90" antialias="true"/>
+        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-4"/>
+        <line y1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="6"/>
+        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-29" text_from="ElementInfo" y="-7" z="12" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{b5b7a461-b739-4958-92ac-3848d0ca99be}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="5" end1="none" x2="-7"/>
+        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="36"/>
+        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="20"/>
+        <line y1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="26"/>
+        <line y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="20"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="25"/>
+        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="40"/>
+        <line y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="40"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="33"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="1" y="-17" rotation="0"/>
+        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-4"/>
+        <terminal x="40" y="-20" orientation="n"/>
+        <terminal x="0" y="-20" orientation="n"/>
+        <terminal x="20" y="-20" orientation="n"/>
+        <terminal x="40" y="20" orientation="s"/>
+        <terminal x="0" y="20" orientation="s"/>
+        <terminal x="20" y="20" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/e_stop_1p.elmt

@@ -0,0 +1,41 @@
+<definition version="0.70" height="60" type="element" width="30" hotspot_x="17" link_type="master" hotspot_y="30" orientation="dyyy">
+    <uuid uuid="{0cd260bb-47bb-45ec-9f21-b5426b6587c6}"/>
+    <names>
+        <name lang="cs">Nouzové zastavení 1p</name>
+        <name lang="ar">زرّ توقف طارئ (NC)</name>
+        <name lang="pt">Paragem de emergência (NC)</name>
+        <name lang="en">Emergency stop (NC)</name>
+        <name lang="nl">Noodstop drukknop (NC)</name>
+        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
+        <name lang="ru">Аварийный стоп</name>
+        <name lang="it">Arresto d'emergenza</name>
+        <name lang="de">Pilzdrucktaster Öffner</name>
+        <name lang="fr">Arrêt d'urgence (NF)</name>
+        <name lang="es">Parada de emergencia (NC)</name>
+    </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">commutator</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon x3="0" y1="-10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" antialias="true" y2="10" closed="false" x2="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="2" y="18" rotation="0"/>
+        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="true" length1="1.5" end2="none" y2="0" end1="none" x2="-1"/>
+        <arc height="10" x="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="-5" width="8" start="-90" antialias="true"/>
+        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-4"/>
+        <line y1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="6"/>
+        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-29" text_from="ElementInfo" y="-7" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{c703c729-03a4-402b-a03a-857a56439457}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="5" end1="none" x2="-7"/>
+        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="2"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="1" y="-17" rotation="0"/>
+        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-7"/>
+        <terminal x="0" y="20" orientation="s"/>
+        <terminal x="0" y="-20" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/mag_spinac.elmt

@@ -0,0 +1,64 @@
+<definition orientation="dyyy" hotspot_y="31" hotspot_x="29" width="80" version="0.80" type="element" height="60" link_type="simple">
+    <uuid uuid="{b4edcab9-dda2-4ef4-839d-e3875c61fed7}"/>
+    <names>
+        <name lang="ar">زرّ توقف طارئ (NC)</name>
+        <name lang="es">Parada de emergencia (NC)</name>
+        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
+        <name lang="it">Arresto d'emergenza</name>
+        <name lang="de">Pilzdrucktaster Öffner</name>
+        <name lang="pt">Paragem de emergência (NC)</name>
+        <name lang="fr">Arrêt d'urgence (NF)</name>
+        <name lang="cs">Dveřní spínač magnetický</name>
+        <name lang="en">Emergency stop (NC)</name>
+        <name lang="ru">Аварийный стоп</name>
+        <name lang="nl">Noodstop drukknop (NC)</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="manufacturer"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="designation"></elementInformation>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+    </elementInformations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <text x="21" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="-17" text="1" rotation="0"/>
+        <polygon x1="5" y1="-10" x2="0" x3="0" closed="false" antialias="true" y2="10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="21" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="18" text="2" rotation="0"/>
+        <text x="41" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="-17" text="3" rotation="0"/>
+        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="18" text="2" rotation="0"/>
+        <text x="41" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="18" text="4" rotation="0"/>
+        <line x1="0" y1="-9" end1="none" length1="1.5" length2="1.5" x2="6" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="0" y1="-20" end1="none" length1="1.5" length2="1.5" x2="0" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <dynamic_text z="9" text_width="-1" x="-42" uuid="{522765e1-81a1-4dfc-bba6-792fc10a339c}" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" Valignment="AlignTop" y="-7" rotation="0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line x1="20" y1="-18" end1="none" length1="1.5" length2="1.5" x2="20" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="20" y1="-9" end1="none" length1="1.5" length2="1.5" x2="26" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="20" y1="17" end1="none" length1="1.5" length2="1.5" x2="20" antialias="false" end2="none" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="20" y1="10" end1="none" length1="1.5" length2="1.5" x2="25" antialias="false" end2="none" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="40" y1="-16" end1="none" length1="1.5" length2="1.5" x2="40" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="40" y1="16" end1="none" length1="1.5" length2="1.5" x2="40" antialias="false" end2="none" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="40" y1="10" end1="none" length1="1.5" length2="1.5" x2="33" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="-17" text="1" rotation="0"/>
+        <polygon x1="-10" y1="0" y7="0" y6="0" x2="-15" y5="0" x6="-10" x3="-20" x7="-10" closed="false" antialias="false" x5="-10" x4="-15" y2="-5" y3="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="5"/>
+        <line x1="-16" y1="-4" end1="none" length1="1.5" length2="1.5" x2="-16" antialias="false" end2="none" y2="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="-14" y1="-4" end1="none" length1="1.5" length2="1.5" x2="-14" antialias="false" end2="none" y2="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x8="-19" y6="-5" x6="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="-24" antialias="false" y7="5" y4="-6" x5="-19" y3="-6" x2="-24" y5="-5" x1="-19" x4="-19" y8="5" x7="-23" closed="false" y2="6" y1="6"/>
+        <line x1="-20" y1="-6" end1="none" length1="1.5" length2="1.5" x2="-23" antialias="false" end2="none" y2="-6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x1="-20" y1="-6" x2="-23" x3="-23" closed="false" antialias="false" x4="-19" y2="-6" y3="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="6"/>
+        <line x1="-10" y1="0" end1="none" length1="1.5" length2="1.5" x2="36" antialias="false" end2="none" y2="0" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
+        <terminal orientation="n" x="0" y="-20"/>
+        <terminal orientation="s" x="0" y="20"/>
+        <terminal orientation="s" x="20" y="20"/>
+        <terminal orientation="s" x="40" y="20"/>
+        <terminal orientation="n" x="40" y="-20"/>
+        <terminal orientation="n" x="20" y="-20"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/otocny_spinac.elmt

@@ -0,0 +1,23 @@
+<definition version="0.70" height="50" type="element" width="40" hotspot_x="29" link_type="simple" hotspot_y="25" orientation="dyyy">
+    <uuid uuid="{caef4d22-3e62-462b-9b42-52fe7a7e7e6f}"/>
+    <names>
+        <name lang="cs">Otočný spínač</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="0"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="15" end1="none" x2="0"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="-5"/>
+        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-20"/>
+        <polygon x3="-20" y1="-5" y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" antialias="false" y4="5" y2="-5" x4="-25" closed="false" x2="-20"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="3" y="-12" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="4" y="13" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-46" text_from="ElementInfo" y="-13" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{b09e55b6-81c8-438a-9bc4-c40573d99d3d}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="0" y="-15" orientation="n"/>
+        <terminal x="0" y="15" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/rozpin_tlacitko.elmt

@@ -0,0 +1,24 @@
+<definition version="0.70" height="50" type="element" width="30" hotspot_x="22" link_type="simple" hotspot_y="26" orientation="dyyy">
+    <uuid uuid="{26747ab8-68b3-48bc-ba35-994bd72091e1}"/>
+    <names>
+        <name lang="cs">Rozpínací tlačítko</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="0"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="15" end1="none" x2="0"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-11" end1="none" x2="5"/>
+        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-20"/>
+        <polygon x3="-20" y1="-5" y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" antialias="false" y4="5" y2="-5" x4="-15" closed="false" x2="-20"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="1" y="-13" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="2" y="13" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-46" text_from="ElementInfo" y="-13" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{b6af45cd-f9bf-429a-83ad-5f06ff421d3b}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="6"/>
+        <terminal x="0" y="-15" orientation="n"/>
+        <terminal x="0" y="15" orientation="s"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/spin_tlacitko.elmt

@@ -0,0 +1,23 @@
+<definition version="0.70" height="50" type="element" width="30" hotspot_x="22" link_type="simple" hotspot_y="25" orientation="dyyy">
+    <uuid uuid="{9a1d4a4a-3715-4424-9b87-cb14c0e1cf65}"/>
+    <names>
+        <name lang="cs">Spínací tlačítko</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="0"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="15" end1="none" x2="0"/>
+        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="-5"/>
+        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-20"/>
+        <polygon x3="-20" y1="-5" y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" antialias="false" y4="5" y2="-5" x4="-15" closed="false" x2="-20"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="3" y="-12" rotation="0"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="4" y="13" rotation="0"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-46" text_from="ElementInfo" y="-13" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{6d243ebc-046d-41a5-a109-0885e709b987}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal x="0" y="15" orientation="s"/>
+        <terminal x="0" y="-15" orientation="n"/>
+    </description>
+</definition>