Fix Summary headline issue on german

Fixing translation file list in CMake

.github/workflows/publish-edge-snap.yml

@@ -0,0 +1,22 @@
+name: Publish Edge Snap
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish_amd64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Checkout submodules
+      run: git submodule update --init --recursive
+    - uses: snapcore/action-build@v1
+      id: build
+    - uses: snapcore/action-publish@v1
+      env:
+        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+      with:
+        snap: ${{ steps.build.outputs.snap }}
+        release: stable

.gitmodules

@@ -0,0 +1,10 @@
+[submodule "pugixml"]
+	path = pugixml
+	url = https://github.com/zeux/pugixml.git
+[submodule "SingleApplication"]
+	path = SingleApplication
+	url = https://github.com/itay-grudev/SingleApplication.git
+[submodule "elements"]
+	path = elements
+	url = https://github.com/qelectrotech/qelectrotech-elements.git
+

CMakeLists.txt

@@ -31,7 +31,7 @@ set(QET_DIR ${PROJECT_SOURCE_DIR})
 # Add sub directories
 option(PACKAGE_TESTS "Build the tests" ON)
 if(PACKAGE_TESTS)
-  message("Add sub directorie tests")
+  message("Add sub directory tests")
   add_subdirectory(tests)
 endif()
 
@@ -125,7 +125,7 @@ target_include_directories(
   ${QET_DIR}/sources/NameList
   ${QET_DIR}/sources/NameList/ui
   ${QET_DIR}/sources/utils
-  ${QET_DIR}/sources/pugixml
+  ${QET_DIR}/pugixml/src
   ${QET_DIR}/sources/dataBase
   ${QET_DIR}/sources/dataBase/ui
   ${QET_DIR}/sources/factory/ui
@@ -146,15 +146,7 @@ install(DIRECTORY elements DESTINATION share/qelectrotech)
 install(DIRECTORY examples DESTINATION share/qelectrotech)
 install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
 install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
-install(FILES misc/qelectrotech.desktop DESTINATION share/applications)
-install(FILES misc/x-qet-element.xml
-              misc/x-qet-project.xml
-              misc/x-qet-titleblock.xml
-              DESTINATION share/mime/application)
-install(FILES misc/x-qet-element.desktop
-              misc/x-qet-project.desktop
-              misc/x-qet-titleblock.desktop
-              DESTINATION share/mimelnk/application)
+install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
 install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
 install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
 install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})

ChangeLog

@@ -1,3 +1,54 @@
+====== ChangeLog from 0.8 to 0.9 ======
+
+
+*Diagram editor :
+Improved QElectroTech speed (launch qet, open project, function)
+A drop-down list has been added to the toolbar to change the size of the resize handles.
+
+
+*Element Editor:
+The "keep visual rotation" property of element texts is editable from the element editor.
+Thanks to the work of antonioaja it is now possible to import a dxf directly from the element editor in a completely transparent way for the user.
+In the background QElectroTech uses the dxf2elmt software. https://qelectrotech.org/forum/viewtopic.php?id=2265 https://github.com/antonioaja/dxf2elmt
+Improved responsiveness when multiple shapes are selected or deleted, especially when working on a large converted DXF element.
+https://qelectrotech.org/forum/viewtopic.php?pid=16612#p16612
+
+*Other:
+Add a "side project" tab in the "about" window.
+In the general QElectroTech configuration, a drop down list allows to choose the scaling method for hdpi screens.
+Allow open polygons (i.e. polylines) when saving in dxf format.
+https://qelectrotech.org/forum/viewtopic.php?pid=16611#p16611
+
+Added 'Other' option for slave device contact type.
+https://github.com/qelectrotech/qelectrotech-source-mirror/pull/222
+https://qelectrotech.org/forum/viewtopic.php?id=2264
+
+*Logs:
+
+Added a QElapsedTimer to calculate the time used to reload the item collection.
+Improved QElapsedTimer to calculate the time used to reload the item collection in seconds instead of ms.
+Added Linux pc.gpu.RAM information, but requires mesa-utils dependency on the Linux OS.
+Added information about mounted disk volumes.
+Added CPU architecture for which Qt was compiled in the aboutqetdialog widget and in the logs.
+Added MSVC support to MachineInfo.
+Added RAM information on Windows of available RAM.
+Added QElectroTech version to the log file.
+
+
+
+* Elements collection :
+Improve collection 8274 elements in 1097 categories (i.e. 9371 files).
+
+
+
+* macOS :
+Fix sqlite3 database export on macOS, now I use macports with Digikam scripts instead off Homebrew Package Manager.
+See: https://invent.kde.org/graphics/digikam/-/tree/master/project/bundles/macports
+
+
+*Bug fix:
+see: https://git.tuxfamily.org/qet/qet.git/log/?h=0.8.1
+
 ====== ChangeLog from 0.7 to 0.8 ======
 
 

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = QElectroTech
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = " 0.8-dev"
+PROJECT_NUMBER         = " 0.100.0-dev"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

ELEMENTS.LICENSE

@@ -4,6 +4,10 @@ without any warranty of fitness for your purpose or working.
 The usage, the modification and the integration of the elements into electric
 diagrams is allowed without any condition, whatever the final license of the
 diagrams is.
+
+Permission is not granted to use this software or any of the associated files
+as sample data for the purposes of building machine learning models.
+
 If you redistribute all or a part of the QElectroTech collection, with or
 without any modification, out of an electric diagram, you must respect the
 conditions of the CC-BY license:
@@ -19,6 +23,9 @@ fonctionne.
 L'utilisation, la modification et l'intégration des éléments dans des schémas
 électriques est autorisée sans condition, quelle que soit la licence finale des
 schémas.
+L'autorisation n'est pas accordée pour utiliser ce logiciel ou l'un des fichiers associés
+comme exemples de données aux fins de création de modèles d’apprentissage automatique.
+
 Si vous redistribuez tout ou partie de la collection QElectroTech, avec ou sans
 modification, en dehors d'un schéma électrique, vous devrez respecter les
 conditions de la licence CC-BY :
@@ -27,6 +34,26 @@ disponible en ligne http://creativecommons.org/licenses/by/3.0/ ou par
 courrier postal à Creative Commons, 171 Second Street, Suite 300, San Francisco,
 California 94105, USA.
 
+[de]
+Die mit QElectroTech zur Verfügung gestellte Sammlung von Elementen wird ohne
+Gewährleistung der Eignung für einen bestimmten Zweck oder der Funktions-
+fähigkeit zur Verfügung gestellt.
+Die Verwendung, Modifikation und Integration der Elemente in elektrische
+Schaltpläne ist uneingeschränkt erlaubt, unabhängig von der endgültigen Lizenz
+der Schaltpläne.
+Es ist nicht gestattet, diese Software oder eine der zugehörigen Dateien
+als Beispieldaten für die Erstellung von Modellen für maschinelles Lernen
+zu verwenden.
+Wenn Sie die gesamte QElectroTech-Sammlung oder Teile davon, mit oder ohne
+Modifikationen, aus einem Schaltplan weitergeben, müssen Sie die Bedingungen
+der CC-BY-Lizenz einhalten.
+Dieses Werk steht unter einer Creative Commons Attribution 3.0 Lizenz.
+Eine Kopie dieser Lizenz finden Sie unter:
+http://creativecommons.org/licenses/by/3.0/
+oder senden Sie einen Brief an:
+Creative Commons, 171 Second Street, Suite 300,
+San Francisco, Kalifornien, 94105, USA.
+
 [ru]
 Коллекция элементов, поставляемая вместе с QElectroTech, поставляется "как есть"
 и без каких-либо гарантий пригодности для той или иной цели или работы.
@@ -136,7 +163,6 @@ http://creativecommons.org/licenses/by/3.0/ ή στείλτε μια επιστ
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
 
 [nl]
-
 De elementen collectie voorzien, samen met QElectroTech wordt geleverd als en
 zonder enige garantie van geschiktheid voor uw doel of werk.
 Het gebruik, de wijziging en de integratie van de elementen in elektrische
@@ -151,7 +177,6 @@ http://creativecommons.org/licenses/by/3.0/ of stuur een brief naar Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
 
 [be]
-
 De elementen collectie welke samen met QElectroTech wordt geleverd zonder enige garantie
 of deze geschikt zijn voor uw doel of de werking.
 Het gebruik, wijzigen en integratie van de elementen in uw elektrische

INSTALL

@@ -20,6 +20,17 @@ $ make
 # umask 0022
 # make install
 
+[de]
+Abhängigkeiten:
+libQt5 (Pakete libqt5*)
+cupsys-bsd zum Drucken
+
+Kompilieren:
+$ qmake (qmake-qt5 für Debian-basierende Systeme)
+$ make
+# umask 0022
+# make install
+
 [ru]
 Зависимости:
 libQt5 (пакет libqt5*)

LICENSE

@@ -7,6 +7,7 @@
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
+
 			    Preamble
 
   The licenses for most software are designed to take away your

README

@@ -8,7 +8,7 @@ QET utilise le format XML pour ses éléments et ses schémas et inclut un édit
 
 [de]
 QElectroTech ist eine Qt5 Software, um Schaltpläne zu erstellen.
-QET benutzt das XML Format für seine Bauteile und seine Projekte, und beinhaltet einen Schaltplaneditor, einen Bauteileditor sowie einen Zeichnungskopfeditor.
+QET benutzt das XML Format für seine Bauteile und seine Projekte, und beinhaltet einen Schaltplaneditor, einen Bauteileditor sowie einen Schriftfeldeditor.
 
 
 [ru]

README.md

@@ -15,25 +15,27 @@ The main goal of the developers is to provide a libre, easy to use and effective
 
 ### Version
 
