projectview: Only append .qet if not snap or flatpak

add workflow for building candidate snap
snap: set version manually
2025-12-17 20:50:34 +01:00 · 2022-01-26 17:04:17 +01:00 · 2022-01-20 10:09:35 +01:00 · 2022-01-20 09:53:17 +01:00 · 2022-01-20 09:46:19 +01:00 · 2022-01-20 09:45:43 +01:00
9401 changed files with 655203 additions and 142176 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,67 @@
+---
+BasedOnStyle: LLVM
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveMacros: 'true'
+AlignConsecutiveAssignments: 'true'
+AlignConsecutiveDeclarations: 'true'
+AlignEscapedNewlines: Right
+AlignOperands: 'true'
+AlignTrailingComments: 'true'
+AllowAllArgumentsOnNextLine: 'false'
+AllowAllConstructorInitializersOnNextLine: 'true'
+AllowAllParametersOfDeclarationOnNextLine: 'true'
+AllowShortBlocksOnASingleLine: 'true'
+AllowShortCaseLabelsOnASingleLine: 'true'
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: 'true'
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: 'true'
+AlwaysBreakTemplateDeclarations: 'Yes'
+BinPackArguments: 'false'
+BinPackParameters: 'false'
+BreakAfterJavaFieldAnnotations: 'true'
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: 'false'
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
+BreakStringLiterals: 'true'
+ColumnLimit: '80'
+CompactNamespaces: 'false'
+ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
+Cpp11BracedListStyle: 'true'
+FixNamespaceComments: 'true'
+IncludeBlocks: Regroup
+IndentCaseLabels: 'false'
+IndentPPDirectives: AfterHash
+IndentWidth: '4'
+JavaScriptWrapImports: 'true'
+Language: Cpp
+MaxEmptyLinesToKeep: '1'
+NamespaceIndentation: All
+PointerAlignment: Left
+ReflowComments: 'true'
+SortIncludes: 'true'
+SortUsingDeclarations: 'true'
+SpaceAfterCStyleCast: 'true'
+SpaceAfterLogicalNot: 'true'
+SpaceAfterTemplateKeyword: 'true'
+SpaceBeforeAssignmentOperators: 'true'
+SpaceBeforeCpp11BracedList: 'true'
+SpaceBeforeCtorInitializerColon: 'true'
+SpaceBeforeInheritanceColon: 'true'
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: 'true'
+SpaceInEmptyParentheses: 'false'
+SpacesInAngles: 'false'
+SpacesInCStyleCastParentheses: 'false'
+SpacesInContainerLiterals: 'false'
+SpacesInParentheses: 'false'
+SpacesInSquareBrackets: 'false'
+Standard: Cpp11
+TabWidth: '4'
+UseTab: Always
+
+...
--- a/.github/workflows/publish-candidate-snap.yml
+++ b/.github/workflows/publish-candidate-snap.yml
@@ -0,0 +1,20 @@
+name: Publish Candidate Snap
+
+on:
+  push:
+    branches:
+      - "snap/latest/candidate"
+  workflow_dispatch:
+
+jobs:
+  publish_amd64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: snapcore/action-build@v1
+      id: build
+    - uses: snapcore/action-publish@v1
+      with:
+        store_login: ${{ secrets.STORE_LOGIN }}
+        snap: ${{ steps.build.outputs.snap }}
+        release: candidate
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.snap
+.flatpak-builder
+# Qt build output
+*.user
+# doxygen Doxyfile output
+doc/
+QElectroTech.tag
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,133 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+include(cmake/hoto_update_cmake_message.cmake)
+
+cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
+
+project(qelectrotech
+  VERSION 0.8.0
+  DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
+  HOMEPAGE_URL "https://qelectrotech.org/"
+  LANGUAGES CXX)
+
+include(cmake/copyright_message.cmake)
+
+set(QET_DIR ${PROJECT_SOURCE_DIR})
+
+# Add sub directories
+option(PACKAGE_TESTS "Build the tests" ON)
+if(PACKAGE_TESTS)
+  message("Add sub directorie tests")
+  add_subdirectory(tests)
+endif()
+
+include(cmake/paths_compilation_installation.cmake)
+include(cmake/start_options.cmake)
+include(cmake/developer_options.cmake)
+include(cmake/git_update_submodules.cmake)
+include(cmake/git_last_commit_sha.cmake)
+include(cmake/fetch_kdeaddons.cmake)
+include(cmake/fetch_singleapplication.cmake)
+include(cmake/fetch_pugixml.cmake)
+include(cmake/qet_compilation_vars.cmake)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+SET(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(
+  QT
+ NAMES
+  Qt6
+  Qt5
+ COMPONENTS
+  ${QET_COMPONENTS}
+ REQUIRED
+ )
+
+find_package(
+  Qt${QT_VERSION_MAJOR}
+ COMPONENTS
+ ${QET_COMPONENTS}
+ REQUIRED)
+
+set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
+qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
+qt5_add_translation(QM_FILES ${TS_FILES})
+
+# als laatse
+include(cmake/define_definitions.cmake)
+
+add_executable(
+  ${PROJECT_NAME}
+  ${QET_RES_FILES}
+  ${QET_SRC_FILES}
+  ${QM_FILES}
+  ${QET_DIR}/qelectrotech.qrc
+  )
+
+target_link_libraries(
+  ${PROJECT_NAME}
+  PUBLIC
+  PRIVATE
+  pugixml::pugixml
+  SingleApplication::SingleApplication
+  ${KF5_PRIVATE_LIBRARIES}
+  ${QET_PRIVATE_LIBRARIES}
+  )
+
+target_include_directories(
+  ${PROJECT_NAME}
+  PRIVATE
+  ${QET_DIR}/sources/titleblock
+  ${QET_DIR}/sources/ui
+  ${QET_DIR}/sources/qetgraphicsitem
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui
+  ${QET_DIR}/sources/richtext
+  ${QET_DIR}/sources/factory
+  ${QET_DIR}/sources/properties
+  ${QET_DIR}/sources/dvevent
+  ${QET_DIR}/sources/editor
+  ${QET_DIR}/sources/editor/esevent
+  ${QET_DIR}/sources/editor/graphicspart
+  ${QET_DIR}/sources/editor/ui
+  ${QET_DIR}/sources/editor/UndoCommand
+  ${QET_DIR}/sources/undocommand
+  ${QET_DIR}/sources/diagramevent
+  ${QET_DIR}/sources/ElementsCollection
+  ${QET_DIR}/sources/ElementsCollection/ui
+  ${QET_DIR}/sources/autoNum
+  ${QET_DIR}/sources/autoNum/ui
+  ${QET_DIR}/sources/ui/configpage
+  ${QET_DIR}/sources/SearchAndReplace
+  ${QET_DIR}/sources/SearchAndReplace/ui
+  ${QET_DIR}/sources/NameList
+  ${QET_DIR}/sources/NameList/ui
+  ${QET_DIR}/sources/utils
+  ${QET_DIR}/sources/pugixml
+  ${QET_DIR}/sources/dataBase
+  ${QET_DIR}/sources/dataBase/ui
+  ${QET_DIR}/sources/factory/ui
+  ${QET_DIR}/sources/print
+  )
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,121 @@
+# How to contribute
+ 
+I'm really glad you're reading this,
+because we need volunteer developers to help
+this project come to fruition.
+
+
+Here are some important resources:
+
+* [Qet code style](https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet)
+* [git Documentation](https://git-scm.com/doc)
+
+## Testing
+
+## Submitting changes
+
+Always write a clear log message for your commits.
+One-line messages are fine for small changes,
+but bigger changes should look like this:
+
+    $ git commit -m "A brief summary of the commit
+    > 
+    > A paragraph describing what changed and its impact."
+
+* It is always appropriate to keep the commits small.
+* For major changes it is recommended to use branches.
+
+### Interactive Staging
+https://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging
+
+issue: you have modified a class but you want to write it in 2 commits
+
+ ´git add -p´ or ´git add -i´
+
+
+    /qet> git add -i
+
+
+               staged     unstaged path
+      1:    unchanged        +1/-1 sources/diagram.cpp
+
+    *** Commands ***
+      1: status       2: update       3: revert       4: add untracked
+      5: patch        6: diff         7: quit         8: help
+
+
+    What now> 5
+
+
+               staged     unstaged path
+      1:    unchanged        +1/-1 sources/diagram.cpp
+    Patch update>> 1
+               staged     unstaged path
+    * 1:    unchanged        +1/-1 sources/diagram.cpp
+    Patch update>>
+    diff --git a/sources/diagram.cpp b/sources/diagram.cpp
+    index bffca653f..9bd2280f7 100644
+    --- a/sources/diagram.cpp
+    +++ b/sources/diagram.cpp
+    @@ -103,9 +103,9 @@ Diagram::Diagram(QETProject *project) :
+        connect(&border_and_titleblock,
+                &BorderTitleBlock::titleBlockFolioChanged,
+                this, &Diagram::updateLabels);
+    -       connect(this, &Diagram::diagramActivated,
+    +       foo(do_a);
+    -       adjust(diagramActivated);
+    +       bar(do_c);
+        adjustSceneRect();
+     }
+
+
+    (1/1) Stage this hunk [y,n,q,a,d,s,e,?]? s
+
+
+    Split into 2 hunks.
+    @@ -103,5 +103,5 @@
+        connect(&border_and_titleblock,
+                &BorderTitleBlock::titleBlockFolioChanged,
+                this, &Diagram::updateLabels);
+    -       connect(this, &Diagram::diagramActivated,
+    +       foo(do_a);
+
+
+    (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? y
+
+
+    @@ -107,5 +107,5 @@
+                this, &Diagram::loadElmtFolioSeq);
+    -       adjust(diagramActivated);
+    +       bar(do_c);
+        adjustSceneRect();
+     }
+
+
+    (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? n
+
+
+    *** Commands ***
+      1: status       2: update       3: revert       4: add untracked
+      5: patch        6: diff         7: quit         8: help
+    What now>What now>7
+    Bye.
+
+    git commit -m "Mod Signal Slot to funsion"
+
+## Coding conventions
+
+Start reading our code and you'll get the hang of it.
+We optimize for readability:
+
+  * We use tabs to indent, and interpret tabs as taking up to 8 spaces.
+    see https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet
+  * We try to keep to at most 80 characters per line.
+  * Try to make your code understandable.
+    You may put comments in, but comments invariably tend to stale out when
+    the code they were describing changes.
+    Often splitting a function into two
+    makes the intention of the code much clearer.
+    
+Thanks,
+QElectroTech
--- a/22
+++ b/22
@@ -1,7 +1,5 @@
 [en]
 Thanks to Qt Software for their Qt library ( http://www.qtsoftware.com/ ), licensed under GNU/GPL.
-Thanks to Everaldo Coelho for the Crystal SVG icons theme ( http://www.iconfinder.com/iconsets/crystalproject) licensed under LGPL.
-Thanks to Nuno Pinheiro for the Oxygen icons theme ( http://www.oxygen-icons.org/ ) licensed under LGPL but also for the QElectroTech-dedicated icons.
 Thanks to the KDE project ( http://www.kde.org/ ).
 Thanks to Loic for his mathematics-related explanations.
 Thanks to Remi Collet for the Fedora packaging.
@@ -32,8 +30,6 @@ Thanks to Mrbit for ebuild Gentoo packaging.

 [fr]
 Merci à Qt Software pour la bibliothèque Qt ( http://www.qtsoftware.com/ ), sous licence GNU/GPL.
-Merci à Everaldo Coelho pour le thème d'icônes Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject ) sous licence LGPL.
-Merci à Nuno Pinheiro pour le thème d'icônes Oxygen ( http://www.oxygen-icons.org/ ) sous licence LGPL mais aussi pour les icônes dédiées à QElectroTech
 Merci au projet KDE ( http://www.kde.org/ ).
 Merci à Loic pour ses explications d'ordre mathématique.
 Merci à Remi Collet pour les paquets Fedora.
@@ -64,8 +60,6 @@ Merci à Mrbit for ebuild les paquets Gentoo

 [ru]
 Спасибо Qt Software за их библиотеку Qt ( http://www.qtsoftware.com/ ), лицензированную на условиях GNU/GPL.
-Спасибо Everaldo Coelho за тему значков Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject ) лицензированную на условиях LGPL.
-Спасибо Nuno Pinheiro за тему значков Oxygen ( http://www.oxygen-icons.org/ ) лицензированную на условиях LGPL, а также за значки связанные с QElectroTech.
 Спасибо проекту KDE ( http://www.kde.org/ ).
 Спасибо Loic за объяснения связанные с математикой.
 Спасибо Remi Collet за пакет для Fedora.
@@ -79,8 +73,6 @@ Merci à Mrbit for ebuild les paquets Gentoo

 [pt]
 Agradecimentos a Qt Software pela sua biblioteca Qt ( http://www.qtsoftware.com/ ), licenciada de acordo com a GNU/GPL.
-Agradecimentos a Everaldo Coelho pelo tema de ícones Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject ), licenciado de acordo com a LGPL.
-Agradecimentos a Nuno Pinheiro pelo tema de ícones Oxygen e em especial pelos ícones dedicados ao programa QElectroTech ( http://www.oxygen-icons.org/ ), lincenciado de acordo com a LGPL.
 Agradecimentos ao projecto KDE ( http://www.kde.org/ ).
 Agradecimentos a Loic pelas suas explicações relacionadas com problemas matemáticos.
 Agradecimentos a Remi Collet pela criação dos pacotes para Fedora.
@@ -94,8 +86,6 @@ Agradecimentos a 'Dr.Slump'pela tradução para italiano

 [es]
 Agradecimientos a Qt Software por su biblioteca Qt ( http://www.qtsoftware.com/ ), licenciada bajo GNU/GPL.
-Agradecimientos a Everaldo Coelho por el tema de icónos Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject ), licenciado bajo LGPL.
-Agradecimientos a Nuno Pinheiro por el tema de icónos Oxygen y especialmente por los icónos dedicados al programa QElectroTech ( http://www.oxygen-icons.org/ ), licenciado bajo LGPL.
 Agradecimientos al proyecto KDE ( http://www.kde.org/ ).
 Agradecimientos a Loic por sus explicaciones relacionadas con problemas matemáticos.
 Agradecimientos a Remi Collet por criación de paquetes para Fedora.
@@ -109,8 +99,6 @@ Agradecimientos a 'Dr.Slump' por sus traducciones en italiano

 [cs]
 Díky Qt Software za jejich knihovnu Qt ( http://www.qtsoftware.com/ ), pod licencí GNU/GPL.
-Díky Everaldovi Coelho za téma Crystal SVG icons theme ( http://www.iconfinder.com/iconsets/crystalproject ) pod licencí LGPL.
-Díky Nunovi Pinheirovi za téma ikon Oxygen ( http://www.oxygen-icons.org/ ) pod licencí LGPL ale také za ikony věnované QElectroTech.
 Díky projektu KDE ( http://www.kde.org/ ).
 Díky Loicovi za jeho vysvětlení vztahující se k matematice.
 Díky Remi Colletovi za balíček pro Fedoru.
@@ -124,8 +112,6 @@ Dìky 'Dr.Slump' za jeho italianský překlad

 [pl]
 Podziękowania dla Qt Software, za biblioteki Qt (http://www.qtsoftware.com/) na licencji GNU / GPL.
-Podziękowania dla Everaldo Coelho, za ikony Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject) na licencji LGPL.
-Podziękowania dla Nun Pinheiro, za ikony Oxygen (http://www.oxygen-icons.org/) na licencji LGPL, a także za ikony przeznaczone do projektu QElectroTech.
 Podziękowania dla projektu KDE (http://www.kde.org/).
 Podziękowania dla Loic, za pomoc w rozwiązaniu problemów matematycznych.
 Podziękowania dla Remi Collet, za pakiety dla Fedory.
@@ -138,8 +124,6 @@ Podziękowania dla Alfredo Carreto, za jego tłumaczenie na język hiszpański i

 [it]
 Grazie a Qt Software per le loro librerie Qt (http://www.qtsoftware.com/), licenzate sotto GNU/GPL.
-Grazie a Everaldo Coelho per il tema icone Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject) licenzato sotto LGPL.
-Grazie a Nuno Pinheiro per il tema icone Oxygen (http://www.oxygen-icons.org/) licenzato sotto LGPL ma anche per le icone dedicate a QElectroTech.
 Grazie al progetto KDE (http://www.kde.org/).
 Grazie a Loic per le sue spiegazioni matematiche.
 Grazie a Remi Collet per i pacchetti per Fedora.
@@ -165,8 +149,6 @@ Grazie a Markos Chandras per i pacchetti per Gentoo.

 [el]
 Ευχαριστίες στην Qt Software για την βιβλιοθήκη Qt ( http://www.qtsoftware.com/ ), αδειοδοτημένο ως GNU/GPL.
-Ευχαριστίες στον Everaldo Coelho για τα εικονίδια του θέματος Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject) αδειοδοτημένο ως LGPL.
-Ευχαριστίες to Nuno Pinheiro για τα εικονίδια του θέματος Oxygen ( http://www.oxygen-icons.org/ ) αδειοδοτημένο ως LGPL και επίσης για τα εικονίδια ειδικά για το QElectroTech.
 Ευχαριστίες στο έργο KDE ( http://www.kde.org/ ).
 Ευχαριστίες στον Loic για τις εξηγήσεις σχετικές με μαθηματικά.
 Ευχαριστίες στον Remi Collet για τα πακέτα Fedora.
@@ -197,8 +179,6 @@ Grazie a Markos Chandras per i pacchetti per Gentoo.

 [nl]
 Dank aan Qt Software voor hun Qt library ( http://www.qtsoftware.com/ ) , onder de GNU / GPL licentie .
-Dank aan Everaldo Coelho voor de Crystal SVG iconen thema ( http://www.iconfinder.com/iconsets/crystalproject ) gelicenseerd onder LGPL .
-Dank aan Nuno Pinheiro voor de Oxygen iconen thema ( http://www.oxygen-icons.org/ ) gelicenseerd onder LGPL maar ook voor de QElectroTech -dedicated iconen.
 Dank aan het KDE-project ( http://www.kde.org/ ) .
 Dank aan Loic voor zijn wiskunde - gerelateerde verklaringen .
 Met dank aan Remi Collet voor de Fedora pakket.
@@ -229,8 +209,6 @@ Dank aan Mrbit voor ebuild Gentoo pakket.

 [be]
 Dank aan Qt Software bibliotheek voor Qt ( http://www.qtsoftware.com/ ), onder licentie van GNU/GPL.
-Dank aan Everaldo Coelho voor het pictogram thema Crystal SVG ( http://www.iconfinder.com/iconsets/crystalproject )onder licentie van licence LGPL.
-Dank aan Nuno Pinheiro voor het pictogram thema Oxygen ( http://www.oxygen-icons.org/ ) onder licentie van LGPL maar ook voor de iconen opgedragen aan QElectroTech
 Dank aan project KDE ( http://www.kde.org/ ).
 Dank aan Loic voor zijn uitleg van de mathematische orde.
 Dank aan Remi Collet voor de pakketten Fedora.
--- a/275
+++ b/275
@@ -1,3 +1,275 @@
+====== ChangeLog from 0.7 to 0.8 ======
+
+
+* Moving the main QET repository SVN trunk to GIT.
+* Add a mirror of the main QET repository, which is synced to hosted at tuxfamily.org to Github.
+* Doxyfile update add QCH file for doxygen-generated docs using qhelpgenerator and then import them into Qt Creator.
+* Improve portability of Doxyfile (Simon).
+* Fix deprecated warnings (Simon).
+* Wrap code for better readability (Simon, Damian).
+
+
+
+
+* Elements collection :
+Improve collection 7378 elements in 1092 categories
+Thanks Sebastien, Dinozzo, Simon,  Rafał, Arnaud, Bisku, Fernando, Riesermauf, Alexis, david, Plc-user, Christophe, Michele,  Galexis, Jevgenijs, Gabor, 
+Benoit Michel, Franck, Ludovic, Cyrille, ossau2mation,  Mitzot,  Edgar, Nuri, Friskolon, Baboune41, Wiktor, shateks, Dik, Shateks,  Marcin
+
+
+* Diagram editor :
+
+* The export of the nomenclature to csv file has been completely rewritten :
+It is now possible to choose which information to export as well as the order in which it should be displayed.
+An option allows filtering by type of element: all, terminal block, button / switch.
+Another option allows to display or not the column headers in the csv file.
+With these options, it is possible to create a nomenclature, an order list, but also for printing labels: list of terminals and list of buttons / switches.
+It is possible to save / load a configuration easily.
+Finally, the work being done by an SQLite database, a text field allows the user to create his own SQL query.
+
+* Add Conductors numbering to csv file.
+
+* Add new summary table.
+
+* add BOM creation dialog :
+nomenclature is now integrated into the project (accompanied by several parameters in order to be customizable).
+Tables can have a name.
+Tables an be added to any folio.
+Font margin and alignment (right center left) separately adjustable for headers and table cells.
+Position size and number of lines is adjustable.
+Possibility of linking several tables together, especially when the entire nomenclature cannot be contained in a folio.
+Automatic adjustment of the size of the table in relation to the folio.
+Option to apply the geometry of an array to all the array linked to it, so that everything is homogeneous.
+Save / load table configuration and content to make creation faster.
+Option to automatically adjust the table to the folio.
+Option to automatically add new tables in new folios if the nomenclature cannot be contained in 1 to N folios / tables.
+
+* Table content:
+Fully customizable, you display what you want or want (info to display in the desired order, filter on type of element, filter on content of the info "contains, not contains, not empty etc ..." ).
+The content being generated from a sqlite database, you can write your own request.
+
+
+* Loading of element collections is now faster (thanks to the pugixml parser)
+* The loading of collections of elements no longer freezes QElectroTech.
+* The appearance and disappearance of the search / replace menu is animated.
+* Fix wrong position of slave xref after open a saved project
+
+* Add font color of the conductors (Simon).
+* Add section and color properties for wires.
+
+* config dialog : 
+* Add QScrollArea to configdialog and resize to max_screen (Simon).
+* Add gui resize depending on screen size (Simon).
+* Add Screen info user (Simon).
+* Mod ScrollArea on demand (Simon).
+
+
+* Element editor:
+* Polygon editing widget, when you click on a point in the list, the corresponding point changes color in order to better visualize what you are doing.
+On this same list, a right click opens a contextual menu allowing to delete the selected point or inserted a point after the selected one.
+When holding the ctrl + directional arrow key, the selected parts move by 0.1 instead of 1 point.
+* with Ctrl key you can moving by keyboard primitives selected by 0.1 point instead by 1 points, added the same feature for moving the selected aera.
+* Added 140 web standard colors In Element editor (Arnaud).
+
+* Add multiedit feature (martin).
+* Add terminals uuid for next features (martin).
+
+
+* Windows :
+* Fix bad fonts rendering if Qt version >= 5.13.1.
+See : https://bugreports.qt.io/browse/QTBUG-83161
+* Fix backup file on windows
+For unknown reason KautoSaveFile don't write the file on Windows if file
+is open in another part of the code.
+No error is returned and use the method :
+qint64 QIODevice::write(const QByteArray &byteArray) return the good
+number of bytes written but the real file stay empty.
+Probably the problem don't come from KautoSaveFile but QFileDevice or
+QIODevice on windows.
+
+The fix consist to open the file just before write on it and close it
+just after.
+
+* writeToFile on a other Thread to improve this for windows performance (Simon).
+
+
+* macOS :
+* Add Fusion style and fix tilesets tab bar size
+* Enable mouse wheel on tilesets tab bar with command keyboard, thanks Giovanni.
+(removed by Qt upstream) https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=ea47d152b35158ba07a55d009f57df0e4c2a048f;hp=08cc9b9991ae9ab51bed5b857b6257401401ff6f
+
+
+* Add Snap packages :
+* thanks Max for help.
+https://snapcraft.io/qelectrotech
+See: https://qelectrotech.org/forum/viewtopic.php?id=1426
+* Use kde-neon extension
+The kde-neon extension reduces our boilerplate in snapcraft.yaml
+and reduces the snap size considerably, as we do not need to ship
+any library that is already included in the kde-frameworks-5-core18
+snap itself.
+
+This limits qelectrotech builds to the architectures supported
+by kde-frameworks-5-core18, i.e. only amd64.
+
+https://git.tuxfamily.org/qet/qet.git/log/?qt=grep&q=snap
+
+
+
+* Add Flatpak packages : 
+* thanks Mathieu for help.
+See: https://github.com/qelectrotech/qelectrotech-source-mirror/pull/18
+* remove the file name extension added
+automatically to the saved files even if the user sets an unknown file
+extension for the program.
+
+https://git.tuxfamily.org/qet/qet.git/log/?qt=grep&q=flatpak
+
+
+
+
+
+
+
+
+====== ChangeLog from 0.6 to 0.7 ======
+
+
+* Element editor :
+* Element informations (manufacturer, reference etc...) can be created directly from the element editor. For that go to the widget "Element Property"
+* It is no longer required to have a text field, for save the edited element.
+* Improve the behavior with the arrow keys (depending to the current selection  (nothing / one / several).
+* Context menu display only enabled actions.
+* Added new feature -> alignment.
+* Alignment of text field can be edited.
+* Added two new actions in context menu for insert or remove point of a selected polygon.
+* Rectangle can have rounded corner.
+* Polyline: finish the creation of polyline with the last point at the same position of the first point, close the polyline.
+
+
+* Diagram editor :
+* Conductors can now be drawn with two colors.
+* Improve High-DPI support on Windows and Linux plateform.
+* The code for the resize handles has been almost completely redesigned.
+* Dissociate fonts policy and size for independent text item and for summarry pages (foliolist), added a 2 button in config page for open Qfontdialog widget and choose policy for independent text item.
+* Add in config page a Qfontdialog widget for change dynamic text size, font family, orientation angle and text length, by default.
+* Basic shape add new CustomDashLine style with Dash Pattern (<< 10 << 10 );
+* It is now possible to add a text field to an element directly from the diagram.
+* Element text item with are now converted to dynamic element text item.
+* Element editor, part text can't be edited directly.
+* User can export / import the configuration of the texts and texts group of an element.
+* Context menu display only enabled actions.
+* Added new action in the context menu, multiple paste, check box for autonum the pasted element.
+* Multipaste -> improve the conductor autonum, conductors are numerated from top to bottom, and left to right.
+* Text of conductor can be placed at top/bottom/left/right of conductor, and text never overlaps the conductor.
+* Function for search conductor at the same potential.
+When the search function is searching in a terminal element, they search only for the first terminal found, no matter if the terminal element have more than two terminals.
+So the list of conductors at the same potential is missing some conductors.
+This commit fix it, now the search function search for every terminals of a terminal element.
+* When remove an element with several conductors connected to the same terminal, the electrical potential is partially or totally destroyed.
+This commit fix it : When element is removed one or several conductors are created (if needed) to conserve the electrical potential.
+
+* Added new feature -> alignment.
+* Alignment of text field can be edited.
+* Added new context menu action "group the selected texts".
+* Widget used to edit text item group can edit the pos of the group.
+* Element text item group can now be framed.
+* Added two new actions in context menu for insert or remove point of a selected polygon.
+* QETshapeItem rectangle can have rounded corner.
+* Add in config the possibility to start the numbering of the columns of titleblocks at 0.
+* Add new function Search and replace widget Crtl +F
+* Diagram properties, Element properties, Independent text item can be changed (and mass changed) through the search and replace widget.
+* Added 4 tools for edit the depth (Z value) of items.
+* Element panel : elements can be searched by their name but also with by all their informations.
+* New free selection style.
+* Diagram editor : dock used to edit the shape item, can now edit several items in the same time.
+* Dynamic element text item : The font of the dynamic texts can be individually be setted.
+
+* Adding or revoming diagram set project to modified
+* When user cleanning an project, set project to modified
+* Add a shortcut "Ctrl+Shift+P" to quickly open the dialog used for create the auto numbering rules.
+* Add missing StatusTip of some QAction
+
+* When user add a polygon, a message in statusBar show how to finish this shape
+* Polyline: finish the creation of polyline with the last point at the same position of the first point, close the polyline.
+
+
+
+* Plug-in : Add StatusTip instruction for install and launching DXF plugin depending on the operating system
+* when plugin qet-tb-generator"generate terminal blocks and connectors" isn't installed show an QMessageBox instruction now depending on the operating system for install it 
+Add in QMessageBox url encoding/decoding for easy download packages
+
+* Elementspanelwidget: adds keyboard shortcuts to quickly move up, down,or move the targeted folio to the beginning of the project
+F3 MoveUp
+F4 MoveDown
+F5 MoveUpTop
+
+* Title block editor :
+Added new title block variables %projectpath, %projectfilename, %projecttitle, previous-folio-num and next-folio-num
+"%saveddate, %savedtime, %savedfilename and %savedfilepath" they variables should be updated after file save or save as dialog is confirmed,
+before file is saved.
+* NameList widget : add a combo box for easily paste texts, like the variables for title block.
+*  The font of the dynamic text field can be edited.
+* The font of the static text field can be edited.
+* The color of the static text field can be edited.
+
+
+
+* Improve for new qet_tb_generator plug-in : added the full path of the current project as
+an argument when calling the plug-in from QET if a project is open.
+If not a file dialog is showed to select the QET project.
+
+
+
+* QET create a backup file, use to restore the project when a crash occur.
+* Use KAutoSaveFile for the backup system, instead of home made function.
+* Use of QSAveFile instead a QFile.
+* User can enable and edit autosave timer.
+* let user define the file system path of the common,custom elements collections, and custom title blocks template.
+
+
+* QetGraphicsItem, remove the function applyRotation and rotateBy, and use instead the native function of QGraphicsItem : setRotation
+* Conductor is an herited class of QGraphicsObject, instead of QObject and QGraphicsPathItem
+* Clean (and reduce the size) the class QETDiagramEditor, mostly by replacing the connection syntax "signal -> slot" by "signal -> lambda".
+* Replace deprecated QMatrix by QTransform.
+
+
+* DXF export : fix some double items in dxf file.
+* DXF export : add some colors for basic shapes inside dxf.
+
+
+* Bug fix :
+* Fix compilation warning (clang and gcc).
+
+* Fix element text item alignment work well when text rotation != 0.
+* Fix crash when the properties of a element text item group
+* Fix crash occurred by the conductor and shape "ghost".
+* Fix element text alignment work also when font size change.
+* fix :
+1- When open a .qet by double click on it, QET ask user for open the backup file, of this .qet.
+2- On windows, if user open a project from the recent files menu, when close QET the file is deleted   user lose her work.
+clear the element texts when paste an element with the option "Do not store the labels of items in the copy paste" enabled.
+* elements can't be moved up and left, when there rotation are different than 0.
+* minor fix : slave link dialog doesn't display the good label, when the label of master element is build from formula.
+* Fix : in some condition, dynamic text are not at the same position when open a project.
+* On windows when user drag and drop an element from the common elements collection to the custom elements collection,
+the element file stay in read only mode, and so user can't save the element
+* Improvement : minimize the unwanted gap of the top right folio of the view (see https://qelectrotech.org/forum/viewtopic.php?pid=9379#p9379)
+* Fix: bug 168
+* Fix : when create multiple conductors with the free hand selection, the checking of existing potentiel don't search trought a folio report.
+* Fix:  DXF export.
+* Minor fix : remove from the element information the html hexadecimal and decimal characters of line feed and carriage return.
+* fix : in the diagram editor, when we select several shapes at the same time, the properties widget only apply the change to one shape.
+* Bug fix : when user load a project which contains summary pages, project was marked modified (summary was created on the fly and moved from the end on second
+position), now the project is no longer marked as amended when user have one or multiples summary pages when loading this project.
+* Static text of element are now exported to dxf
+* Fix Static text size of element exported to dxf
+* Improvement : minimize the unwanted gap of the top right folio of the view
+* Fix : when create multiple conductors with the free hand selection, the checking of existing potentiel don't search trought a folio report.
+* Don't display gui when qet is launched with specific argument
+
+
+
 ====== ChangeLog from 0.5 to 0.6 ======
 In the official collection, there are now 4106 elements, and 539 categoris for a total of 4645 files

@@ -271,4 +543,5 @@ Le dialogue "Exporter" (pour générer un fichier image d'un schéma) a égaleme
  * Affinage du constructeur de la classe QETApp
  * Moins d'avertissements à la compilation (testé avec gcc 4.3)
  * Moins d'inclusions non pertinentes
-  * Nettoyage du trunk : déplacement des sources dans un sous-répertoire
+
+  
--- a/2662
+++ b/2662
--- a/ELEMENTS.LICENSE
+++ b/ELEMENTS.LICENSE
@@ -175,3 +175,15 @@ Dette værk er licenseret under Creative Commons Attribution 3.0 License.
 For at se en kopi af denne licens, besøg
 http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+
+[ja]
+QElectroTech と一緒に提供される要素コレクションは現状のまま提供され、
+あなたの目的や作業に適合することを保証するものではありません。
+回路図での要素の利用、変更、統合は、回路図の最終的なライセンスに関わらず
+無条件で許可されます。
+回路図とは別に QElectroTech コレクションの全部または一部を
+変更の有無に関わらず再配布する場合は CC-BY ライセンスを尊重しなければなりません:
+この作品は Creative Commons Attribution 3.0 の下でライセンスされます。
+ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、
+「Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.」に
+手紙を送ってください。
--- a/11
+++ b/11
@@ -140,3 +140,14 @@ $ qmake (qmake-qt5 for Debian baserede systemer)
 $ make
 # umask 0022
 # make install
+
+[ja]
+必要条件 :
+libQt5 (パッケージ libqt5* を参照)
+cupsys-bsd 印刷用
+
+コンパイルの方法 :
+$ qmake (Debian ベースのシステムでは qmake-qt5)
+$ make
+# umask 0022
+# make install
--- a/9
+++ b/9
@@ -6,6 +6,11 @@ It uses XML files for elements and diagrams, and includes both a diagram editor,
 QElectroTech est une application Qt5 pour réaliser des schémas électriques.
 QET utilise le format XML pour ses éléments et ses schémas et inclut un éditeur de schémas, un éditeur d'élément, ainsi qu'un editeur de cartouche.

+[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.
+
+
 [ru]
 QElectroTech - приложение написанное на Qt5 и предназначенное для разработки электрических схем.
 Оно использует XML-файлы для элементов и схем, и включает, как редактор схем, так и редактор элементов.
@@ -45,3 +50,7 @@ QET gebruikt XML voor de elementen en schema's en omvat een schematische editor,
 [da]
 QElectroTech er et Qt5 program til at redigere elektriske diagrammer.
 Det bruger XML filer for symboler og diagrammer og inkluderer diagram, symbol og titelblok redigering.
+
+[ja]
+QElectroTech は電気回路図を作成する Qt5 アプリケーションです。
+QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。
--- a/README.md
+++ b/README.md
@@ -0,0 +1,178 @@
+![](logo.png)
+
+
+# QElectroTech
+
+### What it is
+
+QElectroTech, or QET in short, is a libre and open source desktop application to create diagrams and schematics.  
+The software is primarily intended to create electrical documentation but it can also be used to draw any kinds of diagrams, such as those made in pneumatics, hydraulics, process industries, electronics...  
+Generally speaking, QET is a **CAD/CAE editor focusing on schematics drawing features**.  
+
+This means that there are no embedded simulating or calculating functionalities and it is not planned to implement them.
+
+The main goal of the developers is to provide a libre, easy to use and effective software for **schematics drawing purposes**.
+
+### Version
+
+The current stable version is 0.70 and was released on 2019.07.13.  
+Once it has been officialy released, the stable version is always frozen and is no longer developed.
+
+New functionalities, bug and issue fixings are further made in the development version (currently 0.8), which can also be [downloaded](https://qelectrotech.org/download.html).
+
+Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partialy implemented until they are done!
+
+### License
+
+The software is licensed under [GNU/GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).  
+You are free to use, copy, modify and redistribute it under the terms of the license.
+
+
+Like many other open source softwares, QElectroTech is provided as it is, without any warranty.
+
+### Development / technical choices
+
+The development follows the classical way of free and open source software: the source code, written by a community of users, is freely accessible.
+
+Here are the technical choices made for the software development:
+
+*   Integrated development environment: [Qt Framework](https://www.qt.io/ide/)
+*   Libraries: Qt 5.x
+*   [KF5 Framework](https://github.com/KDE)  
+    [Cmake](https://cmake.org/install/)   
+    [kcoreaddons](https://github.com/KDE/kcoreaddons)   
+    [kwidgetsaddons](https://github.com/KDE/kwidgetsaddons).  
+*   Coding language: [C++](https://en.wikipedia.org/wiki/C%2B%2B)
+*   GUI translations: [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html)
+*   Version control: [GIT](https://git.tuxfamily.org/qet/qet.git/)
+*   File format for projects, elements and titleblocks: [XML](http://www.w3schools.com/xml/xml_whatis.asp)
+*   Main development platform: [GNU/Linux](http://getgnulinux.org/en/linux/)
+*   Targeted platforms: Windows, GNU/Linux, Mac OS X, BSDs
+*   [Forum](https://qelectrotech.org/forum/index.php)
+*   [Wiki](https://qelectrotech.org/wiki_new/)
+*   [Mantis_bugtracker](https://qelectrotech.org/bugtracker/my_view_page.php)
+
+If you wish to be informed of the latest developments, browse the [archive](https://listengine.tuxfamily.org/lists.tuxfamily.org/qet/) of the project mailing list where all commits (changes) are registered. This archive is publicly available, you don't need any account to access it.
+
+
+# Features
+
+QElectroTech is a free and open source software.  
+No need to worry about restrictive licensing, privacy violation or dependency on a company.  
+Zero cost and no licensing fees!  
+But you are welcome to make a donation to support the development
+
+QElectroTech runs on the 3 most widespread operating systems for desktop computers in the world.  
+Files that were created on an OS can be edited on another OS without any conversion or restriction.  
+MS Windows users can even run the "ready-to-use" version of QElectroTech from an external medium with no need to install it on an access restricted computer.
+
+
+Take advantage of the modern GUI
+
+Toolbars and panels can be enabled/disabled, moved and displayed the way you want to work.  
+Panels can be stacked on each other (as tabs) or docked on the sides (as docks) or completely separated from the main window (as windows).  
+The GUI can fit to small or big screens, and even to multi-display configurations.
+![](https://download.tuxfamily.org/qet/images-features/0030.png "GUI overview")
+
+
+The GUI of QElectroTech is translated in 19 languages.  
+You only need to restart the application for the new selected language to take effect.
+![](https://download.tuxfamily.org/qet/images-features/0040.png "Lang menu")
+
+Create technical documentation in professional quality
+
+Size, look and informations of the folios (sheets) are fully configurable.  
+You can set vertical and horizontal headers (printed rulers) individually on and off, set number of columns and rows, and set width/height of each column/row.
+
+Titlebocks can be created and edited with the embedded titleblock editor to perfectly suit your needs.  
+Custom variables can be defined to display the informations you wish in the titleblock.
+![](https://download.tuxfamily.org/qet/images-features/0055.png "Titleblock editor")
+
+With only 2 mouse clicks you can add a full automatic generated table of content.  
+Changes in the documentation are updated on the fly.
+![](https://download.tuxfamily.org/qet/images-features/0060.png "Table of content")
+
+Choose from more than 7.000 symbols...
+The embedded QET collection contains a rich library of electric, logic, pneumatic, hydraulic and fluid symbols.  
+The library grows at every new release thanks to an active user community.
+![](https://download.tuxfamily.org/qet/images-features/0070.png "Collections")
+
+...or create your own collection
+
+The embedded element editor is a nice tool to create your own elements (symbols or anything else).  
+Your own elements are stored in the user collection.
+![](https://download.tuxfamily.org/qet/images-features/0080.png "Element editor")
+
+Quickly find what you need
+
+All collections can quickly be searched with the integrated search engine.  
+Furthermore, the search request can be restricted to the folder of your choice.
+![](https://download.tuxfamily.org/qet/images-features/0090.png "Search engine")
+
+Easily draw complex schematics
+
+To add an element on the drawing area, it only needs a drag & drop from the collection panel.
+![](https://download.tuxfamily.org/qet/images-features/0102.png "Drag and drop")
+
+Elements are automatically connected if they are aligned, or connected from point to point by pulling a conductor with the mouse.
+![](https://download.tuxfamily.org/qet/images-features/0105.png "Conductor connections")
+
+The path of every conductor can be modified by moving its handles with the mouse.
+![](https://download.tuxfamily.org/qet/images-features/0107.png "Conductor handles")
+And of course, you can accurately zoom with the mouse wheel over the drawing area to catch the smallest details.
+
+Link elements together to create cross references
+
+Several types of element can be linked together to display a cross reference text.  
+All types of cross references are automatically updated on the fly, you don't need to think about them if you make changes.
+![](https://download.tuxfamily.org/qet/images-features/0112.png "Cross ref elements")
+To speed up your work, linkable elements are easily searched and shown.
+![](https://download.tuxfamily.org/qet/images-features/0115.png  "Cross ref search")
+
+
+Export informations to a parts list
+Informations of all elements in the project can be exported to a .csv file that can be read and edited by any spreadsheet application.
+![](https://download.tuxfamily.org/qet/images-features/0122.png "Element informations")
+
+This way, you can make your own parts list or bill of material using the full power of a spreadsheet program.
+![](https://download.tuxfamily.org/qet/images-features/0125.png "Spreadsheet")
+Print to pdf and/or export your work to images
+
+Your whole documentation or only selected parts of it can be printed to a real printer or to a pdf file.  
+Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format images.
+
+### And much more:
+
+*   open and edit several projects at the same time
+*   import images (.bmp, .jpg, .png, .svg) in your diagrams
+*   add basic shapes (lines, rectangles, ellipses, polygons) to your drawings
+*   edit the thickness, the line style and the color of conductors
+*   define some autonum patterns for conductors, symbols and folios
+*   take advantage of the open xml standard of elements and projects to create custom tools
+*   search and replace Widget (Ctrl + F) in entire project
+*   conductors num can be exported to csv file.
+*   ***
+
+### Story
+
+The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.  
+Xavier developed the base application itself and made all technical choices about the development.  
+The first version of QET (0.1) was released on 09.03.2008.  
+However, both Xavier and Benoit do not participate anymore in the project since 2013.
+
+Following this period, new developers and contributors took over the project and kept it alive.  
+The development and the many translations are actively maintained.  
+New functionalities and evolutions are planned to make QET ever better.
+
+Nowadays, QET is not only used by many individuals, teachers and students but also by professional electricians and companies all over the world.
+
+  
+### Donate Money
+
+If you love QElectroTech, you can help developers to buy new hardware to test
+and implement new features. Thanks in advance for your generous donations.
+
+For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)  
+or at [leetchi.com](https://www.leetchi.com/c/qelectroteck)
+
+
--- a/SingleApplication/CHANGELOG.md
+++ b/SingleApplication/CHANGELOG.md
@@ -0,0 +1,228 @@
+Changelog
+=========
+
+__3.0.18__
+----------
+
+* Fallback to standard QApplication class on iOS and Android systems where
+  the library is not supported.
+  
+* Added Build CI tests to verify the library builds successfully on Linux, Windows and MacOS  across multiple Qt versions.
+
+  _Anton Filimonov_
+
+__3.0.17__
+----------
+
+* Fixed compilation warning/error caused by `geteuid()` on unix based systems.
+
+   _Iakov Kirilenko_
+
+* Added CMake support
+
+   _Hennadii Chernyshchyk_
+
+__3.0.16__
+----------
+
+* Use geteuid and getpwuid to get username on Unix, fallback to environment variable.
+
+   _Jonas Kvinge_
+
+__3.0.15__
+----------
+
+* Bug Fix: sendMessage() might return false even though data was actually written.
+
+   _Jonas Kvinge_
+
+__3.0.14__
+----------
+
+* Fixed uninitialised variables in the `SingleApplicationPrivate` constructor.
+
+__3.0.13a__
+----------
+
+* Process socket events asynchronously
+* Fix undefined variable error on Windows
+
+   _Francis Giraldeau_
+
+__3.0.12a__
+----------
+
+* 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.
--- a/SingleApplication/CMakeLists.txt
+++ b/SingleApplication/CMakeLists.txt
@@ -0,0 +1,43 @@
+cmake_minimum_required(VERSION 3.1.0)
+
+project(SingleApplication)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+# SingleApplication base class
+set(QAPPLICATION_CLASS QCoreApplication CACHE STRING "Inheritance class for SingleApplication")
+set_property(CACHE QAPPLICATION_CLASS PROPERTY STRINGS QApplication QGuiApplication QCoreApplication)
+
+# Libary target
+add_library(${PROJECT_NAME} STATIC
+    singleapplication.cpp
+    singleapplication_p.cpp
+    )
+
+# Find dependencies
+find_package(Qt5Network)
+if(QAPPLICATION_CLASS STREQUAL QApplication)
+    find_package(Qt5 COMPONENTS Widgets REQUIRED)
+elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
+    find_package(Qt5 COMPONENTS Gui REQUIRED)
+else()
+    find_package(Qt5 COMPONENTS Core REQUIRED)
+endif()
+add_compile_definitions(QAPPLICATION_CLASS=${QAPPLICATION_CLASS})
+
+# Link dependencies
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Network)
+if(QAPPLICATION_CLASS STREQUAL QApplication)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
+elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Gui)
+else()
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core)
+endif()
+
+if(WIN32)
+    target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
+endif()
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
--- a/SingleApplication/LICENSE
+++ b/SingleApplication/LICENSE
@@ -0,0 +1,24 @@
+The MIT License (MIT)
+
+Copyright (c) Itay Grudev 2015 - 2016
+
+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.
--- a/SingleApplication/README.md
+++ b/SingleApplication/README.md
@@ -0,0 +1,277 @@
+SingleApplication
+=================
+
+This is a replacement of the QtSingleApplication for `Qt5`.
+
+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.
+
+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.
+
+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 and include it's contents with a `.pri` file. 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)
+```
+
+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.*
+
+API
+---
+
+### Members
+
+```cpp
+SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100 )
+```
+
+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.
+
+*__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.
+
+### 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.
--- a/SingleApplication/Windows.md
+++ b/SingleApplication/Windows.md
@@ -0,0 +1,46 @@
+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
--- a/SingleApplication/examples/basic/basic.pro
+++ b/SingleApplication/examples/basic/basic.pro
@@ -0,0 +1,5 @@
+# Single Application implementation
+include(../../singleapplication.pri)
+DEFINES += QAPPLICATION_CLASS=QCoreApplication
+
+SOURCES += main.cpp
--- a/SingleApplication/examples/basic/main.cpp
+++ b/SingleApplication/examples/basic/main.cpp
@@ -0,0 +1,9 @@
+#include <singleapplication.h>
+
+int main(int argc, char *argv[])
+{
+    // Allow secondary instances
+    SingleApplication app( argc, argv );
+
+    return app.exec();
+}
--- a/SingleApplication/examples/calculator/button.cpp
+++ b/SingleApplication/examples/calculator/button.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** 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]
--- a/SingleApplication/examples/calculator/button.h
+++ b/SingleApplication/examples/calculator/button.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** 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
--- a/SingleApplication/examples/calculator/calculator.cpp
+++ b/SingleApplication/examples/calculator/calculator.cpp
@@ -0,0 +1,406 @@
+/****************************************************************************
+**
+** 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(tr("."), SLOT(pointClicked()));
+    Button *changeSignButton = createButton(tr("\302\261"), SLOT(changeSignClicked()));
+
+    Button *backspaceButton = createButton(tr("Backspace"), SLOT(backspaceClicked()));
+    Button *clearButton = createButton(tr("Clear"), SLOT(clear()));
+    Button *clearAllButton = createButton(tr("Clear All"), SLOT(clearAll()));
+
+    Button *clearMemoryButton = createButton(tr("MC"), SLOT(clearMemory()));
+    Button *readMemoryButton = createButton(tr("MR"), SLOT(readMemory()));
+    Button *setMemoryButton = createButton(tr("MS"), SLOT(setMemory()));
+    Button *addToMemoryButton = createButton(tr("M+"), SLOT(addToMemory()));
+
+    Button *divisionButton = createButton(tr("\303\267"), SLOT(multiplicativeOperatorClicked()));
+    Button *timesButton = createButton(tr("\303\227"), SLOT(multiplicativeOperatorClicked()));
+    Button *minusButton = createButton(tr("-"), SLOT(additiveOperatorClicked()));
+    Button *plusButton = createButton(tr("+"), SLOT(additiveOperatorClicked()));
+
+    Button *squareRootButton = createButton(tr("Sqrt"), SLOT(unaryOperatorClicked()));
+    Button *powerButton = createButton(tr("x\302\262"), SLOT(unaryOperatorClicked()));
+    Button *reciprocalButton = createButton(tr("1/x"), SLOT(unaryOperatorClicked()));
+    Button *equalButton = createButton(tr("="), 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(tr("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 == tr("Sqrt")) {
+        if (operand < 0.0) {
+            abortOperation();
+            return;
+        }
+        result = std::sqrt(operand);
+    } else if (clickedOperator == tr("x\302\262")) {
+        result = std::pow(operand, 2.0);
+    } else if (clickedOperator == tr("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() + tr("."));
+    waitingForOperand = false;
+}
+//! [22]
+
+//! [24]
+void Calculator::changeSignClicked()
+{
+    QString text = display->text();
+    double value = text.toDouble();
+
+    if (value > 0.0) {
+        text.prepend(tr("-"));
+    } 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(tr("####"));
+}
+//! [36]
+
+//! [38]
+bool Calculator::calculate(double rightOperand, const QString &pendingOperator)
+{
+    if (pendingOperator == tr("+")) {
+        sumSoFar += rightOperand;
+    } else if (pendingOperator == tr("-")) {
+        sumSoFar -= rightOperand;
+    } else if (pendingOperator == tr("\303\227")) {
+        factorSoFar *= rightOperand;
+    } else if (pendingOperator == tr("\303\267")) {
+        if (rightOperand == 0.0)
+            return false;
+        factorSoFar /= rightOperand;
+    }
+    return true;
+}
+//! [38]
--- a/SingleApplication/examples/calculator/calculator.h
+++ b/SingleApplication/examples/calculator/calculator.h
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** 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
--- a/SingleApplication/examples/calculator/calculator.pro
+++ b/SingleApplication/examples/calculator/calculator.pro
@@ -0,0 +1,11 @@
+QT += widgets
+
+HEADERS = button.h \
+    calculator.h
+SOURCES = button.cpp \
+    calculator.cpp \
+    main.cpp
+
+# Single Application implementation
+include(../../singleapplication.pri)
+DEFINES += QAPPLICATION_CLASS=QApplication
--- a/SingleApplication/examples/calculator/main.cpp
+++ b/SingleApplication/examples/calculator/main.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** 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();
+}
--- a/SingleApplication/examples/sending_arguments/main.cpp
+++ b/SingleApplication/examples/sending_arguments/main.cpp
@@ -0,0 +1,25 @@
+#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() );
+        return 0;
+    } else {
+        QObject::connect(
+            &app,
+            &SingleApplication::receivedMessage,
+            &msgReceiver,
+            &MessageReceiver::receivedMessage
+        );
+    }
+
+    return app.exec();
+}
--- a/SingleApplication/examples/sending_arguments/messagereceiver.cpp
+++ b/SingleApplication/examples/sending_arguments/messagereceiver.cpp
@@ -0,0 +1,12 @@
+#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;
+}
--- a/SingleApplication/examples/sending_arguments/messagereceiver.h
+++ b/SingleApplication/examples/sending_arguments/messagereceiver.h
@@ -0,0 +1,15 @@
+#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
--- a/SingleApplication/examples/sending_arguments/sending_arguments.pro
+++ b/SingleApplication/examples/sending_arguments/sending_arguments.pro
@@ -0,0 +1,9 @@
+# Single Application implementation
+include(../../singleapplication.pri)
+DEFINES += QAPPLICATION_CLASS=QCoreApplication
+
+SOURCES += main.cpp \
+    messagereceiver.cpp
+
+HEADERS += \
+    messagereceiver.h
--- a/SingleApplication/singleapplication.cpp
+++ b/SingleApplication/singleapplication.cpp
@@ -0,0 +1,195 @@
+// 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.
+
+#include <QtCore/QTime>
+#include <QtCore/QThread>
+#include <QtCore/QDateTime>
+#include <QtCore/QByteArray>
+#include <QtCore/QSharedMemory>
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
+#else
+#if TODO_LIST
+#pragma message("@TODO remove code for QT 5.10 or later")
+#endif
+#include <QRandomGenerator>
+#endif
+#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 {bool} allowSecondaryInstances
+*/
+SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout )
+	: 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;
+
+	// Generating an application ID used for identifying the shared memory
+	// block and QLocalServer
+	d->genBlockServerName();
+
+#ifdef Q_OS_UNIX
+	// By explicitly attaching it and then deleting it we make sure that the
+	// 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
+		d->memory->lock();
+		d->initializeMemoryBlock();
+		d->memory->unlock();
+	} else {
+		// Attempt to attach to the memory segment
+		if( ! d->memory->attach() ) {
+			qCritical() << "SingleApplication: Unable to attach to shared memory block.";
+			qCritical() << d->memory->errorString();
+			delete d;
+			::exit( EXIT_FAILURE );
+		}
+	}
+
+	InstancesInfo* 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 ) {
+		d->memory->lock();
+
+		if( d->blockChecksum() == inst->checksum ) break;
+
+		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();
+		}
+
+		d->memory->unlock();
+
+		// Random sleep here limits the probability of a collision between two racing apps
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
+		qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
+		QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
+#else
+#if TODO_LIST
+#pragma message("@TODO remove code for QT 5.10 or later")
+#endif
+		quint32 value = QRandomGenerator::global()->generate();
+		QThread::sleep(8 + static_cast<unsigned long>(value / RAND_MAX * 10));
+#endif
+	}
+
+	if( inst->primary == false) {
+		d->startPrimary();
+		d->memory->unlock();
+		return;
+	}
+
+	// Check if another instance can be started
+	if( allowSecondary ) {
+		inst->secondary += 1;
+		inst->checksum = d->blockChecksum();
+		d->instanceNumber = inst->secondary;
+		d->startSecondary();
+		if( d->options & Mode::SecondaryNotification ) {
+			d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
+		}
+		d->memory->unlock();
+		return;
+	}
+
+	d->memory->unlock();
+
+	d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+
+	delete d;
+
+	::exit( EXIT_SUCCESS );
+}
+
+/**
+	@brief Destructor
+*/
+SingleApplication::~SingleApplication()
+{
+	Q_D(SingleApplication);
+	delete d;
+}
+
+bool SingleApplication::isPrimary()
+{
+	Q_D(SingleApplication);
+	return d->server != nullptr;
+}
+
+bool SingleApplication::isSecondary()
+{
+	Q_D(SingleApplication);
+	return d->server == nullptr;
+}
+
+quint32 SingleApplication::instanceId()
+{
+	Q_D(SingleApplication);
+	return d->instanceNumber;
+}
+
+qint64 SingleApplication::primaryPid()
+{
+	Q_D(SingleApplication);
+	return d->primaryPid();
+}
+
+bool SingleApplication::sendMessage( QByteArray message, int timeout )
+{
+	Q_D(SingleApplication);
+
+	// Nobody to connect to
+	if( isPrimary() ) return false;
+
+	// Make sure the socket is connected
+	d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
+
+	d->socket->write( message );
+	bool dataWritten = d->socket->waitForBytesWritten( timeout );
+	d->socket->flush();
+	return dataWritten;
+}
--- a/SingleApplication/singleapplication.h
+++ b/SingleApplication/singleapplication.h
@@ -0,0 +1,136 @@
+// 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>
+#include <QElapsedTimer>
+
+#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
+	
+	typedef QAPPLICATION_CLASS app_t;
+	
+	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 );
+	~SingleApplication();
+	
+	/**
+		@brief Returns if the instance is the primary instance
+		@returns {bool}
+	*/
+	bool isPrimary();
+	
+	/**
+		@brief Returns if the instance is a secondary instance
+		@returns {bool}
+	*/
+	bool isSecondary();
+	
+	/**
+		@brief Returns a unique identifier for the current instance
+		@returns {qint32}
+	*/
+	quint32 instanceId();
+	
+	/**
+		@brief Returns the process ID (PID) of the primary instance
+		@returns {qint64}
+	*/
+	qint64 primaryPid();
+	
+	/**
+		@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( QByteArray message, int timeout = 100 );
+	
+	Q_SIGNALS:
+	void instanceStarted();
+	void receivedMessage( quint32 instanceId, QByteArray message );
+	
+	private:
+	SingleApplicationPrivate *d_ptr;
+	Q_DECLARE_PRIVATE(SingleApplication)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
+
+#endif // SINGLE_APPLICATION_H
--- a/SingleApplication/singleapplication.pri
+++ b/SingleApplication/singleapplication.pri
@@ -0,0 +1,19 @@
+QT += core network
+CONFIG += c++17
+
+HEADERS += $$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
--- a/SingleApplication/singleapplication_p.cpp
+++ b/SingleApplication/singleapplication_p.cpp
@@ -0,0 +1,444 @@
+// 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.
+
+//
+//  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/QByteArray>
+#include <QtCore/QDataStream>
+#include <QtCore/QCryptographicHash>
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+
+#include "singleapplication.h"
+#include "singleapplication_p.h"
+
+#ifdef Q_OS_UNIX
+	#include <unistd.h>
+	#include <sys/types.h>
+	#include <pwd.h>
+#endif
+
+#ifdef Q_OS_WIN
+#include <windows.h>
+#include <lmcons.h>
+#endif
+
+SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
+	: q_ptr( q_ptr )
+{
+	server = nullptr;
+	socket = nullptr;
+	memory = nullptr;
+	instanceNumber = -1;
+}
+
+SingleApplicationPrivate::~SingleApplicationPrivate()
+{
+	if( socket != nullptr ) {
+		socket->close();
+		delete socket;
+	}
+
+	memory->lock();
+	InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+	if( server != nullptr ) {
+		server->close();
+		delete server;
+		inst->primary = false;
+		inst->primaryPid = -1;
+		inst->checksum = blockChecksum();
+	}
+	memory->unlock();
+
+	delete memory;
+}
+
+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( ! (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 ) {
+#ifdef Q_OS_WIN
+		wchar_t username [ UNLEN + 1 ];
+		// Specifies size of the buffer on input
+		DWORD usernameLength = UNLEN + 1;
+		if( GetUserNameW( username, &usernameLength ) ) {
+			appData.addData( QString::fromWCharArray(username).toUtf8() );
+		} else {
+			appData.addData( qgetenv("USERNAME") );
+		}
+#endif
+#ifdef Q_OS_UNIX
+		QByteArray username;
+		uid_t uid = geteuid();
+		struct passwd *pw = getpwuid(uid);
+		if( pw ) {
+			username = pw->pw_name;
+		}
+		if( username.isEmpty() ) {
+			username = qgetenv("USER");
+		}
+		appData.addData(username);
+#endif
+	}
+
+	// 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()
+{
+	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+	inst->primary = false;
+	inst->secondary = 0;
+	inst->primaryPid = -1;
+	inst->checksum = blockChecksum();
+}
+
+void SingleApplicationPrivate::startPrimary()
+{
+	Q_Q(SingleApplication);
+
+	// 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
+				);
+
+	// Reset the number of connections
+	InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
+
+	inst->primary = true;
+	inst->primaryPid = q->applicationPid();
+	inst->checksum = blockChecksum();
+
+	instanceNumber = 0;
+}
+
+void SingleApplicationPrivate::startSecondary()
+{
+}
+
+void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
+{
+	// Connect to the Local Server of the Primary Instance if not already
+	// connected.
+	if( socket == nullptr ) {
+		socket = new QLocalSocket();
+	}
+
+	// If already connected - we are done;
+	if( socket->state() == QLocalSocket::ConnectedState )
+		return;
+
+	// If not connect
+	if( socket->state() == QLocalSocket::UnconnectedState ||
+		socket->state() == QLocalSocket::ClosingState ) {
+		socket->connectToServer( blockServerName );
+	}
+
+	// Wait for being connected
+	if( socket->state() == QLocalSocket::ConnectingState ) {
+		socket->waitForConnected( msecs );
+	}
+
+	// Initialisation message according to the SingleApplication protocol
+	if( socket->state() == QLocalSocket::ConnectedState ) {
+		// Notify the parent that a new instance had been started;
+		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)	// ### Qt 6: remove
+		quint16 checksum =
+				qChecksum(
+					initMsg.constData(),
+					static_cast<quint32>(initMsg.length()));
+#else
+#if TODO_LIST
+#pragma message("@TODO remove code for QT 6 or later")
+#endif
+		quint16 checksum =
+				qChecksum(
+					QByteArrayView(
+						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 );
+		socket->flush();
+		socket->waitForBytesWritten( msecs );
+	}
+}
+
+quint16 SingleApplicationPrivate::blockChecksum()
+{
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
+	return qChecksum(
+				static_cast <const char *>( memory->data() ),
+				offsetof( InstancesInfo, checksum )
+				);
+#else
+#if TODO_LIST
+#pragma message("@TODO remove code for QT 6 or later")
+#endif
+	return qChecksum(
+				QByteArrayView(
+					static_cast <const char *>( memory->data() ),
+					offsetof( InstancesInfo, checksum )));
+
+#endif
+}
+
+qint64 SingleApplicationPrivate::primaryPid()
+{
+	qint64 pid;
+
+	memory->lock();
+	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+	pid = inst->primaryPid;
+	memory->unlock();
+
+	return pid;
+}
+
+/**
+	@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, this](){
+		connectionMap.remove(nextConnSocket);
+		nextConnSocket->deleteLater();
+	}
+	);
+
+	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)	// ### Qt 6: remove
+	const quint16 actualChecksum =
+			qChecksum(
+				msgBytes.constData(),
+				static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
+#else
+#if TODO_LIST
+#pragma message("@TODO remove code for QT 6 or later")
+#endif
+	const quint16 actualChecksum =
+			qChecksum(
+				QByteArrayView(
+					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  );
+}
--- a/SingleApplication/singleapplication_p.h
+++ b/SingleApplication/singleapplication_p.h
@@ -0,0 +1,99 @@
+// The MIT License (MIT)
+//
+// Copyright (c) Itay Grudev 2015 - 2016
+//
+// 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;
+	quint16 checksum;
+};
+
+struct ConnectionInfo {
+	explicit ConnectionInfo() :
+		msgLen(0), instanceId(0), stage(0) {}
+	qint64 msgLen;
+	quint32 instanceId;
+	quint8 stage;
+};
+
+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();
+	
+	void genBlockServerName();
+	void initializeMemoryBlock();
+	void startPrimary();
+	void startSecondary();
+	void connectToPrimary(int msecs, ConnectionType connectionType );
+	quint16 blockChecksum();
+	qint64 primaryPid();
+	void readInitMessageHeader(QLocalSocket *socket);
+	void readInitMessageBody(QLocalSocket *socket);
+	
+	SingleApplication *q_ptr;
+	QSharedMemory *memory;
+	QLocalSocket *socket;
+	QLocalServer *server;
+	quint32 instanceNumber;
+	QString blockServerName;
+	SingleApplication::Options options;
+	QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+	
+	public Q_SLOTS:
+	void slotConnectionEstablished();
+	void slotDataAvailable( QLocalSocket*, quint32 );
+	void slotClientConnectionClosed( QLocalSocket*, quint32 );
+};
+
+#endif // SINGLEAPPLICATION_P_H
--- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json
+++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json
@@ -0,0 +1,37 @@
+{
+  "id": "org.qelectrotech.QElectroTech",
+  "runtime": "org.kde.Platform",
+  "runtime-version": "5.14",
+  "sdk": "org.kde.Sdk",
+  "command": "qelectrotech",
+  "rename-desktop-file": "qelectrotech.desktop",
+  "rename-appdata-file": "qelectrotech.appdata.xml",
+  "rename-icon": "qelectrotech",
+  "copy-icon": true,
+  "finish-args": [
+    "--socket=wayland",
+    "--socket=x11",
+    "--device=dri",
+    "--share=ipc",
+    "--filesystem=host"
+  ],
+  "modules": [
+    {
+      "name": "qelectrotech",
+      "buildsystem": "qmake",
+      "post-install": [
+        "mv /app/share/mime/packages/qelectrotech.xml /app/share/mime/packages/org.qelectrotech.QElectroTech.xml"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "../.."
+        },
+        {
+          "type": "patch",
+          "path": "patches/0001-build-Fix-the-installation-paths.patch"
+        }
+      ]
+    }
+  ]
+}
--- a/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch
+++ b/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch
@@ -0,0 +1,44 @@
+From 2a390b5188fe070295090b1bd37273d12963b371 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(-)
+
+diff --git a/qelectrotech.pro b/qelectrotech.pro
+index 2901a30d5..1019a9870 100644
+--- a/qelectrotech.pro
+++ b/qelectrotech.pro
+@@ -5,20 +5,20 @@
+ # Chemins utilises pour la compilation et l'installation de QET
+ unix {
+         # Chemins UNIX
+-        COMPIL_PREFIX              = '/usr/local/'
+-        INSTALL_PREFIX             = '/usr/local/'
+        COMPIL_PREFIX              = '/app/'
+        INSTALL_PREFIX             = '/app/'
+         QET_BINARY_PATH            = 'bin/'
+         QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
+         QET_COMMON_TBT_PATH        = 'share/qelectrotech/titleblocks/'
+         QET_LANG_PATH              = 'share/qelectrotech/lang/'
+         QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
+-        QET_LICENSE_PATH           = 'doc/qelectrotech/'
+-        QET_MIME_XML_PATH          = '../share/mime/application/'
+-        QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
+-        QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
+        QET_LICENSE_PATH           = 'share/doc/qelectrotech/'
+        QET_MIME_XML_PATH          = 'share/mime/application/'
+        QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
+        QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
+         QET_DESKTOP_PATH           = 'share/applications/'
+         QET_ICONS_PATH             = 'share/icons/hicolor/'
+-        QET_MAN_PATH               = 'man/'
+        QET_MAN_PATH               = 'share/man/'
+         QET_APPDATA_PATH           = 'share/appdata'
+ }
+ win32 {
+-- 
+2.28.0
+
--- a/build-aux/linux/fedora/README.elements
+++ b/build-aux/linux/fedora/README.elements
@@ -36,3 +36,6 @@ Elementen collectie voor QElectroTech.

 [da]
 Symbol samling for QElectroTech.
+
+[ja]
+QElectroTech の要素コレクション。
--- a/build-aux/linux/fedora/packaging
+++ b/build-aux/linux/fedora/packaging
--- a/build-aux/linux/gentoo/README.txt
+++ b/build-aux/linux/gentoo/README.txt
--- a/build-aux/snap/local/launchers/qelectrotech-launch
+++ b/build-aux/snap/local/launchers/qelectrotech-launch
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
+from="$SNAP_USER_DATA/.qet"
+to="$SNAP_USER_COMMON/.qet"
+if [ ! -d "$to" ] && [ -d "$from" ]; then
+  echo "Migrating user data from $from to $to"
+  mkdir "$to"
+  cp -av "$from/." "$to"
+fi
+
+# link DXFtoQET so that QET finds it
+mkdir -p "$HOME/.qet"
+ln -snf "$SNAP/bin/DXFtoQET" "$HOME/.qet/DXFtoQET"
+
+exec "${@}"
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -0,0 +1,119 @@
+name: qelectrotech
+title: QElectroTech
+base: core20
+version: "0.8.0"
+license: GPL-2.0
+summary: Electrical diagram editor
+description: |
+  QElectroTech, or QET in short, is a libre and open source desktop application 
+  to create diagrams and schematics.
+
+grade: stable
+confinement: strict
+compression: lzo
+
+layout:
+  /usr/local/share/qelectrotech:
+    symlink: $SNAP/usr/local/share/qelectrotech
+  /usr/share/libdrm/amdgpu.ids:
+    symlink: $SNAP/kf5/usr/share/libdrm/amdgpu.ids
+
+apps:
+  qelectrotech:
+    command: usr/local/bin/qelectrotech
+    command-chain:
+      - bin/qelectrotech-launch
+    desktop: usr/local/share/applications/qelectrotech.desktop
+    extensions: [kde-neon]
+    plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
+    environment: &env
+      TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
+      HOME: $SNAP_USER_COMMON
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3.8:$SNAP/usr/lib/python3.8/lib-dynload
+
+  qet-tb-generator:
+    command: bin/qet_tb_generator
+    command-chain:
+      - bin/qelectrotech-launch
+    extensions: [kde-neon]
+    plugs: *plugs
+    environment: *env
+      
+  dxf-to-qet:
+    command: bin/DXFtoQET
+    extensions: [kde-neon]
+    plugs: *plugs
+    environment: *env
+
+parts:
+  launchers:
+    plugin: dump
+    source: build-aux/snap/local/launchers
+    organize:
+      '*': bin/
+
+  qet-tb-generator:
+    plugin: python
+    source: https://github.com/raulroda/qet_tb_generator-plugin.git
+    python-packages: [PySimpleGUI]
+    stage-packages: 
+      - python3-lxml
+      - python3-tk
+      - libtk8.6
+
+  kde-sdk-setup:
+    plugin: nil
+    build-snaps:
+      - kde-frameworks-5-qt-5-15-3-core20-sdk
+    build-packages:
+      - g++
+      - mesa-common-dev
+      - libglvnd-dev
+      - rsync
+    override-build: |
+      rsync -a --ignore-existing /snap/kde-frameworks-5-qt-5-15-3-core20-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, xdg-user-dirs ]
+    build-packages:
+      - git
+      - libsqlite3-dev
+    override-build: |
+      modified_displayed_version="${SNAPCRAFT_PROJECT_VERSION}.snap"
+      sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
+      qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
+      make -j${SNAPCRAFT_PARALLEL_BUILD_COUNT}
+      make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
+    override-stage: |
+      snapcraftctl stage
+      # patch desktop file with correct icon path
+      SED_CMD="sed -i -E s|^Icon=(.*)|Icon=\${SNAP}/usr/local/share/icons/hicolor/128x128/apps/\1.png|g" 
+      $SED_CMD usr/local/share/applications/qelectrotech.desktop
+
+  cleanup:
+    after: [qelectrotech, dxf-to-qet, qet-tb-generator]
+    plugin: nil
+    build-snaps: [kde-frameworks-5-qt-5-15-3-core20]
+    override-prime: |
+      set -eux
+      for snap in "kde-frameworks-5-qt-5-15-3-core20"; do  # List all content-snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" "$SNAPCRAFT_PRIME/usr/{}" \;
+      done
+      for cruft in bug lintian man; do
+        rm -rf $SNAPCRAFT_PRIME/usr/share/$cruft
+      done
+      find $SNAPCRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
+      find $SNAPCRAFT_PRIME/usr/share -type d -empty -delete
--- a/build-aux/windows/Contrib/Dutch_Belgium.nlf
+++ b/build-aux/windows/Contrib/Dutch_Belgium.nlf
--- a/build-aux/windows/Contrib/Dutch_Belgium.nsh
+++ b/build-aux/windows/Contrib/Dutch_Belgium.nsh
--- a/build-aux/windows/Lancer
+++ b/build-aux/windows/Lancer
--- a/build-aux/windows/QET.nsi
+++ b/build-aux/windows/QET.nsi
@@ -289,9 +289,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" "http://download.tuxfamily.org/qet/joshua/html/QET.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "http://download.tuxfamily.org/qet/joshua/html/QET_ru.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url"      "InternetShortcut" "URL" "http://download.tuxfamily.org/qet/builds/nightly/"
+	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
--- a/build-aux/windows/QET64.nsi
+++ b/build-aux/windows/QET64.nsi
@@ -295,9 +295,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" "http://download.tuxfamily.org/qet/joshua/html/QET.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "http://download.tuxfamily.org/qet/joshua/html/QET_ru.html"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url"      "InternetShortcut" "URL" "http://download.tuxfamily.org/qet/builds/nightly/"
+	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
--- a/build-aux/windows/README.txt
+++ b/build-aux/windows/README.txt
--- a/build-aux/windows/images/header.bmp
+++ b/build-aux/windows/images/header.bmp
--- a/build-aux/windows/images/wizard.bmp
+++ b/build-aux/windows/images/wizard.bmp
--- a/build-aux/windows/images/wizard2.bmp
+++ b/build-aux/windows/images/wizard2.bmp
--- a/build-aux/windows/lang_extra.nsh
+++ b/build-aux/windows/lang_extra.nsh
--- a/build-aux/windows/lang_extra_fr.nsh
+++ b/build-aux/windows/lang_extra_fr.nsh
--- a/cmake/copyright_message.cmake
+++ b/cmake/copyright_message.cmake
@@ -0,0 +1,34 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(
+  "_____________________________________________________________________"
+  "\nCopyright 2006 The QElectroTech Team"
+  "\nThis file is part of QElectroTech."
+
+  "\n\nQElectroTech is free software: you can redistribute it and/or modify"
+  "\nit under the terms of the GNU General Public License as published by"
+  "\nthe Free Software Foundation, either version 2 of the License, or"
+  "\n(at your option) any later version."
+
+  "\nQElectroTech is distributed in the hope that it will be useful,"
+  "\nbut WITHOUT ANY WARRANTY; without even the implied warranty of"
+  "\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"
+  "\nGNU General Public License for more details."
+
+  "\n\nYou should have received a copy of the GNU General Public License"
+  "\nalong with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.\n"
+  "_____________________________________________________________________")
--- a/cmake/define_definitions.cmake
+++ b/cmake/define_definitions.cmake
@@ -0,0 +1,71 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+# Paths used for compilation and installation of QET
+
+message(" - define_definitions")
+
+message("Paths used for compilation and installation of QET")
+message("--------------------------------------------------")
+message("COMPIL_PREFIX              " ${COMPIL_PREFIX})
+message("INSTALL_PREFIX             " ${INSTALL_PREFIX})
+message("QET_BINARY_PATH            " ${QET_BINARY_PATH})
+
+if(${QET_COMMON_COLLECTION_PATH} STRGREATER "")
+  message("QET_COMMON_COLLECTION_PATH " ${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH})
+  add_definitions(-DQET_COMMON_COLLECTION_PATH=${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH})
+endif()
+if(${QET_COMMON_TBT_PATH} STRGREATER "")
+  message("QET_COMMON_TBT_PATH        " ${INSTALL_PREFIX}${QET_COMMON_TBT_PATH})
+  add_definitions(-DQET_COMMON_TBT_PATH=${INSTALL_PREFIX}${QET_COMMON_TBT_PATH})
+endif()
+if(${QET_LANG_PATH_RELATIVE_TO_BINARY_PATH})
+  add_definitions(-DQET_LANG_PATH_RELATIVE_TO_BINARY_PATH)
+endif()
+if(${QET_LANG_PATH} STRGREATER "")
+  message("QET_LANG_PATH              " ${INSTALL_PREFIX}${QET_LANG_PATH})
+  add_definitions(-DQET_LANG_PATH=${INSTALL_PREFIX}${QET_LANG_PATH})
+endif()
+if(${QET_EXAMPLES_PATH} STRGREATER "")
+  message("QET_EXAMPLES_PATH          " ${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
+  add_definitions(-DQET_EXAMPLES_PATH=${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
+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})
+message("QET_MAN_PATH               " ${QET_MAN_PATH})
+message("QET_APPDATA_PATH           " ${QET_APPDATA_PATH})
+message("ICON                       " ${ICON})
+message("--------------------------------------------------")
+message("PROJECT_NAME              :" ${PROJECT_NAME})
+message("PROJECT_VERSION           :" ${PROJECT_VERSION})
+message("PROJECT_DESCRIPTION       :" ${PROJECT_DESCRIPTION})
+message("PROJECT_HOMEPAGE_URL      :" ${PROJECT_HOMEPAGE_URL})
+message("PROJECT_SOURCE_DIR        :" ${PROJECT_SOURCE_DIR})
+message("QET_DIR                   :" ${QET_DIR})
+message("GIT_COMMIT_SHA            :" ${GIT_COMMIT_SHA})
+
+if(BUILD_WITH_KF5)
+  message("KF5_GIT_TAG               :" ${KF5_GIT_TAG})
+else()
+  add_definitions(-DBUILD_WITHOUT_KF5)
+endif()
+message("QET_COMPONENTS            :" ${QET_COMPONENTS})
+message("QT_VERSION_MAJOR          :" ${QT_VERSION_MAJOR})
--- a/cmake/developer_options.cmake
+++ b/cmake/developer_options.cmake
@@ -0,0 +1,35 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - developer_options")
+
+# warn on *any* usage of deprecated APIs
+add_definitions(-DQT_DEPRECATED_WARNINGS)
+
+# You can make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# disables all the APIs deprecated before Qt 6.0.0
+#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+
+# to enable function names and line numbers even for release builds
+add_definitions(-DQT_MESSAGELOGCONTEXT)
+
+# You can make your code warn on compile time for the TODO's
+# In order to do so, uncomment the following line.
+#add_definitions(-DTODO_LIST)
+
+# Build with KF5
+option(BUILD_WITH_KF5 "Build with KF5" ON)
--- a/cmake/fetch_kdeaddons.cmake
+++ b/cmake/fetch_kdeaddons.cmake
@@ -0,0 +1,67 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - fetch_kdeaddons")
+
+if(DEFINED BUILD_WITH_KF5)
+  Include(FetchContent)
+
+  set(BUILD_KF5_YES "YES")
+
+  if(DEFINED BUILD_KF5_YES)
+
+    if(NOT DEFINED KF5_GIT_TAG)
+      #https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
+      set(KF5_GIT_TAG v5.77.0)
+    endif()
+
+    # Fix stop the run autotests of kcoreaddons
+    # see
+    # https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98
+    # issue:
+    # CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
+    # Cannot find source file:
+    # see
+    # https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
+    set(KDE_SKIP_TEST_SETTINGS "TRUE")
+    set(BUILD_TESTING "0")
+    FetchContent_Declare(
+      ecm
+      GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
+      GIT_TAG        ${KF5_GIT_TAG})
+    FetchContent_MakeAvailable(ecm)
+
+    FetchContent_Declare(
+      kcoreaddons
+      GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
+      GIT_TAG        ${KF5_GIT_TAG})
+    FetchContent_MakeAvailable(kcoreaddons)
+
+    FetchContent_Declare(
+      kwidgetsaddons
+      GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
+      GIT_TAG        ${KF5_GIT_TAG})
+    FetchContent_MakeAvailable(kwidgetsaddons)
+  else()
+    find_package(KF5CoreAddons REQUIRED)
+    find_package(KF5WidgetsAddons REQUIRED)
+  endif()
+
+  set(KF5_PRIVATE_LIBRARIES
+    KF5::WidgetsAddons
+    KF5::CoreAddons
+    )
+endif()
--- a/cmake/fetch_pugixml.cmake
+++ b/cmake/fetch_pugixml.cmake
@@ -0,0 +1,26 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - fetch_pugixml")
+
+Include(FetchContent)
+
+FetchContent_Declare(
+  pugixml
+  GIT_REPOSITORY https://github.com/zeux/pugixml.git
+  GIT_TAG        v1.11.1)
+
+FetchContent_MakeAvailable(pugixml)
--- a/cmake/fetch_singleapplication.cmake
+++ b/cmake/fetch_singleapplication.cmake
@@ -0,0 +1,31 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - fetch_singleapplication")
+
+# https://github.com/itay-grudev/SingleApplication/issues/18
+#qmake
+#DEFINES += QAPPLICATION_CLASS=QGuiApplication
+set(QAPPLICATION_CLASS QApplication)
+
+Include(FetchContent)
+
+FetchContent_Declare(
+  SingleApplication
+  GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
+  GIT_TAG        v3.1.5)
+
+FetchContent_MakeAvailable(SingleApplication)
--- a/cmake/git_last_commit_sha.cmake
+++ b/cmake/git_last_commit_sha.cmake
@@ -0,0 +1,41 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - git_last_commit_sha")
+
+find_package(Git QUIET)
+
+if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+  #get GIT COMMIT SHA
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} -C ${QET_DIR} rev-parse --verify HEAD
+    OUTPUT_VARIABLE  GIT_COMMIT_SHA
+    RESULT_VARIABLE GIT_COMMIT_RESULT)
+
+  # This strips terminating newline in the variable
+  string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}")
+
+  # This adds to definitions => .cpp
+  add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")
+
+  if(NOT GIT_COMMIT_RESULT EQUAL "0")
+    message(
+      FATAL_ERROR
+      "git rev-parse --verify HEAD failed with "
+      ${GIT_COMMIT_RESULT}
+      ", please check")
+  endif()
+endif()
--- a/cmake/git_update_submodules.cmake
+++ b/cmake/git_update_submodules.cmake
@@ -0,0 +1,35 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - git_update_submodules")
+
+find_package(Git QUIET)
+
+if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+  # updates all git submodules
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+
+  if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+    message(
+      FATAL_ERROR
+      "git submodule update --init failed with "
+      ${GIT_SUBMOD_RESULT}
+      ", please checkout submodules")
+  endif()
+endif()
--- a/cmake/hoto_update_cmake_message.cmake
+++ b/cmake/hoto_update_cmake_message.cmake
@@ -0,0 +1,25 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+if(${CMAKE_VERSION} VERSION_LESS 3.14)
+  message(
+    "_____________________________________________________________________")
+  message("to update Cmake on linux:")
+  message("https://github.com/Kitware/CMake/")
+  message("linux => cmake-3.19.1-Linux-x86_64.sh")
+  message("         sudo ./cmake.sh --prefix=/usr/local/ --exclude-subdir")
+  message("windows good luck :)")
+endif()
--- a/cmake/paths_compilation_installation.cmake
+++ b/cmake/paths_compilation_installation.cmake
@@ -0,0 +1,69 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+# Paths used for compilation and installation of QET
+
+message(" - paths_compilation_installation")
+
+if(UNIX AND NOT APPLE)
+  # for Linux, BSD, Solaris, Minix
+  set(COMPIL_PREFIX               "/usr/local/")
+  set(INSTALL_PREFIX              "/usr/local/")
+  set(QET_BINARY_PATH             "bin/")
+  set(QET_COMMON_COLLECTION_PATH  "share/qelectrotech/elements/")
+  set(QET_COMMON_TBT_PATH         "share/qelectrotech/titleblocks/")
+  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/")
+  set(QET_MAN_PATH                "man/")
+  set(QET_APPDATA_PATH            "share/appdata")
+endif()
+
+if(APPLE)
+  # for MacOS X or iOS, watchOS, tvOS (since 3.10.3)
+  set(COMPIL_PREFIX               "./")
+  set(INSTALL_PREFIX              "/usr/local/")
+  set(QET_BINARY_PATH             "bin/")
+  set(QET_COMMON_COLLECTION_PATH  "../Resources/elements/")
+  set(QET_COMMON_TBT_PATH         "../Resources/titleblocks/")
+  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/")
+  set(ICON                        "ico/mac_icon/qelectrotech.icns")
+endif()
+
+if(WIN32)
+  # for Windows operating system in general
+  set(COMPIL_PREFIX               "./")
+  set(INSTALL_PREFIX              "./")
+  set(QET_BINARY_PATH             "./")
+  set(QET_COMMON_COLLECTION_PATH  "elements/")
+  set(QET_COMMON_TBT_PATH         "titleblocks/")
+  set(QET_LANG_PATH               "l10n/")
+  set(QET_LICENSE_PATH            "./")
+  # Liste des ressources Windows
+#RC_FILE = qelectrotech.rc
+endif()
--- a/cmake/qet_compilation_vars.cmake
+++ b/cmake/qet_compilation_vars.cmake
@@ -0,0 +1,639 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - qet_compilation_vars")
+
+set(QET_COMPONENTS
+  LinguistTools
+  PrintSupport
+  Xml
+  Svg
+  Sql
+  Network
+  Widgets
+  Concurrent)
+
+set(QET_PRIVATE_LIBRARIES
+  Qt::PrintSupport
+  Qt::Gui
+  Qt::Xml
+  Qt::Svg
+  Qt::Sql
+  Qt::Network
+  Qt::Widgets
+  Qt::Concurrent
+  )
+
+set(QET_RES_FILES
+  ${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.ui
+  ${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.ui
+  ${QET_DIR}/sources/autoNum/ui/folioautonumbering.ui
+  ${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.ui
+  ${QET_DIR}/sources/autoNum/ui/numparteditorw.ui
+  ${QET_DIR}/sources/autoNum/ui/selectautonumw.ui
+  ${QET_DIR}/sources/dataBase/ui/elementquerywidget.ui
+  ${QET_DIR}/sources/dataBase/ui/summaryquerywidget.ui
+  ${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.ui
+  ${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.ui
+  ${QET_DIR}/sources/editor/ui/ellipseeditor.ui
+  ${QET_DIR}/sources/editor/ui/lineeditor.ui
+  ${QET_DIR}/sources/editor/ui/polygoneditor.ui
+  ${QET_DIR}/sources/editor/ui/rectangleeditor.ui
+  ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.ui
+  ${QET_DIR}/sources/factory/ui/addtabledialog.ui
+  ${QET_DIR}/sources/NameList/ui/namelistdialog.ui
+  ${QET_DIR}/sources/NameList/ui/namelistwidget.ui
+  ${QET_DIR}/sources/print/projectprintwindow.ui
+  ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.ui
+  ${QET_DIR}/sources/richtext/addlinkdialog.ui
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.ui
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.ui
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.ui
+  ${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.ui
+  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.ui
+  ${QET_DIR}/sources/ui/aboutqetdialog.ui
+  ${QET_DIR}/sources/ui/alignmenttextdialog.ui
+  ${QET_DIR}/sources/ui/bomexportdialog.ui
+  ${QET_DIR}/sources/ui/borderpropertieswidget.ui
+  ${QET_DIR}/sources/ui/compositetexteditdialog.ui
+  ${QET_DIR}/sources/ui/conductorpropertiesdialog.ui
+  ${QET_DIR}/sources/ui/conductorpropertieswidget.ui
+  ${QET_DIR}/sources/ui/configsaveloaderwidget.ui
+  ${QET_DIR}/sources/ui/diagramcontextwidget.ui
+  ${QET_DIR}/sources/ui/diagramselection.ui
+  ${QET_DIR}/sources/ui/dialogwaiting.ui
+  ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.ui
+  ${QET_DIR}/sources/ui/elementinfopartwidget.ui
+  ${QET_DIR}/sources/ui/elementinfowidget.ui
+  ${QET_DIR}/sources/ui/formulaassistantdialog.ui
+  ${QET_DIR}/sources/ui/imagepropertieswidget.ui
+  ${QET_DIR}/sources/ui/importelementdialog.ui
+  ${QET_DIR}/sources/ui/importelementtextpatterndialog.ui
+  ${QET_DIR}/sources/ui/linksingleelementwidget.ui
+  ${QET_DIR}/sources/ui/marginseditdialog.ui
+  ${QET_DIR}/sources/ui/masterpropertieswidget.ui
+  ${QET_DIR}/sources/ui/multipastedialog.ui
+  ${QET_DIR}/sources/ui/potentialselectordialog.ui
+  ${QET_DIR}/sources/ui/reportpropertiewidget.ui
+  ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.ui
+  ${QET_DIR}/sources/ui/titleblockpropertieswidget.ui
+  ${QET_DIR}/sources/ui/xrefpropertieswidget.ui
+  ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.ui
+  )
+set(QET_SRC_FILES
+  ${QET_DIR}/sources/borderproperties.cpp
+  ${QET_DIR}/sources/borderproperties.h
+  ${QET_DIR}/sources/bordertitleblock.cpp
+  ${QET_DIR}/sources/bordertitleblock.h
+  ${QET_DIR}/sources/conductorautonumerotation.cpp
+  ${QET_DIR}/sources/conductorautonumerotation.h
+  ${QET_DIR}/sources/conductornumexport.cpp
+  ${QET_DIR}/sources/conductornumexport.h
+  ${QET_DIR}/sources/conductorprofile.cpp
+  ${QET_DIR}/sources/conductorprofile.h
+  ${QET_DIR}/sources/conductorproperties.cpp
+  ${QET_DIR}/sources/conductorproperties.h
+  ${QET_DIR}/sources/conductorsegment.cpp
+  ${QET_DIR}/sources/conductorsegment.h
+  ${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
+  ${QET_DIR}/sources/diagramcommands.h
+  ${QET_DIR}/sources/diagramcontent.cpp
+  ${QET_DIR}/sources/diagramcontent.h
+  ${QET_DIR}/sources/diagramcontext.cpp
+  ${QET_DIR}/sources/diagramcontext.h
+  ${QET_DIR}/sources/diagram.cpp
+  ${QET_DIR}/sources/diagram.h
+  ${QET_DIR}/sources/diagramposition.cpp
+  ${QET_DIR}/sources/diagramposition.h
+  ${QET_DIR}/sources/diagramview.cpp
+  ${QET_DIR}/sources/diagramview.h
+  ${QET_DIR}/sources/elementdialog.cpp
+  ${QET_DIR}/sources/elementdialog.h
+  ${QET_DIR}/sources/elementprovider.cpp
+  ${QET_DIR}/sources/elementprovider.h
+  ${QET_DIR}/sources/elementscategoryeditor.cpp
+  ${QET_DIR}/sources/elementscategoryeditor.h
+  ${QET_DIR}/sources/elementscollectioncache.cpp
+  ${QET_DIR}/sources/elementscollectioncache.h
+  ${QET_DIR}/sources/elementsmover.cpp
+  ${QET_DIR}/sources/elementsmover.h
+  ${QET_DIR}/sources/elementspanel.cpp
+  ${QET_DIR}/sources/elementspanel.h
+  ${QET_DIR}/sources/elementspanelwidget.cpp
+  ${QET_DIR}/sources/elementspanelwidget.h
+  ${QET_DIR}/sources/elementtextpattern.cpp
+  ${QET_DIR}/sources/elementtextpattern.h
+  ${QET_DIR}/sources/elementtextsmover.cpp
+  ${QET_DIR}/sources/elementtextsmover.h
+  ${QET_DIR}/sources/exportdialog.cpp
+  ${QET_DIR}/sources/exportdialog.h
+  ${QET_DIR}/sources/exportproperties.cpp
+  ${QET_DIR}/sources/exportproperties.h
+  ${QET_DIR}/sources/exportpropertieswidget.cpp
+  ${QET_DIR}/sources/exportpropertieswidget.h
+  ${QET_DIR}/sources/genericpanel.cpp
+  ${QET_DIR}/sources/genericpanel.h
+  ${QET_DIR}/sources/machine_info.cpp
+  ${QET_DIR}/sources/machine_info.h
+  ${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
+  ${QET_DIR}/sources/qetapp.h
+  ${QET_DIR}/sources/qetarguments.cpp
+  ${QET_DIR}/sources/qetarguments.h
+  ${QET_DIR}/sources/qet.cpp
+  ${QET_DIR}/sources/qetdiagrameditor.cpp
+  ${QET_DIR}/sources/qetdiagrameditor.h
+  ${QET_DIR}/sources/qet.h
+  ${QET_DIR}/sources/qeticons.cpp
+  ${QET_DIR}/sources/qeticons.h
+  ${QET_DIR}/sources/qetinformation.cpp
+  ${QET_DIR}/sources/qetinformation.h
+  ${QET_DIR}/sources/qetmainwindow.cpp
+  ${QET_DIR}/sources/qetmainwindow.h
+  ${QET_DIR}/sources/qetmessagebox.cpp
+  ${QET_DIR}/sources/qetmessagebox.h
+  ${QET_DIR}/sources/qetproject.cpp
+  ${QET_DIR}/sources/qetproject.h
+  ${QET_DIR}/sources/qetregexpvalidator.cpp
+  ${QET_DIR}/sources/qetregexpvalidator.h
+  ${QET_DIR}/sources/qetresult.cpp
+  ${QET_DIR}/sources/qetresult.h
+  ${QET_DIR}/sources/qetxml.cpp
+  ${QET_DIR}/sources/qetxml.h
+  ${QET_DIR}/sources/qfilenameedit.cpp
+  ${QET_DIR}/sources/qfilenameedit.h
+  ${QET_DIR}/sources/qgimanager.cpp
+  ${QET_DIR}/sources/qgimanager.h
+  ${QET_DIR}/sources/qtextorientationspinboxwidget.cpp
+  ${QET_DIR}/sources/qtextorientationspinboxwidget.h
+  ${QET_DIR}/sources/qtextorientationwidget.cpp
+  ${QET_DIR}/sources/qtextorientationwidget.h
+  ${QET_DIR}/sources/recentfiles.cpp
+  ${QET_DIR}/sources/recentfiles.h
+  ${QET_DIR}/sources/titleblockcell.cpp
+  ${QET_DIR}/sources/titleblockcell.h
+  ${QET_DIR}/sources/titleblockproperties.cpp
+  ${QET_DIR}/sources/titleblockproperties.h
+  ${QET_DIR}/sources/titleblocktemplate.cpp
+  ${QET_DIR}/sources/titleblocktemplate.h
+  ${QET_DIR}/sources/titleblocktemplaterenderer.cpp
+  ${QET_DIR}/sources/titleblocktemplaterenderer.h
+
+  ${QET_DIR}/sources/autoNum/assignvariables.cpp
+  ${QET_DIR}/sources/autoNum/assignvariables.h
+  ${QET_DIR}/sources/autoNum/numerotationcontextcommands.cpp
+  ${QET_DIR}/sources/autoNum/numerotationcontextcommands.h
+  ${QET_DIR}/sources/autoNum/numerotationcontext.cpp
+  ${QET_DIR}/sources/autoNum/numerotationcontext.h
+  ${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.cpp
+  ${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.h
+  ${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.cpp
+  ${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.h
+  ${QET_DIR}/sources/autoNum/ui/folioautonumbering.cpp
+  ${QET_DIR}/sources/autoNum/ui/folioautonumbering.h
+  ${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.cpp
+  ${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.h
+  ${QET_DIR}/sources/autoNum/ui/numparteditorw.cpp
+  ${QET_DIR}/sources/autoNum/ui/numparteditorw.h
+  ${QET_DIR}/sources/autoNum/ui/selectautonumw.cpp
+  ${QET_DIR}/sources/autoNum/ui/selectautonumw.h
+
+  ${QET_DIR}/sources/dataBase/projectdatabase.cpp
+  ${QET_DIR}/sources/dataBase/projectdatabase.h
+
+  ${QET_DIR}/sources/dataBase/ui/elementquerywidget.cpp
+  ${QET_DIR}/sources/dataBase/ui/elementquerywidget.h
+  ${QET_DIR}/sources/dataBase/ui/summaryquerywidget.cpp
+  ${QET_DIR}/sources/dataBase/ui/summaryquerywidget.h
+
+  ${QET_DIR}/sources/diagramevent/diagrameventaddelement.cpp
+  ${QET_DIR}/sources/diagramevent/diagrameventaddelement.h
+  ${QET_DIR}/sources/diagramevent/diagrameventaddimage.cpp
+  ${QET_DIR}/sources/diagramevent/diagrameventaddimage.h
+  ${QET_DIR}/sources/diagramevent/diagrameventaddshape.cpp
+  ${QET_DIR}/sources/diagramevent/diagrameventaddshape.h
+  ${QET_DIR}/sources/diagramevent/diagrameventaddtext.cpp
+  ${QET_DIR}/sources/diagramevent/diagrameventaddtext.h
+  ${QET_DIR}/sources/diagramevent/diagrameventinterface.cpp
+  ${QET_DIR}/sources/diagramevent/diagrameventinterface.h
+
+  ${QET_DIR}/sources/dvevent/dveventinterface.cpp
+  ${QET_DIR}/sources/dvevent/dveventinterface.h
+
+  ${QET_DIR}/sources/editor/arceditor.cpp
+  ${QET_DIR}/sources/editor/arceditor.h
+  ${QET_DIR}/sources/editor/editorcommands.cpp
+  ${QET_DIR}/sources/editor/editorcommands.h
+  ${QET_DIR}/sources/editor/elementcontent.h
+  ${QET_DIR}/sources/editor/elementitemeditor.cpp
+  ${QET_DIR}/sources/editor/elementitemeditor.h
+  ${QET_DIR}/sources/editor/elementprimitivedecorator.cpp
+  ${QET_DIR}/sources/editor/elementprimitivedecorator.h
+  ${QET_DIR}/sources/editor/elementscene.cpp
+  ${QET_DIR}/sources/editor/elementscene.h
+  ${QET_DIR}/sources/editor/elementview.cpp
+  ${QET_DIR}/sources/editor/elementview.h
+  ${QET_DIR}/sources/editor/qetelementeditor.cpp
+  ${QET_DIR}/sources/editor/qetelementeditor.h
+  ${QET_DIR}/sources/editor/styleeditor.cpp
+  ${QET_DIR}/sources/editor/styleeditor.h
+  ${QET_DIR}/sources/editor/terminaleditor.cpp
+  ${QET_DIR}/sources/editor/terminaleditor.h
+
+  ${QET_DIR}/sources/editor/esevent/eseventaddarc.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventaddarc.h
+  ${QET_DIR}/sources/editor/esevent/eseventadddynamictextfield.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventadddynamictextfield.h
+  ${QET_DIR}/sources/editor/esevent/eseventaddellipse.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventaddellipse.h
+  ${QET_DIR}/sources/editor/esevent/eseventaddline.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventaddline.h
+  ${QET_DIR}/sources/editor/esevent/eseventaddpolygon.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventaddpolygon.h
+  ${QET_DIR}/sources/editor/esevent/eseventaddrect.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventaddrect.h
+  ${QET_DIR}/sources/editor/esevent/eseventaddterminal.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventaddterminal.h
+  ${QET_DIR}/sources/editor/esevent/eseventaddtext.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventaddtext.h
+  ${QET_DIR}/sources/editor/esevent/eseventinterface.cpp
+  ${QET_DIR}/sources/editor/esevent/eseventinterface.h
+
+  ${QET_DIR}/sources/editor/graphicspart/abstractpartellipse.cpp
+  ${QET_DIR}/sources/editor/graphicspart/abstractpartellipse.h
+  ${QET_DIR}/sources/editor/graphicspart/customelementgraphicpart.cpp
+  ${QET_DIR}/sources/editor/graphicspart/customelementgraphicpart.h
+  ${QET_DIR}/sources/editor/graphicspart/customelementpart.cpp
+  ${QET_DIR}/sources/editor/graphicspart/customelementpart.h
+  ${QET_DIR}/sources/editor/graphicspart/partarc.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partarc.h
+  ${QET_DIR}/sources/editor/graphicspart/partdynamictextfield.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partdynamictextfield.h
+  ${QET_DIR}/sources/editor/graphicspart/partellipse.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partellipse.h
+  ${QET_DIR}/sources/editor/graphicspart/partline.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partline.h
+  ${QET_DIR}/sources/editor/graphicspart/partpolygon.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partpolygon.h
+  ${QET_DIR}/sources/editor/graphicspart/partrectangle.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partrectangle.h
+  ${QET_DIR}/sources/editor/graphicspart/partterminal.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partterminal.h
+  ${QET_DIR}/sources/editor/graphicspart/parttext.cpp
+  ${QET_DIR}/sources/editor/graphicspart/parttext.h
+  ${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.cpp
+  ${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.h
+  ${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.cpp
+  ${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.h
+  ${QET_DIR}/sources/editor/ui/ellipseeditor.cpp
+  ${QET_DIR}/sources/editor/ui/ellipseeditor.h
+  ${QET_DIR}/sources/editor/ui/lineeditor.cpp
+  ${QET_DIR}/sources/editor/ui/lineeditor.h
+  ${QET_DIR}/sources/editor/ui/polygoneditor.cpp
+  ${QET_DIR}/sources/editor/ui/polygoneditor.h
+  ${QET_DIR}/sources/editor/ui/rectangleeditor.cpp
+  ${QET_DIR}/sources/editor/ui/rectangleeditor.h
+  ${QET_DIR}/sources/editor/ui/texteditor.cpp
+  ${QET_DIR}/sources/editor/ui/texteditor.h
+
+  ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.cpp
+  ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.h
+
+  ${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.cpp
+  ${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.h
+  ${QET_DIR}/sources/ElementsCollection/elementcollectionitem.cpp
+  ${QET_DIR}/sources/ElementsCollection/elementcollectionitem.h
+  ${QET_DIR}/sources/ElementsCollection/elementscollectionmodel.cpp
+  ${QET_DIR}/sources/ElementsCollection/elementscollectionmodel.h
+  ${QET_DIR}/sources/ElementsCollection/elementscollectionwidget.cpp
+  ${QET_DIR}/sources/ElementsCollection/elementscollectionwidget.h
+  ${QET_DIR}/sources/ElementsCollection/elementslocation.cpp
+  ${QET_DIR}/sources/ElementsCollection/elementslocation.h
+  ${QET_DIR}/sources/ElementsCollection/elementstreeview.cpp
+  ${QET_DIR}/sources/ElementsCollection/elementstreeview.h
+  ${QET_DIR}/sources/ElementsCollection/fileelementcollectionitem.cpp
+  ${QET_DIR}/sources/ElementsCollection/fileelementcollectionitem.h
+  ${QET_DIR}/sources/ElementsCollection/xmlelementcollection.cpp
+  ${QET_DIR}/sources/ElementsCollection/xmlelementcollection.h
+  ${QET_DIR}/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp
+  ${QET_DIR}/sources/ElementsCollection/xmlprojectelementcollectionitem.h
+
+  ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.cpp
+  ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.h
+
+  ${QET_DIR}/sources/factory/elementfactory.cpp
+  ${QET_DIR}/sources/factory/elementfactory.h
+  ${QET_DIR}/sources/factory/elementpicturefactory.cpp
+  ${QET_DIR}/sources/factory/elementpicturefactory.h
+  ${QET_DIR}/sources/factory/propertieseditorfactory.cpp
+  ${QET_DIR}/sources/factory/propertieseditorfactory.h
+  ${QET_DIR}/sources/factory/qetgraphicstablefactory.cpp
+  ${QET_DIR}/sources/factory/qetgraphicstablefactory.h
+
+  ${QET_DIR}/sources/factory/ui/addtabledialog.cpp
+  ${QET_DIR}/sources/factory/ui/addtabledialog.h
+
+  ${QET_DIR}/sources/NameList/nameslist.cpp
+  ${QET_DIR}/sources/NameList/nameslist.h
+
+  ${QET_DIR}/sources/NameList/ui/namelistdialog.cpp
+  ${QET_DIR}/sources/NameList/ui/namelistdialog.h
+  ${QET_DIR}/sources/NameList/ui/namelistwidget.cpp
+  ${QET_DIR}/sources/NameList/ui/namelistwidget.h
+
+  ${QET_DIR}/sources/print/projectprintwindow.cpp
+  ${QET_DIR}/sources/print/projectprintwindow.h
+
+  ${QET_DIR}/sources/properties/propertiesinterface.cpp
+  ${QET_DIR}/sources/properties/propertiesinterface.h
+  ${QET_DIR}/sources/properties/reportproperties.cpp
+  ${QET_DIR}/sources/properties/reportproperties.h
+  ${QET_DIR}/sources/properties/terminaldata.cpp
+  ${QET_DIR}/sources/properties/terminaldata.h
+  ${QET_DIR}/sources/properties/xrefproperties.cpp
+  ${QET_DIR}/sources/properties/xrefproperties.h
+
+  ${QET_DIR}/sources/PropertiesEditor/propertieseditordialog.h
+  ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.cpp
+  ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.h
+  ${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}/sources/qetgraphicsitem/conductor.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/conductor.h
+  ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/crossrefitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/crossrefitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/diagramimageitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/diagramimageitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/diagramtextitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/diagramtextitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/dynamicelementtextitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/dynamicelementtextitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/element.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/element.h
+  ${QET_DIR}/sources/qetgraphicsitem/elementtextitemgroup.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/elementtextitemgroup.h
+  ${QET_DIR}/sources/qetgraphicsitem/independenttextitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/independenttextitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/masterelement.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/masterelement.h
+  ${QET_DIR}/sources/qetgraphicsitem/qetgraphicsitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/qetgraphicsitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/qetshapeitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/qetshapeitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/qgraphicsitemutility.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/qgraphicsitemutility.h
+  ${QET_DIR}/sources/qetgraphicsitem/reportelement.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/reportelement.h
+  ${QET_DIR}/sources/qetgraphicsitem/simpleelement.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/simpleelement.h
+  ${QET_DIR}/sources/qetgraphicsitem/slaveelement.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/slaveelement.h
+  ${QET_DIR}/sources/qetgraphicsitem/terminal.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/terminalelement.cpp
+  ${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
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h
+
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h
+
+  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandleritem.cpp
+  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
+  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp
+  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h
+
+  ${QET_DIR}/sources/QPropertyUndoCommand/qpropertyundocommand.cpp
+  ${QET_DIR}/sources/QPropertyUndoCommand/qpropertyundocommand.h
+
+  ${QET_DIR}/sources/QWidgetAnimation/qwidgetanimation.cpp
+  ${QET_DIR}/sources/QWidgetAnimation/qwidgetanimation.h
+
+  ${QET_DIR}/sources/richtext/richtexteditor.cpp
+  ${QET_DIR}/sources/richtext/richtexteditor_p.h
+  ${QET_DIR}/sources/richtext/ui_addlinkdialog.h
+
+  ${QET_DIR}/sources/SearchAndReplace/searchandreplaceworker.cpp
+  ${QET_DIR}/sources/SearchAndReplace/searchandreplaceworker.h
+
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.h
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.cpp
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.h
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.cpp
+  ${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.h
+  ${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.cpp
+  ${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.h
+  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
+  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.h
+
+  ${QET_DIR}/sources/titleblock/dimension.cpp
+  ${QET_DIR}/sources/titleblock/dimension.h
+  ${QET_DIR}/sources/titleblock/dimensionwidget.cpp
+  ${QET_DIR}/sources/titleblock/dimensionwidget.h
+  ${QET_DIR}/sources/titleblock/gridlayoutanimation.cpp
+  ${QET_DIR}/sources/titleblock/gridlayoutanimation.h
+  ${QET_DIR}/sources/titleblock/helpercell.cpp
+  ${QET_DIR}/sources/titleblock/helpercell.h
+  ${QET_DIR}/sources/titleblock/integrationmovetemplateshandler.cpp
+  ${QET_DIR}/sources/titleblock/integrationmovetemplateshandler.h
+  ${QET_DIR}/sources/titleblock/movetemplateshandler.h
+  ${QET_DIR}/sources/titleblock/qettemplateeditor.cpp
+  ${QET_DIR}/sources/titleblock/qettemplateeditor.h
+  ${QET_DIR}/sources/titleblock/splittedhelpercell.cpp
+  ${QET_DIR}/sources/titleblock/splittedhelpercell.h
+  ${QET_DIR}/sources/titleblock/templatecellsset.cpp
+  ${QET_DIR}/sources/titleblock/templatecellsset.h
+  ${QET_DIR}/sources/titleblock/templatecellwidget.cpp
+  ${QET_DIR}/sources/titleblock/templatecellwidget.h
+  ${QET_DIR}/sources/titleblock/templatecommands.cpp
+  ${QET_DIR}/sources/titleblock/templatecommands.h
+  ${QET_DIR}/sources/titleblock/templatedeleter.cpp
+  ${QET_DIR}/sources/titleblock/templatedeleter.h
+  ${QET_DIR}/sources/titleblock/templatelocationchooser.cpp
+  ${QET_DIR}/sources/titleblock/templatelocationchooser.h
+  ${QET_DIR}/sources/titleblock/templatelocation.cpp
+  ${QET_DIR}/sources/titleblock/templatelocation.h
+  ${QET_DIR}/sources/titleblock/templatelocationsaver.cpp
+  ${QET_DIR}/sources/titleblock/templatelocationsaver.h
+  ${QET_DIR}/sources/titleblock/templatelogomanager.cpp
+  ${QET_DIR}/sources/titleblock/templatelogomanager.h
+  ${QET_DIR}/sources/titleblock/templatescollection.cpp
+  ${QET_DIR}/sources/titleblock/templatescollection.h
+  ${QET_DIR}/sources/titleblock/templateview.cpp
+  ${QET_DIR}/sources/titleblock/templateview.h
+  ${QET_DIR}/sources/titleblock/templatevisualcell.cpp
+  ${QET_DIR}/sources/titleblock/templatevisualcell.h
+
+  ${QET_DIR}/sources/ui/aboutqetdialog.cpp
+  ${QET_DIR}/sources/ui/aboutqetdialog.h
+  ${QET_DIR}/sources/ui/abstractelementpropertieseditorwidget.cpp
+  ${QET_DIR}/sources/ui/abstractelementpropertieseditorwidget.h
+  ${QET_DIR}/sources/ui/alignmenttextdialog.cpp
+  ${QET_DIR}/sources/ui/alignmenttextdialog.h
+  ${QET_DIR}/sources/ui/bomexportdialog.cpp
+  ${QET_DIR}/sources/ui/bomexportdialog.h
+  ${QET_DIR}/sources/ui/borderpropertieswidget.cpp
+  ${QET_DIR}/sources/ui/borderpropertieswidget.h
+  ${QET_DIR}/sources/ui/compositetexteditdialog.cpp
+  ${QET_DIR}/sources/ui/compositetexteditdialog.h
+  ${QET_DIR}/sources/ui/conductorpropertiesdialog.cpp
+  ${QET_DIR}/sources/ui/conductorpropertiesdialog.h
+  ${QET_DIR}/sources/ui/conductorpropertieswidget.cpp
+  ${QET_DIR}/sources/ui/conductorpropertieswidget.h
+  ${QET_DIR}/sources/ui/configsaveloaderwidget.cpp
+  ${QET_DIR}/sources/ui/configsaveloaderwidget.h
+  ${QET_DIR}/sources/ui/diagramcontextwidget.cpp
+  ${QET_DIR}/sources/ui/diagramcontextwidget.h
+  ${QET_DIR}/sources/ui/diagrampropertiesdialog.cpp
+  ${QET_DIR}/sources/ui/diagrampropertiesdialog.h
+  ${QET_DIR}/sources/ui/diagrampropertieseditordockwidget.cpp
+  ${QET_DIR}/sources/ui/diagrampropertieseditordockwidget.h
+  ${QET_DIR}/sources/ui/diagramselection.cpp
+  ${QET_DIR}/sources/ui/diagramselection.h
+  ${QET_DIR}/sources/ui/dialogwaiting.cpp
+  ${QET_DIR}/sources/ui/dialogwaiting.h
+  ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.cpp
+  ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.h
+  ${QET_DIR}/sources/ui/dynamicelementtextmodel.cpp
+  ${QET_DIR}/sources/ui/dynamicelementtextmodel.h
+  ${QET_DIR}/sources/ui/elementinfopartwidget.cpp
+  ${QET_DIR}/sources/ui/elementinfopartwidget.h
+  ${QET_DIR}/sources/ui/elementinfowidget.cpp
+  ${QET_DIR}/sources/ui/elementinfowidget.h
+  ${QET_DIR}/sources/ui/elementpropertieswidget.cpp
+  ${QET_DIR}/sources/ui/elementpropertieswidget.h
+  ${QET_DIR}/sources/ui/formulaassistantdialog.cpp
+  ${QET_DIR}/sources/ui/formulaassistantdialog.h
+  ${QET_DIR}/sources/ui/imagepropertieswidget.cpp
+  ${QET_DIR}/sources/ui/imagepropertieswidget.h
+  ${QET_DIR}/sources/ui/importelementdialog.cpp
+  ${QET_DIR}/sources/ui/importelementdialog.h
+  ${QET_DIR}/sources/ui/importelementtextpatterndialog.cpp
+  ${QET_DIR}/sources/ui/importelementtextpatterndialog.h
+  ${QET_DIR}/sources/ui/inditextpropertieswidget.cpp
+  ${QET_DIR}/sources/ui/inditextpropertieswidget.h
+  ${QET_DIR}/sources/ui/linksingleelementwidget.cpp
+  ${QET_DIR}/sources/ui/linksingleelementwidget.h
+  ${QET_DIR}/sources/ui/marginseditdialog.cpp
+  ${QET_DIR}/sources/ui/marginseditdialog.h
+  ${QET_DIR}/sources/ui/masterpropertieswidget.cpp
+  ${QET_DIR}/sources/ui/masterpropertieswidget.h
+  ${QET_DIR}/sources/ui/multipastedialog.cpp
+  ${QET_DIR}/sources/ui/multipastedialog.h
+  ${QET_DIR}/sources/ui/potentialselectordialog.cpp
+  ${QET_DIR}/sources/ui/potentialselectordialog.h
+  ${QET_DIR}/sources/ui/projectpropertiesdialog.cpp
+  ${QET_DIR}/sources/ui/projectpropertiesdialog.h
+  ${QET_DIR}/sources/ui/reportpropertiewidget.cpp
+  ${QET_DIR}/sources/ui/reportpropertiewidget.h
+  ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.cpp
+  ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.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/generalconfigurationpage.cpp
+
+  ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.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/changeelementinformationcommand.cpp
+  ${QET_DIR}/sources/undocommand/changeelementinformationcommand.h
+  ${QET_DIR}/sources/undocommand/changetitleblockcommand.cpp
+  ${QET_DIR}/sources/undocommand/changetitleblockcommand.h
+  ${QET_DIR}/sources/undocommand/deleteqgraphicsitemcommand.cpp
+  ${QET_DIR}/sources/undocommand/deleteqgraphicsitemcommand.h
+  ${QET_DIR}/sources/undocommand/itemmodelcommand.cpp
+  ${QET_DIR}/sources/undocommand/itemmodelcommand.h
+  ${QET_DIR}/sources/undocommand/linkelementcommand.cpp
+  ${QET_DIR}/sources/undocommand/linkelementcommand.h
+  ${QET_DIR}/sources/undocommand/rotateselectioncommand.cpp
+  ${QET_DIR}/sources/undocommand/rotateselectioncommand.h
+  ${QET_DIR}/sources/undocommand/rotatetextscommand.cpp
+  ${QET_DIR}/sources/undocommand/rotatetextscommand.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/qetutils.cpp
+  ${QET_DIR}/sources/utils/qetutils.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_cs.ts
+  ${QET_DIR}/lang/qet_el.ts
+  ${QET_DIR}/lang/qet_hr.ts
+  ${QET_DIR}/lang/qet_ja.ts
+  ${QET_DIR}/lang/qet_nb.ts
+  ${QET_DIR}/lang/qet_no.ts
+  ${QET_DIR}/lang/qet_pt.ts
+  ${QET_DIR}/lang/qet_sl.ts
+  ${QET_DIR}/lang/qet_tr.ts
+  )
--- a/cmake/start_options.cmake
+++ b/cmake/start_options.cmake
@@ -0,0 +1,29 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+message(" - start_options")
+
+# Comment the line below to deactivate the --common-elements-dir option
+add_definitions(-DQET_ALLOW_OVERRIDE_CED_OPTION)
+
+# Comment the line below to disable the --common-tbt-dir option
+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 disable the project database export
+#add_definitions(-DQET_EXPORT_PROJECT_DB) #error Todo
--- a/dev_doc/ID_of_QUndoCommand.txt
+++ b/dev_doc/ID_of_QUndoCommand.txt
@@ -3,4 +3,5 @@ LinkElementCommand = 2
 ItemResizerCommand = 3
 ChangeShapeStyleCommand = 4
 QetShapeGeometryCommand = 5
+AlignmentTextsGroupCommand = 6
 QPropertyUndoCommand = 10 000
--- a/dev_doc/enum_type_of_QGraphicsItem
+++ b/dev_doc/enum_type_of_QGraphicsItem
@@ -10,6 +10,7 @@ ConductorTextItem + 1006
 DiagramImageItem    + 1007
 QetShapItem         + 1008
 crossRefItem        + 1009
+DynamiqueElementTextItem  + 1010
 ElementPrimitiveDecorator + 2200

 ###ELEMENT EDITOR###
@@ -21,3 +22,11 @@ part terminal   + 1106
 part text       + 1107
 part text field + 1108
 part rectangle  + 1109
+part dynamic text field + 1110
+
+###QetGraphicsHandlerItem###
+QetGraphicsHandlerItem + 1200
+
+###VIEW ITEMS###
+QetGraphicsTableItem  + 1300
+QetGraphicsHeaderItem + 1301
--- a/elements/10_electric/10_allpole/100_folio_referencing/01coming_arrow.elmt
+++ b/elements/10_electric/10_allpole/100_folio_referencing/01coming_arrow.elmt
@@ -1,24 +1,28 @@
-<definition width="70" version="0.3" hotspot_x="49" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy"
-link_type="previous_report">
-<uuid uuid="{F549BEFB-F0CF-44ED-A948-F6F796BFB421}"/><names>
-        <name lang="ru">Предыдущая страница</name>
+<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="it">Foglio precedente</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="es">folio anterior</name>
-        <name lang="cs">Předchozí list</name>
+        <name lang="hu">Beérkező hivatkozás</name>
        <name lang="nl">Referentie Vorig</name>
    </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <polygon x4="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-1" y2="4" x2="-1" y3="0" x3="9" y4="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="9" y2="0" x2="12"/>
-        <input x="-44" y="0" size="9" rotate="true" text="/"/>
-        <terminal x="13" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <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>
--- a/elements/10_electric/10_allpole/100_folio_referencing/02going_arrow.elmt
+++ b/elements/10_electric/10_allpole/100_folio_referencing/02going_arrow.elmt
@@ -1,24 +1,28 @@
-<definition width="40" version="0.3" hotspot_x="18" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy"
-link_type="next_report">
-<uuid uuid="{717352A1-F3C7-49C7-9A06-51620AB5CA00}"/><names>
-        <name lang="ru">Следующая страница</name>
-        <name lang="ar">الصفحة التالية</name>
+<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="it">Foglio successivo</name>
-        <name lang="fr">Folio suivant</name>
-        <name lang="pl">Wyjście adresowe</name>
        <name lang="es">Folio siguiente</name>
-        <name lang="cs">Další list</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
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-9" y2="4" x2="-9" y3="0" x3="2" y4="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-9" y2="0" x2="-12"/>
-        <input x="6" y="0" size="9" rotate="true" text="/"/>
-        <terminal x="-13" y="0" nameHidden="0" number="" name="" orientation="w"/>
+        <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>
--- a/elements/10_electric/10_allpole/100_folio_referencing/qet_directory
+++ b/elements/10_electric/10_allpole/100_folio_referencing/qet_directory
@@ -2,14 +2,18 @@
    <names>
        <name lang="ru">Точки разрыва</name>
        <name lang="ar">إحالات</name>
-        <name lang="cs">Výstupy</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>
--- a/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt
@@ -0,0 +1,38 @@
+<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>
--- a/elements/10_electric/10_allpole/110_network_supplies/3f_n_pe_pravy.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/3f_n_pe_pravy.elmt
@@ -0,0 +1,41 @@
+<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>
--- a/elements/10_electric/10_allpole/110_network_supplies/ground1.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/ground1.elmt
@@ -1,26 +1,43 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="50" hotspot_y="29" type="element">
-    <uuid uuid="{75d4e5ef-6080-4118-9eab-afb53220b9ef}"/>
+<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="es">Masa</name>
+        <name lang="cs">Kostra</name>
+        <name lang="it">Massa</name>
        <name lang="nl">Massa</name>
        <name lang="el">Γείωση</name>
+        <name lang="ru">Шасси</name>
        <name lang="de">Masse</name>
-        <name lang="cs">Kostra</name>
-        <name lang="pl">Masa</name>
-        <name lang="ro">Masă</name>
-        <name lang="it">Massa</name>
        <name lang="en">Ground</name>
+        <name lang="pl">Masa</name>
+        <name lang="es">Masa</name>
        <name lang="ar">هيكل معدني</name>
        <name lang="fr">Masse</name>
-        <name lang="ru">Шасси</name>
+	<name lang="hu">Test</name>
    </names>
-    <informations>titus
+    <elementInformations>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+    </elementInformations>
+    <informations>titus&#xd;
 titus0818@yahoo.com</informations>
    <description>
-        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="-16"/>
-        <line antialias="false" length1="1.5" x2="12.62" end2="none" x1="-13.6493" end1="none" y2="14" length2="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="14"/>
-        <input x="8" y="2" tagg="label" size="9" rotate="true" text="_"/>
+        <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>
--- a/elements/10_electric/10_allpole/110_network_supplies/masse.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/masse.elmt
@@ -1,4 +1,4 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="9" orientation="dyyy" height="30" hotspot_y="20" type="element">
+<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>
@@ -13,6 +13,7 @@
        <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>
--- a/elements/10_electric/10_allpole/110_network_supplies/qet_directory
+++ b/elements/10_electric/10_allpole/110_network_supplies/qet_directory
@@ -1,14 +1,18 @@
 <qet-directory>
    <names>
        <name lang="ru">Подвод питания, сеть</name>
-        <name lang="en">Network supplies</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">Netwerk voedingen</name>
-        <name lang="cs">Síťové zdroje</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>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_1p_pe_n.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_1p_pe_n.elmt
@@ -1,17 +1,18 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
+<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">1 fáze + 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>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_1p_pen.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_1p_pen.elmt
@@ -1,17 +1,18 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="22" orientation="dyyy" height="40" hotspot_y="20" type="element">
+<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">1 fáze + 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>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_1pn.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_1pn.elmt
@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="40" hotspot_y="20" type="element">
+<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>
@@ -6,13 +6,14 @@
        <name lang="nl">Wisselspanning L + nul N</name>
        <name lang="el">Μονοφασικό + Ουδέτερος</name>
        <name lang="de">Wechselstrom L + N</name>
-        <name lang="cs">Jednopólový zdroj + nulový</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&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3p.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3p.elmt
@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
+<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>
@@ -6,13 +6,14 @@
        <name lang="nl">3fasen</name>
        <name lang="el">Τριφασικό</name>
        <name lang="de">Drehstrom</name>
-        <name lang="cs">Třípólový zdroj</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&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3p_pe_n.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3p_pe_n.elmt
@@ -1,17 +1,18 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="100" hotspot_y="50" type="element">
+<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">3 fáze + 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>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3p_pen.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3p_pen.elmt
@@ -1,17 +1,18 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="23" orientation="dyyy" height="80" hotspot_y="41" type="element">
+<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">3 fáze + 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>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3pn.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3pn.elmt
@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="80" hotspot_y="40" type="element">
+<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>
@@ -6,13 +6,14 @@
        <name lang="nl">Driefasen + nul</name>
        <name lang="el">Τριφασικό + Ουδέτερος</name>
        <name lang="de">Dreiphasig + Neutral</name>
-        <name lang="cs">Třípólový zdroj + nulový</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&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_n.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_n.elmt
@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
+<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>
@@ -6,13 +6,14 @@
        <name lang="nl">Nul voeding</name>
        <name lang="el">Ουδέτερος</name>
        <name lang="de">Neutralleiter</name>
-        <name lang="cs">Nulový zdroj</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>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_p.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_p.elmt
@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
+<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>
@@ -6,13 +6,14 @@
        <name lang="nl">Fase</name>
        <name lang="el">Φάση</name>
        <name lang="de">Phase</name>
-        <name lang="cs">Fázový zdroj</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&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_tnc_tns.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_tnc_tns.elmt
@@ -1,4 +1,4 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="100" hotspot_y="40" type="element">
+<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>
@@ -11,6 +11,7 @@
        <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>
--- a/elements/10_electric/10_allpole/110_network_supplies/terre.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/terre.elmt
@@ -1,27 +1,44 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="30" hotspot_y="19" type="element">
-    <uuid uuid="{93eafb79-a84a-45e3-b43b-327d0944591b}"/>
+<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="el">Γείωση</name>
-        <name lang="es">Tierra</name>
-        <name lang="nl">Aarde</name>
-        <name lang="de">Erde</name>
-        <name lang="cs">Země</name>
-        <name lang="pl">Uziemienie</name>
+        <name lang="cs">Uzemnění</name>
        <name lang="it">Terra</name>
-        <name lang="ar">تأريض</name>
-        <name lang="en">Ground</name>
-        <name lang="fr">Terre</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>
-    <informations>Author: The QElectroTech team
+    <elementInformations>
+        <elementInformation name="comment" show="1"></elementInformation>
+        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
+        <elementInformation name="description" show="1"></elementInformation>
+        <elementInformation name="manufacturer" show="1"></elementInformation>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <elementInformation name="quantity" show="1"></elementInformation>
+        <elementInformation name="unity" show="1"></elementInformation>
+        <elementInformation name="supplier" show="1"></elementInformation>
+        <elementInformation name="plant" show="1"></elementInformation>
+        <elementInformation name="label" show="1"></elementInformation>
+    </elementInformations>
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <input x="2" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
-        <line antialias="false" length1="1.5" x2="3" end2="none" x1="-3" end1="none" y2="4" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4"/>
-        <line antialias="false" length1="1.5" x2="5" end2="none" x1="-5" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2"/>
-        <line antialias="false" length1="1.5" x2="7" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <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"/>
+        <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>
--- a/elements/10_electric/10_allpole/114_connections/bod.elmt
+++ b/elements/10_electric/10_allpole/114_connections/bod.elmt
@@ -0,0 +1,17 @@
+<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>
--- a/elements/10_electric/10_allpole/114_connections/combine.elmt
+++ b/elements/10_electric/10_allpole/114_connections/combine.elmt
@@ -1,21 +1,27 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="11">
-    <uuid uuid="{8ef9d490-8db2-450a-ab89-22d2b35c01ed}"/>
+<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="it">Collegamento</name>
        <name lang="en">Combine</name>
-        <name lang="ru">Соединение</name>
-        <name lang="pl">Połączenie 1</name>
+        <name lang="de">Klemmstelle (2)</name>
        <name lang="fr">Jonction</name>
-        <name lang="cs">Spoj</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 y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="7" y1="0" end2="none" x2="1" antialias="false" end1="none" length2="1.5"/>
-        <input x="2" y="13.5" size="1" tagg="label" rotate="true" text="_"/>
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
-        <terminal orientation="w" x="-4" y="0"/>
-        <terminal orientation="s" x="0" y="10"/>
-        <terminal orientation="e" x="10" y="0"/>
+        <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>
--- a/elements/10_electric/10_allpole/114_connections/corner.elmt
+++ b/elements/10_electric/10_allpole/114_connections/corner.elmt
@@ -1,18 +1,25 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="7" width="20" hotspot_x="11">
-    <uuid uuid="{2c6c492e-8d8e-402e-a449-0cf5a7462ced}"/>
+<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="en">Corner</name>
        <name lang="it">Angolo</name>
-        <name lang="ru">Угол</name>
        <name lang="fr">Coin</name>
        <name lang="pl">Narożnik</name>
-        <name lang="cs">Roh</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>
-        <input x="-0.5" y="-0.45" size="1" tagg="label" rotate="true" text="_"/>
-        <terminal orientation="s" x="0" y="4"/>
-        <terminal orientation="w" x="-4" y="0"/>
+        <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>
--- a/elements/10_electric/10_allpole/114_connections/cross.elmt
+++ b/elements/10_electric/10_allpole/114_connections/cross.elmt
@@ -1,21 +1,29 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="9" width="20" hotspot_x="9">
-    <uuid uuid="{eb8040c8-6998-4f43-818b-1d368825ffac}"/>
+<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="en">Cross</name>
+        <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="pl">Połączenie 2</name>
-        <name lang="cs">Kříž</name>
+        <name lang="de">Kreuz</name>
+        <name lang="en">Cross</name>
        <name lang="es">Cruzar</name>
    </names>
+    <elementInformations/>
    <informations></informations>
    <description>
-        <circle x="-1" y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="true" diameter="2"/>
-        <input x="-0.5" y="-4.45" size="1" tagg="label" rotate="true" text="_"/>
-        <terminal orientation="e" x="4" y="0"/>
-        <terminal orientation="s" x="0" y="4"/>
-        <terminal orientation="n" x="0" y="-4"/>
-        <terminal orientation="w" x="-4" y="0"/>
+        <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>
--- a/elements/10_electric/10_allpole/114_connections/jump.elmt
+++ b/elements/10_electric/10_allpole/114_connections/jump.elmt
@@ -1,19 +1,25 @@
-<definition type="element" height="30" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="14" width="10" hotspot_x="5">
-    <uuid uuid="{cd8b3f5f-5eae-416c-9966-c7b5529b6e63}"/>
+<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="it">Salto</name>
-        <name lang="ru">Перемычка</name>
+        <name lang="de">Sprung</name>
        <name lang="fr">Saut</name>
-        <name lang="pl">Brak połączenia</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 height="6" start="90" angle="-180" x="-3" y="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="6"/>
-        <input x="1.5" y="-6.45" size="1" tagg="label" rotate="true" text="_"/>
-        <terminal orientation="n" x="0" y="-7"/>
-        <terminal orientation="s" x="0" y="7"/>
+        <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>
--- a/elements/10_electric/10_allpole/114_connections/lphd.elmt
+++ b/elements/10_electric/10_allpole/114_connections/lphd.elmt
@@ -0,0 +1,22 @@
+<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>
--- a/elements/10_electric/10_allpole/114_connections/qet_directory
+++ b/elements/10_electric/10_allpole/114_connections/qet_directory
@@ -3,13 +3,16 @@
        <name lang="ru">Соединения</name>
        <name lang="de">Verbindungen</name>
        <name lang="en">Connections</name>
-        <name lang="es">Conexiones</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>
--- a/elements/10_electric/10_allpole/114_connections/splice.elmt
+++ b/elements/10_electric/10_allpole/114_connections/splice.elmt
@@ -1,21 +1,26 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
-    <uuid uuid="{0f807068-d5a4-4628-85f4-0644e6d3129f}"/>
+<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="en">Splice</name>
-        <name lang="it">Spaziatura</name>
-        <name lang="ru">Сращивание</name>
        <name lang="fr">Epissure</name>
-        <name lang="pl">Połączenie 3</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>
-        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1" y1="0" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
-        <terminal orientation="s" x="0" y="10"/>
-        <terminal orientation="w" x="-10" y="0"/>
-        <terminal orientation="e" x="4" y="0"/>
+        <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>
--- a/elements/10_electric/10_allpole/114_connections/thruleft.elmt
+++ b/elements/10_electric/10_allpole/114_connections/thruleft.elmt
@@ -1,21 +1,27 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
-    <uuid uuid="{a1ced185-e98f-4cf1-8a62-3f8ea691bcb6}"/>
+<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="en">Thru left</name>
+        <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="pl">Połączenie 4</name>
        <name lang="cs">Levé spojení</name>
-		<name lang="es">A la izquierda</name>
    </names>
+    <elementInformations/>
    <informations></informations>
    <description>
-        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
-        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
-        <terminal orientation="e" x="4" y="0"/>
-        <terminal orientation="w" x="-10" y="0"/>
-        <terminal orientation="s" x="0" y="10"/>
+        <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>
--- a/elements/10_electric/10_allpole/114_connections/thruright.elmt
+++ b/elements/10_electric/10_allpole/114_connections/thruright.elmt
@@ -1,22 +1,27 @@
-<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="14">
-    <uuid uuid="{5d72394b-8aa0-4368-bc88-0f738478ca45}"/>
+<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="en">Thru right</name>
        <name lang="it">Collegamento destro</name>
-        <name lang="ru">Слева направо</name>
        <name lang="fr">Liaison droite</name>
-        <name lang="pl">Połączenie 5</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>
-        <input x="5.5" y="4.55" size="1" tagg="label" rotate="true" text="_"/>
-        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
-        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
-        <line y2="6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="6" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
-        <terminal orientation="s" x="0" y="10"/>
-        <terminal orientation="w" x="-10" y="0"/>
-        <terminal orientation="e" x="10" y="0"/>
+        <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>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable.elmt
@@ -1,25 +1,26 @@
-<definition width="90" link_type="simple" version="0.5" hotspot_x="42" orientation="dyyy" height="20" hotspot_y="3" type="element">
-    <uuid uuid="{5ba1917d-c353-41b2-aa70-caf65579b81e}"/>
+<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="cs">Označení drátového propojení - 2 fáze + země</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
-        <name lang="it">Cavo 2 fasi + terra</name>
-        <name lang="es">Cable 2 fases+tierra</name>
-        <name lang="fr">Cable 2 phases+terre</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&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <text x="12" y="9" size="4" text="2"/>
-        <line antialias="true" length1="1.5" x2="30.95" end2="none" x1="26.95" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <line antialias="true" length1="1.5" x2="12" end2="none" x1="8" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
+        <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" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line antialias="false" length1="1.5" x2="37.932" end2="none" x1="-39.9373" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line antialias="true" length1="1.5" x2="-28" end2="none" x1="-32" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
+        <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" tagg="label" size="5" rotate="true" text="+"/>
+        <input x="-61" y="1" size="5" rotate="true" text="+"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable1.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable1.elmt
@@ -1,27 +1,28 @@
-<definition width="100" link_type="simple" version="0.5" hotspot_x="46" orientation="dyyy" height="20" hotspot_y="3" type="element">
-    <uuid uuid="{d95f81ca-8802-48c0-830d-b214fb41af86}"/>
+<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="cs">Označení drátového propojení - 3 fáze + země</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</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="ru">Кабель 3 жилы + PE</name>
+        <name lang="cs">Kabel 4G</name>
+        <name lang="hu">Kábel 3 + PE</name>
    </names>
    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line antialias="true" length1="1.5" x2="-8.05" end2="none" x1="-12.05" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.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="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 antialias="true" length1="1.5" x2="30.95" end2="none" x1="26.95" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <line antialias="true" length1="1.5" x2="12" end2="none" x1="8" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
+        <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" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line antialias="false" length1="1.5" x2="37.932" end2="none" x1="-39.9373" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line antialias="true" length1="1.5" x2="-28" end2="none" x1="-32" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
+        <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" tagg="label" size="5" rotate="true" text="+"/>
+        <input x="-61" y="1" size="5" rotate="true" text="+"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable2.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable2.elmt
@@ -1,25 +1,26 @@
-<definition width="80" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="20" hotspot_y="3" type="element">
-    <uuid uuid="{d7b0edcd-eca1-432c-8ea7-698c613bca22}"/>
+<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="cs">Označení drátového propojení - 2 fáze + země</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</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="ru">Кабель 2 жилы + PE</name>
+        <name lang="cs">Kabel 3G</name>
+        <name lang="hu">Kábel 2 + PE</name>
    </names>
    <informations>Author: The QElectroTech team&#xd;
 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="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.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="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" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line antialias="true" length1="1.5" x2="1.95" end2="none" x1="-2.05" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <line antialias="false" length1="1.5" x2="27.2717" end2="none" x1="-30.2509" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line antialias="true" length1="1.5" x2="-18" end2="none" x1="-22" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
+        <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" tagg="label" size="5" rotate="true" text="+"/>
+        <input x="-51" y="1" size="5" rotate="true" text="+"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable3.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable3.elmt
@@ -1,24 +1,26 @@
-<definition hotspot_y="3" orientation="dyyy" version="0.51" hotspot_x="39" link_type="simple" width="80" type="element" height="20">
-    <uuid uuid="{408ddc21-5f6a-48a4-ac26-80a9992b4964}"/>
+<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="es">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&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line end1="none" x1="-33.05" y1="7.95" x2="-29.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="-13.05" y1="7.95" x2="-9.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="3" size="4" y="9" x="31"/>
-        <line end1="none" x1="27" y1="8" x2="31" 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="1" size="4" y="9" x="-10"/>
-        <text text="2" size="4" y="9" x="11"/>
-        <line end1="none" x1="7" y1="8" x2="11" 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;4G_ mm²" size="6" rotate="true" y="2.5" x="-82" tagg="label"/>
-        <line end1="none" x1="-31" y1="10" x2="29" 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="-31"/>
-        <input text="" size="5" rotate="true" y="1" x="-62" tagg="none"/>
+        <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>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable5.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable5.elmt
@@ -1,10 +1,12 @@
-<definition hotspot_y="3" orientation="dyyy" version="0.51" hotspot_x="47" link_type="simple" width="100" type="element" height="20">
+<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&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/Show More
+++ b/Show More