Mod git pull

this works for git pull since Git 2.15

.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
+
+...

.gitignore

@@ -1 +1,7 @@
 *.snap
+.flatpak-builder
+# Qt build output
+*.user
+# doxygen Doxyfile output
+doc/
+QElectroTech.tag

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

ChangeLog

@@ -1,3 +1,137 @@
+====== 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 ======
 
 

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.」に
+手紙を送ってください。

INSTALL

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

README

@@ -50,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 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。

README.md

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

SingleApplication/CHANGELOG.md

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

SingleApplication/CMakeLists.txt

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

SingleApplication/README.md

@@ -50,15 +50,27 @@ how:
 git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
 ```
 
-Then include the `singleapplication.pri` file in your `.pro` project file. Also
-don't forget to specify which `QCoreApplication` class your app is using if it
-is not `QCoreApplication`.
+**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
 ------------------------
 

SingleApplication/Windows.md

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

SingleApplication/singleapplication.cpp

@@ -25,150 +25,171 @@
 #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
- */
+	@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 ) )
+	: app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
 
-    // Store the current mode of the program
-    d->options = options;
+#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
 
-    // Generating an application ID used for identifying the shared memory
-    // block and QLocalServer
-    d->genBlockServerName();
+	// 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;
+	// 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 );
+	// 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 );
-        }
-    }
+	// 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() );
-    QTime time;
-    time.start();
+	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();
+	// Make sure the shared memory block is initialised and in consistent state
+	while( true ) {
+		d->memory->lock();
 
-        if( d->blockChecksum() == inst->checksum ) break;
+		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();
-        }
+		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();
+		d->memory->unlock();
 
-        // Random sleep here limits the probability of a collision between two racing apps
-        qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
-        QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
-    }
+		// 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>( static_cast <float>( value ) / RAND_MAX * 10 ) );
+#endif
+	}
 
-    if( inst->primary == false) {
-        d->startPrimary();
-        d->memory->unlock();
-        return;
-    }
+	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;
-    }
+	// 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->memory->unlock();
 
-    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+	d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
 
-    delete d;
+	delete d;
 
-    ::exit( EXIT_SUCCESS );
+	::exit( EXIT_SUCCESS );
 }
 
 /**
- * @brief Destructor
- */
+	@brief Destructor
+*/
 SingleApplication::~SingleApplication()
 {
-    Q_D(SingleApplication);
-    delete d;
+	Q_D(SingleApplication);
+	delete d;
 }
 
 bool SingleApplication::isPrimary()
 {
-    Q_D(SingleApplication);
-    return d->server != nullptr;
+	Q_D(SingleApplication);
+	return d->server != nullptr;
 }
 
 bool SingleApplication::isSecondary()
 {
-    Q_D(SingleApplication);
-    return d->server == nullptr;
+	Q_D(SingleApplication);
+	return d->server == nullptr;
 }
 
 quint32 SingleApplication::instanceId()
 {
-    Q_D(SingleApplication);
-    return d->instanceNumber;
+	Q_D(SingleApplication);
+	return d->instanceNumber;
 }
 
 qint64 SingleApplication::primaryPid()
 {
-    Q_D(SingleApplication);
-    return d->primaryPid();
+	Q_D(SingleApplication);
+	return d->primaryPid();
 }
 
 bool SingleApplication::sendMessage( QByteArray message, int timeout )
 {
-    Q_D(SingleApplication);
+	Q_D(SingleApplication);
 
-    // Nobody to connect to
-    if( isPrimary() ) return false;
+	// Nobody to connect to
+	if( isPrimary() ) return false;
 
-    // Make sure the socket is connected
-    d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
+	// Make sure the socket is connected
+	d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
 
-    d->socket->write( message );
-    bool dataWritten = d->socket->flush();
-    d->socket->waitForBytesWritten( timeout );
-    return dataWritten;
+	d->socket->write( message );
+	bool dataWritten = d->socket->waitForBytesWritten( timeout );
+	d->socket->flush();
+	return dataWritten;
 }

SingleApplication/singleapplication.h

@@ -25,6 +25,7 @@
 
 #include <QtCore/QtGlobal>
 #include <QtNetwork/QLocalSocket>
+#include <QElapsedTimer>
 
 #ifndef QAPPLICATION_CLASS
   #define QAPPLICATION_CLASS QCoreApplication
@@ -35,99 +36,99 @@
 class SingleApplicationPrivate;
 
 /**
- * @brief The SingleApplication class handles multipe instances of the same
- * Application
- * @see QCoreApplication
- */
+	@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 miliseconds.
-     * @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_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)

SingleApplication/singleapplication.pri

@@ -1,5 +1,5 @@
 QT += core network
-CONFIG += c++11
+CONFIG += c++17
 
 HEADERS += $$PWD/singleapplication.h \
     $$PWD/singleapplication_p.h

SingleApplication/singleapplication_p.cpp

@@ -33,11 +33,8 @@
 #include <cstddef>
 
 #include <QtCore/QDir>
-#include <QtCore/QProcess>
 #include <QtCore/QByteArray>
-#include <QtCore/QSemaphore>
 #include <QtCore/QDataStream>
-#include <QtCore/QStandardPaths>
 #include <QtCore/QCryptographicHash>
 #include <QtNetwork/QLocalServer>
 #include <QtNetwork/QLocalSocket>
@@ -45,134 +42,140 @@
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
+#ifdef Q_OS_UNIX
+	#include <unistd.h>
+	#include <sys/types.h>
+	#include <pwd.h>
+#endif
+
 #ifdef Q_OS_WIN
-    #include <windows.h>
-    #include <lmcons.h>
+#include <windows.h>
+#include <lmcons.h>
 #endif
 
 SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
-    : q_ptr( q_ptr )
+	: q_ptr( q_ptr )
 {
-    server = nullptr;
-    socket = nullptr;
+	server = nullptr;
+	socket = nullptr;
+	memory = nullptr;
+	instanceNumber = -1;
 }
 
 SingleApplicationPrivate::~SingleApplicationPrivate()
 {
-    if( socket != nullptr ) {
-        socket->close();
-        delete socket;
-    }
+	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();
+	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;
+	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() );
+	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::ExcludeAppVersion) ) {
+		appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
+	}
 
-    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
+	if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
 #ifdef Q_OS_WIN
-        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
+		appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
 #else
-        appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
+		appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
 #endif
-    }
+	}
 
-    // User level block requires a user specific data in the hash
-    if( options & SingleApplication::Mode::User ) {
+	// 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( QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).join("").toUtf8() );
-        }
+		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
-        QProcess process;
-        process.start( "whoami" );
-        if( process.waitForFinished( 100 ) &&
-            process.exitCode() == QProcess::NormalExit) {
-            appData.addData( process.readLine() );
-        } else {
-            appData.addData(
-                QDir(
-                    QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
-                ).absolutePath().toUtf8()
-            );
-        }
+		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("/", "_");
+	// 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();
+	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);
+	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();
+	// 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 );
-    }
+	// 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
-    );
+	server->listen( blockServerName );
+	QObject::connect(
+				server,
+				&QLocalServer::newConnection,
+				this,
+				&SingleApplicationPrivate::slotConnectionEstablished
+				);
 
-    // Reset the number of connections
-    InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
+	// Reset the number of connections
+	InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
 
-    inst->primary = true;
-    inst->primaryPid = q->applicationPid();
-    inst->checksum = blockChecksum();
+	inst->primary = true;
+	inst->primaryPid = q->applicationPid();
+	inst->checksum = blockChecksum();
 
-    instanceNumber = 0;
+	instanceNumber = 0;
 }
 
 void SingleApplicationPrivate::startSecondary()
@@ -181,223 +184,261 @@ 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();
-    }
+	// 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 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 );
-    }
+	// 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 );
-    }
+	// 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);
+	// 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);
+		writeStream.setVersion(QDataStream::Qt_5_6);
 #endif
 
-        writeStream << blockServerName.toLatin1();
-        writeStream << static_cast<quint8>(connectionType);
-        writeStream << instanceNumber;
-        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-        writeStream << checksum;
+		writeStream << blockServerName.toLatin1();
+		writeStream << static_cast<quint8>(connectionType);
+		writeStream << instanceNumber;
 
-        // The header indicates the message length that follows
-        QByteArray header;
-        QDataStream headerStream(&header, QIODevice::WriteOnly);
+#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);
+		headerStream.setVersion(QDataStream::Qt_5_6);
 #endif
-        headerStream << static_cast <quint64>( initMsg.length() );
+		headerStream << static_cast <quint64>( initMsg.length() );
 
-        socket->write( header );
-        socket->write( initMsg );
-        socket->flush();
-        socket->waitForBytesWritten( msecs );
-    }
+		socket->write( header );
+		socket->write( initMsg );
+		socket->flush();
+		socket->waitForBytesWritten( msecs );
+	}
 }
 
 quint16 SingleApplicationPrivate::blockChecksum()
 {
-    return qChecksum(
-       static_cast <const char *>( memory->data() ),
-       offsetof( InstancesInfo, checksum )
-   );
+#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;
+	qint64 pid;
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-    pid = inst->primaryPid;
-    memory->unlock();
+	memory->lock();
+	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+	pid = inst->primaryPid;
+	memory->unlock();
 
-    return pid;
+	return pid;
 }
 
 /**
- * @brief Executed when a connection has been made to the LocalServer
- */
+	@brief Executed when a connection has been made to the LocalServer
+*/
 void SingleApplicationPrivate::slotConnectionEstablished()
 {
-    QLocalSocket *nextConnSocket = server->nextPendingConnection();
-    connectionMap.insert(nextConnSocket, ConnectionInfo());
+	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::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::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;
-            };
-        }
-    );
+	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 (!connectionMap.contains( sock )) {
+		return;
+	}
 
-    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
-        return;
-    }
+	if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
+		return;
+	}
 
-    QDataStream headerStream( sock );
+	QDataStream headerStream( sock );
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
+	headerStream.setVersion( QDataStream::Qt_5_6 );
 #endif
 
-    // Read the header to know the message length
-    quint64 msgLen = 0;
-    headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
-    info.stage = StageBody;
-    info.msgLen = msgLen;
+	// 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 );
-    }
+	if ( sock->bytesAvailable() >= (qint64) msgLen ) {
+		readInitMessageBody( sock );
+	}
 }
 
 void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
 {
-    Q_Q(SingleApplication);
+	Q_Q(SingleApplication);
 
-    if (!connectionMap.contains( sock )) {
-        return;
-    }
+	if (!connectionMap.contains( sock )) {
+		return;
+	}
 
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
-        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);
+	// 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 );
+	readStream.setVersion( QDataStream::Qt_5_6 );
 #endif
 
-    // server name
-    QByteArray latin1Name;
-    readStream >> latin1Name;
+	// server name
+	QByteArray latin1Name;
+	readStream >> latin1Name;
 
-    // connection type
-    ConnectionType connectionType = InvalidConnection;
-    quint8 connTypeVal = InvalidConnection;
-    readStream >> connTypeVal;
-    connectionType = static_cast <ConnectionType>( connTypeVal );
+	// connection type
+	ConnectionType connectionType = InvalidConnection;
+	quint8 connTypeVal = InvalidConnection;
+	readStream >> connTypeVal;
+	connectionType = static_cast <ConnectionType>( connTypeVal );
 
-    // instance id
-    quint32 instanceId = 0;
-    readStream >> instanceId;
+	// instance id
+	quint32 instanceId = 0;
+	readStream >> instanceId;
 
-    // checksum
-    quint16 msgChecksum = 0;
-    readStream >> msgChecksum;
+	// checksum
+	quint16 msgChecksum = 0;
+	readStream >> msgChecksum;
 
-    const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
+#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;
 
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
+	if( !isValid ) {
+		sock->close();
+		return;
+	}
 
-    if( !isValid ) {
-        sock->close();
-        return;
-    }
+	info.instanceId = instanceId;
+	info.stage = StageConnected;
 
-    info.instanceId = instanceId;
-    info.stage = StageConnected;
+	if( connectionType == NewInstance ||
+		( connectionType == SecondaryInstance &&
+		  options & SingleApplication::Mode::SecondaryNotification ) )
+	{
+		Q_EMIT q->instanceStarted();
+	}
 
-    if( connectionType == NewInstance ||
-        ( connectionType == SecondaryInstance &&
-          options & SingleApplication::Mode::SecondaryNotification ) )
-    {
-        Q_EMIT q->instanceStarted();
-    }
-
-    if (sock->bytesAvailable() > 0) {
-			//This line crash
-        //Q_EMIT this->slotDataAvailable( sock, instanceId );
-    }
+	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() );
+	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  );
+	if( closedSocket->bytesAvailable() > 0 )
+		Q_EMIT slotDataAvailable( closedSocket, instanceId  );
 }

SingleApplication/singleapplication_p.h

@@ -38,62 +38,62 @@
 #include "singleapplication.h"
 
 struct InstancesInfo {
-    bool primary;
-    quint32 secondary;
-    qint64 primaryPid;
-    quint16 checksum;
+	bool primary;
+	quint32 secondary;
+	qint64 primaryPid;
+	quint16 checksum;
 };
 
 struct ConnectionInfo {
-    explicit ConnectionInfo() :
-        msgLen(0), instanceId(0), stage(0) {}
-    qint64 msgLen;
-    quint32 instanceId;
-    quint8 stage;
+	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 );
+	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

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

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

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

@@ -0,0 +1,44 @@
+From 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
+

build-aux/linux/fedora/README.elements

@@ -36,3 +36,6 @@ Elementen collectie voor QElectroTech.
 
 [da]
 Symbol samling for QElectroTech.
+
+[ja]
+QElectroTech の要素コレクション。

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

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

build-aux/snap/snapcraft.yaml

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

dev_doc/enum_type_of_QGraphicsItem

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

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

@@ -1,4 +1,4 @@
-<definition width="40" version="0.3" hotspot_x="18" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy"
+<definition width="40" version="0.3" hotspot_x="18" hotspot_y="15" height="30" type="element" ic="true"
 link_type="next_report">
 <uuid uuid="{717352A1-F3C7-49C7-9A06-51620AB5CA00}"/><names>
         <name lang="ru">Следующая страница</name>

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

@@ -12,5 +12,6 @@
         <name lang="es">Referencias</name>
         <name lang="nl">Referenties</name>
         <name lang="da">Ark henvisninger</name>
+        <name lang="ja">フォリオ参照</name>
     </names>
 </qet-directory>

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

@@ -0,0 +1,37 @@
+<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">3 fáze + PEN pravý</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <dynamic_text z="1" Valignment="AlignTop" x="-7" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{7c68cf51-b979-4e89-97b2-a93b5ad61f95}" y="-60.45" Halignment="AlignLeft" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="33" text="PEN" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="13" text="L3" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-7" text="L2" color="#000000"/>
+        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-27" text="L1" color="#000000"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-14" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
+        <terminal orientation="w" x="-15" y="-30"/>
+        <terminal orientation="w" x="-15" y="-10"/>
+        <terminal orientation="w" x="-15" y="30"/>
+        <terminal orientation="w" x="-15" y="10"/>
+    </description>
+</definition>

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

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

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

@@ -1,26 +1,42 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="50" hotspot_y="29" type="element">
-    <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>
     </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>

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>

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

@@ -11,5 +11,6 @@
         <name lang="cs">Síťové zdroje</name>
 		<name lang="es">Fuentes de red</name>
         <name lang="da">Netværkskilder</name>
+        <name lang="ja">電源網</name>
     </names>
 </qet-directory>

elements/10_electric/10_allpole/110_network_supplies/src_1p_pe_n.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="{35f2834a-308b-4e79-bc2a-1c00486b24e7}"/>
     <names>
         <name lang="es">Fuente unipolo + PE +N</name>

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

@@ -1,4 +1,4 @@
-<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>

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>

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>

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

@@ -1,4 +1,4 @@
-<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>

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

@@ -1,4 +1,4 @@
-<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>

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>

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>

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>

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>

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

@@ -1,27 +1,43 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="30" hotspot_y="19" type="element">
-    <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="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>
     </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>

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

@@ -0,0 +1,15 @@
+<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>
+    </names>
+    <informations></informations>
+    <description>
+        <circle diameter="4" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-2" x="-2"/>
+        <input rotate="true" text=" " tagg="label" size="9" y="-3" x="-11"/>
+        <terminal orientation="e" y="0" x="2"/>
+        <terminal orientation="w" y="0" x="-2"/>
+        <terminal orientation="s" y="2" x="0"/>
+        <terminal orientation="n" y="-2" x="0"/>
+    </description>
+</definition>

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

@@ -1,4 +1,4 @@
-<definition hotspot_x="11" hotspot_y="4" version="0.70" type="element" height="20" orientation="dyyy" link_type="terminal" width="30">
+<definition hotspot_x="11" hotspot_y="4" version="0.70" type="element" height="20" link_type="terminal" width="30">
     <uuid uuid="{141e7e1e-4f7f-456d-9f04-52c32109b969}"/>
     <names>
         <name lang="en">Combine</name>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="7" width="20" orientation="dyyy" type="element" height="20" version="0.70" hotspot_x="11" link_type="terminal">
+<definition hotspot_y="7" width="20" type="element" height="20" version="0.70" hotspot_x="11" link_type="terminal">
     <uuid uuid="{2d505b61-db0f-4784-9b9c-189366058272}"/>
     <names>
         <name lang="es">Esquina</name>

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

@@ -1,4 +1,4 @@
-<definition height="20" link_type="terminal" hotspot_x="9" width="20" orientation="dyyy" hotspot_y="9" version="0.70" type="element">
+<definition height="20" link_type="terminal" hotspot_x="9" width="20" hotspot_y="9" version="0.70" type="element">
     <uuid uuid="{8c0d3e9c-dc37-41d7-bfd5-fe4dbf8dc4fb}"/>
     <names>
         <name lang="ru">Пересечение</name>

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

@@ -1,4 +1,4 @@
-<definition width="10" hotspot_y="14" hotspot_x="5" height="30" link_type="terminal" orientation="dyyy" version="0.70" type="element">
+<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>

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

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

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

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

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

@@ -11,5 +11,6 @@
         <name lang="nl">Verbindingen</name>
 		<name lang="es">Conexiones</name>
         <name lang="da">Forbindelser</name>
+        <name lang="ja">接続</name>
     </names>
 </qet-directory>

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

@@ -1,4 +1,4 @@
-<definition type="element" height="20" width="30" orientation="dyyy" version="0.70" hotspot_y="4" link_type="terminal" hotspot_x="17">
+<definition type="element" height="20" width="30" version="0.70" hotspot_y="4" link_type="terminal" hotspot_x="17">
     <uuid uuid="{709e6400-adc2-4faf-ba46-aa513d1dcaf1}"/>
     <names>
         <name lang="fr">Epissure</name>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="4" height="20" hotspot_x="17" type="element" width="30" link_type="terminal" orientation="dyyy" version="0.70">
+<definition hotspot_y="4" height="20" hotspot_x="17" type="element" width="30" link_type="terminal" version="0.70">
     <uuid uuid="{9e88368e-1b20-4a56-8941-5d17a4cce2d4}"/>
     <names>
         <name lang="cs">Levé spojení</name>

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

@@ -1,4 +1,4 @@
-<definition link_type="terminal" width="30" hotspot_x="14" orientation="dyyy" height="20" version="0.70" hotspot_y="4" type="element">
+<definition link_type="terminal" width="30" hotspot_x="14" height="20" version="0.70" hotspot_y="4" type="element">
     <uuid uuid="{6e40fff3-691c-4622-b9aa-4ff930a5b981}"/>
     <names>
         <name lang="en">Thru right</name>

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

@@ -1,4 +1,4 @@
-<definition width="120" version="0.3" hotspot_x="71" hotspot_y="10" height="40" type="element" orientation="dyyy">
+<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>

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

@@ -1,4 +1,4 @@
-<definition width="120" version="0.3" hotspot_x="70" hotspot_y="10" height="40" type="element" orientation="dyyy">
+<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>

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

@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="60" hotspot_y="10" height="40" type="element" orientation="dyyy">
+<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>

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

@@ -1,4 +1,4 @@
-<definition width="130" version="0.3" hotspot_x="88" hotspot_y="18" height="40" type="element" orientation="dyyy">
+<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>

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

@@ -1,4 +1,4 @@
-<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>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="3" orientation="dyyy" version="0.51" hotspot_x="29" link_type="simple" width="60" type="element" height="20">
+<definition hotspot_y="3" version="0.51" hotspot_x="29" link_type="simple" width="60" type="element" height="20">
     <uuid uuid="{5f981421-4c54-4cd5-929e-7f77dab94fef}"/>
     <names>
         <name lang="It">Cavo ? 3G</name>

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

@@ -1,4 +1,4 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="9" type="element">
     <uuid uuid="{4b9a04b1-0d35-4d54-b5cb-b573ed3a9b0d}"/>
     <names>
         <name lang="de">Kabel 3x</name>

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

@@ -1,4 +1,4 @@
-<definition width="60" link_type="simple" version="0.5" hotspot_x="21" orientation="dyyy" height="10" hotspot_y="-6" type="element">
+<definition width="60" link_type="simple" version="0.5" hotspot_x="21" height="10" hotspot_y="-6" type="element">
     <uuid uuid="{822e6fc1-0104-4d3a-ba3c-995c24c79cf2}"/>
     <names>
         <name lang="nl">Scherm</name>

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="9" type="element">
     <uuid uuid="{6ac285f9-6492-40cb-be58-9ba565ea1921}"/>
     <names>
         <name lang="de">Kabelader</name>

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

@@ -1,4 +1,4 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="20" hotspot_y="9" type="element">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="10" height="20" hotspot_y="9" type="element">
     <uuid uuid="{374ed6b3-7329-4cad-ac8c-200b17508460}"/>
     <names>
         <name lang="de">Verdrahtung</name>

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="14" orientation="dyyy" height="20" hotspot_y="4" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="14" height="20" hotspot_y="4" type="element">
     <uuid uuid="{a0e9e33a-ee38-4c08-8f40-c307da8d822b}"/>
     <names>
         <name lang="el">Διατομή αγωγού</name>

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

@@ -11,5 +11,6 @@
         <name lang="nl">Kabels en draden</name>
         <name lang="cs">Kabely a drátové propojení</name>
         <name lang="da">Kabler og ledninger</name>
+        <name lang="ja">ケーブルと配線</name>
     </names>
 </qet-directory>

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="10" hotspot_y="5" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="10" hotspot_y="5" type="element">
     <uuid uuid="{b96a76a6-a798-497b-a044-dd933756d175}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 1 Leiter</name>

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

@@ -1,4 +1,4 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="10" hotspot_y="5" type="element">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="16" height="10" hotspot_y="5" type="element">
     <uuid uuid="{448ac784-f459-4f8f-bd3f-d911802b3369}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 2 Leiter</name>

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

@@ -1,4 +1,4 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="14" orientation="dyyy" height="10" hotspot_y="5" type="element">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="14" height="10" hotspot_y="5" type="element">
     <uuid uuid="{c94d9e16-e3bb-4117-b037-466a15edcb14}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 2 Leiter</name>

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

@@ -1,4 +1,4 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="10" hotspot_y="5" type="element">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="16" height="10" hotspot_y="5" type="element">
     <uuid uuid="{9d939952-9c2b-4b12-898f-262abc91e845}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 3 Leiter</name>

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

@@ -1,4 +1,4 @@
-<definition height="80" hotspot_y="39" hotspot_x="17" version="0.5" orientation="dyyy" width="40" link_type="simple" type="element">
+<definition height="80" hotspot_y="39" hotspot_x="17" version="0.5" width="40" link_type="simple" type="element">
     <uuid uuid="{9d2d8902-b36a-4974-b46d-4de6741f6b9b}"/>
     <names>
         <name lang="en">Terminal strip label</name>

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

@@ -1,4 +1,4 @@
-<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
     <uuid uuid="{2d155649-d0f5-419b-b94a-a13d3fcf38c7}"/>
     <names>
         <name lang="fr">Borne (continuité)</name>

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

@@ -1,4 +1,4 @@
-<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
     <uuid uuid="{da19301b-f6e7-478f-a6dd-eb72e497883b}"/>
     <names>
         <name lang="fr">Borne (terre)</name>

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

@@ -1,4 +1,4 @@
-<definition orientation="dyyy" version="0.51" width="110" height="20" type="element" hotspot_x="55" link_type="simple" hotspot_y="13">
+<definition version="0.51" width="110" height="20" type="element" hotspot_x="55" link_type="simple" hotspot_y="13">
     <uuid uuid="{17db296d-b50e-47ea-9125-aa9c1837b523}"/>
     <names>
         <name lang="fr">Interruption bornier</name>

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

@@ -1,4 +1,4 @@
-<definition orientation="dyyy" version="0.51" width="50" height="110" type="element" hotspot_x="15" link_type="simple" hotspot_y="54">
+<definition version="0.51" width="50" height="110" type="element" hotspot_x="15" link_type="simple" hotspot_y="54">
     <uuid uuid="{387b403b-d81d-45ca-957d-e9014fe009a7}"/>
     <names>
         <name lang="fr">Borne double-étage (continuité)</name>

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

@@ -1,4 +1,4 @@
-<definition height="10" hotspot_y="5" hotspot_x="5" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+<definition height="10" hotspot_y="5" hotspot_x="5" version="0.5" width="30" link_type="simple" type="element">
     <uuid uuid="{9a3ee0a0-5a0e-4f0c-93dd-396ddc3d7f11}"/>
     <names>
         <name lang="de">Einlegebrücke</name>

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

@@ -1,4 +1,4 @@
-<definition orientation="dyyy" version="0.51" width="50" height="10" type="element" hotspot_x="5" link_type="simple" hotspot_y="5">
+<definition version="0.51" width="50" height="10" type="element" hotspot_x="5" link_type="simple" hotspot_y="5">
     <uuid uuid="{5075e5fb-c219-4643-89b8-8096d090ff3d}"/>
     <names>
         <name lang="en">Insertion bridge (double width)</name>

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

@@ -1,4 +1,4 @@
-<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="510" link_type="simple" type="element">
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" width="510" link_type="simple" type="element">
     <uuid uuid="{c17e98a3-738f-4c7a-ac89-91bb4c08fb45}"/>
     <names>
         <name lang="fr">Connecteur 25 fiches</name>

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

@@ -1,4 +1,4 @@
-<definition height="80" hotspot_y="67" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+<definition height="80" hotspot_y="67" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
     <uuid uuid="{116e1210-b7f9-4737-a94f-1034ecb45cc4}"/>
     <names>
         <name lang="fr">Appareil (connexion en bas)</name>

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

@@ -1,4 +1,4 @@
-<definition height="80" hotspot_y="13" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+<definition height="80" hotspot_y="13" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
     <uuid uuid="{e396fc1b-28d7-4978-879a-9b666a2648d3}"/>
     <names>
         <name lang="fr">Appareil (connexion en bas)</name>