-The current stable version is 0.80 and was released on 2021.02.21.  
-Once it has been officialy released, the stable version is always frozen and is no longer developed.
+The current stable version is 0.90 and was released on 2023.01.06.
+Once it has been officially 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.9), which can also be [downloaded](https://qelectrotech.org/download.html).
+New functionalities, bug and issue fixings are further made in the development version (currently 0.100), which can also be [downloaded](https://qelectrotech.org/download.php).
 
-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!
+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 partially 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.
+Like many other open source software, QElectroTech is provided as 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.
-If you are reading this on Github, be aware that this is an hourly synced mirror. Our real code repository [is located here](https://git.tuxfamily.org/qet/qet.git/).
+*    Get sources and sub-modules
+```txt
+git clone --recursive https://github.com/qelectrotech/qelectrotech-source-mirror.git
+```
 
 Here are the technical choices made for the software development:
 
@@ -41,11 +43,13 @@ Here are the technical choices made for the software development:
 *   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).  
+    [kcoreaddons](https://github.com/KDE/kcoreaddons/tree/kf5)   
+    [kwidgetsaddons](https://github.com/KDE/kwidgetsaddons/tree/kf5).  
 *   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/)
+*   Version control: [GIT](https://github.com/qelectrotech/qelectrotech-source-mirror.git)
+*   Doxygen documentation :[Doxygen](https://download.qelectrotech.org/qet/doxygen/html/)
+*   QtCreator qch doxygen :[QElectroTech.qch](https://download.qelectrotech.org/qet/doxygen/)
 *   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
@@ -73,12 +77,12 @@ 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")
+![](https://download.qelectrotech.org/qet/images-features/0030.png "GUI overview")
 
 
-The GUI of QElectroTech is translated in 19 languages.  
+The GUI of QElectroTech is translated in 25 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")
+![](https://download.qelectrotech.org/qet/images-features/0040.png "Lang menu")
 
 Create technical documentation in professional quality
 
@@ -87,56 +91,56 @@ You can set vertical and horizontal headers (printed rulers) individually on and
 
 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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.org/qet/images-features/0060.png "Table of content")
 
-Choose from more than 7.000 symbols...
+Choose from more than 8.200 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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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")
+![](https://download.qelectrotech.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.  
@@ -154,6 +158,52 @@ Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format im
 *   conductors num can be exported to csv file.
 *   ***
 
+Nomenclature
+
+A new nomenclature tool appears in the menu: project -> Add a nomenclature.
+The nomenclature is presented in the form of a configurable table separated into two parts: the display (the form) and the content (the background).  
+- Display: the size and position of the table, the margins between text and the table cell, the alignment of the text in the cells and the font. The configuration of the table headers and the table itself are separate.  
+- Content: the information to display in the table and the order in which it should be displayed.  
+
+![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
+
+In order to speed up the establishment of a nomenclature, it is possible to export / import the display and content configurations separately. This is the "Configuration" part that can be seen in the photos above.  
+
+Behind the scenes, an SQLite database does the work, so setting up the content is nothing more or less than an SQL query created using a dialog (screenshot by right).  
+The SQL query is configured as follows (from top to bottom in the screenshot):  
+- “Available information”: the information to display;  
+- "Filter": filter the information (is not empty, is empty, contains, does not contain, is equal to, is not equal to) only one filter can be applied per information, it is not possible combine several;  
+- "Type of elements": allows you to filter on what type of element you want to obtain information.  
+
+At the bottom, a checkmark "SQL query" allows you to edit a personalized query, if the basic options are not sufficient.  
+
+When a nomenclature is too large to be contained in a single folio, it is possible to separate it on several folios, the tables of each folio are then linked together. When creating a nomenclature, this option is activated by default, which has the effect of adding the necessary number of folios, adding a table in each of them and linking them together.  
+
+Finally two buttons are available in the property panel:    
+- "Fit the table to the folio": positions and adjusts the size and determines the number of rows in the table in relation to the folio;  
+- "Apply geometry to all tables linked to this one": applies the three properties mentioned above to all linked tables in order to save time and maintain aesthetic consistency.  
+
+And to finish a table   
+![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/tableau.png "table")
+
+
+Summary
+
+The old summary has been completely removed from the code in order to make room for the new one which is exactly the same as the nomenclature (a large amount of the code is common), with the exception of the SQL query (and its dialog to configure it) which offers specific information for editing a summary.  
+
+Export of the internal database  
+
+The database used by the nomenclature and the summary can be exported in a “.sqlite” file.  
+Currently this is irrelevant, as the function was created during development for debugging purposes, we left it.  
+Note that the database will become increasingly important in the future of Qet.  
+
+
+Export of the wiring list  
+
+In order to be able to use the wiring number printers more easily, the names of conductors can be exported in CSV format, the export respects the quantity of conductors in order to print the right quantity of numbers, for example a potential numbered 240 composed of 3 wires will give 6 × 240 (2 numbers per wire × 3 wires) in the CSV. 
+
+
+
 ### Story
 
 The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.  
@@ -173,7 +223,7 @@ Nowadays, QET is not only used by many individuals, teachers and students but al
 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)
+For more information, look at [Paypal](https://www.paypal.com/donate/?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC&ssrt=1694606609672)
 
 
 

SingleApplication

@@ -0,0 +1 @@
+Subproject commit cbe496bc01e6515f9692824bf36d5136e8208c85

SingleApplication/CHANGELOG.md

@@ -1,295 +0,0 @@
-Changelog
-=========
-
-If by accident I have forgotten to credit someone in the CHANGELOG, email me and I will fix it.
-
-__3.2.0__
----------
-
-* Added support for Qt 6  - _Jonas Kvinge_
-* Fixed warning in `Qt 5.9` with `min`/`max` functions on Windows - _Nick Korotysh_
-* Fix return value of connectToPrimary() when connect is successful - _Jonas Kvinge_
-* Fix build issue with MinGW GCC pedantic mode - _Iakov Kirilenko_
-* Fixed conversion from `int` to `quint32` and Clang Tidy warnings - _Hennadii Chernyshchyk_
-
-__3.1.5__
----------
-
-* Improved library stability in edge cases and very rapid process initialisation
-* Fixed Bug where the shared memory block may have been modified without a lock
-* Fixed Bug causing `instanceStarted()` to not get emitted when a second instance
-  has been started before the primary has initiated it's `QLocalServer`.
-
-__3.1.4__
----------
-* Officially supporting and build-testing against Qt 5.15
-* Fixed an MSVC C4996 warning that suggests using `strncpy_s`.
-
-    _Hennadii Chernyshchyk_
-
-__3.1.3.1__
----------
-* CMake build system improvements
-* Fixed Clang Tidy warnings
-
-    _Hennadii Chernyshchyk_
-
-__3.1.3__
----------
-* Improved `CMakeLists.txt`
-
-    _Hennadii Chernyshchyk_
-
-__3.1.2__
----------
-
-* Fix a crash when exiting an application on Android and iOS
-
-    _Emeric Grange_
-
-__3.1.1a__
-----------
-
-* Added currentUser() method that returns the user the current instance is running as.
-
-    _Leander Schulten_
-
-__3.1.0a__
-----------
-
-* Added primaryUser() method that returns the user the primary instance is running as.
-
-__3.0.19__
-----------
-
-* Fixed code warning for depricated functions in Qt 5.10 related to `QTime` and `qrand()`.
-
-   _Hennadii Chernyshchyk_  
-   _Anton Filimonov_  
-   _Jonas Kvinge_
-
-__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__
-----------
-
-* Removed signal handling.
-
-__3.0.11a__
-----------
-
-* Fixed bug where the message sent by the second process was not received
-  correctly when the message is sent immediately following a connection.
-
-   _Francis Giraldeau_
-
-* Refactored code and implemented shared memory block consistency checks
-  via `qChecksum()` (CRC-16).
-* Explicit `qWarning` and `qCritical` when the library is unable to initialise
-  correctly.
-
-__3.0.10__
-----------
-
-* Removed C style casts and eliminated all clang warnings. Fixed `instanceId`
-  reading from only one byte in the message deserialization. Cleaned up
-  serialization code using `QDataStream`. Changed connection type to use
-  `quint8 enum` rather than `char`.
-* Renamed `SingleAppConnectionType` to `ConnectionType`. Added initialization
-  values to all `ConnectionType` enum cases.
-
-    _Jedidiah Buck McCready_
-
-__3.0.9__
----------
-
-*   Added SingleApplicationPrivate::primaryPid() as a solution to allow
-    bringing the primary window of an application to the foreground on
-    Windows.
-
-    _Eelco van Dam from Peacs BV_
-
-__3.0.8__
----------
-
-*   Bug fix - changed QApplication::instance() to QCoreApplication::instance()
-
-    _Evgeniy Bazhenov_
-
-__3.0.7a__
-----------
-
-*   Fixed compilation error with Mingw32 in MXE thanks to Vitaly Tonkacheyev.
-*   Removed QMutex used for thread safe behaviour. The implementation now uses
-    QCoreApplication::instance() to get an instance to SingleApplication for
-    memory deallocation.
-
-__3.0.6a__
-----------
-
-*   Reverted GetUserName API usage on Windows. Fixed bug with missing library.
-*   Fixed bug in the Calculator example, preventing it's window to be raised
-    on Windows.
-
-    Special thanks to Charles Gunawan.
-
-__3.0.5a__
-----------
-
-*   Fixed a memory leak in the SingleApplicationPrivate destructor.
-
-    _Sergei Moiseev_
-
-__3.0.4a__
-----------
-
-*   Fixed shadow and uninitialised variable warnings.
-
-    _Paul Walmsley_
-
-__3.0.3a__
-----------
-
-*   Removed Microsoft Windows specific code for getting username due to
-    multiple problems and compiler differences on Windows platforms. On
-    Windows the shared memory block in User mode now includes the user's
-    home path (which contains the user's username).
-
-*   Explicitly getting absolute path of the user's home directory as on Unix
-    a relative path (`~`) may be returned.
-
-__3.0.2a__
-----------
-
-*   Fixed bug on Windows when username containing wide characters causes the
-    library to crash.
-
-    _Le Liu_
-
-__3.0.1a__
-----------
-
-*   Allows the application path and version to be excluded from the server name
-    hash. The following flags were added for this purpose:
-      * `SingleApplication::Mode::ExcludeAppVersion`
-      * `SingleApplication::Mode::ExcludeAppPath`
-*   Allow a non elevated process to connect to a local server created by an
-    elevated process run by the same user on Windows
-*   Fixes a problem with upper case letters in paths on Windows
-
-    _Le Liu_
-
-__v3.0a__
----------
-
-*   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.
-*   The SingleApplication constructor's third parameter is now a bool
-    specifying if the current instance should be allowed to run as a secondary
-    instance if there is already a primary instance.
-*   The SingleApplication constructor accept a fourth parameter specifying if
-    the SingleApplication block should be User-wide or System-wide.
-*   SingleApplication no longer relies on `applicationName` and
-    `organizationName` to be set. It instead concatenates all of the following
-    data and computes a `SHA256` hash which is used as the key of the
-    `QSharedMemory` block and the `QLocalServer`. Since at least
-    `applicationFilePath` is always present there is no need to explicitly set
-    any of the following prior to initialising `SingleApplication`.
-      * `QCoreApplication::applicationName`
-      * `QCoreApplication::applicationVersion`
-      * `QCoreApplication::applicationFilePath`
-      * `QCoreApplication::organizationName`
-      * `QCoreApplication::organizationDomain`
-      * User name or home directory path if in User mode
-*   The primary instance is no longer notified when a secondary instance had
-    been started by default. A `Mode` flag for this feature exists.
-*   Added `instanceNumber()` which represents a unique identifier for each
-    secondary instance started. When called from the primary instance will
-    return `0`.
-
-__v2.4__
---------
-
-*   Stability improvements
-*   Support for secondary instances.
-*   The library now recovers safely after the primary process has crashed
-and the shared memory had not been deleted.
-
-__v2.3__
---------
-
-*   Improved pimpl design and inheritance safety.
-
-    _Vladislav Pyatnichenko_
-
-__v2.2__
---------
-
-*   The `QAPPLICATION_CLASS` macro can now be defined in the file including the
-Single Application header or with a `DEFINES+=` statement in the project file.
-
-__v2.1__
---------
-
-*   A race condition can no longer occur when starting two processes nearly
-    simultaneously.
-
-    Fix issue [#3](https://github.com/itay-grudev/SingleApplication/issues/3)
-
-__v2.0__
---------
-
-*   SingleApplication is now being passed a reference to `argc` instead of a
-    copy.
-
-    Fix issue [#1](https://github.com/itay-grudev/SingleApplication/issues/1)
-
-*   Improved documentation.

SingleApplication/CMakeLists.txt

@@ -1,40 +0,0 @@
-cmake_minimum_required(VERSION 3.7.0)
-
-project(SingleApplication LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-add_library(${PROJECT_NAME} STATIC
-    singleapplication.cpp
-    singleapplication_p.cpp
-)
-add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-
-if(NOT QT_DEFAULT_MAJOR_VERSION)
-    set(QT_DEFAULT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (5 or 6), defaults to 5")
-endif()
-
-# Find dependencies
-set(QT_COMPONENTS Core Network)
-set(QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Core Qt${QT_DEFAULT_MAJOR_VERSION}::Network)
-
-if(QAPPLICATION_CLASS STREQUAL QApplication)
-    list(APPEND QT_COMPONENTS Widgets)
-    list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Widgets)
-elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
-    list(APPEND QT_COMPONENTS Gui)
-    list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Gui)
-else()
-    set(QAPPLICATION_CLASS QCoreApplication)
-endif()
-
-find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED)
-
-target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES})
-
-if(WIN32)
-    target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
-endif()
-
-target_compile_definitions(${PROJECT_NAME} PUBLIC QAPPLICATION_CLASS=${QAPPLICATION_CLASS})
-target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

SingleApplication/LICENSE

@@ -1,24 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) Itay Grudev 2015 - 2020
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Note: Some of the examples include code not distributed under the terms of the
-MIT License.

SingleApplication/README.md

@@ -1,304 +0,0 @@
-SingleApplication
-=================
-[![CI](https://github.com/itay-grudev/SingleApplication/workflows/CI:%20Build%20Test/badge.svg)](https://github.com/itay-grudev/SingleApplication/actions)
-
-This is a replacement of the QtSingleApplication for `Qt5` and `Qt6`.
-
-Keeps the Primary Instance of your Application and kills each subsequent
-instances. It can (if enabled) spawn secondary (non-related to the primary)
-instances and can send data to the primary instance from secondary instances.
-
-Usage
------
-
-The `SingleApplication` class inherits from whatever `Q[Core|Gui]Application`
-class you specify via the `QAPPLICATION_CLASS` macro (`QCoreApplication` is the
-default). Further usage is similar to the use of the `Q[Core|Gui]Application`
-classes.
-
-You can use the library as if you use any other `QCoreApplication` derived
-class:
-
-```cpp
-#include <QApplication>
-#include <SingleApplication.h>
-
-int main( int argc, char* argv[] )
-{
-    SingleApplication app( argc, argv );
-
-    return app.exec();
-}
-```
-
-To include the library files I would recommend that you add it as a git
-submodule to your project. Here is how:
-
-```bash
-git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
-```
-
-**Qmake:**
-
-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)
-target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)
-```
-
-
-The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
-instance of your Application is your Primary Instance. It would check if the
-shared memory block exists and if not it will start a `QLocalServer` and listen
-for connections. Each subsequent instance of your application would check if the
-shared memory block exists and if it does, it will connect to the QLocalServer
-to notify the primary instance that a new instance had been started, after which
-it would terminate with status code `0`. In the Primary Instance
-`SingleApplication` would emit the `instanceStarted()` signal upon detecting
-that a new instance had been started.
-
-The library uses `stdlib` to terminate the program with the `exit()` function.
-
-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
------------------------------
-
-The SingleApplication class implements a `instanceStarted()` signal. You can
-bind to that signal to raise your application's window when a new instance had
-been started, for example.
-
-```cpp
-// window is a QWindow instance
-QObject::connect(
-    &app,
-    &SingleApplication::instanceStarted,
-    &window,
-    &QWindow::raise
-);
-```
-
-Using `SingleApplication::instance()` is a neat way to get the
-`SingleApplication` instance for binding to it's signals anywhere in your
-program.
-
-__Note:__ On Windows the ability to bring the application windows to the
-foreground is restricted. See [Windows specific implementations](Windows.md)
-for a workaround and an example implementation.
-
-
-Secondary Instances
--------------------
-
-If you want to be able to launch additional Secondary Instances (not related to
-your Primary Instance) you have to enable that with the third parameter of the
-`SingleApplication` constructor. The default is `false` meaning no Secondary
-Instances. Here is an example of how you would start a Secondary Instance send
-a message with the command line arguments to the primary instance and then shut
-down.
-
-```cpp
-int main(int argc, char *argv[])
-{
-    SingleApplication app( argc, argv, true );
-
-    if( app.isSecondary() ) {
-        app.sendMessage(  app.arguments().join(' ')).toUtf8() );
-        app.exit( 0 );
-    }
-
-    return app.exec();
-}
-```
-
-*__Note:__ A secondary instance won't cause the emission of the
-`instanceStarted()` signal by default. See `SingleApplication::Mode` for more
-details.*
-
-You can check whether your instance is a primary or secondary with the following
-methods:
-
-```cpp
-app.isPrimary();
-// or
-app.isSecondary();
-```
-
-*__Note:__ If your Primary Instance is terminated a newly launched instance
-will replace the Primary one even if the Secondary flag has been set.*
-
-Examples
---------
-
-There are three examples provided in this repository:
-
-* Basic example that prevents a secondary instance from starting [`examples/basic`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/basic)
-* An example of a graphical application raising it's parent window [`examples/calculator`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/calculator)
-* A console application sending the primary instance it's command line parameters [`examples/sending_arguments`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/sending_arguments)
-
-API
----
-
-### Members
-
-```cpp
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100, QString userData = QString() )
-```
-
-Depending on whether `allowSecondary` is set, this constructor may terminate
-your app if there is already a primary instance running. Additional `Options`
-can be specified to set whether the SingleApplication block should work
-user-wide or system-wide. Additionally the `Mode::SecondaryNotification` may be
-used to notify the primary instance whenever a secondary instance had been
-started (disabled by default). `timeout` specifies the maximum time in
-milliseconds to wait for blocking operations. Setting `userData` provides additional data that will isolate this instance from other instances that do not have the same (or any) user data set.
-
-*__Note:__ `argc` and `argv` may be changed as Qt removes arguments that it
-recognizes.*
-
-*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
-and the secondary instance.*
-
-*__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 block will
-be user wide.*
-
----
-
-```cpp
-bool SingleApplication::sendMessage( QByteArray message, int timeout = 100 )
-```
-
-Sends `message` to the Primary Instance. Uses `timeout` as a the maximum timeout
-in milliseconds for blocking functions
-
----
-
-```cpp
-bool SingleApplication::isPrimary()
-```
-
-Returns if the instance is the primary instance.
-
----
-
-```cpp
-bool SingleApplication::isSecondary()
-```
-Returns if the instance is a secondary instance.
-
----
-
-```cpp
-quint32 SingleApplication::instanceId()
-```
-
-Returns a unique identifier for the current instance.
-
----
-
-```cpp
-qint64 SingleApplication::primaryPid()
-```
-
-Returns the process ID (PID) of the primary instance.
-
----
-
-```cpp
-QString SingleApplication::primaryUser()
-```
-
-Returns the username the primary instance is running as.
-
----
-
-```cpp
-QString SingleApplication::currentUser()
-```
-
-Returns the username the current instance is running as.
-
-### Signals
-
-```cpp
-void SingleApplication::instanceStarted()
-```
-
-Triggered whenever a new instance had been started, except for secondary
-instances if the `Mode::SecondaryNotification` flag is not specified.
-
----
-
-```cpp
-void SingleApplication::receivedMessage( quint32 instanceId, QByteArray message )
-```
-
-Triggered whenever there is a message received from a secondary instance.
-
----
-
-### Flags
-
-```cpp
-enum SingleApplication::Mode
-```
-
-*   `Mode::User` - The SingleApplication block should apply user wide. This adds
-    user specific data to the key used for the shared memory and server name.
-    This is the default functionality.
-*   `Mode::System` – The SingleApplication block applies system-wide.
-*   `Mode::SecondaryNotification` – Whether to trigger `instanceStarted()` even
-    whenever secondary instances are started.
-*   `Mode::ExcludeAppPath` – Excludes the application path from the server name
-    (and memory block) hash.
-*   `Mode::ExcludeAppVersion` – Excludes the application version from the server
-    name (and memory block) hash.
-
-*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
-and the secondary instance.*
-
-*__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 block will
-be user wide.*
-
----
-
-Versioning
-----------
-
-Each major version introduces either very significant changes or is not
-backwards compatible with the previous version. Minor versions only add
-additional features, bug fixes or performance improvements and are backwards
-compatible with the previous release. See [`CHANGELOG.md`](CHANGELOG.md) for
-more details.
-
-Implementation
---------------
-
-The library is implemented with a QSharedMemory block which is thread safe and
-guarantees a race condition will not occur. It also uses a QLocalSocket to
-notify the main process that a new instance had been spawned and thus invoke the
-`instanceStarted()` signal and for messaging the primary instance.
-
-Additionally the library can recover from being forcefully killed on *nix
-systems and will reset the memory block given that there are no other
-instances running.
-
-License
--------
-This library and it's supporting documentation are released under
-`The MIT License (MIT)` with the exception of the Qt calculator examples which
-is distributed under the BSD license.

SingleApplication/SingleApplication

@@ -1 +0,0 @@
-#include "singleapplication.h"

SingleApplication/Windows.md

@@ -1,46 +0,0 @@
-Windows Specific Implementations
-================================
-
-Setting the foreground window
------------------------------
-
-In the `instanceStarted()` example in the `README` we demonstrated how an
-application can bring it's primary instance window whenever a second copy
-of the application is started.
-
-On Windows the ability to bring the application windows to the foreground is
-restricted, see [`AllowSetForegroundWindow()`][AllowSetForegroundWindow] for more
-details.
-
-The background process (the primary instance) can bring its windows to the
-foreground if it is allowed by the current foreground process (the secondary
-instance). To bypass this `SingleApplication` must be initialized with the
-`allowSecondary` parameter set to `true` and the `options` parameter must
-include `Mode::SecondaryNotification`, See `SingleApplication::Mode` for more
-details.
-
-Here is an example:
-
-```cpp
-if( app.isSecondary() ) {
-    // This API requires LIBS += User32.lib to be added to the project
-    AllowSetForegroundWindow( DWORD( app.primaryPid() ) );
-}
-
-if( app.isPrimary() ) {
-    QObject::connect(
-        &app,
-        &SingleApplication::instanceStarted,
-        this,
-        &App::instanceStarted
-    );
-}
-```
-
-```cpp
-void App::instanceStarted() {
-    QApplication::setActiveWindow( [window/widget to set to the foreground] );
-}
-```
-
-[AllowSetForegroundWindow]: https://msdn.microsoft.com/en-us/library/windows/desktop/ms632668.aspx

SingleApplication/examples/basic/CMakeLists.txt

@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.7.0)
-
-project(basic LANGUAGES CXX)
-
-# SingleApplication base class
-set(QAPPLICATION_CLASS QCoreApplication)
-add_subdirectory(../.. SingleApplication)
-
-add_executable(basic main.cpp)
-
-target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)
-

SingleApplication/examples/basic/basic.pro

@@ -1,5 +0,0 @@
-# Single Application implementation
-include(../../singleapplication.pri)
-DEFINES += QAPPLICATION_CLASS=QCoreApplication
-
-SOURCES += main.cpp

SingleApplication/examples/basic/main.cpp

@@ -1,11 +0,0 @@
-#include <singleapplication.h>
-
-int main(int argc, char *argv[])
-{
-    // Allow secondary instances
-    SingleApplication app( argc, argv );
-
-    qWarning() << "Started a new instance";
-
-    return app.exec();
-}

SingleApplication/examples/calculator/CMakeLists.txt

@@ -1,21 +0,0 @@
-cmake_minimum_required(VERSION 3.7.0)
-
-project(calculator LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-# SingleApplication base class
-set(QAPPLICATION_CLASS QApplication)
-add_subdirectory(../.. SingleApplication)
-
-find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED)
-
-add_executable(${PROJECT_NAME}
-    button.h
-    calculator.h
-    button.cpp
-    calculator.cpp
-    main.cpp
-)
-
-target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)

SingleApplication/examples/calculator/button.cpp

@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-
-#include "button.h"
-
-//! [0]
-Button::Button(const QString &text, QWidget *parent)
-    : QToolButton(parent)
-{
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    setText(text);
-}
-//! [0]
-
-//! [1]
-QSize Button::sizeHint() const
-//! [1] //! [2]
-{
-    QSize size = QToolButton::sizeHint();
-    size.rheight() += 20;
-    size.rwidth() = qMax(size.width(), size.height());
-    return size;
-}
-//! [2]

SingleApplication/examples/calculator/button.h

@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef BUTTON_H
-#define BUTTON_H
-
-#include <QToolButton>
-
-//! [0]
-class Button : public QToolButton
-{
-    Q_OBJECT
-
-public:
-    explicit Button(const QString &text, QWidget *parent = 0);
-
-    QSize sizeHint() const Q_DECL_OVERRIDE;
-};
-//! [0]
-
-#endif

SingleApplication/examples/calculator/calculator.cpp

@@ -1,406 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-
-#include <cmath>
-
-#include "button.h"
-#include "calculator.h"
-
-//! [0]
-Calculator::Calculator(QWidget *parent)
-    : QWidget(parent)
-{
-    sumInMemory = 0.0;
-    sumSoFar = 0.0;
-    factorSoFar = 0.0;
-    waitingForOperand = true;
-//! [0]
-
-//! [1]
-    display = new QLineEdit("0");
-//! [1] //! [2]
-    display->setReadOnly(true);
-    display->setAlignment(Qt::AlignRight);
-    display->setMaxLength(15);
-
-    QFont font = display->font();
-    font.setPointSize(font.pointSize() + 8);
-    display->setFont(font);
-//! [2]
-
-//! [4]
-    for (int i = 0; i < NumDigitButtons; ++i) {
-        digitButtons[i] = createButton(QString::number(i), SLOT(digitClicked()));
-    }
-
-    Button *pointButton = createButton(".", SLOT(pointClicked()));
-    Button *changeSignButton = createButton("\302\261", SLOT(changeSignClicked()));
-
-    Button *backspaceButton = createButton("Backspace", SLOT(backspaceClicked()));
-    Button *clearButton = createButton("Clear", SLOT(clear()));
-    Button *clearAllButton = createButton("Clear All", SLOT(clearAll()));
-
-    Button *clearMemoryButton = createButton("MC", SLOT(clearMemory()));
-    Button *readMemoryButton = createButton("MR", SLOT(readMemory()));
-    Button *setMemoryButton = createButton("MS", SLOT(setMemory()));
-    Button *addToMemoryButton = createButton("M+", SLOT(addToMemory()));
-
-    Button *divisionButton = createButton("\303\267", SLOT(multiplicativeOperatorClicked()));
-    Button *timesButton = createButton("\303\227", SLOT(multiplicativeOperatorClicked()));
-    Button *minusButton = createButton("-", SLOT(additiveOperatorClicked()));
-    Button *plusButton = createButton("+", SLOT(additiveOperatorClicked()));
-
-    Button *squareRootButton = createButton("Sqrt", SLOT(unaryOperatorClicked()));
-    Button *powerButton = createButton("x\302\262", SLOT(unaryOperatorClicked()));
-    Button *reciprocalButton = createButton("1/x", SLOT(unaryOperatorClicked()));
-    Button *equalButton = createButton("=", SLOT(equalClicked()));
-//! [4]
-
-//! [5]
-    QGridLayout *mainLayout = new QGridLayout;
-//! [5] //! [6]
-    mainLayout->setSizeConstraint(QLayout::SetFixedSize);
-    mainLayout->addWidget(display, 0, 0, 1, 6);
-    mainLayout->addWidget(backspaceButton, 1, 0, 1, 2);
-    mainLayout->addWidget(clearButton, 1, 2, 1, 2);
-    mainLayout->addWidget(clearAllButton, 1, 4, 1, 2);
-
-    mainLayout->addWidget(clearMemoryButton, 2, 0);
-    mainLayout->addWidget(readMemoryButton, 3, 0);
-    mainLayout->addWidget(setMemoryButton, 4, 0);
-    mainLayout->addWidget(addToMemoryButton, 5, 0);
-
-    for (int i = 1; i < NumDigitButtons; ++i) {
-        int row = ((9 - i) / 3) + 2;
-        int column = ((i - 1) % 3) + 1;
-        mainLayout->addWidget(digitButtons[i], row, column);
-    }
-
-    mainLayout->addWidget(digitButtons[0], 5, 1);
-    mainLayout->addWidget(pointButton, 5, 2);
-    mainLayout->addWidget(changeSignButton, 5, 3);
-
-    mainLayout->addWidget(divisionButton, 2, 4);
-    mainLayout->addWidget(timesButton, 3, 4);
-    mainLayout->addWidget(minusButton, 4, 4);
-    mainLayout->addWidget(plusButton, 5, 4);
-
-    mainLayout->addWidget(squareRootButton, 2, 5);
-    mainLayout->addWidget(powerButton, 3, 5);
-    mainLayout->addWidget(reciprocalButton, 4, 5);
-    mainLayout->addWidget(equalButton, 5, 5);
-    setLayout(mainLayout);
-
-    setWindowTitle("Calculator");
-}
-//! [6]
-
-//! [7]
-void Calculator::digitClicked()
-{
-    Button *clickedButton = qobject_cast<Button *>(sender());
-    int digitValue = clickedButton->text().toInt();
-    if (display->text() == "0" && digitValue == 0.0)
-        return;
-
-    if (waitingForOperand) {
-        display->clear();
-        waitingForOperand = false;
-    }
-    display->setText(display->text() + QString::number(digitValue));
-}
-//! [7]
-
-//! [8]
-void Calculator::unaryOperatorClicked()
-//! [8] //! [9]
-{
-    Button *clickedButton = qobject_cast<Button *>(sender());
-    QString clickedOperator = clickedButton->text();
-    double operand = display->text().toDouble();
-    double result = 0.0;
-
-    if (clickedOperator == "Sqrt") {
-        if (operand < 0.0) {
-            abortOperation();
-            return;
-        }
-        result = std::sqrt(operand);
-    } else if (clickedOperator == "x\302\262") {
-        result = std::pow(operand, 2.0);
-    } else if (clickedOperator == "1/x") {
-        if (operand == 0.0) {
-            abortOperation();
-            return;
-        }
-        result = 1.0 / operand;
-    }
-    display->setText(QString::number(result));
-    waitingForOperand = true;
-}
-//! [9]
-
-//! [10]
-void Calculator::additiveOperatorClicked()
-//! [10] //! [11]
-{
-    Button *clickedButton = qobject_cast<Button *>(sender());
-    QString clickedOperator = clickedButton->text();
-    double operand = display->text().toDouble();
-
-//! [11] //! [12]
-    if (!pendingMultiplicativeOperator.isEmpty()) {
-//! [12] //! [13]
-        if (!calculate(operand, pendingMultiplicativeOperator)) {
-            abortOperation();
-            return;
-        }
-        display->setText(QString::number(factorSoFar));
-        operand = factorSoFar;
-        factorSoFar = 0.0;
-        pendingMultiplicativeOperator.clear();
-    }
-
-//! [13] //! [14]
-    if (!pendingAdditiveOperator.isEmpty()) {
-//! [14] //! [15]
-        if (!calculate(operand, pendingAdditiveOperator)) {
-            abortOperation();
-            return;
-        }
-        display->setText(QString::number(sumSoFar));
-    } else {
-        sumSoFar = operand;
-    }
-
-//! [15] //! [16]
-    pendingAdditiveOperator = clickedOperator;
-//! [16] //! [17]
-    waitingForOperand = true;
-}
-//! [17]
-
-//! [18]
-void Calculator::multiplicativeOperatorClicked()
-{
-    Button *clickedButton = qobject_cast<Button *>(sender());
-    QString clickedOperator = clickedButton->text();
-    double operand = display->text().toDouble();
-
-    if (!pendingMultiplicativeOperator.isEmpty()) {
-        if (!calculate(operand, pendingMultiplicativeOperator)) {
-            abortOperation();
-            return;
-        }
-        display->setText(QString::number(factorSoFar));
-    } else {
-        factorSoFar = operand;
-    }
-
-    pendingMultiplicativeOperator = clickedOperator;
-    waitingForOperand = true;
-}
-//! [18]
-
-//! [20]
-void Calculator::equalClicked()
-{
-    double operand = display->text().toDouble();
-
-    if (!pendingMultiplicativeOperator.isEmpty()) {
-        if (!calculate(operand, pendingMultiplicativeOperator)) {
-            abortOperation();
-            return;
-        }
-        operand = factorSoFar;
-        factorSoFar = 0.0;
-        pendingMultiplicativeOperator.clear();
-    }
-    if (!pendingAdditiveOperator.isEmpty()) {
-        if (!calculate(operand, pendingAdditiveOperator)) {
-            abortOperation();
-            return;
-        }
-        pendingAdditiveOperator.clear();
-    } else {
-        sumSoFar = operand;
-    }
-
-    display->setText(QString::number(sumSoFar));
-    sumSoFar = 0.0;
-    waitingForOperand = true;
-}
-//! [20]
-
-//! [22]
-void Calculator::pointClicked()
-{
-    if (waitingForOperand)
-        display->setText("0");
-    if (!display->text().contains('.'))
-        display->setText(display->text() + ".");
-    waitingForOperand = false;
-}
-//! [22]
-
-//! [24]
-void Calculator::changeSignClicked()
-{
-    QString text = display->text();
-    double value = text.toDouble();
-
-    if (value > 0.0) {
-        text.prepend("-");
-    } else if (value < 0.0) {
-        text.remove(0, 1);
-    }
-    display->setText(text);
-}
-//! [24]
-
-//! [26]
-void Calculator::backspaceClicked()
-{
-    if (waitingForOperand)
-        return;
-
-    QString text = display->text();
-    text.chop(1);
-    if (text.isEmpty()) {
-        text = "0";
-        waitingForOperand = true;
-    }
-    display->setText(text);
-}
-//! [26]
-
-//! [28]
-void Calculator::clear()
-{
-    if (waitingForOperand)
-        return;
-
-    display->setText("0");
-    waitingForOperand = true;
-}
-//! [28]
-
-//! [30]
-void Calculator::clearAll()
-{
-    sumSoFar = 0.0;
-    factorSoFar = 0.0;
-    pendingAdditiveOperator.clear();
-    pendingMultiplicativeOperator.clear();
-    display->setText("0");
-    waitingForOperand = true;
-}
-//! [30]
-
-//! [32]
-void Calculator::clearMemory()
-{
-    sumInMemory = 0.0;
-}
-
-void Calculator::readMemory()
-{
-    display->setText(QString::number(sumInMemory));
-    waitingForOperand = true;
-}
-
-void Calculator::setMemory()
-{
-    equalClicked();
-    sumInMemory = display->text().toDouble();
-}
-
-void Calculator::addToMemory()
-{
-    equalClicked();
-    sumInMemory += display->text().toDouble();
-}
-//! [32]
-//! [34]
-Button *Calculator::createButton(const QString &text, const char *member)
-{
-    Button *button = new Button(text);
-    connect(button, SIGNAL(clicked()), this, member);
-    return button;
-}
-//! [34]
-
-//! [36]
-void Calculator::abortOperation()
-{
-    clearAll();
-    display->setText("####");
-}
-//! [36]
-
-//! [38]
-bool Calculator::calculate(double rightOperand, const QString &pendingOperator)
-{
-    if (pendingOperator == "+") {
-        sumSoFar += rightOperand;
-    } else if (pendingOperator == "-") {
-        sumSoFar -= rightOperand;
-    } else if (pendingOperator == "\303\227") {
-        factorSoFar *= rightOperand;
-    } else if (pendingOperator == "\303\267") {
-        if (rightOperand == 0.0)
-            return false;
-        factorSoFar /= rightOperand;
-    }
-    return true;
-}
-//! [38]

SingleApplication/examples/calculator/calculator.h

@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CALCULATOR_H
-#define CALCULATOR_H
-
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-QT_END_NAMESPACE
-class Button;
-
-//! [0]
-class Calculator : public QWidget
-{
-    Q_OBJECT
-
-public:
-    Calculator(QWidget *parent = 0);
-
-private slots:
-    void digitClicked();
-    void unaryOperatorClicked();
-    void additiveOperatorClicked();
-    void multiplicativeOperatorClicked();
-    void equalClicked();
-    void pointClicked();
-    void changeSignClicked();
-    void backspaceClicked();
-    void clear();
-    void clearAll();
-    void clearMemory();
-    void readMemory();
-    void setMemory();
-    void addToMemory();
-//! [0]
-
-//! [1]
-private:
-//! [1] //! [2]
-    Button *createButton(const QString &text, const char *member);
-    void abortOperation();
-    bool calculate(double rightOperand, const QString &pendingOperator);
-//! [2]
-
-//! [3]
-    double sumInMemory;
-//! [3] //! [4]
-    double sumSoFar;
-//! [4] //! [5]
-    double factorSoFar;
-//! [5] //! [6]
-    QString pendingAdditiveOperator;
-//! [6] //! [7]
-    QString pendingMultiplicativeOperator;
-//! [7] //! [8]
-    bool waitingForOperand;
-//! [8]
-
-//! [9]
-    QLineEdit *display;
-//! [9] //! [10]
-
-    enum { NumDigitButtons = 10 };
-    Button *digitButtons[NumDigitButtons];
-};
-//! [10]
-
-#endif

SingleApplication/examples/calculator/calculator.pro

@@ -1,11 +0,0 @@
-QT += widgets
-
-HEADERS = button.h \
-    calculator.h
-SOURCES = button.cpp \
-    calculator.cpp \
-    main.cpp
-
-# Single Application implementation
-include(../../singleapplication.pri)
-DEFINES += QAPPLICATION_CLASS=QApplication

SingleApplication/examples/calculator/main.cpp

@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-
-#include <singleapplication.h>
-
-#include "calculator.h"
-
-int main(int argc, char *argv[])
-{
-    SingleApplication app(argc, argv);
-
-    Calculator calc;
-
-    QObject::connect( &app, &SingleApplication::instanceStarted, [ &calc ]() {
-        calc.raise();
-        calc.activateWindow();
-    });
-
-    calc.show();
-
-    return app.exec();
-}

SingleApplication/examples/sending_arguments/CMakeLists.txt

@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 3.7.0)
-
-project(sending_arguments LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-# SingleApplication base class
-set(QAPPLICATION_CLASS QCoreApplication)
-add_subdirectory(../.. SingleApplication)
-
-find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED)
-
-add_executable(${PROJECT_NAME}
-    main.cpp
-    messagereceiver.cpp
-    messagereceiver.h
-    main.cpp
-)
-
-target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)

SingleApplication/examples/sending_arguments/main.cpp

@@ -1,28 +0,0 @@
-#include <singleapplication.h>
-#include "messagereceiver.h"
-
-int main(int argc, char *argv[])
-{
-    // Allow secondary instances
-    SingleApplication app( argc, argv, true );
-
-    MessageReceiver msgReceiver;
-
-    // If this is a secondary instance
-    if( app.isSecondary() ) {
-        app.sendMessage( app.arguments().join(' ').toUtf8() );
-        qDebug() << "App already running.";
-        qDebug() << "Primary instance PID: " << app.primaryPid();
-        qDebug() << "Primary instance user: " << app.primaryUser();
-        return 0;
-    } else {
-        QObject::connect(
-            &app,
-            &SingleApplication::receivedMessage,
-            &msgReceiver,
-            &MessageReceiver::receivedMessage
-        );
-    }
-
-    return app.exec();
-}

SingleApplication/examples/sending_arguments/messagereceiver.cpp

@@ -1,12 +0,0 @@
-#include <QDebug>
-#include "messagereceiver.h"
-
-MessageReceiver::MessageReceiver(QObject *parent) : QObject(parent)
-{
-}
-
-void MessageReceiver::receivedMessage(int instanceId, QByteArray message)
-{
-    qDebug() << "Received message from instance: " << instanceId;
-    qDebug() << "Message Text: " << message;
-}

SingleApplication/examples/sending_arguments/messagereceiver.h

@@ -1,15 +0,0 @@
-#ifndef MESSAGERECEIVER_H
-#define MESSAGERECEIVER_H
-
-#include <QObject>
-
-class MessageReceiver : public QObject
-{
-    Q_OBJECT
-public:
-    explicit MessageReceiver(QObject *parent = 0);
-public slots:
-    void receivedMessage( int instanceId, QByteArray message );
-};
-
-#endif // MESSAGERECEIVER_H

SingleApplication/examples/sending_arguments/sending_arguments.pro

@@ -1,9 +0,0 @@
-# Single Application implementation
-include(../../singleapplication.pri)
-DEFINES += QAPPLICATION_CLASS=QCoreApplication
-
-SOURCES += main.cpp \
-    messagereceiver.cpp
-
-HEADERS += \
-    messagereceiver.h

SingleApplication/singleapplication.cpp

@@ -1,274 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) Itay Grudev 2015 - 2020
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include <QtCore/QElapsedTimer>
-#include <QtCore/QByteArray>
-#include <QtCore/QSharedMemory>
-
-#include "singleapplication.h"
-#include "singleapplication_p.h"
-
-/**
- * @brief Constructor. Checks and fires up LocalServer or closes the program
- * if another instance already exists
- * @param argc
- * @param argv
- * @param allowSecondary Whether to enable secondary instance support
- * @param options Optional flags to toggle specific behaviour
- * @param timeout Maximum time blocking functions are allowed during app load
- */
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, const QString &userData )
-    : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
-{
-    Q_D( SingleApplication );
-
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    // 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
-
-    // Store the current mode of the program
-    d->options = options;
-
-    // Add any unique user data
-    if ( ! userData.isEmpty() )
-        d->addAppData( userData );
-
-    // Generating an application ID used for identifying the shared memory
-    // block and QLocalServer
-    d->genBlockServerName();
-
-    // To mitigate QSharedMemory issues with large amount of processes
-    // attempting to attach at the same time
-    SingleApplicationPrivate::randomSleep();
-
-#ifdef Q_OS_UNIX
-    // By explicitly attaching it and then deleting it we make sure that the
-    // memory is deleted even after the process has crashed on Unix.
-    d->memory = new QSharedMemory( d->blockServerName );
-    d->memory->attach();
-    delete d->memory;
-#endif
-    // Guarantee thread safe behaviour with a shared memory block.
-    d->memory = new QSharedMemory( d->blockServerName );
-
-    // Create a shared memory block
-    if( d->memory->create( sizeof( InstancesInfo ) )){
-        // Initialize the shared memory block
-        if( ! d->memory->lock() ){
-          qCritical() << "SingleApplication: Unable to lock memory block after create.";
-          abortSafely();
-        }
-        d->initializeMemoryBlock();
-    } else {
-        if( d->memory->error() == QSharedMemory::AlreadyExists ){
-          // Attempt to attach to the memory segment
-          if( ! d->memory->attach() ){
-              qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-              abortSafely();
-          }
-          if( ! d->memory->lock() ){
-            qCritical() << "SingleApplication: Unable to lock memory block after attach.";
-            abortSafely();
-          }
-        } else {
-          qCritical() << "SingleApplication: Unable to create block.";
-          abortSafely();
-        }
-    }
-
-    auto *inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QElapsedTimer time;
-    time.start();
-
-    // Make sure the shared memory block is initialised and in consistent state
-    while( true ){
-      // If the shared memory block's checksum is valid continue
-      if( d->blockChecksum() == inst->checksum ) break;
-
-      // If more than 5s have elapsed, assume the primary instance crashed and
-      // assume it's position
-      if( time.elapsed() > 5000 ){
-          qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
-          d->initializeMemoryBlock();
-      }
-
-      // Otherwise wait for a random period and try again. The random sleep here
-      // limits the probability of a collision between two racing apps and
-      // allows the app to initialise faster
-      if( ! d->memory->unlock() ){
-        qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
-        qDebug() << d->memory->errorString();
-      }
-      SingleApplicationPrivate::randomSleep();
-      if( ! d->memory->lock() ){
-        qCritical() << "SingleApplication: Unable to lock memory after random wait.";
-        abortSafely();
-      }
-    }
-
-    if( inst->primary == false ){
-        d->startPrimary();
-        if( ! d->memory->unlock() ){
-          qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
-          qDebug() << d->memory->errorString();
-        }
-        return;
-    }
-
-    // Check if another instance can be started
-    if( allowSecondary ){
-        d->startSecondary();
-        if( d->options & Mode::SecondaryNotification ){
-            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
-        }
-        if( ! d->memory->unlock() ){
-          qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
-          qDebug() << d->memory->errorString();
-        }
-        return;
-    }
-
-    if( ! d->memory->unlock() ){
-      qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
-      qDebug() << d->memory->errorString();
-    }
-
-    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
-
-    delete d;
-
-    ::exit( EXIT_SUCCESS );
-}
-
-SingleApplication::~SingleApplication()
-{
-    Q_D( SingleApplication );
-    delete d;
-}
-
-/**
- * Checks if the current application instance is primary.
- * @return Returns true if the instance is primary, false otherwise.
- */
-bool SingleApplication::isPrimary() const
-{
-    Q_D( const SingleApplication );
-    return d->server != nullptr;
-}
-
-/**
- * Checks if the current application instance is secondary.
- * @return Returns true if the instance is secondary, false otherwise.
- */
-bool SingleApplication::isSecondary() const
-{
-    Q_D( const SingleApplication );
-    return d->server == nullptr;
-}
-
-/**
- * Allows you to identify an instance by returning unique consecutive instance
- * ids. It is reset when the first (primary) instance of your app starts and
- * only incremented afterwards.
- * @return Returns a unique instance id.
- */
-quint32 SingleApplication::instanceId() const
-{
-    Q_D( const SingleApplication );
-    return d->instanceNumber;
-}
-
-/**
- * Returns the OS PID (Process Identifier) of the process running the primary
- * instance. Especially useful when SingleApplication is coupled with OS.
- * specific APIs.
- * @return Returns the primary instance PID.
- */
-qint64 SingleApplication::primaryPid() const
-{
-    Q_D( const SingleApplication );
-    return d->primaryPid();
-}
-
-/**
- * Returns the username the primary instance is running as.
- * @return Returns the username the primary instance is running as.
- */
-QString SingleApplication::primaryUser() const
-{
-    Q_D( const SingleApplication );
-    return d->primaryUser();
-}
-
-/**
- * Returns the username the current instance is running as.
- * @return Returns the username the current instance is running as.
- */
-QString SingleApplication::currentUser() const
-{
-    return SingleApplicationPrivate::getUsername();
-}
-
-/**
- * Sends message to the Primary Instance.
- * @param message The message to send.
- * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfuly, false otherwise.
- */
-bool SingleApplication::sendMessage( const QByteArray &message, int timeout )
-{
-    Q_D( SingleApplication );
-
-    // Nobody to connect to
-    if( isPrimary() ) return false;
-
-    // Make sure the socket is connected
-    if( ! d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect ) )
-      return false;
-
-    d->socket->write( message );
-    bool dataWritten = d->socket->waitForBytesWritten( timeout );
-    d->socket->flush();
-    return dataWritten;
-}
-
-/**
- * Cleans up the shared memory block and exits with a failure.
- * This function halts program execution.
- */
-void SingleApplication::abortSafely()
-{
-    Q_D( SingleApplication );
-
-    qCritical() << "SingleApplication: " << d->memory->error() << d->memory->errorString();
-    delete d;
-    ::exit( EXIT_FAILURE );
-}
-
-QStringList SingleApplication::userData() const
-{
-    Q_D( const SingleApplication );
-    return d->appData();
-}

SingleApplication/singleapplication.h

@@ -1,154 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) Itay Grudev 2015 - 2018
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef SINGLE_APPLICATION_H
-#define SINGLE_APPLICATION_H
-
-#include <QtCore/QtGlobal>
-#include <QtNetwork/QLocalSocket>
-
-#ifndef QAPPLICATION_CLASS
-  #define QAPPLICATION_CLASS QCoreApplication
-#endif
-
-#include QT_STRINGIFY(QAPPLICATION_CLASS)
-
-class SingleApplicationPrivate;
-
-/**
- * @brief The SingleApplication class handles multiple instances of the same
- * Application
- * @see QCoreApplication
- */
-class SingleApplication : public QAPPLICATION_CLASS
-{
-    Q_OBJECT
-
-    using app_t = QAPPLICATION_CLASS;
-
-public:
-    /**
-     * @brief Mode of operation of SingleApplication.
-     * Whether the block should be user-wide or system-wide and whether the
-     * primary instance should be notified when a secondary instance had been
-     * started.
-     * @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
-     * block will be user wide.
-     * @enum
-     */
-    enum Mode {
-        User                    = 1 << 0,
-        System                  = 1 << 1,
-        SecondaryNotification   = 1 << 2,
-        ExcludeAppVersion       = 1 << 3,
-        ExcludeAppPath          = 1 << 4
-    };
-    Q_DECLARE_FLAGS(Options, Mode)
-
-    /**
-     * @brief Intitializes a SingleApplication instance with argc command line
-     * arguments in argv
-     * @arg {int &} argc - Number of arguments in argv
-     * @arg {const char *[]} argv - Supplied command line arguments
-     * @arg {bool} allowSecondary - Whether to start the instance as secondary
-     * if there is already a primary instance.
-     * @arg {Mode} mode - Whether for the SingleApplication block to be applied
-     * User wide or System wide.
-     * @arg {int} timeout - Timeout to wait in milliseconds.
-     * @note argc and argv may be changed as Qt removes arguments that it
-     * recognizes
-     * @note Mode::SecondaryNotification only works if set on both the primary
-     * instance and the secondary instance.
-     * @note The timeout is just a hint for the maximum time of blocking
-     * operations. It does not guarantee that the SingleApplication
-     * initialisation will be completed in given time, though is a good hint.
-     * Usually 4*timeout would be the worst case (fail) scenario.
-     * @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, const QString &userData = {} );
-    ~SingleApplication() override;
-
-    /**
-     * @brief Returns if the instance is the primary instance
-     * @returns {bool}
-     */
-    bool isPrimary() const;
-
-    /**
-     * @brief Returns if the instance is a secondary instance
-     * @returns {bool}
-     */
-    bool isSecondary() const;
-
-    /**
-     * @brief Returns a unique identifier for the current instance
-     * @returns {qint32}
-     */
-    quint32 instanceId() const;
-
-    /**
-     * @brief Returns the process ID (PID) of the primary instance
-     * @returns {qint64}
-     */
-    qint64 primaryPid() const;
-
-    /**
-     * @brief Returns the username of the user running the primary instance
-     * @returns {QString}
-     */
-    QString primaryUser() const;
-
-    /**
-     * @brief Returns the username of the current user
-     * @returns {QString}
-     */
-    QString currentUser() const;
-
-    /**
-     * @brief Sends a message to the primary instance. Returns true on success.
-     * @param {int} timeout - Timeout for connecting
-     * @returns {bool}
-     * @note sendMessage() will return false if invoked from the primary
-     * instance.
-     */
-    bool sendMessage( const QByteArray &message, int timeout = 100 );
-
-    /**
-     * @brief Get the set user data.
-     * @returns {QStringList}
-     */
-    QStringList userData() const;
-
-Q_SIGNALS:
-    void instanceStarted();
-    void receivedMessage( quint32 instanceId, QByteArray message );
-
-private:
-    SingleApplicationPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(SingleApplication)
-    void abortSafely();
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
-
-#endif // SINGLE_APPLICATION_H

SingleApplication/singleapplication.pri

@@ -1,20 +0,0 @@
-QT += core network
-CONFIG += c++11
-
-HEADERS += $$PWD/SingleApplication \
-    $$PWD/singleapplication.h \
-    $$PWD/singleapplication_p.h
-SOURCES += $$PWD/singleapplication.cpp \
-    $$PWD/singleapplication_p.cpp
-
-INCLUDEPATH += $$PWD
-
-win32 {
-    msvc:LIBS += Advapi32.lib
-    gcc:LIBS += -ladvapi32
-}
-
-DISTFILES += \
-    $$PWD/README.md \
-    $$PWD/CHANGELOG.md \
-    $$PWD/Windows.md

SingleApplication/singleapplication_p.cpp

@@ -1,486 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) Itay Grudev 2015 - 2020
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This file is not part of the SingleApplication API. It is used purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or may even be removed.
-//
-
-#include <cstdlib>
-#include <cstddef>
-
-#include <QtCore/QDir>
-#include <QtCore/QThread>
-#include <QtCore/QByteArray>
-#include <QtCore/QDataStream>
-#include <QtCore/QElapsedTimer>
-#include <QtCore/QCryptographicHash>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#include <QtCore/QRandomGenerator>
-#else
-#include <QtCore/QDateTime>
-#endif
-
-#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
-    #ifndef NOMINMAX
-        #define NOMINMAX 1
-    #endif
-    #include <windows.h>
-    #include <lmcons.h>
-#endif
-
-SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
-    : q_ptr( q_ptr )
-{
-    server = nullptr;
-    socket = nullptr;
-    memory = nullptr;
-    instanceNumber = 0;
-}
-
-SingleApplicationPrivate::~SingleApplicationPrivate()
-{
-    if( socket != nullptr ){
-        socket->close();
-        delete socket;
-    }
-
-    if( memory != nullptr ){
-        memory->lock();
-        auto *inst = static_cast<InstancesInfo*>(memory->data());
-        if( server != nullptr ){
-            server->close();
-            delete server;
-            inst->primary = false;
-            inst->primaryPid = -1;
-            inst->primaryUser[0] =  '\0';
-            inst->checksum = blockChecksum();
-        }
-        memory->unlock();
-
-        delete memory;
-    }
-}
-
-QString SingleApplicationPrivate::getUsername()
-{
-#ifdef Q_OS_WIN
-      wchar_t username[UNLEN + 1];
-      // Specifies size of the buffer on input
-      DWORD usernameLength = UNLEN + 1;
-      if( GetUserNameW( username, &usernameLength ) )
-          return QString::fromWCharArray( username );
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-      return QString::fromLocal8Bit( qgetenv( "USERNAME" ) );
-#else
-      return qEnvironmentVariable( "USERNAME" );
-#endif
-#endif
-#ifdef Q_OS_UNIX
-      QString username;
-      uid_t uid = geteuid();
-      struct passwd *pw = getpwuid( uid );
-      if( pw )
-          username = QString::fromLocal8Bit( pw->pw_name );
-      if ( username.isEmpty() ){
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-          username = QString::fromLocal8Bit( qgetenv( "USER" ) );
-#else
-          username = qEnvironmentVariable( "USER" );
-#endif
-      }
-      return username;
-#endif
-}
-
-void SingleApplicationPrivate::genBlockServerName()
-{
-    QCryptographicHash appData( QCryptographicHash::Sha256 );
-    appData.addData( "SingleApplication", 17 );
-    appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
-    appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
-    appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
-
-    if ( ! appDataList.isEmpty() )
-        appData.addData( appDataList.join( "" ).toUtf8() );
-
-    if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ){
-        appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
-    }
-
-    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ){
-#ifdef Q_OS_WIN
-        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
-#else
-        appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
-#endif
-    }
-
-    // User level block requires a user specific data in the hash
-    if( options & SingleApplication::Mode::User ){
-        appData.addData( getUsername().toUtf8() );
-    }
-
-    // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
-    // server naming requirements.
-    blockServerName = appData.result().toBase64().replace("/", "_");
-}
-
-void SingleApplicationPrivate::initializeMemoryBlock() const
-{
-    auto *inst = static_cast<InstancesInfo*>( memory->data() );
-    inst->primary = false;
-    inst->secondary = 0;
-    inst->primaryPid = -1;
-    inst->primaryUser[0] =  '\0';
-    inst->checksum = blockChecksum();
-}
-
-void SingleApplicationPrivate::startPrimary()
-{
-    // Reset the number of connections
-    auto *inst = static_cast <InstancesInfo*>( memory->data() );
-
-    inst->primary = true;
-    inst->primaryPid = QCoreApplication::applicationPid();
-    qstrncpy( inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser) );
-    inst->checksum = blockChecksum();
-    instanceNumber = 0;
-    // Successful creation means that no main process exists
-    // So we start a QLocalServer to listen for connections
-    QLocalServer::removeServer( blockServerName );
-    server = new QLocalServer();
-
-    // Restrict access to the socket according to the
-    // SingleApplication::Mode::User flag on User level or no restrictions
-    if( options & SingleApplication::Mode::User ){
-        server->setSocketOptions( QLocalServer::UserAccessOption );
-    } else {
-        server->setSocketOptions( QLocalServer::WorldAccessOption );
-    }
-
-    server->listen( blockServerName );
-    QObject::connect(
-        server,
-        &QLocalServer::newConnection,
-        this,
-        &SingleApplicationPrivate::slotConnectionEstablished
-    );
-}
-
-void SingleApplicationPrivate::startSecondary()
-{
-  auto *inst = static_cast <InstancesInfo*>( memory->data() );
-
-  inst->secondary += 1;
-  inst->checksum = blockChecksum();
-  instanceNumber = inst->secondary;
-}
-
-bool SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
-{
-    QElapsedTimer time;
-    time.start();
-
-    // Connect to the Local Server of the Primary Instance if not already
-    // connected.
-    if( socket == nullptr ){
-        socket = new QLocalSocket();
-    }
-
-    if( socket->state() == QLocalSocket::ConnectedState ) return true;
-
-    if( socket->state() != QLocalSocket::ConnectedState ){
-
-        while( true ){
-            randomSleep();
-
-          if( socket->state() != QLocalSocket::ConnectingState )
-            socket->connectToServer( blockServerName );
-
-          if( socket->state() == QLocalSocket::ConnectingState ){
-              socket->waitForConnected( static_cast<int>(msecs - time.elapsed()) );
-          }
-
-          // If connected break out of the loop
-          if( socket->state() == QLocalSocket::ConnectedState ) break;
-
-          // If elapsed time since start is longer than the method timeout return
-          if( time.elapsed() >= msecs ) return false;
-        }
-    }
-
-    // Initialisation message according to the SingleApplication protocol
-    QByteArray initMsg;
-    QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    writeStream.setVersion(QDataStream::Qt_5_6);
-#endif
-
-    writeStream << blockServerName.toLatin1();
-    writeStream << static_cast<quint8>(connectionType);
-    writeStream << instanceNumber;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
-#else
-    quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-#endif
-    writeStream << checksum;
-
-    // The header indicates the message length that follows
-    QByteArray header;
-    QDataStream headerStream(&header, QIODevice::WriteOnly);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
-    headerStream << static_cast <quint64>( initMsg.length() );
-
-    socket->write( header );
-    socket->write( initMsg );
-    bool result = socket->waitForBytesWritten( static_cast<int>(msecs - time.elapsed()) );
-    socket->flush();
-    return result;
-}
-
-quint16 SingleApplicationPrivate::blockChecksum() const
-{
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum)));
-#else
-    quint16 checksum = qChecksum(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum));
-#endif
-    return checksum;
-}
-
-qint64 SingleApplicationPrivate::primaryPid() const
-{
-    qint64 pid;
-
-    memory->lock();
-    auto *inst = static_cast<InstancesInfo*>( memory->data() );
-    pid = inst->primaryPid;
-    memory->unlock();
-
-    return pid;
-}
-
-QString SingleApplicationPrivate::primaryUser() const
-{
-    QByteArray username;
-
-    memory->lock();
-    auto *inst = static_cast<InstancesInfo*>( memory->data() );
-    username = inst->primaryUser;
-    memory->unlock();
-
-    return QString::fromUtf8( username );
-}
-
-/**
- * @brief Executed when a connection has been made to the LocalServer
- */
-void SingleApplicationPrivate::slotConnectionEstablished()
-{
-    QLocalSocket *nextConnSocket = server->nextPendingConnection();
-    connectionMap.insert(nextConnSocket, ConnectionInfo());
-
-    QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-        [nextConnSocket, this](){
-            auto &info = connectionMap[nextConnSocket];
-            Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
-        }
-    );
-
-    QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
-
-    QObject::connect(nextConnSocket, &QLocalSocket::destroyed,
-        [nextConnSocket, this](){
-            connectionMap.remove(nextConnSocket);
-        }
-    );
-
-    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-        [nextConnSocket, this](){
-            auto &info = connectionMap[nextConnSocket];
-            switch(info.stage){
-            case StageHeader:
-                readInitMessageHeader(nextConnSocket);
-                break;
-            case StageBody:
-                readInitMessageBody(nextConnSocket);
-                break;
-            case StageConnected:
-                Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
-                break;
-            default:
-                break;
-            };
-        }
-    );
-}
-
-void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
-{
-    if (!connectionMap.contains( sock )){
-        return;
-    }
-
-    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ){
-        return;
-    }
-
-    QDataStream headerStream( sock );
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
-#endif
-
-    // Read the header to know the message length
-    quint64 msgLen = 0;
-    headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
-    info.stage = StageBody;
-    info.msgLen = msgLen;
-
-    if ( sock->bytesAvailable() >= (qint64) msgLen ){
-        readInitMessageBody( sock );
-    }
-}
-
-void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
-{
-    Q_Q(SingleApplication);
-
-    if (!connectionMap.contains( sock )){
-        return;
-    }
-
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ){
-        return;
-    }
-
-    // Read the message body
-    QByteArray msgBytes = sock->read(info.msgLen);
-    QDataStream readStream(msgBytes);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
-#endif
-
-    // server name
-    QByteArray latin1Name;
-    readStream >> latin1Name;
-
-    // connection type
-    ConnectionType connectionType = InvalidConnection;
-    quint8 connTypeVal = InvalidConnection;
-    readStream >> connTypeVal;
-    connectionType = static_cast <ConnectionType>( connTypeVal );
-
-    // instance id
-    quint32 instanceId = 0;
-    readStream >> instanceId;
-
-    // checksum
-    quint16 msgChecksum = 0;
-    readStream >> msgChecksum;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
-#else
-    const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
-#endif
-
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
-
-    if( !isValid ){
-        sock->close();
-        return;
-    }
-
-    info.instanceId = instanceId;
-    info.stage = StageConnected;
-
-    if( connectionType == NewInstance ||
-        ( connectionType == SecondaryInstance &&
-          options & SingleApplication::Mode::SecondaryNotification ) )
-    {
-        Q_EMIT q->instanceStarted();
-    }
-
-    if (sock->bytesAvailable() > 0){
-        Q_EMIT this->slotDataAvailable( sock, instanceId );
-    }
-}
-
-void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
-{
-    Q_Q(SingleApplication);
-    Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
-}
-
-void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
-{
-    if( closedSocket->bytesAvailable() > 0 )
-        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
-}
-
-void SingleApplicationPrivate::randomSleep()
-{
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 )
-    QThread::msleep( QRandomGenerator::global()->bounded( 8u, 18u ));
-#else
-    qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
-    QThread::msleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ));
-#endif
-}
-
-void SingleApplicationPrivate::addAppData(const QString &data)
-{
-    appDataList.push_back(data);
-}
-
-QStringList SingleApplicationPrivate::appData() const
-{
-    return appDataList;
-}

SingleApplication/singleapplication_p.h

@@ -1,104 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) Itay Grudev 2015 - 2020
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This file is not part of the SingleApplication API. It is used purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or may even be removed.
-//
-
-#ifndef SINGLEAPPLICATION_P_H
-#define SINGLEAPPLICATION_P_H
-
-#include <QtCore/QSharedMemory>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
-#include "singleapplication.h"
-
-struct InstancesInfo {
-    bool primary;
-    quint32 secondary;
-    qint64 primaryPid;
-    char primaryUser[128];
-    quint16 checksum; // Must be the last field
-};
-
-struct ConnectionInfo {
-    qint64 msgLen = 0;
-    quint32 instanceId = 0;
-    quint8 stage = 0;
-};
-
-class SingleApplicationPrivate : public QObject {
-Q_OBJECT
-public:
-    enum ConnectionType : quint8 {
-        InvalidConnection = 0,
-        NewInstance = 1,
-        SecondaryInstance = 2,
-        Reconnect = 3
-    };
-    enum ConnectionStage : quint8 {
-        StageHeader = 0,
-        StageBody = 1,
-        StageConnected = 2,
-    };
-    Q_DECLARE_PUBLIC(SingleApplication)
-
-    SingleApplicationPrivate( SingleApplication *q_ptr );
-    ~SingleApplicationPrivate() override;
-
-    static QString getUsername();
-    void genBlockServerName();
-    void initializeMemoryBlock() const;
-    void startPrimary();
-    void startSecondary();
-    bool connectToPrimary( int msecs, ConnectionType connectionType );
-    quint16 blockChecksum() const;
-    qint64 primaryPid() const;
-    QString primaryUser() const;
-    void readInitMessageHeader(QLocalSocket *socket);
-    void readInitMessageBody(QLocalSocket *socket);
-    static void randomSleep();
-    void addAppData(const QString &data);
-    QStringList appData() const;
-
-    SingleApplication *q_ptr;
-    QSharedMemory *memory;
-    QLocalSocket *socket;
-    QLocalServer *server;
-    quint32 instanceNumber;
-    QString blockServerName;
-    SingleApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
-    QStringList appDataList;
-
-public Q_SLOTS:
-    void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
-};
-
-#endif // SINGLEAPPLICATION_P_H

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

@@ -1,10 +1,11 @@
 {
   "id": "org.qelectrotech.QElectroTech",
+  "base-version": "5.15-23.08",
   "runtime": "org.kde.Platform",
-  "runtime-version": "5.15",
+  "runtime-version": "5.15-23.08",
   "sdk": "org.kde.Sdk",
   "command": "qelectrotech",
-  "rename-desktop-file": "qelectrotech.desktop",
+  "rename-desktop-file": "org.qelectrotech.qelectrotech.desktop",
   "rename-appdata-file": "qelectrotech.appdata.xml",
   "rename-icon": "qelectrotech",
   "copy-icon": true,
@@ -13,6 +14,8 @@
     "--socket=fallback-x11",
     "--device=dri",
     "--share=ipc",
+    "--share=network",
+    "--socket=cups",
     "--filesystem=host"
   ],
   "modules": [
@@ -26,7 +29,7 @@
         {
           "type": "git",
           "url": "https://github.com/iwalton3/tkinter-standalone",
-          "commit": "2301112d142ebaf7532b25600c77d1a2edc9ef04"
+          "commit": "23c793bad2429f4a81eee9f50e2d07ae845b7785"
         }
             ],
       "modules": [
@@ -78,18 +81,17 @@
       ]
     },
     {
-    "name": "python3.6.0",
+    "name": "python3-PySimpleGUI",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
+    ],
     "sources": [
         {
-            "type": "archive",
-            "url": "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz",
-            "sha256": "b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622"
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
+            "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
         }
-    ],
-    "config-opts": ["--enable-shared"],
-    "post-install": [
-        "chmod +w ${FLATPAK_DEST}/lib/libpython3.6m.so.1.0",
-        "chmod +w ${FLATPAK_DEST}/lib/libpython3.so"
     ]
 },
     {
@@ -101,25 +103,10 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/9e/c3/aaad3309a5f2ca08e2fa0ab01123bb6fafb15a92854bff88042039192a67/qet_tb_generator-1.1.7.tar.gz",
-            "sha256": "f626ab7bf4d9091fc85f63d33136585e611272b347499b448ece4e33cc04eeed"
+            "url": "https://files.pythonhosted.org/packages/70/aa/ebde0dddfbde799a4e8cf0564e52f95089105a7f562739ee1d16ff5a495a/qet_tb_generator-1.3.1.tar.gz",
+            "sha256": "52c9836387d54bc30ea29272068ec156fc65c3905e0cb863afd9418abc3c0907"
         }
     ]
-},
-    {
-      "name": "DXFtoQET-2020-1",
-      "buildsystem": "qmake",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qelectrotech/DXFtoQET-2020.git",
-          "commit": "01fbb2afe0fe66782cb1d1f901c73616c7d5299d"
-        }
-      ],
-      "post-install": [
-        "mkdir -p ${FLATPAK_DEST}/bin",
-        "cp DXFtoQET ${FLATPAK_DEST}/bin/"
-        ]
 }
   ]
 }

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

@@ -1,17 +1,17 @@
-From 2a390b5188fe070295090b1bd37273d12963b371 Mon Sep 17 00:00:00 2001
+From 14f0685ddcf3a7d64bb85a3e9a9ac97c369bb508 Mon Sep 17 00:00:00 2001
 From: Laurent Trinques <scorpio@qelectrotech.org>
 Date: Sat, 26 Sep 2020 22:52:52 +0200
 Subject: [PATCH] build: Fix the installation paths
 
 ---
- qelectrotech.pro | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ qelectrotech.pro | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/qelectrotech.pro b/qelectrotech.pro
-index 2901a30d5..1019a9870 100644
+index 7baddbb08..5dcda04b6 100644
 --- a/qelectrotech.pro
 +++ b/qelectrotech.pro
-@@ -5,20 +5,20 @@
+@@ -5,18 +5,18 @@
  # Chemins utilises pour la compilation et l'installation de QET
  unix {
          # Chemins UNIX
@@ -25,12 +25,8 @@ index 2901a30d5..1019a9870 100644
          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/'
@@ -40,5 +36,5 @@ index 2901a30d5..1019a9870 100644
  }
  win32 {
 -- 
-2.28.0
+2.35.1
 

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

@@ -1,15 +1,5 @@
 #!/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"
@@ -19,16 +9,6 @@ if [ ! -d "$to" ] && [ -d "$from" ]; then
   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

@@ -1,6 +1,6 @@
 name: qelectrotech
 title: QElectroTech
-base: core18
+base: core22
 adopt-info: qelectrotech
 license: GPL-2.0
 summary: Electrical diagram editor
@@ -10,44 +10,38 @@ description: |
 
 grade: stable
 confinement: strict
+compression: lzo
 
 architectures:
   - build-on: amd64
-    run-on: amd64
+    build-for: amd64
+  - build-on: arm64
+    build-for: arm64
     
 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]
+    common-id: qelectrotech.desktop
+    extensions: 
+     - kde-neon
+    plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control, wayland, x11]
     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
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.10/site-packages:$SNAP/usr/lib/python3.10:$SNAP/usr/lib/python3.10/lib-dynload
 
   qet-tb-generator:
-    command: bin/qelectrotech-launch $SNAP/bin/qet_tb_generator
-    extensions: [kde-neon]
+    command: 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:
@@ -58,8 +52,8 @@ parts:
 
   qet-tb-generator:
     plugin: python
-    python-version: python3
-    source: https://github.com/qelectrotech/qet_tb_generator.git
+    source: https://github.com/raulroda/qet_tb_generator-plugin.git
+    python-packages: [PySimpleGUI]
     stage-packages: 
       - python3-lxml
       - python3-tk
@@ -68,57 +62,50 @@ parts:
   kde-sdk-setup:
     plugin: nil
     build-snaps:
-      - kde-frameworks-5-core18-sdk
+      - kf5-5-110-qt-5-15-11-core22-sdk
     build-packages:
       - g++
       - mesa-common-dev
       - libglvnd-dev
       - rsync
     override-build: |
-      rsync -a --ignore-existing /snap/kde-frameworks-5-core18-sdk/current/ /
+      rsync -a --ignore-existing /snap/kf5-5-110-qt-5-15-11-core22-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: .
-    stage-packages: [ git, sqlite3 ]
+    stage-packages: [ git, sqlite3, xdg-user-dirs ]
     build-packages:
       - git
       - libsqlite3-dev
-    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"
+      displayed_version=$(cat sources/qetversion.cpp | grep "return QVersionNumber{"| head -n 1| awk -F "{" '{ print $2 }' | awk -F "}" '{ print $1 }' | sed -e 's/,/./g' -e 's/ //g')
+      snap_version="${displayed_version}-g$(git rev-parse --short=8 HEAD)"
+      modified_displayed_version="${snap_version}.snap"
+      sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
+      craftctl set version="$snap_version"
+      qmake "$CRAFT_PART_SRC/qelectrotech.pro"
+      make -j${CRAFT_PARALLEL_BUILD_COUNT}
+      make install INSTALL_ROOT="$CRAFT_PART_INSTALL"
     override-stage: |
-      snapcraftctl stage
+      craftctl default
       # 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
+      $SED_CMD usr/local/share/applications/org.qelectrotech.qelectrotech.desktop
 
   cleanup:
-    after: [qelectrotech, dxf-to-qet, qet-tb-generator]
+    after: [qelectrotech, qet-tb-generator]
     plugin: nil
-    build-snaps: [core18, kde-frameworks-5-core18]
+    build-snaps: [kf5-5-110-qt-5-15-11-core22]
     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/{}" \;
+      for snap in "kf5-5-110-qt-5-15-11-core22"; do  # List all content-snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" "$CRAFT_PRIME/usr/{}" \;
       done
+      for cruft in bug lintian man; do
+        rm -rf $CRAFT_PRIME/usr/share/$cruft
+      done
+      find $CRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
+      find $CRAFT_PRIME/usr/share -type d -empty -delete

build-aux/windows/Lancer QET.bat

@@ -5,7 +5,10 @@ set current_dir=%~dp0
 cd /d %current_dir%
 
 rem lance QElectroTech
-rem Sans option --config-dir, la configuration de QElectroTech ainsi que la
-rem collection d'elements perso seront dans "%APPDATA%\qet"
+rem Sans option --config-dir, la configuration de QElectroTech seront dans
+rem "C:/Users/<USER>/AppData/Local/QElectroTech/QElectroTech"
+rem Sans l'option --data-dir, les données utilisateur (elements, titleblocks,
+rem log, ...) de QElectroTech sont stockées dans
+rem "C:/Users/<USER>/AppData/Roaming/QElectroTech/QElectroTech"
 set command=bin\qelectrotech.exe --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ -style windowsvista %*
 @start %command%

build-aux/windows/QET.nsi

@@ -1,391 +0,0 @@
-; this file is part of installer for QElectroTech
-; Copyright (C)2015 QElectroTech Team <scorpio@qelectrotech.org>
-;
-; This program is free software; you can redistribute it and/or
-; modify it under the terms of the GNU General Public License
-; as published by the Free Software Foundation; either
-; version 2 of the License, or (at your option) any later version.
-;
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
-; 
-; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
-; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-; WebSite : http://qelectrotech.org/
-
-;--------------------------------
-;Include Modern UI
-	
-	!include "MUI2.nsh"
-	!include "FileFunc.nsh"
-	!insertmacro Locate
-	!include FileFunc.nsh
-	!insertmacro GetParameters
-	!insertmacro GetOptions
-
-
-	
-; MUI Settings
-;--------------------------------
-;General
-	; General Product Description Definitions
-	!define SOFT_NAME     "QElectroTech"
-	!define SOFT_VERSION  "0.5-dev+4113"
-	!define SOFT_WEB_SITE "http://qelectrotech.org/"
-	!define SOFT_BUILD    "1"
-	
-	SetCompressor /final /solid lzma
-	CRCCheck force
-	XPStyle on
-	BrandingText "${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}"   ; Shows in the Bottom Left of the installer
-	
-	;Name and file
-	Name "${SOFT_NAME} ${SOFT_VERSION}"
-	OutFile "Installer_${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}.exe"
-
-	;Default installation folder
-	InstallDir "$PROGRAMFILES\${SOFT_NAME}"
-
-	;Get installation folder from registry if available
-	InstallDirRegKey HKCU "Software\${SOFT_NAME}" ""
-
-	;Request application privileges for Windows Vista
-	; we request for admin because we write stuff into the registry
-	RequestExecutionLevel admin
-
-;--------------------------------
-;Interface Settings
-
-	!define MUI_ABORTWARNING
-	!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico"
-	!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico"
-	
-
-	!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp"
-	!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-
-	!define MUI_HEADERIMAGE
-	!define MUI_HEADERIMAGE_BITMAP ".\images\header.bmp" ; optional
-	
-;--------------------------------
-;Language Selection Dialog Settings
-
-	;Remember the installer language
-	!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
-	!define MUI_LANGDLL_REGISTRY_KEY "Software\${SOFT_NAME}" 
-	!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-;--------------------------------
-;Pages
-
-	!define MUI_COMPONENTSPAGE_SMALLDESC
-	!insertmacro MUI_PAGE_WELCOME
-	!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
-	!insertmacro MUI_PAGE_COMPONENTS
-	!insertmacro MUI_PAGE_DIRECTORY
-	!insertmacro MUI_PAGE_INSTFILES
-
-	!insertmacro MUI_UNPAGE_CONFIRM
-	!insertmacro MUI_UNPAGE_INSTFILES
-	
-; Finish page and checkbox to run QElectroTech
-	!define MUI_FINISHPAGE_RUN "$INSTDIR\Lancer QET.bat"
-	!define MUI_FINISHPAGE_RUN_NOTCHECKED
-	!define MUI_FINISHPAGE_RUN_TEXT "$(Check)"
-	!insertmacro MUI_PAGE_FINISH
-;--------------------------------
-;Languages
-	;Since NSIS 2.26, the language selection dialog of Modern UI hides languages unsupported by the user's selected codepage by default.
-	;To revert to the old behavior and display all languages, no matter what the user will see when they're selected, use MUI_LANGDLL_ALLLANGUAGES.
-	!define MUI_LANGDLL_ALLLANGUAGES
-	
-	; For consistency, we limit the installer to languages supported by QElectroTech itself
-	!insertmacro MUI_LANGUAGE "English" ;first language is the default language
-        !insertmacro MUI_LANGUAGE "French"
-        !insertmacro MUI_LANGUAGE "Spanish"
-        !insertmacro MUI_LANGUAGE "Russian"
-        !insertmacro MUI_LANGUAGE "Portuguese"
-        !insertmacro MUI_LANGUAGE "Czech"
-        !insertmacro MUI_LANGUAGE "Polish"
-        !insertmacro MUI_LANGUAGE "Greek"
-        !insertmacro MUI_LANGUAGE "Arabic"
-        !insertmacro MUI_LANGUAGE "German"
-        !insertmacro MUI_LANGUAGE "Italian"
-        !insertmacro MUI_LANGUAGE "Romanian"
-        !insertmacro MUI_LANGUAGE "Catalan"
-        !insertmacro MUI_LANGUAGE "Croatian"
-        !insertmacro MUI_LANGUAGE "Dutch"
-        !insertmacro MUI_LANGUAGE "Dutch_Belgium"
-        !insertmacro MUI_LANGUAGE "Danish"
-
-	!insertmacro MUI_RESERVEFILE_LANGDLL
-	!include lang_extra.nsh
-	!include lang_extra_fr.nsh
-	
-
-	
-SetOverwrite on	
-Section "Main Program"
-SectionIn RO ; Read only, always installed
-
-Setoutpath "$INSTDIR\bin\"
-File "./files/bin/${SOFT_NAME}.exe"
-
-Setoutpath "$INSTDIR"
-File "./files/ChangeLog"
-File "./files/CREDIT"
-File "./files/ELEMENTS.LICENSE"
-File "./files/LICENSE"
-File "./files/qet_uninstall_file_associations.reg"
-File "./files/README"
-File "./files/register_filetypes.bat"
-File "Lancer QET.bat"
-
-SetOutPath "$INSTDIR"
-File /r "./files/ico"
-
-SectionEnd
-
-;---------------------------
-SetOverwrite on
-SubSection "$(Elements)" SEC01
-
-SetOverwrite on
-Section "$(Electric)" 
-  SetOutPath "$INSTDIR\elements"
-  File /r "./files/elements/10_electric"
-SectionEnd
-
-SetOverwrite on
-Section "$(Logic)" 
-  SetOutPath "$INSTDIR\elements"
-  File /r "./files/elements/20_logic"
-SectionEnd
-
-SetOverwrite on
-Section  "$(Hydraulic)" 
-  SetOutPath "$INSTDIR\elements"
-  File /r "./files/elements/30_hydraulic"
-SectionEnd
-
-
-SetOverwrite on
-Section "$(Pneumatic)" 
-  SetOutPath "$INSTDIR\elements"
-  File /r "./files/elements/50_pneumatic"
-SectionEnd
-
-
-;---------------------------------
-SubSection "$(Energy)" 
-
-SetOverwrite on
-Section  "$(water)" 
-  SetOutPath "$INSTDIR\elements\60_energy"
-  File /r "./files/elements/60_energy/11_water"
-  File /r "./files/elements/60_energy/"
-SectionEnd
-
-SetOverwrite on
-Section  "$(Refrigeration)" 
-  SetOutPath "$INSTDIR\elements\60_energy"
-  File /r "./files/elements/60_energy/21_refrigeration"
-  File /r "./files/elements/60_energy/"
-SectionEnd
-
-SetOverwrite on
-Section  "$(Solar_thermal)" 
-  SetOutPath "$INSTDIR\elements\60_energy"
-  File /r "./files/elements/60_energy/31_solar_thermal"
-  File /r "./files/elements/60_energy/"
-SectionEnd
-
-SubSectionEnd 
-SubSectionEnd 
-;-------------------------------
-
-SetOverwrite on
-Section "$(Lang)" SEC02
-  SetOutPath "$INSTDIR\lang"
-  File "./files/lang/*.qm"
-SectionEnd
-
-SetOverwrite on
-Section "$(Titleblocks)" SEC03
-  SetOutPath "$INSTDIR"
-  File /r "./files/titleblocks"
-SectionEnd
-
-SetOverwrite on
-Section "$(Examples)" SEC04
-  SetOutPath "$INSTDIR"
-  File /r "./files/examples"
-SectionEnd
-
-;--------------------------------
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $(var1)
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(var2)
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(var3)
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $(var4)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-;--------------------------------
-
-;Installer Sections
-
-Section ""
-	SetOutPath "$INSTDIR"  
-	;Store installation folder
-	WriteRegStr HKCU "Software\${SOFT_NAME}" "" $INSTDIR
-	; write uninstall strings
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "DisplayName"     "${SOFT_NAME} (remove only)"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-	;Create uninstaller
-	WriteUninstaller "$INSTDIR\Uninstall.exe"
-	
-	; get the final path for the icons and the launch script
-	Var /GLOBAL final_qet_exe
-	Var /GLOBAL final_project_ico
-	Var /GLOBAL final_element_ico
-	Var /GLOBAL final_titleblock_ico
-
-	StrCpy $final_qet_exe     "$INSTDIR\Lancer QET.bat"
-	StrCpy $final_project_ico "$INSTDIR\\ico\application-x-qet-project.ico"
-	StrCpy $final_element_ico "$INSTDIR\\ico\application-x-qet-element.ico"
-	StrCpy $final_titleblock_ico "$INSTDIR\\ico\application-x-qet-titleblock.ico"
-	
-	; write file associations registry keys
-	WriteRegStr   HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" ""             "$\"$final_qet_exe$\" $\"%1$\""
-	WriteRegStr   HKEY_CLASSES_ROOT ".qet"                                             ""             "qet_diagram_file"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                 ""             "Schéma QET"
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "EditFlags"    0x00000000
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "BrowserFlags" 0x00000008
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon"                     ""             "$final_project_ico"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
-	WriteRegStr   HKEY_CLASSES_ROOT ".elmt"                                            ""             "qet_element_file"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                 ""             "Élément QET"
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "EditFlags"    0x00000000
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "BrowserFlags" 0x00000008
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon"                     ""             "$final_element_ico"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
-	WriteRegStr   HKEY_CLASSES_ROOT ".titleblock"                                      ""             "qet_titleblock_file"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file"                              ""             "Titleblock QET"
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                              "EditFlags"    0x00000000
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                              "BrowserFlags" 0x00000008
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\DefaultIcon"                  ""             "$final_titleblock_ico"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\shell\open\command"           ""             "$\"$final_qet_exe$\" $\"%1$\""
-	
-	SetShellVarContext all ; all users
-	; shortcuts in the start menu
-	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
-	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Manual"
-	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Upgrade"
-	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\QElectroTech.lnk"           "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\\ico\qelectrotech.ico"
-	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\Uninstall QElectroTech.lnk" "$INSTDIR\Uninstall.exe"
-	
-	; shortcut on the desktop
-	CreateShortCut "$DESKTOP\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/manual_0.7/build/index.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/joshua/html/QET_ru.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url"      "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/builds/nightly/"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url"                "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
-	
-	;changing $INSTDIR\elements\ *.elmt to read-only attribute
-	${Locate} "$INSTDIR\elements\" "/L=FD /M=*.elmt" "LocateCallback"
-	IfErrors 0 +2
-	;MessageBox MB_OK "Error"
-SectionEnd
-
-Function LocateCallback
-	SetFileAttributes $R9 FILE_ATTRIBUTE_READONLY
-	Push $0
-FunctionEnd
-;--------------------------------
-;Installer Functions
-
-Function .onInit
-
-	!insertmacro MUI_LANGDLL_DISPLAY
-	
-;Auto-uninstall old before installing new
-  ReadRegStr $R0 HKLM \
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
-  "UninstallString"
-  StrCmp $R0 "" done
-
-MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "$(installed)" \
-  IDOK uninst
-  Abort
-
-
-;Run the uninstaller
-uninst:
-  ClearErrors
-  ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
-
-  IfErrors no_remove_uninstaller done
-    ;You can either use Delete /REBOOTOK in the uninstaller or add some code
-    ;here to remove the uninstaller. Use a registry key to check
-    ;whether the user has chosen to uninstall. If you are using an uninstaller
-    ;components page, make sure all sections are uninstalled.
-  no_remove_uninstaller:
- 
-done:
-
-FunctionEnd
-
-;--------------------------------
-;Descriptions
-
-	;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
-
-	;Assign descriptions to sections
-	;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-	;!insertmacro MUI_DESCRIPTION_TEXT ${CopyFiles} "CopyFiles"
-	;!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-	SetShellVarContext all ; all users
-	; remove start menu shortcuts
-	RMDir /r "$SMPROGRAMS\${SOFT_NAME}"
-	; remove shortcut on the desktop
-	Delete "$DESKTOP\QElectroTech.lnk"
-	
-	; remove the application files
-	Delete "$INSTDIR\*.*"
-	RMDir /r "$INSTDIR"
-	
-	;remove installation registry keys
-	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}"
-	DeleteRegKey /ifempty HKCU "Software\${SOFT_NAME}"
-	
-	; remove file associations registry keys
-	DeleteRegKey HKEY_CLASSES_ROOT "Applications\qelectrotech.exe"
-	DeleteRegKey HKEY_CLASSES_ROOT ".qet"
-	DeleteRegKey HKEY_CLASSES_ROOT "qet_diagram_file"
-	DeleteRegKey HKEY_CLASSES_ROOT ".elmt"
-	DeleteRegKey HKEY_CLASSES_ROOT "qet_element_file"
-	DeleteRegKey HKEY_CLASSES_ROOT ".titleblock"
-	DeleteRegKey HKEY_CLASSES_ROOT "qet_titleblock_file"
-	
-	IfFileExists "$INSTDIR" 0 NoErrorMsg
-	;MessageBox MB_OK "Note: $INSTDIR could not be removed!" IDOK 0 ; skipped if file doesn't exist
-	NoErrorMsg:
-SectionEnd
-
-;--------------------------------
-;Uninstaller Functions
-
-Function un.onInit
-
-	!insertmacro MUI_UNGETLANGUAGE
-
-FunctionEnd

build-aux/windows/QET64.nsi

@@ -125,6 +125,7 @@
         !insertmacro MUI_LANGUAGE "Dutch"
         !insertmacro MUI_LANGUAGE "Dutch_Belgium"
         !insertmacro MUI_LANGUAGE "Danish"
+        !insertmacro MUI_LANGUAGE "Swedish"
 	!insertmacro MUI_RESERVEFILE_LANGDLL
 	
 	!include lang_extra.nsh
@@ -266,13 +267,13 @@ Section ""
 	; write file associations registry keys
 	WriteRegStr   HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" ""             "$\"$final_qet_exe$\" $\"%1$\""
 	WriteRegStr   HKEY_CLASSES_ROOT ".qet"                                             ""             "qet_diagram_file"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                 ""             "Schéma QET"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                 ""             "Diagram QET"
 	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "EditFlags"    0x00000000
 	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "BrowserFlags" 0x00000008
 	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon"                     ""             "$final_project_ico"
 	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
 	WriteRegStr   HKEY_CLASSES_ROOT ".elmt"                                            ""             "qet_element_file"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                 ""             "Élément QET"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                 ""             "Element QET"
 	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "EditFlags"    0x00000000
 	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "BrowserFlags" 0x00000008
 	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon"                     ""             "$final_element_ico"
@@ -295,9 +296,9 @@ Section ""
 	
 	; shortcut on the desktop
 	CreateShortCut "$DESKTOP\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/manual_0.7/build/index.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/joshua/html/QET_ru.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url"      "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/builds/nightly/"
+	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/manual_0.7/build/index.html"
+	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/joshua/html/QET_ru.html"
+	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url"      "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/builds/nightly/"
 	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url"                "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
 	
 	;changing $INSTDIR\elements\ *.elmt to read-only attribute

build-aux/windows/lang_extra.nsh

@@ -104,7 +104,7 @@
         
         
         LangString installed         ${LANG_GERMAN} "${SOFT_NAME} ist bereits installiert. $\n$\nKlicken Sie auf `OK`, um die alte Version zu deinstallieren, oder auf `Abbrechen`, um das Upgrade abzubrechen." 
-        LangString wrongArch         ${LANG_GERMAN} "Dieses Programm läuft ausschließlich unter Windows 64 Bits."
+        LangString wrongArch         ${LANG_GERMAN} "Dieses Programm läuft ausschließlich unter Windows 64 Bit."
         LangString Elements          ${LANG_GERMAN}  "Bauteile"
         LangString Electric          ${LANG_GERMAN}  "Elektrik"
         LangString Logic             ${LANG_GERMAN}  "Logik"
@@ -115,13 +115,13 @@
         LangString Refrigeration     ${LANG_GERMAN}  "Kältetechnik"
         LangString Solar_thermal     ${LANG_GERMAN}  "Solar-Wärmetechnik"
         LangString Lang              ${LANG_GERMAN}  "Sprachen"
-        LangString Titleblocks       ${LANG_GERMAN}  "Zeichnungsköpfe"
+        LangString Titleblocks       ${LANG_GERMAN}  "Schriftfelder"
         LangString Examples          ${LANG_GERMAN}  "Beispiele"
-        LangString Check             ${LANG_GERMAN}  "Check to start ${SOFT_NAME}"
-        LangString var1              ${LANG_GERMAN}  "Elements of the official collection"
-        LangString var2              ${LANG_GERMAN}  "languagues files"
-        LangString var3              ${LANG_GERMAN}  "Examples of cartridges"
-        LangString var4              ${LANG_GERMAN}  "Examples of diagrams"
+        LangString Check             ${LANG_GERMAN}  "Ankreuzen zum Starten von ${SOFT_NAME}"
+        LangString var1              ${LANG_GERMAN}  "Elemente der offiziellen Sammlung"
+        LangString var2              ${LANG_GERMAN}  "Sprachdateien"
+        LangString var3              ${LANG_GERMAN}  "Schriftfeld-Beispiele"
+        LangString var4              ${LANG_GERMAN}  "Schaltplan-Beispiele"
         
         
         LangString installed         ${LANG_RUSSIAN} "${SOFT_NAME} уже установлен. $\n$\nДля удаления предыдущей версии нажмите `OK` или `Cancel` для отмены обновления." 

cmake/define_definitions.cmake

@@ -47,8 +47,6 @@ endif()
 endif()
 
 message("QET_LICENSE_PATH           " ${QET_LICENSE_PATH})
-message("QET_MIME_XML_PATH          " ${QET_MIME_XML_PATH})
-message("QET_MIME_DESKTOP_PATH      " ${QET_MIME_DESKTOP_PATH})
 message("QET_MIME_PACKAGE_PATH      " ${QET_MIME_PACKAGE_PATH})
 message("QET_DESKTOP_PATH           " ${QET_DESKTOP_PATH})
 message("QET_ICONS_PATH             " ${QET_ICONS_PATH})

cmake/paths_compilation_installation.cmake

@@ -28,8 +28,6 @@ if(UNIX AND NOT APPLE)
   set(QET_LANG_PATH               "share/qelectrotech/lang/")
   set(QET_EXAMPLES_PATH           "share/qelectrotech/examples/")
   set(QET_LICENSE_PATH            "doc/qelectrotech/")
-  set(QET_MIME_XML_PATH           "../share/mime/application/")
-  set(QET_MIME_DESKTOP_PATH       "../share/mimelnk/application/")
   set(QET_MIME_PACKAGE_PATH       "../share/mime/packages/")
   set(QET_DESKTOP_PATH            "share/applications/")
   set(QET_ICONS_PATH              "share/icons/hicolor/")
@@ -47,8 +45,6 @@ if(APPLE)
   set(QET_LANG_PATH               "../Resources/lang/")
   set(QET_EXAMPLES_PATH           "share/qelectrotech/examples/")
   set(QET_LICENSE_PATH            "doc/qelectrotech/")
-  set(QET_MIME_XML_PATH           "../share/mime/application/")
-  set(QET_MIME_DESKTOP_PATH       "../share/mimelnk/application/")
   set(QET_DESKTOP_PATH            "share/applications/")
   set(QET_ICONS_PATH              "share/icons/hicolor/")
   set(QET_MAN_PATH                "man/")

cmake/qet_compilation_vars.cmake

@@ -66,6 +66,13 @@ set(QET_RES_FILES
   ${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.ui
   ${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.ui
   ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.ui
+  ${QET_DIR}/sources/TerminalStrip/ui/addterminalstripitemdialog.ui
+  ${QET_DIR}/sources/TerminalStrip/ui/freeterminaleditor.ui
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripcreatordialog.ui
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditor.ui
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditorwindow.ui
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstriplayouteditor.ui
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstriptreedockwidget.ui
   ${QET_DIR}/sources/ui/aboutqetdialog.ui
   ${QET_DIR}/sources/ui/alignmenttextdialog.ui
   ${QET_DIR}/sources/ui/bomexportdialog.ui
@@ -75,6 +82,7 @@ set(QET_RES_FILES
   ${QET_DIR}/sources/ui/conductorpropertieswidget.ui
   ${QET_DIR}/sources/ui/configsaveloaderwidget.ui
   ${QET_DIR}/sources/ui/diagramcontextwidget.ui
+  ${QET_DIR}/sources/ui/diagrameditorhandlersizewidget.ui
   ${QET_DIR}/sources/ui/diagramselection.ui
   ${QET_DIR}/sources/ui/dialogwaiting.ui
   ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.ui
@@ -91,6 +99,7 @@ set(QET_RES_FILES
   ${QET_DIR}/sources/ui/potentialselectordialog.ui
   ${QET_DIR}/sources/ui/reportpropertiewidget.ui
   ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.ui
+  ${QET_DIR}/sources/ui/thirdpartybinaryinstalldialog.ui
   ${QET_DIR}/sources/ui/titleblockpropertieswidget.ui
   ${QET_DIR}/sources/ui/xrefpropertieswidget.ui
   ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.ui
@@ -113,9 +122,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/conductorsegmentprofile.h
   ${QET_DIR}/sources/configdialog.cpp
   ${QET_DIR}/sources/configdialog.h
-  ${QET_DIR}/sources/configpage.h
-  ${QET_DIR}/sources/configpages.cpp
-  ${QET_DIR}/sources/configpages.h
   ${QET_DIR}/sources/createdxf.cpp
   ${QET_DIR}/sources/createdxf.h
   ${QET_DIR}/sources/diagramcommands.cpp
@@ -161,8 +167,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/main.cpp
   ${QET_DIR}/sources/newelementwizard.cpp
   ${QET_DIR}/sources/newelementwizard.h
-  ${QET_DIR}/sources/projectconfigpages.cpp
-  ${QET_DIR}/sources/projectconfigpages.h
   ${QET_DIR}/sources/projectview.cpp
   ${QET_DIR}/sources/projectview.h
   ${QET_DIR}/sources/qetapp.cpp
@@ -189,6 +193,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/qetresult.h
   ${QET_DIR}/sources/qetxml.cpp
   ${QET_DIR}/sources/qetxml.h
+  ${QET_DIR}/sources/qetversion.cpp
+  ${QET_DIR}/sources/qetversion.h
   ${QET_DIR}/sources/qfilenameedit.cpp
   ${QET_DIR}/sources/qfilenameedit.h
   ${QET_DIR}/sources/qgimanager.cpp
@@ -249,6 +255,12 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/dvevent/dveventinterface.cpp
   ${QET_DIR}/sources/dvevent/dveventinterface.h
 
+  ${QET_DIR}/sources/dxf/dxftoelmt.cpp
+  ${QET_DIR}/sources/dxf/dxftoelmt.h
+
+  ${QET_DIR}/sources/qet_elementscaler/qet_elementscaler.cpp
+  ${QET_DIR}/sources/qet_elementscaler/qet_elementscaler.h
+
   ${QET_DIR}/sources/editor/arceditor.cpp
   ${QET_DIR}/sources/editor/arceditor.h
   ${QET_DIR}/sources/editor/editorcommands.cpp
@@ -327,6 +339,12 @@ set(QET_SRC_FILES
 
   ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.cpp
   ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.h
+  ${QET_DIR}/sources/editor/UndoCommand/openelmtcommand.cpp
+  ${QET_DIR}/sources/editor/UndoCommand/openelmtcommand.h
+  ${QET_DIR}/sources/editor/UndoCommand/deletepartscommand.cpp
+  ${QET_DIR}/sources/editor/UndoCommand/deletepartscommand.h
+  ${QET_DIR}/sources/editor/UndoCommand/addpartcommand.cpp
+  ${QET_DIR}/sources/editor/UndoCommand/addpartcommand.h
 
   ${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.cpp
   ${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.h
@@ -373,6 +391,9 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/print/projectprintwindow.cpp
   ${QET_DIR}/sources/print/projectprintwindow.h
 
+  ${QET_DIR}/sources/project/projectpropertieshandler.cpp
+  ${QET_DIR}/sources/project/projectpropertieshandler.h
+
   ${QET_DIR}/sources/properties/elementdata.cpp
   ${QET_DIR}/sources/properties/elementdata.h
   ${QET_DIR}/sources/properties/propertiesinterface.cpp
@@ -392,9 +413,9 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp
   ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h
 
-  ${QET_DIR}/sources/pugixml/pugiconfig.hpp
-  ${QET_DIR}/sources/pugixml/pugixml.cpp
-  ${QET_DIR}/sources/pugixml/pugixml.hpp
+  ${QET_DIR}/pugixml/src/pugiconfig.hpp
+  ${QET_DIR}/pugixml/src/pugixml.cpp
+  ${QET_DIR}/pugixml/src/pugixml.hpp
 
   ${QET_DIR}/sources/qetgraphicsitem/conductor.cpp
   ${QET_DIR}/sources/qetgraphicsitem/conductor.h
@@ -433,7 +454,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/qetgraphicsitem/terminalelement.h
   ${QET_DIR}/sources/qetgraphicsitem/terminal.h
 
-
   ${QET_DIR}/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp
   ${QET_DIR}/sources/qetgraphicsitem/ViewItem/projectdbmodel.h
   ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp
@@ -513,6 +533,65 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/titleblock/templatevisualcell.cpp
   ${QET_DIR}/sources/titleblock/templatevisualcell.h
 
+  ${QET_DIR}/sources/TerminalStrip/physicalterminal.cpp
+  ${QET_DIR}/sources/TerminalStrip/physicalterminal.h
+  ${QET_DIR}/sources/TerminalStrip/realterminal.cpp
+  ${QET_DIR}/sources/TerminalStrip/realterminal.h
+  ${QET_DIR}/sources/TerminalStrip/terminalstripbridge.cpp
+  ${QET_DIR}/sources/TerminalStrip/terminalstripbridge.h
+  ${QET_DIR}/sources/TerminalStrip/terminalstrip.cpp
+  ${QET_DIR}/sources/TerminalStrip/terminalstrip.h
+  ${QET_DIR}/sources/TerminalStrip/terminalstripdata.cpp
+  ${QET_DIR}/sources/TerminalStrip/terminalstripdata.h
+  ${QET_DIR}/sources/TerminalStrip/ui/addterminalstripitemdialog.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/addterminalstripitemdialog.h
+  ${QET_DIR}/sources/TerminalStrip/ui/freeterminaleditor.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/freeterminaleditor.h
+  ${QET_DIR}/sources/TerminalStrip/ui/freeterminalmodel.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/freeterminalmodel.h
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripcreatordialog.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripcreatordialog.h
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditor.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditor.h
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditorwindow.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditorwindow.h
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstriplayouteditor.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstriplayouteditor.h
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripmodel.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstripmodel.h
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstriptreedockwidget.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/terminalstriptreedockwidget.h
+  ${QET_DIR}/sources/TerminalStrip/ui/ConfigPage/terminalstripprojectconfigpage.cpp
+  ${QET_DIR}/sources/TerminalStrip/ui/ConfigPage/terminalstripprojectconfigpage.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminalstripcommand.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminalstripcommand.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminaltostripcommand.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminaltostripcommand.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/bridgeterminalscommand.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/bridgeterminalscommand.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminallevel.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminallevel.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripcolor.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripcolor.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripdata.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripdata.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/groupterminalscommand.h
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp
+  ${QET_DIR}/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.h
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/demoterminalstrip.cpp
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/demoterminalstrip.h
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripitem.cpp
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripitem.h
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/trueterminalstrip.cpp
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/trueterminalstrip.h
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.h
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.cpp
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.h
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutshandler.cpp
+  ${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutshandler.h
+
   ${QET_DIR}/sources/ui/aboutqetdialog.cpp
   ${QET_DIR}/sources/ui/aboutqetdialog.h
   ${QET_DIR}/sources/ui/abstractelementpropertieseditorwidget.cpp
@@ -533,6 +612,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/ui/configsaveloaderwidget.h
   ${QET_DIR}/sources/ui/diagramcontextwidget.cpp
   ${QET_DIR}/sources/ui/diagramcontextwidget.h
+  ${QET_DIR}/sources/ui/diagrameditorhandlersizewidget.cpp
+  ${QET_DIR}/sources/ui/diagrameditorhandlersizewidget.h
   ${QET_DIR}/sources/ui/diagrampropertiesdialog.cpp
   ${QET_DIR}/sources/ui/diagrampropertiesdialog.h
   ${QET_DIR}/sources/ui/diagrampropertieseditordockwidget.cpp
@@ -577,18 +658,26 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/ui/reportpropertiewidget.h
   ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.cpp
   ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.h
+  ${QET_DIR}/sources/ui/thirdpartybinaryinstalldialog.cpp
+  ${QET_DIR}/sources/ui/thirdpartybinaryinstalldialog.h
   ${QET_DIR}/sources/ui/titleblockpropertieswidget.cpp
   ${QET_DIR}/sources/ui/titleblockpropertieswidget.h
   ${QET_DIR}/sources/ui/xrefpropertieswidget.cpp
   ${QET_DIR}/sources/ui/xrefpropertieswidget.h
+  ${QET_DIR}/sources/ui/configpage/configpage.h
+  ${QET_DIR}/sources/ui/configpage/configpages.cpp
+  ${QET_DIR}/sources/ui/configpage/configpages.h
   ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.cpp
-
   ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.h
+  ${QET_DIR}/sources/ui/configpage/projectconfigpages.cpp
+  ${QET_DIR}/sources/ui/configpage/projectconfigpages.h
 
   ${QET_DIR}/sources/undocommand/addelementtextcommand.cpp
   ${QET_DIR}/sources/undocommand/addelementtextcommand.h
   ${QET_DIR}/sources/undocommand/addgraphicsobjectcommand.cpp
   ${QET_DIR}/sources/undocommand/addgraphicsobjectcommand.h
+  ${QET_DIR}/sources/undocommand/changeelementdatacommand.cpp
+  ${QET_DIR}/sources/undocommand/changeelementdatacommand.h
   ${QET_DIR}/sources/undocommand/changeelementinformationcommand.cpp
   ${QET_DIR}/sources/undocommand/changeelementinformationcommand.h
   ${QET_DIR}/sources/undocommand/changetitleblockcommand.cpp
@@ -603,43 +692,53 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/undocommand/rotateselectioncommand.h
   ${QET_DIR}/sources/undocommand/rotatetextscommand.cpp
   ${QET_DIR}/sources/undocommand/rotatetextscommand.h
+  ${QET_DIR}/sources/undocommand/movegraphicsitemcommand.cpp
+  ${QET_DIR}/sources/undocommand/movegraphicsitemcommand.h
 
   ${QET_DIR}/sources/utils/conductorcreator.cpp
   ${QET_DIR}/sources/utils/conductorcreator.h
   ${QET_DIR}/sources/utils/macosxopenevent.cpp
   ${QET_DIR}/sources/utils/macosxopenevent.h
+  ${QET_DIR}/sources/utils/qetsettings.cpp
+  ${QET_DIR}/sources/utils/qetsettings.h
   ${QET_DIR}/sources/utils/qetutils.cpp
   ${QET_DIR}/sources/utils/qetutils.h
+
+  ${QET_DIR}/sources/xml/terminalstripitemxml.cpp
+  ${QET_DIR}/sources/xml/terminalstripitemxml.h
   )
 
 set(TS_FILES
-  ${QET_DIR}/lang/qet_ca.ts
-  ${QET_DIR}/lang/qet_de.ts
-  ${QET_DIR}/lang/qet_es.ts
-  ${QET_DIR}/lang/qet_fr.ts
-  ${QET_DIR}/lang/qet_it.ts
-  ${QET_DIR}/lang/qet_mn.ts
-  ${QET_DIR}/lang/qet_pt_br.ts
-  ${QET_DIR}/lang/qet_ru.ts
-  ${QET_DIR}/lang/qet_sr.ts
-  ${QET_DIR}/lang/qet_zh.ts
-  ${QET_DIR}/lang/qet_be.ts
-  ${QET_DIR}/lang/qet_da.ts
-  ${QET_DIR}/lang/qet_en.ts
-  ${QET_DIR}/lang/qet_fi.ts
-  ${QET_DIR}/lang/qet_hu.ts
-  ${QET_DIR}/lang/qet_nl.ts
-  ${QET_DIR}/lang/qet_pl.ts
-  ${QET_DIR}/lang/qet_ro.ts
-  ${QET_DIR}/lang/qet_sk.ts
   ${QET_DIR}/lang/qet_ar.ts
+  ${QET_DIR}/lang/qet_ca.ts
   ${QET_DIR}/lang/qet_cs.ts
+  ${QET_DIR}/lang/qet_da.ts
+  ${QET_DIR}/lang/qet_de.ts
   ${QET_DIR}/lang/qet_el.ts
+  ${QET_DIR}/lang/qet_en.ts
+  ${QET_DIR}/lang/qet_es.ts
+  ${QET_DIR}/lang/qet_fi.ts
+  ${QET_DIR}/lang/qet_fr.ts
   ${QET_DIR}/lang/qet_hr.ts
+  ${QET_DIR}/lang/qet_hu.ts
+  ${QET_DIR}/lang/qet_it.ts
   ${QET_DIR}/lang/qet_ja.ts
+  ${QET_DIR}/lang/qet_mn.ts
   ${QET_DIR}/lang/qet_nb.ts
+  ${QET_DIR}/lang/qet_nl.ts
+  ${QET_DIR}/lang/qet_nl_BE.ts  
   ${QET_DIR}/lang/qet_no.ts
+  ${QET_DIR}/lang/qet_pl.ts
   ${QET_DIR}/lang/qet_pt.ts
+  ${QET_DIR}/lang/qet_pt_BR.ts
+  ${QET_DIR}/lang/qet_ro.ts
+  ${QET_DIR}/lang/qet_rs.ts  
+  ${QET_DIR}/lang/qet_ru.ts
+  ${QET_DIR}/lang/qet_sk.ts
   ${QET_DIR}/lang/qet_sl.ts
+  ${QET_DIR}/lang/qet_sr.ts
+  ${QET_DIR}/lang/qet_sv.ts
   ${QET_DIR}/lang/qet_tr.ts
+  ${QET_DIR}/lang/qet_uk.ts
+  ${QET_DIR}/lang/qet_zh.ts
   )

cmake/start_options.cmake

@@ -25,5 +25,8 @@ add_definitions(-DQET_ALLOW_OVERRIDE_CTBTD_OPTION)
 # Comment the line below to deactivate the --config-dir option
 add_definitions(-DQET_ALLOW_OVERRIDE_CD_OPTION)
 
+# Comment the line below to deactivate the --data-dir option
+add_definitions(-DQET_ALLOW_OVERRIDE_DD_OPTION)
+
 #comment the line below to disable the project database export
 #add_definitions(-DQET_EXPORT_PROJECT_DB) #error Todo

dev_doc/enum_type_of_QGraphicsItem

@@ -11,6 +11,7 @@ DiagramImageItem    + 1007
 QetShapItem         + 1008
 crossRefItem        + 1009
 DynamiqueElementTextItem  + 1010
+TerminalStripItem   +1011
 ElementPrimitiveDecorator + 2200
 
 ###ELEMENT EDITOR###

elements

@@ -0,0 +1 @@
+Subproject commit 9f20b039b7c384fe29d7e7190fa62b67c8aae471

elements/10_electric/10_allpole/100_folio_referencing/01coming_arrow.elmt

@@ -1,28 +0,0 @@
-<definition height="20" version="0.80" width="30" hotspot_x="8" link_type="previous_report" hotspot_y="10" type="element">
-    <uuid uuid="{994d5b97-25b5-49aa-93ae-c1857ab866ea}"/>
-    <names>
-        <name lang="ar">الصفحة السابقة</name>
-        <name lang="ru">Предыдущая страница</name>
-        <name lang="es">folio anterior</name>
-        <name lang="it">Foglio precedente</name>
-        <name lang="de">Vorherige Folie</name>
-        <name lang="el">Προηγούμενη σελίδα</name>
-        <name lang="en">Coming arrow</name>
-        <name lang="cs">Předchozí list</name>
-        <name lang="fr">Folio précédent</name>
-        <name lang="pl">Wejście adresowe</name>
-        <name lang="hu">Beérkező hivatkozás</name>
-        <name lang="nl">Referentie Vorig</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x2="-1" y2="4" y4="-4" x1="-1" x3="9" y3="0" closed="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" x4="-1" antialias="true"/>
-        <line length2="1.5" x2="12" end2="none" y2="0" length1="1.5" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" end1="none" antialias="false"/>
-        <dynamic_text x="-44" rotation="0" uuid="{8ec41ce2-36d6-4fe3-b299-c8a48cb2182c}" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo" y="-11.5" Valignment="AlignTop" z="3" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal x="13" uuid="{d7fd0bec-9f05-4651-a50b-29d7ffabeb41}" name="" y="0" orientation="e"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/100_folio_referencing/02going_arrow.elmt

@@ -1,28 +0,0 @@
-<definition hotspot_x="21" hotspot_y="10" version="0.80" type="element" height="20" link_type="next_report" width="30">
-    <uuid uuid="{2e596a05-ef45-4895-b826-942d28c2d038}"/>
-    <names>
-        <name lang="de">Nächste Folie</name>
-        <name lang="ar">الصفحة التالية</name>
-        <name lang="fr">Folio suivant</name>
-        <name lang="hu">Elmenő hivatkozás</name>
-        <name lang="it">Foglio successivo</name>
-        <name lang="el">Επόμενη σελίδα</name>
-        <name lang="en">Going arrow</name>
-        <name lang="es">Folio siguiente</name>
-        <name lang="nl">Referentie volgend</name>
-        <name lang="pl">Wyjście adresowe</name>
-        <name lang="ru">Следующая страница</name>
-        <name lang="cs">Další list</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon y3="0" y2="4" x4="-9" x3="2" x1="-9" x2="-9" y4="-4" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" closed="false" antialias="true"/>
-        <line y2="0" x1="-9" x2="-12" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" end1="none" length2="1.5" antialias="false"/>
-        <dynamic_text Valignment="AlignTop" Halignment="AlignLeft" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{93888a84-3ffd-438d-acef-5396acba0750}" text_width="-1" x="6" frame="false" z="3" y="-11.5" text_from="ElementInfo">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal uuid="{975add6f-4ba5-44af-a4c0-e1f1c2024601}" name="" x="-13" orientation="w" y="0"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/100_folio_referencing/qet_directory

@@ -1,19 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="ru">Точки разрыва</name>
-        <name lang="ar">إحالات</name>
-        <name lang="cs">Odkazování listů</name>
-        <name lang="de">Folienverweise</name>
-        <name lang="el">Αναφορές σελίδας</name>
-        <name lang="en">Folio referencing</name>
-        <name lang="fr">Reports de folio</name>
-        <name lang="it">Riferimenti</name>
-        <name lang="pl">Odsyłacze</name>
-    	<name lang="pt_br">Referências</name>
-        <name lang="es">Referencias</name>
-        <name lang="nl">Referenties</name>
-        <name lang="da">Ark henvisninger</name>
-        <name lang="ja">フォリオ参照</name>
-	    <name lang="hu">Tervlap hivatkozások</name>
-    </names>
-</qet-directory>

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

@@ -1,38 +0,0 @@
-<definition type="element" 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">Přípojnice 3f+PEN pravá</name>
-	<name lang="hu">3F + PEN</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

@@ -1,41 +0,0 @@
-<definition type="element" 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 + N + PE</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">Přípojnice 3f+N+PE pravá</name>
-	<name lang="hu">3F + N + PE</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,43 +0,0 @@
-<definition height="50" width="30" link_type="terminal" hotspot_x="16" version="0.80" type="element" hotspot_y="29">
-    <uuid uuid="{a98ac40d-9055-4b9b-88ab-cffe6b08ed37}"/>
-    <names>
-        <name lang="ro">Masă</name>
-        <name lang="pt">Massa</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="en">Ground</name>
-        <name lang="pl">Masa</name>
-        <name lang="es">Masa</name>
-        <name lang="ar">هيكل معدني</name>
-        <name lang="fr">Masse</name>
-	<name lang="hu">Test</name>
-    </names>
-    <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
-titus0818@yahoo.com</informations>
-    <description>
-        <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 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"/>
-        <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/masse.elmt

@@ -1,31 +0,0 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="9" height="30" hotspot_y="20" type="element">
-    <uuid uuid="{5983fe6f-de69-4368-a387-a6ce3b9c2951}"/>
-    <names>
-        <name lang="pt">Massa</name>
-        <name lang="es">Masa</name>
-        <name lang="nl">Massa</name>
-        <name lang="el">Σασί</name>
-        <name lang="de">Masse</name>
-        <name lang="cs">Kostra</name>
-        <name lang="pl">Masa</name>
-        <name lang="it">Massa</name>
-        <name lang="ar">هيكل معدني</name>
-        <name lang="en">Chassis</name>
-        <name lang="fr">Masse</name>
-        <name lang="ru">Шасси</name>
-	<name lang="hu">Vázszerkezet</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="3" y="-12.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="5" end2="none" x1="7.5" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5"/>
-        <line antialias="false" length1="1.5" x2="1.5" end2="none" x1="-1" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line antialias="false" length1="1.5" x2="-4.5" end2="none" x1="-7" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line antialias="false" length1="1.5" x2="4.5" end2="none" x1="2" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line antialias="false" length1="1.5" x2="-1.5" end2="none" x1="-4" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line antialias="false" length1="1.5" x2="8" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <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"/>
-        <terminal x="0" y="-11" orientation="n"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/110_network_supplies/qet_directory

@@ -1,18 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="ru">Подвод питания, сеть</name>
-        <name lang="en">Network sources</name>
-        <name lang="fr">Sources réseau</name>
-        <name lang="it">Alimentazione da rete</name>
-        <name lang="pl">Sieć elektroenergetyczna</name>
-    	<name lang="pt_br">Alimentação</name>
-        <name lang="de">Netzquellen</name>
-        <name lang="el">Παροχές δικτύου</name>
-        <name lang="nl">Netvoedingen</name>
-        <name lang="cs">Napájení</name>
-    	<name lang="es">Fuentes de red</name>
-        <name lang="da">Netværkskilder</name>
-        <name lang="ja">電源網</name>
-        <name lang="hu">Hálózati források</name>
-    </names>
-</qet-directory>

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

@@ -1,31 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="60" hotspot_y="30" type="element">
-    <uuid uuid="{35f2834a-308b-4e79-bc2a-1c00486b24e7}"/>
-    <names>
-        <name lang="es">Fuente unipolo + PE +N</name>
-        <name lang="nl">1 fase + aarde + nul</name>
-        <name lang="el">Μονοφασικό +N +PE</name>
-        <name lang="de">Wechselstrom + PE +N</name>
-        <name lang="cs">Přípojnice 1f+N+PE</name>
-        <name lang="pl">Linia jednofazowa (trójprzewodowa)</name>
-        <name lang="it">Sorgente unipolare + PE +N</name>
-        <name lang="ar">مصدر وحيد القطبية + أرضي PE + محايد N</name>
-        <name lang="en">Single-pole source + PE +N</name>
-        <name lang="fr">Source unipolaire + PE +N</name>
-        <name lang="ru">Однополюсный + PE +N</name>
-	<name lang="hu">F + N + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-12" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <text x="-12" y="23" size="5" text="PE"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <text x="-12" y="3" size="5" text="N"/>
-        <text x="-12" y="-17" size="5" text="L"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="-20" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,28 +0,0 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="22" height="40" hotspot_y="20" type="element">
-    <uuid uuid="{fd042050-e73b-4f95-b4c1-834aa403b07a}"/>
-    <names>
-        <name lang="es">Fuente unipolo + PEN</name>
-        <name lang="nl">1 fase + aardenul</name>
-        <name lang="el">Μονοφασικό +PEN</name>
-        <name lang="de">Wechselstrom + PEN</name>
-        <name lang="cs">Přípojnice 1f+PEN</name>
-        <name lang="pl">Linia jednofazowa (TN-C)</name>
-        <name lang="it">Sorgente unipolare + PEN</name>
-        <name lang="ar">مصدر وحيد القطبية +PEN</name>
-        <name lang="en">Single-pole source +PEN</name>
-        <name lang="fr">Source unipolaire + PEN</name>
-        <name lang="ru">Однополюсный + PEN</name>
-	<name lang="hu">F + PEN</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-7" y="-23.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <text x="-16" y="12" size="5" text="PEN"/>
-        <text x="-15" y="-7" size="5" text="L"/>
-        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="10" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,29 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="40" hotspot_y="20" type="element">
-    <uuid uuid="{457a0c01-871c-40fd-83d7-14033333fb95}"/>
-    <names>
-        <name lang="pt">Fonte unipolar + neutro</name>
-        <name lang="es">Fuente unipolo + neutro</name>
-        <name lang="nl">Wisselspanning L + nul N</name>
-        <name lang="el">Μονοφασικό + Ουδέτερος</name>
-        <name lang="de">Wechselstrom L + N</name>
-        <name lang="cs">Přípojnice 1f+N</name>
-        <name lang="pl">Linia jednofazowa (dwuprzewodowa)</name>
-        <name lang="it">Sorgente unipolare + neutro</name>
-        <name lang="ar">مصدر وحيد القطبية + محايد N</name>
-        <name lang="en">Single-pole source + neutral</name>
-        <name lang="fr">Source unipolaire + neutre</name>
-        <name lang="ru">Однополюсный + нейтраль</name>
-	<name lang="hu">F + N</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-5" y="-25.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <text x="-12" y="13" size="5" text="N"/>
-        <text x="-12" y="-7" size="5" text="L"/>
-        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="10" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,32 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="60" hotspot_y="30" type="element">
-    <uuid uuid="{03b9e482-cb45-4bee-8030-96b93624fc60}"/>
-    <names>
-        <name lang="pt">Fonte tripolar</name>
-        <name lang="es">Fuente tripolar</name>
-        <name lang="nl">3fasen</name>
-        <name lang="el">Τριφασικό</name>
-        <name lang="de">Drehstrom</name>
-        <name lang="cs">Přípojnice 3f</name>
-        <name lang="pl">Linia trójfazowa (trójprzewodowa)</name>
-        <name lang="it">Sorgente tripolare</name>
-        <name lang="ar">مصدر ثلاثي القطبيّة</name>
-        <name lang="en">Three-pole source</name>
-        <name lang="fr">Source tripolaire</name>
-        <name lang="ru">Трёхполюсный</name>
-	<name lang="hu">3F</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-2" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <text x="-12" y="23" size="5" text="L3"/>
-        <text x="-12" y="3" size="5" text="L2"/>
-        <text x="-12" y="-17" size="5" text="L1"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="20" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,37 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="100" hotspot_y="50" type="element">
-    <uuid uuid="{0e017749-6c0f-44c0-8726-6804be8bbee7}"/>
-    <names>
-        <name lang="es">Fuente tripolar + PE +N</name>
-        <name lang="nl">driefase + aarde + nul</name>
-        <name lang="el">Τριφασικό +N +PE</name>
-        <name lang="de">Drehstrom + PE +N</name>
-        <name lang="cs">Přípojnice 3f+N+PE</name>
-        <name lang="pl">Linia trójfazowa (pięcioprzewodowa)</name>
-        <name lang="it">Sorgente tripolare +PE + N</name>
-        <name lang="ar">مصدر ثلاثي القطبية + PE + N</name>
-        <name lang="en">Three-pole source + PE +N</name>
-        <name lang="fr">Source tripolaire + PE +N</name>
-        <name lang="ru">Трёхполюсный + PE +N</name>
-	<name lang="hu">3F + N + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="3" y="-59.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <text x="-12" y="43" size="5" text="PE"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <text x="-12" y="23" size="5" text="N"/>
-        <text x="-12" y="3" size="5" text="L3"/>
-        <text x="-12" y="-17" size="5" text="L2"/>
-        <text x="-12" y="-37" size="5" text="L1"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40"/>
-        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="10" y="-40" orientation="e"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="40" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,34 +0,0 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="23" height="80" hotspot_y="41" type="element">
-    <uuid uuid="{c0913e95-3b3c-4dc2-a74d-bc73ded78c32}"/>
-    <names>
-        <name lang="es">Fuente tripolar + PEN</name>
-        <name lang="nl">driefasen + aardenul</name>
-        <name lang="el">Τριφασικό + PEN</name>
-        <name lang="de">Drehstrom + PEN</name>
-        <name lang="cs">Přípojnice 3f+PEN</name>
-        <name lang="pl">Linia trójfazowa (PEN)</name>
-        <name lang="it">Sorgente tripolare + PEN</name>
-        <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
-        <name lang="en">Three-pole source + PEN</name>
-        <name lang="fr">Source tripolaire + PEN</name>
-        <name lang="ru">Трёхполюсный + PEN</name>
-	<name lang="hu">3F + PEN</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-7" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <text x="-18" y="32" size="5" text="PEN"/>
-        <text x="-18" y="12" size="5" text="L3"/>
-        <text x="-18" y="-8" size="5" text="L2"/>
-        <text x="-18" y="-28" size="5" text="L1"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <terminal x="10" y="-30" orientation="e"/>
-        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="10" orientation="e"/>
-        <terminal x="10" y="30" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,35 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="80" hotspot_y="40" type="element">
-    <uuid uuid="{8bfb1790-0735-47d5-88a2-8b4d91aba2f1}"/>
-    <names>
-        <name lang="pt">Fonte tripolar + neutro</name>
-        <name lang="es">Fuente tripolar + neutro</name>
-        <name lang="nl">Driefasen + nul</name>
-        <name lang="el">Τριφασικό + Ουδέτερος</name>
-        <name lang="de">Dreiphasig + Neutral</name>
-        <name lang="cs">Přípojnice 3f+N</name>
-        <name lang="pl">Linia trójfazowa (czteroprzewodowa)</name>
-        <name lang="it">Sorgente tripolare + neutro</name>
-        <name lang="ar">مصدر ثلاثي القطبيّة + محايد</name>
-        <name lang="en">Three-pole source + neutral</name>
-        <name lang="fr">Source tripolaire + neutre</name>
-        <name lang="ru">Трёхполюсный + нейтраль</name>
-	<name lang="hu">3F + N</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-7" y="-44.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <text x="-12" y="33" size="5" text="N"/>
-        <text x="-12" y="13" size="5" text="L3"/>
-        <text x="-12" y="-7" size="5" text="L2"/>
-        <text x="-12" y="-27" size="5" text="L1"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <terminal x="10" y="10" orientation="e"/>
-        <terminal x="10" y="30" orientation="e"/>
-        <terminal x="10" y="-30" orientation="e"/>
-        <terminal x="10" y="-10" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,26 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="10" type="element">
-    <uuid uuid="{b5ad2e41-804d-4745-99be-e8951cffdf98}"/>
-    <names>
-        <name lang="pt">Fonte de neutro</name>
-        <name lang="es">Fuente neutro</name>
-        <name lang="nl">Nul voeding</name>
-        <name lang="el">Ουδέτερος</name>
-        <name lang="de">Neutralleiter</name>
-        <name lang="cs">Přípojnice N</name>
-        <name lang="pl">Przewód neutralny</name>
-        <name lang="it">Sorgente neutro</name>
-        <name lang="ar">مصدر محايد</name>
-        <name lang="en">Neutral source</name>
-        <name lang="fr">Source neutre</name>
-        <name lang="ru">Нейтраль</name>
-	<name lang="hu">N</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <input x="-5" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>
-        <text x="-12" y="3" size="5" text="N"/>
-        <terminal x="10" y="0" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,26 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="10" type="element">
-    <uuid uuid="{7693c5e0-762b-4309-8d97-cb74619f9efd}"/>
-    <names>
-        <name lang="pt">Fonte de fase</name>
-        <name lang="es">Fuente fase</name>
-        <name lang="nl">Fase</name>
-        <name lang="el">Φάση</name>
-        <name lang="de">Phase</name>
-        <name lang="cs">Přípojnice L</name>
-        <name lang="pl">Przewód liniowy</name>
-        <name lang="it">Sorgente fase</name>
-        <name lang="ar">مصدر وجه</name>
-        <name lang="en">Phase source</name>
-        <name lang="fr">Source phase</name>
-        <name lang="ru">Фаза</name>
-	<name lang="hu">F</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-6" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <text x="-12" y="3" size="5" text="L"/>
-        <terminal x="10" y="0" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,49 +0,0 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="34" height="100" hotspot_y="40" type="element">
-    <uuid uuid="{4b9794cf-e7c0-4f59-aa0a-bb1fce4dfe48}"/>
-    <names>
-        <name lang="es">Punto de distribución TN-C > TN-S</name>
-        <name lang="nl">Net TN-C > TN-S</name>
-        <name lang="de">Netz TNC > TNS</name>
-        <name lang="cs">Bod rozdělení TN-C > TN-S</name>
-        <name lang="pl">Linia trójfazowa (TN-C-S)</name>
-        <name lang="it">Punto di distribuzione TN-C</name>
-        <name lang="ar">نقطة توزيع TN-C &lt; TN-S </name>
-        <name lang="en">Distribution point TN-C >TN-S</name>
-        <name lang="fr">Point de distribution TN-C >TN-S</name>
-        <name lang="ru">Распределительный пункт TN-C >TN-S</name>
-	<name lang="hu">3F + PEN szétválasztva TN-C-ről TN-S-re</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <input x="-17" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line antialias="false" length1="1.5" x2="-4" end2="none" x1="-6" end1="none" y2="54" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54"/>
-        <line antialias="false" length1="1.5" x2="-2" end2="none" x1="-8" end1="none" y2="52" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="52"/>
-        <line antialias="false" length1="1.5" x2="0" end2="none" x1="-10" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <text x="13" y="53" size="5" text="PE"/>
-        <text x="13" y="33" size="5" text="N"/>
-        <text x="13" y="13" size="5" text="L3"/>
-        <text x="13" y="-7" size="5" text="L2"/>
-        <text x="13" y="-27" size="5" text="L1"/>
-        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line antialias="false" length1="1.5" x2="12" end2="none" x1="7" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <text x="-30" y="33" size="5" text="PEN"/>
-        <text x="-30" y="13" size="5" text="L3"/>
-        <text x="-30" y="-7" size="5" text="L2"/>
-        <text x="-30" y="-27" size="5" text="L1"/>
-        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <polygon antialias="true" x2="-5" x1="7" x3="-5" y2="30" y3="49" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <terminal x="30" y="-10" orientation="e"/>
-        <terminal x="30" y="10" orientation="e"/>
-        <terminal x="30" y="30" orientation="e"/>
-        <terminal x="30" y="50" orientation="e"/>
-        <terminal x="30" y="-30" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,44 +0,0 @@
-<definition height="30" width="20" link_type="terminal" hotspot_x="10" version="0.80" type="element" hotspot_y="19">
-    <uuid uuid="{e4e753a8-9fde-4e8e-9256-0cf99d67e3de}"/>
-    <names>
-        <name lang="pt">Terra</name>
-        <name lang="cs">Uzemnění</name>
-        <name lang="it">Terra</name>
-        <name lang="el">Γείωση</name>
-        <name lang="nl">Aarde</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>
-	    <name lang="hu">Földelő</name>
-    </names>
-    <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
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <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">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <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

@@ -1,17 +0,0 @@
-<definition width="20" height="20" hotspot_y="9" type="element" link_type="simple" hotspot_x="9" version="0.60">
-    <uuid uuid="{079913f8-18b5-4524-84bd-aadf75dfefbf}"/>
-    <names>
-        <name lang="cs">Bod</name>
-        <name lang="de">Verbindung</name>
-        <name lang="hu">Keresztezés pont alakzatban</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/combine.elmt

@@ -1,27 +0,0 @@
-<definition hotspot_x="11" hotspot_y="4" version="0.70" type="element" height="20" link_type="terminal" width="30">
-    <uuid uuid="{141e7e1e-4f7f-456d-9f04-52c32109b969}"/>
-    <names>
-        <name lang="en">Combine</name>
-        <name lang="de">Klemmstelle (2)</name>
-        <name lang="fr">Jonction</name>
-        <name lang="es">Unión</name>
-        <name lang="it">Collegamento</name>
-        <name lang="pl">Połączenie 1</name>
-        <name lang="ar">وصلة</name>
-        <name lang="ru">Соединение</name>
-        <name lang="cs">Spoj</name>
-        <name lang="hu">Egyesítő három vezetékhez</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" x1="7" length1="1.5" x2="1" y2="0" length2="1.5" end1="none"/>
-        <dynamic_text text_from="UserText" y="8.5" uuid="{43af2b14-2822-4ba2-988b-bda2005f69fd}" x="2" frame="false" z="2" rotation="0" text_width="-1" font_size="1">
-            <text>_</text>
-        </dynamic_text>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" antialias="false" x1="0" length1="1.5" x2="6" y2="0" length2="1.5" end1="none"/>
-        <terminal y="0" x="-4" orientation="w"/>
-        <terminal y="10" x="0" orientation="s"/>
-        <terminal y="0" x="10" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,25 +0,0 @@
-<definition link_type="terminal" width="20" height="20" hotspot_y="7" type="element" version="0.80" hotspot_x="11">
-    <uuid uuid="{95725a69-d9bf-4186-938c-1f1b9256530b}"/>
-    <names>
-        <name lang="it">Angolo</name>
-        <name lang="fr">Coin</name>
-        <name lang="pl">Narożnik</name>
-        <name lang="ar">ركن</name>
-        <name lang="es">Esquina</name>
-        <name lang="ru">Угол</name>
-        <name lang="en">Corner</name>
-        <name lang="de">Ecke</name>
-        <name lang="cs">Roh</name>
-        <name lang="hu">Sarok</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text rotation="0" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" text_width="-1" x="-0.5" z="1" Halignment="AlignLeft" Valignment="AlignTop" text_from="UserText" frame="false" y="-5.45" uuid="{9b8dd22d-096a-4989-b6f7-1de9e0339f53}">
-            <text>_</text>
-        </dynamic_text>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" y2="0" y1="0" antialias="false" x2="0" x3="0" y3="4" closed="false"/>
-        <terminal name="" orientation="w" x="-4" y="0" uuid="{e1ea331a-7456-47f0-b991-0a2299d3023c}"/>
-        <terminal name="" orientation="s" x="0" y="4" uuid="{eacfd29f-4682-41c2-9783-cedb80773f13}"/>
-    </description>
-</definition>

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

@@ -1,29 +0,0 @@
-<definition hotspot_y="9" link_type="terminal" height="20" hotspot_x="9" version="0.80" type="element" width="20">
-    <uuid uuid="{30794dcd-a269-4b6b-8231-c88d89a91e27}"/>
-    <names>
-        <name lang="cs">Kříž</name>
-        <name lang="ar">صليب</name>
-        <name lang="hu">Kereszt alakú</name>
-        <name lang="it">Croce</name>
-        <name lang="pl">Połączenie 2</name>
-        <name lang="ru">Пересечение</name>
-        <name lang="fr">Croix</name>
-        <name lang="de">Kreuz</name>
-        <name lang="en">Cross</name>
-        <name lang="es">Cruzar</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <circle y="-1" x="-1" antialias="true" diameter="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <dynamic_text y="-9.45" text_width="-1" x="-0.5" text_from="UserText" Valignment="AlignTop" rotation="0" Halignment="AlignLeft" z="2" frame="false" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{fc5c039b-1fca-40d9-a6ff-a9e1775de38b}">
-            <text>_</text>
-        </dynamic_text>
-        <line y1="0" y2="0" x1="-4" antialias="false" end1="none" length1="1.5" length2="1.5" x2="4" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-4" y2="4" x1="0" antialias="false" end1="none" length1="1.5" length2="1.5" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal y="-4" name="" x="0" orientation="n" uuid="{667d83d2-8840-40ec-bf41-8dc659926fe2}"/>
-        <terminal y="4" name="" x="0" orientation="s" uuid="{c9b40e74-5d24-4cd5-9dc7-3be318007661}"/>
-        <terminal y="0" name="" x="-4" orientation="w" uuid="{935e3f1e-3dc0-4b41-8252-6e7ee9f1a3e1}"/>
-        <terminal y="0" name="" x="4" orientation="e" uuid="{340c983a-1f7e-4939-b844-c50c8e28302d}"/>
-    </description>
-</definition>

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

@@ -1,25 +0,0 @@
-<definition width="10" hotspot_y="14" hotspot_x="5" height="30" link_type="terminal" version="0.70" type="element">
-    <uuid uuid="{b5abb4c2-455d-45ff-95f2-328521f4e2e1}"/>
-    <names>
-        <name lang="en">Jump</name>
-        <name lang="de">Sprung</name>
-        <name lang="fr">Saut</name>
-        <name lang="ar">قفز</name>
-        <name lang="cs">Skok</name>
-        <name lang="it">Salto</name>
-        <name lang="pl">Brak połączenia</name>
-        <name lang="ru">Перемычка</name>
-        <name lang="es">Puente</name>
-        <name lang="hu">Átugrás összekötés nélkül</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <arc x="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="90" y="-3" height="6" angle="-180"/>
-        <dynamic_text font_size="1" x="1.5" text_from="UserText" z="2" y="-11.45" rotation="0" uuid="{1a3e4d91-15cc-424b-99d0-25930d779fb6}" frame="false" text_width="-1">
-            <text>_</text>
-        </dynamic_text>
-        <terminal x="0" y="-7" orientation="n"/>
-        <terminal x="0" y="7" orientation="s"/>
-    </description>
-</definition>

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

@@ -1,22 +0,0 @@
-<definition hotspot_x="14" height="30" link_type="simple" width="30" version="0.80" type="element" hotspot_y="12">
-    <uuid uuid="{0b6817fe-dd44-42a8-8e7c-3c110d13b8a2}"/>
-    <names>
-        <name lang="hu">Egyesítő négy vezetékhez</name>
-        <name lang="de">Klemmstelle (3)</name>
-        <name lang="cs">Všestranný spoj</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text Valignment="AlignTop" x="-13" text_from="ElementInfo" text_width="-1" z="2" uuid="{14c0b70c-c028-49ef-bf72-3c3c9cd64669}" y="-12" rotation="0" frame="false" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <polygon x1="-10" y5="0" x3="0" x5="10" y2="0" y3="5" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="5" x2="-5" antialias="false" y4="0" y1="0"/>
-        <line x1="0" end1="none" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" length1="1.5" antialias="false" end2="none" y1="-5" length2="1.5"/>
-        <terminal x="10" orientation="e" uuid="{06bf5c9f-6986-45bf-b11f-02e876abc4b8}" y="0" name=""/>
-        <terminal x="0" orientation="n" uuid="{33c03677-8555-4b42-ae2c-4b4308978086}" y="-5" name=""/>
-        <terminal x="-10" orientation="w" uuid="{95bef6e9-343e-45d7-9705-4aa81f62bed0}" y="0" name=""/>
-        <terminal x="0" orientation="s" uuid="{e9329e22-255b-4763-9dc6-65da277e1ac7}" y="10" name=""/>
-    </description>
-</definition>

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

@@ -1,18 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="ru">Соединения</name>
-        <name lang="de">Verbindungen</name>
-        <name lang="en">Connections</name>
-        <name lang="fr">Connections</name>
-        <name lang="it">Collegamenti</name>
-        <name lang="pl">Połączenia</name>
-    	<name lang="pt_br">Conexões</name>
-        <name lang="cs">Spojení</name>
-        <name lang="el">Ενώσεις</name>
-        <name lang="nl">Verbindingen</name>
-	<name lang="es">Conexiones</name>
-        <name lang="da">Forbindelser</name>
-        <name lang="ja">接続</name>
-        <name lang="hu">Csatlakozások</name>
-    </names>
-</qet-directory>

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

@@ -1,26 +0,0 @@
-<definition width="30" version="0.80" hotspot_x="17" hotspot_y="4" link_type="terminal" type="element" height="20">
-    <uuid uuid="{5a3d6c01-db95-45ec-be2c-dd861938525b}"/>
-    <names>
-        <name lang="fr">Epissure</name>
-        <name lang="cs">Spojka</name>
-        <name lang="es">Empalme</name>
-        <name lang="pl">Połączenie 3</name>
-        <name lang="it">Spaziatura</name>
-        <name lang="en">Splice</name>
-        <name lang="de">Spleiß</name>
-        <name lang="hu">Egyesítő három vezetékhez</name>
-        <name lang="ru">Сращивание</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text Valignment="AlignTop" y="-1.45" text_width="-1" frame="false" x="1.5" Halignment="AlignLeft" uuid="{b653b162-d4c8-4660-a5ca-e6ca05a56de9}" text_from="ElementInfo" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" rotation="0" z="1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <polygon y1="0" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="0" y4="5" x3="-5" antialias="false" x2="-10" y5="10" x5="0" closed="false" x1="4" y3="0"/>
-        <terminal y="10" x="0" uuid="{1d3bb613-e8e2-4bcd-8515-ff9a0459b3c3}" name="" orientation="s"/>
-        <terminal y="0" x="-10" uuid="{367dd739-791b-4d8f-9e49-4a70fd990b19}" name="" orientation="w"/>
-        <terminal y="0" x="4" uuid="{f75b8c8d-508b-4346-a6df-8cda82201d98}" name="" orientation="e"/>
-    </description>
-</definition>

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

@@ -1,27 +0,0 @@
-<definition height="20" version="0.80" hotspot_x="17" link_type="terminal" width="30" type="element" hotspot_y="4">
-    <uuid uuid="{3dd412d9-6882-42ae-9f5f-eb04f2224214}"/>
-    <names>
-        <name lang="hu">Balra továbbmenő leágazás</name>
-        <name lang="es">A la izquierda</name>
-        <name lang="ar">ربط يسار</name>
-        <name lang="pl">Połączenie 4</name>
-        <name lang="it">Collegamento sinistro</name>
-        <name lang="ru">Справа налево</name>
-        <name lang="de">Abzweig links</name>
-        <name lang="en">Thru left</name>
-        <name lang="fr">Liaison gauche</name>
-        <name lang="cs">Levé spojení</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text text_width="-1" text_from="UserText" Valignment="AlignTop" x="1.5" frame="false" rotation="0" uuid="{5ff9bef8-b6a8-4cf8-ba82-4dabe7b1820f}" z="1" y="-1.45" Halignment="AlignLeft" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal">
-            <text>_</text>
-        </dynamic_text>
-        <polygon y1="0" x4="0" x2="-5" x3="0" antialias="false" y2="0" y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="10" x1="-10" closed="false"/>
-        <polygon y1="10" x2="0" x3="4" antialias="false" y2="0" y3="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" closed="false"/>
-        <terminal x="0" uuid="{46980c8f-3fb1-4993-b1ec-6f3b60832fab}" orientation="s" name="" y="10"/>
-        <terminal x="-10" uuid="{401a02b0-a3d8-4f09-bd65-c4a6ad782686}" orientation="w" name="" y="0"/>
-        <terminal x="4" uuid="{223e7aaa-f9ff-47e6-b901-89471848b8de}" orientation="e" name="" y="0"/>
-    </description>
-</definition>

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

@@ -1,27 +0,0 @@
-<definition width="30" type="element" hotspot_x="14" version="0.80" hotspot_y="4" height="20" link_type="terminal">
-    <uuid uuid="{8e68cb1a-e9d8-42e4-aa67-aca8b6e6b32d}"/>
-    <names>
-        <name lang="it">Collegamento destro</name>
-        <name lang="fr">Liaison droite</name>
-        <name lang="ru">Слева направо</name>
-        <name lang="hu">Jobbra továbbmenő leágazás</name>
-        <name lang="cs">Pravé spojení</name>
-        <name lang="de">Abzweig rechts</name>
-        <name lang="en">Thru right</name>
-        <name lang="es">A la derecha</name>
-        <name lang="pl">Połączenie 5</name>
-        <name lang="ar">ربط يمين</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text z="1" Halignment="AlignLeft" text_width="-1" y="-0.45" uuid="{ab829572-e7d6-4e5c-9c6e-a0852fea788e}" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" Valignment="AlignTop" text_from="UserText" x="5.5" frame="false" rotation="0">
-            <text>_</text>
-        </dynamic_text>
-        <polygon y4="0" x4="10" x1="0" y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="5" closed="false" y1="10" y3="0" x2="0" antialias="false"/>
-        <polygon x1="0" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="-10" closed="false" y1="10" y3="0" x2="0" antialias="false"/>
-        <terminal y="0" uuid="{53d9bb7f-b045-4581-bc2d-7a9198286e89}" name="" orientation="w" x="-10"/>
-        <terminal y="10" uuid="{7883adda-c1cd-4e21-93f5-330d9c7461ea}" name="" orientation="s" x="0"/>
-        <terminal y="0" uuid="{053ce092-f1df-46a5-8960-e4c6fcea95d1}" name="" orientation="e" x="10"/>
-    </description>
-</definition>

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

@@ -1,26 +0,0 @@
-<definition width="120" version="0.3" hotspot_x="71" hotspot_y="10" height="40" type="element">
-    <names>
-        <name lang="ar">كايبل طورين + تأريض</name>
-        <name lang="de">Kabel 3G</name>
-        <name lang="ru">Кабель 2 жилы + PE</name>
-        <name lang="it">Cavo 2 fasi + terra</name>
-        <name lang="fr">Cable 2 phases+terre</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
-        <name lang="es">Cable 2 fases+tierra</name>
-        <name lang="cs">Kabel 3G</name>
-        <name lang="hu">Kábel 2 + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text x="12" y="9" size="4" text="2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="26.95" y2="11.95" x2="30.95"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="8" y2="12" x2="12"/>
-        <text x="30.5" y="8.55" size="4" text="GNYE"/>
-        <input x="-68" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-39.9373" y2="10" x2="37.932"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-32" y2="12" x2="-28"/>
-        <text x="-28" y="9" size="4" text="1"/>
-        <input x="-61" y="1" size="5" rotate="true" text="+"/>
-    </description>
-</definition>

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

@@ -1,28 +0,0 @@
-<definition width="120" version="0.3" hotspot_x="70" hotspot_y="10" height="40" type="element">
-    <names>
-        <name lang="ar">كايبل ثلاثي الطور + تأريض</name>
-        <name lang="de">Kabel 4G</name>
-        <name lang="ru">Кабель 3 жилы + PE</name>
-        <name lang="it">Cavo 3 fasi + terra</name>
-        <name lang="fr">Cable 3 phases+terre</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
-        <name lang="es">Cable 3 fases+tierra</name>
-        <name lang="cs">Kabel 4G</name>
-        <name lang="hu">Kábel 3 + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-12.05" y2="11.95" x2="-8.05"/>
-        <text x="-9" y="9" size="4" text="2"/>
-        <text x="12" y="9" size="4" text="3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="26.95" y2="11.95" x2="30.95"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="8" y2="12" x2="12"/>
-        <text x="32" y="9" size="4" text="GNYE"/>
-        <input x="-68" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-39.9373" y2="10" x2="37.932"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-32" y2="12" x2="-28"/>
-        <text x="-28" y="9" size="4" text="1"/>
-        <input x="-61" y="1" size="5" rotate="true" text="+"/>
-    </description>
-</definition>

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

@@ -1,26 +0,0 @@
-<definition width="100" version="0.3" hotspot_x="60" hotspot_y="10" height="40" type="element">
-    <names>
-        <name lang="ar">كايبل بطورين و تأريض</name>
-        <name lang="de">Kabel 3G</name>
-        <name lang="ru">Кабель 2 жилы + PE</name>
-        <name lang="it">Cavo 2 fasi + terra</name>
-        <name lang="fr">Cable 2 phases+terre</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
-        <name lang="es">Cable 2 fases+tierra</name>
-        <name lang="cs">Kabel 3G</name>
-        <name lang="hu">Kábel 2 + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="17.95" y2="11.95" x2="21.95"/>
-        <text x="2" y="9" size="4" text="2"/>
-        <text x="23" y="9" size="4" text="GNYE"/>
-        <input x="-58" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-2.05" y2="11.95" x2="1.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-30.2509" y2="10" x2="27.2717"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-22" y2="12" x2="-18"/>
-        <text x="-18" y="9" size="4" text="1"/>
-        <input x="-51" y="1" size="5" rotate="true" text="+"/>
-    </description>
-</definition>

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

@@ -1,26 +0,0 @@
-<definition width="130" version="0.3" hotspot_x="88" hotspot_y="18" height="40" type="element">
-    <names>
-        <name lang="ar">كايبل رباعي النواة</name>
-        <name lang="It">Cavo ? 4G</name>
-        <name lang="fr">Cable 4G</name>
-        <name lang="pl">Przewód czterożyłowy</name>
-        <name lang="es">Cable 4G</name>
-        <name lang="cs">Kabel 4G</name>
-        <name lang="hu">Kábel 3 + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-33.05" y2="11.95" x2="-29.05"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-13.05" y2="11.95" x2="-9.05"/>
-        <text x="31" y="9" size="4" text="3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="27" y2="12" x2="31"/>
-        <text x="-10" y="9" size="4" text="1"/>
-        <text x="11" y="9" size="4" text="2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="7" y2="12" x2="11"/>
-        <input x="-82" y="2.5" size="6" rotate="true" text="type?&#xa;4G_ mm²"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-31" y2="10" x2="29"/>
-        <text x="-31" y="9" size="4" text="GNYE"/>
-        <input x="-62" y="1" size="5" rotate="true" text=""/>
-    </description>
-</definition>

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

@@ -1,28 +0,0 @@
-<definition hotspot_y="3" version="0.51" hotspot_x="47" link_type="simple" width="100" type="element" height="20">
-    <uuid uuid="{9923c1a5-b49a-4243-923e-cde9d916ea2b}"/>
-    <names>
-        <name lang="fr">Cable 5G</name>
-        <name lang="it">Cavo Type 5G</name>
-        <name lang="es">Cable 5G</name>
-        <name lang="pl">Przewód pięciożyłowy</name>
-        <name lang="cs">Kabel 5G</name>
-        <name lang="hu">Kábel 4 + N + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line end1="none" x1="-42.05" y1="7.95" x2="-38.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-22.05" y1="7.95" x2="-18.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text text="2" size="4" y="9" x="22"/>
-        <line end1="none" x1="18" y1="8" x2="22" length1="1.5" y2="12" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text text="BL" size="4" y="9" x="-19"/>
-        <text text="1" size="4" y="9" x="2"/>
-        <line end1="none" x1="37.95" y1="7.95" x2="41.95" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-2" y1="8" x2="2" length1="1.5" y2="12" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text text="3" size="4" y="9" x="43"/>
-        <input text="Type?&#xa;5G_ mm²" size="6" rotate="true" y="2" x="-85" tagg="label"/>
-        <line end1="none" x1="-40" y1="10" x2="40" length1="1.5" y2="10" antialias="false" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text text="GNYE" size="4" y="9" x="-40"/>
-        <input text="" size="5" rotate="true" y="1" x="-71" tagg="none"/>
-    </description>
-</definition>

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

@@ -1,24 +0,0 @@
-<definition hotspot_y="3" version="0.51" hotspot_x="29" link_type="simple" width="60" type="element" height="20">
-    <uuid uuid="{5f981421-4c54-4cd5-929e-7f77dab94fef}"/>
-    <names>
-        <name lang="It">Cavo ? 3G</name>
-        <name lang="fr">Cable 3G</name>
-        <name lang="es">Cable 3G</name>
-        <name lang="pl">Przewód trójżyłowy</name>
-        <name lang="cs">Kabel 3G</name>
-        <name lang="hu">Kábel 2 + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line end1="none" x1="-23.05" y1="7.95" x2="-19.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-3.05" y1="7.95" x2="0.95" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text text="1" size="4" y="9" x="0"/>
-        <text text="2" size="4" y="9" x="21"/>
-        <line end1="none" x1="17" y1="8" x2="21" length1="1.5" y2="12" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input text="type?&#xa;3G_ mm²" size="6" rotate="true" y="2.5" x="-72" tagg="label"/>
-        <line end1="none" x1="-21" y1="10" x2="20" length1="1.5" y2="10" antialias="false" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text text="GNYE" size="4" y="9" x="-21"/>
-        <input text="" size="5" rotate="true" y="1" x="-52" tagg="none"/>
-    </description>
-</definition>

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

@@ -1,26 +0,0 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="9" type="element">
-    <uuid uuid="{4b9a04b1-0d35-4d54-b5cb-b573ed3a9b0d}"/>
-    <names>
-        <name lang="de">Kabel 3x</name>
-        <name lang="cs">Kabel 3x</name>
-        <name lang="pl">Oznaczenie przewodu trójżyłowego</name>
-        <name lang="it">Cavo a 3 conduttori</name>
-        <name lang="en">Cable 3 wires</name>
-        <name lang="es">Cable 3 alambres</name>
-        <name lang="fr">Cable 3 brins</name>
-        <name lang="ru">Кабель 3 жилы</name>
-        <name lang="hu">Kábel 3 + PE</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line antialias="false" length1="1.5" x2="50" end2="none" x1="-10" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <input x="-36" y="-6" tagg="label" size="7" rotate="true" text="-W?"/>
-        <input x="-56" y="4.5" tagg="none" size="5" rotate="true" text="ÖLFLEX 100"/>
-        <terminal x="0" y="-5" orientation="n"/>
-        <terminal x="20" y="-5" orientation="n"/>
-        <terminal x="40" y="-5" orientation="n"/>
-        <terminal x="0" y="5" orientation="s"/>
-        <terminal x="20" y="5" orientation="s"/>
-        <terminal x="40" y="5" orientation="s"/>
-    </description>
-</definition>

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

@@ -1,24 +0,0 @@
-<definition width="60" link_type="simple" version="0.5" hotspot_x="21" height="10" hotspot_y="-6" type="element">
-    <uuid uuid="{822e6fc1-0104-4d3a-ba3c-995c24c79cf2}"/>
-    <names>
-        <name lang="nl">Scherm</name>
-        <name lang="el">Πλέγμα</name>
-        <name lang="de">Schirm</name>
-        <name lang="cs">Stínění</name>
-        <name lang="pl">Ekran 3</name>
-        <name lang="it">Schermo</name>
-        <name lang="ar">شاشة</name>
-        <name lang="en">Screen</name>
-        <name lang="es">Pantalla</name>
-        <name lang="fr">Ecran</name>
-        <name lang="ru">Экран</name>
-        <name lang="hu">Árnyékolás</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <ellipse width="50" x="-15" antialias="true" y="7.5" height="5" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
-        <input x="-9" y="-2.45" tagg="label" size="9" rotate="true" text="_"/>
-        <terminal x="-15" y="10" orientation="w"/>
-    </description>
-</definition>

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

@@ -1,22 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="9" type="element">
-    <uuid uuid="{6ac285f9-6492-40cb-be58-9ba565ea1921}"/>
-    <names>
-        <name lang="de">Kabelader</name>
-        <name lang="cs">Vodič kabelu</name>
-        <name lang="pl">Połączenie przewodu</name>
-        <name lang="it">Conduttore di un cavo</name>
-        <name lang="en">Wire of cable</name>
-        <name lang="es">Alambre del cable</name>
-        <name lang="fr">Fil de cable</name>
-        <name lang="ru">Жила кабеля</name>
-        <name lang="hu">Kábelér</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line antialias="false" length1="1.5" x2="9.82672" end2="none" x1="-9.76313" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <input x="1" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="4.11304" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.10435"/>
-        <terminal x="0" y="5" orientation="s"/>
-        <terminal x="0" y="-5" orientation="n"/>
-    </description>
-</definition>

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

@@ -1,21 +0,0 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="10" height="20" hotspot_y="9" type="element">
-    <uuid uuid="{374ed6b3-7329-4cad-ac8c-200b17508460}"/>
-    <names>
-        <name lang="de">Verdrahtung</name>
-        <name lang="cs">Vodič kabelu</name>
-        <name lang="pl">Oznaczenie przewodu</name>
-        <name lang="it">Conduttura</name>
-        <name lang="en">Wiring</name>
-        <name lang="es">Alambrado</name>
-        <name lang="fr">Filerie</name>
-        <name lang="hu">Vezeték</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line antialias="false" length1="1.5" x2="-5" end2="none" x1="5" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
-        <input x="0" y="-2.5" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
-        <terminal x="0" y="-5" orientation="n"/>
-        <terminal x="0" y="5" orientation="s"/>
-    </description>
-</definition>

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

@@ -1,34 +0,0 @@
-<definition width="70" hotspot_x="35" hotspot_y="5" 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>
-        <name lang="hu">Kábel 2 + PE</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-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

@@ -1,28 +0,0 @@
-<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="36" hotspot_y="5" 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>
-        <name lang="hu">Kábel 3 + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-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

@@ -1,34 +0,0 @@
-<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="73" hotspot_y="5" 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>
-        <name lang="hu">Kábel 6 + PE</name>
-    </names>
-    <informations>Author: The QElectroTech team
-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/120_cables&wiring/nomenclature_section.elmt

@@ -1,23 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="14" height="20" hotspot_y="4" type="element">
-    <uuid uuid="{a0e9e33a-ee38-4c08-8f40-c307da8d822b}"/>
-    <names>
-        <name lang="el">Διατομή αγωγού</name>
-        <name lang="es">Clasificación de sección</name>
-        <name lang="nl">Doorsnede</name>
-        <name lang="de">Verdrahtungsquerschnitt</name>
-        <name lang="cs">Průřez vodiče</name>
-        <name lang="pl">Pole przekróju przewodu</name>
-        <name lang="it">Sezione della nomenclatura</name>
-        <name lang="ar">تسمية مساحة المقطع </name>
-        <name lang="en">Wiring section</name>
-        <name lang="fr">Section de fil</name>
-        <name lang="hu">Vezeték keresztmetszet</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="-40" y="10" tagg="label" size="6" rotate="true" text="_"/>
-        <text x="8" y="6.3334" size="4" text="2"/>
-        <text x="-10" y="10" size="6" text="mm"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/120_cables&wiring/qet_directory

@@ -1,18 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="ru">Кабели и провода</name>
-        <name lang="en">Cables and wiring</name>
-        <name lang="es">Cables y alambres</name>
-        <name lang="fr">Câbles et filerie</name>
-        <name lang="it">Cavi e collegamenti</name>
-        <name lang="pl">Przewody i kable</name>
-    	<name lang="pt_br">Cabos e fiação</name>
-        <name lang="de">Kabel und Verdrahtung</name>
-        <name lang="el">Καλώδια και καλωδίωση</name>
-        <name lang="nl">Kabels en draden</name>
-        <name lang="cs">Kabely a vodiče</name>
-        <name lang="da">Kabler og ledninger</name>
-        <name lang="ja">ケーブルと配線</name>
-        <name lang="hu">Kábelek és vezetékek</name>
-    </names>
-</qet-directory>

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

@@ -1,19 +0,0 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="10" hotspot_y="5" type="element">
-    <uuid uuid="{b96a76a6-a798-497b-a044-dd933756d175}"/>
-    <names>
-        <name lang="de">Verdrahtungsdefinition 1 Leiter</name>
-        <name lang="cs">Označení vodiče</name>
-        <name lang="pl">Oznaczenie pola przekroju przewodu jednożyłowego</name>
-        <name lang="it">Sezione 1 conduttore</name>
-        <name lang="fr">Section 1 conducteur</name>
-        <name lang="es">Sección 1 conductor</name>
-        <name lang="hu">1 ér keresztmetszet</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" length1="1.5" x2="9.91885" end2="none" x1="-10.8483" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
-    </description>
-</definition>

elements/10_electric/10_allpole/120_cables&wiring/section2-1conducteurs.elmt

@@ -1,20 +0,0 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="16" height="10" hotspot_y="5" type="element">
-    <uuid uuid="{448ac784-f459-4f8f-bd3f-d911802b3369}"/>
-    <names>
-        <name lang="de">Verdrahtungsdefinition 2 Leiter</name>
-        <name lang="cs">Označení žil 2 vodiče</name>
-        <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
-        <name lang="it">Sezione 2 conduttori</name>
-        <name lang="fr">Section 2 conducteurs</name>
-        <name lang="es">Sección 2 conductores</name>
-        <name lang="hu">2 ér keresztmetszet</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line antialias="false" length1="1.5" x2="47.2717" end2="none" x1="-10.2509" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
-    </description>
-</definition>

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

@@ -1,20 +0,0 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="14" height="10" hotspot_y="5" type="element">
-    <uuid uuid="{c94d9e16-e3bb-4117-b037-466a15edcb14}"/>
-    <names>
-        <name lang="de">Verdrahtungsdefinition 2 Leiter</name>
-        <name lang="cs">Označení žil 2 vodiče</name>
-        <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
-        <name lang="it">Sezione 2 conduttori</name>
-        <name lang="fr">Section 2 conducteurs</name>
-        <name lang="es">Sección 2 conductores</name>
-        <name lang="hu">2 ér keresztmetszet</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="true" length1="1.5" x2="21.95" end2="none" x1="17.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line antialias="false" length1="1.5" x2="19.8781" end2="none" x1="-10.8107" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
-    </description>
-</definition>

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

@@ -1,21 +0,0 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="16" height="10" hotspot_y="5" type="element">
-    <uuid uuid="{9d939952-9c2b-4b12-898f-262abc91e845}"/>
-    <names>
-        <name lang="de">Verdrahtungsdefinition 3 Leiter</name>
-        <name lang="cs">Označení žil 3 vodiče</name>
-        <name lang="pl">Oznaczenie pola przekroju przewodu trójżyłowego</name>
-        <name lang="it">Sezione 3 conduttori</name>
-        <name lang="fr">Section 3 conducteurs</name>
-        <name lang="es">Sección 3 conductores</name>
-        <name lang="hu">3 ér keresztmetszet</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line antialias="true" length1="1.5" x2="21.95" end2="none" x1="17.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line antialias="false" length1="1.5" x2="47.2717" end2="none" x1="-10.2509" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
-    </description>
-</definition>

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

@@ -1,19 +0,0 @@
-<definition height="80" hotspot_y="39" hotspot_x="17" version="0.5" width="40" link_type="simple" type="element">
-    <uuid uuid="{9d2d8902-b36a-4974-b46d-4de6741f6b9b}"/>
-    <names>
-        <name lang="en">Terminal strip label</name>
-        <name lang="es">Etiqueta de clemas</name>
-        <name lang="fr">Label de bornier</name>
-        <name lang="de">Klemmleisten-BMK</name>
-        <name lang="pl">Etykieta listwy zaciskowej</name>
-        <name lang="cs">Štítek svorkovnice</name>
-        <name lang="hu">Sorkapocstömb jelölő</name>
-    </names>
-    <informations/>
-    <description>
-        <input tagg="label" x="1" rotation="270" y="21" rotate="true" text="_" size="11"/>
-        <rect height="71" x="-15" y="-35" style="line-style:normal;line-weight:hight;filling:none;color:black" antialias="false" width="30"/>
-        <line end1="none" length1="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" x2="20" antialias="false" y2="-30" x1="15" end2="none" length2="1.5" y1="-30"/>
-        <line end1="none" length1="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" x2="20" antialias="false" y2="30" x1="15" end2="none" length2="1.5" y1="30"/>
-    </description>
-</definition>