Add new ewon element, thanks Vbxler

When the model of a qetgraphicstableitem is reseted (for exemple when
the sql query is modified) we check if there is useless tables (table
with 0 row displayed) and remove it.

CMakeLists.txt

@@ -19,7 +19,7 @@ include(cmake/hoto_update_cmake_message.cmake)
 cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
 
 project(qelectrotech
-  VERSION 0.8.0
+  VERSION 0.9.0
   DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
   HOMEPAGE_URL "https://qelectrotech.org/"
   LANGUAGES CXX)
@@ -131,3 +131,32 @@ target_include_directories(
   ${QET_DIR}/sources/factory/ui
   ${QET_DIR}/sources/print
   )
+
+install(TARGETS ${PROJECT_NAME})
+if (NOT MINGW)
+
+install(DIRECTORY ico/breeze-icons/16x16 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/22x22 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/32x32 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/48x48 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/64x64 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY elements DESTINATION share/qelectrotech)
+install(DIRECTORY examples DESTINATION share/qelectrotech)
+install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
+install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
+install(FILES misc/qelectrotech.desktop DESTINATION share/applications)
+install(FILES misc/x-qet-element.xml
+              misc/x-qet-project.xml
+              misc/x-qet-titleblock.xml
+              DESTINATION share/mime/application)
+install(FILES misc/x-qet-element.desktop
+              misc/x-qet-project.desktop
+              misc/x-qet-titleblock.desktop
+              DESTINATION share/mimelnk/application)
+install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
+install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
+install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+
+endif()

README.md

@@ -15,10 +15,10 @@ The main goal of the developers is to provide a libre, easy to use and effective
 
 ### Version
 
-The current stable version is 0.70 and was released on 2019.07.13.  
+The current stable version is 0.80 and was released on 2021.02.21.  
 Once it has been officialy released, the stable version is always frozen and is no longer developed.
 
-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).
+New functionalities, bug and issue fixings are further made in the development version (currently 0.9), which can also be [downloaded](https://qelectrotech.org/download.html).
 
 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!
 
@@ -33,6 +33,7 @@ Like many other open source softwares, QElectroTech is provided as it is, withou
 ### Development / technical choices
 
 The development follows the classical way of free and open source software: the source code, written by a community of users, is freely accessible.
+If you are reading this on Github, be aware that this is an hourly synced mirror. Our real code repository [is located here](https://git.tuxfamily.org/qet/qet.git/).
 
 Here are the technical choices made for the software development:
 
@@ -153,6 +154,52 @@ Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format im
 *   conductors num can be exported to csv file.
 *   ***
 
+Nomenclature
+
+A new nomenclature tool appears in the menu: project -> Add a nomenclature.
+The nomenclature is presented in the form of a configurable table separated into two parts: the display (the form) and the content (the background).  
+- Display: the size and position of the table, the margins between text and the table cell, the alignment of the text in the cells and the font. The configuration of the table headers and the table itself are separate.  
+- Content: the information to display in the table and the order in which it should be displayed.  
+
+![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
+
+In order to speed up the establishment of a nomenclature, it is possible to export / import the display and content configurations separately. This is the "Configuration" part that can be seen in the photos above.  
+
+Behind the scenes, an SQLite database does the work, so setting up the content is nothing more or less than an SQL query created using a dialog (screenshot by right).  
+The SQL query is configured as follows (from top to bottom in the screenshot):  
+- “Available information”: the information to display;  
+- "Filter": filter the information (is not empty, is empty, contains, does not contain, is equal to, is not equal to) only one filter can be applied per information, it is not possible combine several;  
+- "Type of elements": allows you to filter on what type of element you want to obtain information.  
+
+At the bottom, a checkmark "SQL query" allows you to edit a personalized query, if the basic options are not sufficient.  
+
+When a nomenclature is too large to be contained in a single folio, it is possible to separate it on several folios, the tables of each folio are then linked together. When creating a nomenclature, this option is activated by default, which has the effect of adding the necessary number of folios, adding a table in each of them and linking them together.  
+
+Finally two buttons are available in the property panel:    
+- "Fit the table to the folio": positions and adjusts the size and determines the number of rows in the table in relation to the folio;  
+- "Apply geometry to all tables linked to this one": applies the three properties mentioned above to all linked tables in order to save time and maintain aesthetic consistency.  
+
+And to finish a table   
+![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/tableau.png "table")
+
+
+Summary
+
+The old summary has been completely removed from the code in order to make room for the new one which is exactly the same as the nomenclature (a large amount of the code is common), with the exception of the SQL query (and its dialog to configure it) which offers specific information for editing a summary.  
+
+Export of the internal database  
+
+The database used by the nomenclature and the summary can be exported in a “.sqlite” file.  
+Currently this is irrelevant, as the function was created during development for debugging purposes, we left it.  
+Note that the database will become increasingly important in the future of Qet.  
+
+
+Export of the wiring list  
+
+In order to be able to use the wiring number printers more easily, the names of conductors can be exported in CSV format, the export respects the quantity of conductors in order to print the right quantity of numbers, for example a potential numbered 240 composed of 3 wires will give 6 × 240 (2 numbers per wire × 3 wires) in the CSV. 
+
+
+
 ### Story
 
 The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.  
@@ -172,7 +219,7 @@ Nowadays, QET is not only used by many individuals, teachers and students but al
 If you love QElectroTech, you can help developers to buy new hardware to test
 and implement new features. Thanks in advance for your generous donations.
 
-For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)  
-or at [leetchi.com](https://www.leetchi.com/c/qelectroteck)
+For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)
+
 
 

SingleApplication/CHANGELOG.md

@@ -1,12 +1,79 @@
 Changelog
 =========
 
+If by accident I have forgotten to credit someone in the CHANGELOG, email me and I will fix it.
+
+__3.2.0__
+---------
+
+* Added support for Qt 6  - _Jonas Kvinge_
+* Fixed warning in `Qt 5.9` with `min`/`max` functions on Windows - _Nick Korotysh_
+* Fix return value of connectToPrimary() when connect is successful - _Jonas Kvinge_
+* Fix build issue with MinGW GCC pedantic mode - _Iakov Kirilenko_
+* Fixed conversion from `int` to `quint32` and Clang Tidy warnings - _Hennadii Chernyshchyk_
+
+__3.1.5__
+---------
+
+* Improved library stability in edge cases and very rapid process initialisation
+* Fixed Bug where the shared memory block may have been modified without a lock
+* Fixed Bug causing `instanceStarted()` to not get emitted when a second instance
+  has been started before the primary has initiated it's `QLocalServer`.
+
+__3.1.4__
+---------
+* Officially supporting and build-testing against Qt 5.15
+* Fixed an MSVC C4996 warning that suggests using `strncpy_s`.
+
+    _Hennadii Chernyshchyk_
+
+__3.1.3.1__
+---------
+* CMake build system improvements
+* Fixed Clang Tidy warnings
+
+    _Hennadii Chernyshchyk_
+
+__3.1.3__
+---------
+* Improved `CMakeLists.txt`
+
+    _Hennadii Chernyshchyk_
+
+__3.1.2__
+---------
+
+* Fix a crash when exiting an application on Android and iOS
+
+    _Emeric Grange_
+
+__3.1.1a__
+----------
+
+* Added currentUser() method that returns the user the current instance is running as.
+
+    _Leander Schulten_
+
+__3.1.0a__
+----------
+
+* Added primaryUser() method that returns the user the primary instance is running as.
+
+__3.0.19__
+----------
+
+* Fixed code warning for depricated functions in Qt 5.10 related to `QTime` and `qrand()`.
+
+   _Hennadii Chernyshchyk_  
+   _Anton Filimonov_  
+   _Jonas Kvinge_
+
 __3.0.18__
 ----------
 
 * Fallback to standard QApplication class on iOS and Android systems where
   the library is not supported.
-  
+
 * Added Build CI tests to verify the library builds successfully on Linux, Windows and MacOS  across multiple Qt versions.
 
   _Anton Filimonov_

SingleApplication/CMakeLists.txt

@@ -1,43 +1,40 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.7.0)
 
-project(SingleApplication)
+project(SingleApplication LANGUAGES CXX)
 
-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
-    )
+)
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
+if(NOT QT_DEFAULT_MAJOR_VERSION)
+    set(QT_DEFAULT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (5 or 6), defaults to 5")
+endif()
 
 # Find dependencies
-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})
+set(QT_COMPONENTS Core Network)
+set(QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Core Qt${QT_DEFAULT_MAJOR_VERSION}::Network)
 
-# Link dependencies
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Network)
 if(QAPPLICATION_CLASS STREQUAL QApplication)
-    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
+    list(APPEND QT_COMPONENTS Widgets)
+    list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Widgets)
 elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
-    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Gui)
+    list(APPEND QT_COMPONENTS Gui)
+    list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Gui)
 else()
-    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core)
+    set(QAPPLICATION_CLASS QCoreApplication)
 endif()
 
+find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED)
+
+target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES})
+
 if(WIN32)
     target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
 endif()
 
+target_compile_definitions(${PROJECT_NAME} PUBLIC QAPPLICATION_CLASS=${QAPPLICATION_CLASS})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

SingleApplication/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Itay Grudev 2015 - 2016
+Copyright (c) Itay Grudev 2015 - 2020
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

SingleApplication/README.md

@@ -1,7 +1,8 @@
 SingleApplication
 =================
+[![CI](https://github.com/itay-grudev/SingleApplication/workflows/CI:%20Build%20Test/badge.svg)](https://github.com/itay-grudev/SingleApplication/actions)
 
-This is a replacement of the QtSingleApplication for `Qt5`.
+This is a replacement of the QtSingleApplication for `Qt5` and `Qt6`.
 
 Keeps the Primary Instance of your Application and kills each subsequent
 instances. It can (if enabled) spawn secondary (non-related to the primary)
@@ -15,18 +16,6 @@ class you specify via the `QAPPLICATION_CLASS` macro (`QCoreApplication` is the
 default). Further usage is similar to the use of the `Q[Core|Gui]Application`
 classes.
 
-The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
-instance of your Application is your Primary Instance. It would check if the
-shared memory block exists and if not it will start a `QLocalServer` and listen
-for connections. Each subsequent instance of your application would check if the
-shared memory block exists and if it does, it will connect to the QLocalServer
-to notify the primary instance that a new instance had been started, after which
-it would terminate with status code `0`. In the Primary Instance
-`SingleApplication` would emit the `instanceStarted()` signal upon detecting
-that a new instance had been started.
-
-The library uses `stdlib` to terminate the program with the `exit()` function.
-
 You can use the library as if you use any other `QCoreApplication` derived
 class:
 
@@ -43,8 +32,7 @@ int main( int argc, char* argv[] )
 ```
 
 To include the library files I would recommend that you add it as a git
-submodule to your project and include it's contents with a `.pri` file. Here is
-how:
+submodule to your project. Here is how:
 
 ```bash
 git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
@@ -66,13 +54,27 @@ Then include the subdirectory in your `CMakeLists.txt` project file.
 ```cmake
 set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
 add_subdirectory(src/third-party/singleapplication)
+target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)
 ```
 
+
+The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
+instance of your Application is your Primary Instance. It would check if the
+shared memory block exists and if not it will start a `QLocalServer` and listen
+for connections. Each subsequent instance of your application would check if the
+shared memory block exists and if it does, it will connect to the QLocalServer
+to notify the primary instance that a new instance had been started, after which
+it would terminate with status code `0`. In the Primary Instance
+`SingleApplication` would emit the `instanceStarted()` signal upon detecting
+that a new instance had been started.
+
+The library uses `stdlib` to terminate the program with the `exit()` function.
+
 Also don't forget to specify which `QCoreApplication` class your app is using if it
 is not `QCoreApplication` as in examples above.
 
 The `Instance Started` signal
-------------------------
+-----------------------------
 
 The SingleApplication class implements a `instanceStarted()` signal. You can
 bind to that signal to raise your application's window when a new instance had
@@ -137,13 +139,22 @@ app.isSecondary();
 *__Note:__ If your Primary Instance is terminated a newly launched instance
 will replace the Primary one even if the Secondary flag has been set.*
 
+Examples
+--------
+
+There are three examples provided in this repository:
+
+* Basic example that prevents a secondary instance from starting [`examples/basic`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/basic)
+* An example of a graphical application raising it's parent window [`examples/calculator`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/calculator)
+* A console application sending the primary instance it's command line parameters [`examples/sending_arguments`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/sending_arguments)
+
 API
 ---
 
 ### Members
 
 ```cpp
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100 )
+SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100, QString userData = QString() )
 ```
 
 Depending on whether `allowSecondary` is set, this constructor may terminate
@@ -152,7 +163,7 @@ can be specified to set whether the SingleApplication block should work
 user-wide or system-wide. Additionally the `Mode::SecondaryNotification` may be
 used to notify the primary instance whenever a secondary instance had been
 started (disabled by default). `timeout` specifies the maximum time in
-milliseconds to wait for blocking operations.
+milliseconds to wait for blocking operations. Setting `userData` provides additional data that will isolate this instance from other instances that do not have the same (or any) user data set.
 
 *__Note:__ `argc` and `argv` may be changed as Qt removes arguments that it
 recognizes.*
@@ -204,6 +215,22 @@ qint64 SingleApplication::primaryPid()
 
 Returns the process ID (PID) of the primary instance.
 
+---
+
+```cpp
+QString SingleApplication::primaryUser()
+```
+
+Returns the username the primary instance is running as.
+
+---
+
+```cpp
+QString SingleApplication::currentUser()
+```
+
+Returns the username the current instance is running as.
+
 ### Signals
 
 ```cpp

SingleApplication/SingleApplication

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

SingleApplication/examples/basic/CMakeLists.txt

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

SingleApplication/examples/basic/main.cpp

@@ -5,5 +5,7 @@ int main(int argc, char *argv[])
     // Allow secondary instances
     SingleApplication app( argc, argv );
 
+    qWarning() << "Started a new instance";
+
     return app.exec();
 }

SingleApplication/examples/calculator/CMakeLists.txt

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

SingleApplication/examples/calculator/calculator.cpp

@@ -82,27 +82,27 @@ Calculator::Calculator(QWidget *parent)
         digitButtons[i] = createButton(QString::number(i), SLOT(digitClicked()));
     }
 
-    Button *pointButton = createButton(tr("."), SLOT(pointClicked()));
-    Button *changeSignButton = createButton(tr("\302\261"), SLOT(changeSignClicked()));
+    Button *pointButton = createButton(".", SLOT(pointClicked()));
+    Button *changeSignButton = createButton("\302\261", SLOT(changeSignClicked()));
 
-    Button *backspaceButton = createButton(tr("Backspace"), SLOT(backspaceClicked()));
-    Button *clearButton = createButton(tr("Clear"), SLOT(clear()));
-    Button *clearAllButton = createButton(tr("Clear All"), SLOT(clearAll()));
+    Button *backspaceButton = createButton("Backspace", SLOT(backspaceClicked()));
+    Button *clearButton = createButton("Clear", SLOT(clear()));
+    Button *clearAllButton = createButton("Clear All", SLOT(clearAll()));
 
-    Button *clearMemoryButton = createButton(tr("MC"), SLOT(clearMemory()));
-    Button *readMemoryButton = createButton(tr("MR"), SLOT(readMemory()));
-    Button *setMemoryButton = createButton(tr("MS"), SLOT(setMemory()));
-    Button *addToMemoryButton = createButton(tr("M+"), SLOT(addToMemory()));
+    Button *clearMemoryButton = createButton("MC", SLOT(clearMemory()));
+    Button *readMemoryButton = createButton("MR", SLOT(readMemory()));
+    Button *setMemoryButton = createButton("MS", SLOT(setMemory()));
+    Button *addToMemoryButton = createButton("M+", SLOT(addToMemory()));
 
-    Button *divisionButton = createButton(tr("\303\267"), SLOT(multiplicativeOperatorClicked()));
-    Button *timesButton = createButton(tr("\303\227"), SLOT(multiplicativeOperatorClicked()));
-    Button *minusButton = createButton(tr("-"), SLOT(additiveOperatorClicked()));
-    Button *plusButton = createButton(tr("+"), SLOT(additiveOperatorClicked()));
+    Button *divisionButton = createButton("\303\267", SLOT(multiplicativeOperatorClicked()));
+    Button *timesButton = createButton("\303\227", SLOT(multiplicativeOperatorClicked()));
+    Button *minusButton = createButton("-", SLOT(additiveOperatorClicked()));
+    Button *plusButton = createButton("+", SLOT(additiveOperatorClicked()));
 
-    Button *squareRootButton = createButton(tr("Sqrt"), SLOT(unaryOperatorClicked()));
-    Button *powerButton = createButton(tr("x\302\262"), SLOT(unaryOperatorClicked()));
-    Button *reciprocalButton = createButton(tr("1/x"), SLOT(unaryOperatorClicked()));
-    Button *equalButton = createButton(tr("="), SLOT(equalClicked()));
+    Button *squareRootButton = createButton("Sqrt", SLOT(unaryOperatorClicked()));
+    Button *powerButton = createButton("x\302\262", SLOT(unaryOperatorClicked()));
+    Button *reciprocalButton = createButton("1/x", SLOT(unaryOperatorClicked()));
+    Button *equalButton = createButton("=", SLOT(equalClicked()));
 //! [4]
 
 //! [5]
@@ -140,7 +140,7 @@ Calculator::Calculator(QWidget *parent)
     mainLayout->addWidget(equalButton, 5, 5);
     setLayout(mainLayout);
 
-    setWindowTitle(tr("Calculator"));
+    setWindowTitle("Calculator");
 }
 //! [6]
 
@@ -169,15 +169,15 @@ void Calculator::unaryOperatorClicked()
     double operand = display->text().toDouble();
     double result = 0.0;
 
-    if (clickedOperator == tr("Sqrt")) {
+    if (clickedOperator == "Sqrt") {
         if (operand < 0.0) {
             abortOperation();
             return;
         }
         result = std::sqrt(operand);
-    } else if (clickedOperator == tr("x\302\262")) {
+    } else if (clickedOperator == "x\302\262") {
         result = std::pow(operand, 2.0);
-    } else if (clickedOperator == tr("1/x")) {
+    } else if (clickedOperator == "1/x") {
         if (operand == 0.0) {
             abortOperation();
             return;
@@ -287,7 +287,7 @@ void Calculator::pointClicked()
     if (waitingForOperand)
         display->setText("0");
     if (!display->text().contains('.'))
-        display->setText(display->text() + tr("."));
+        display->setText(display->text() + ".");
     waitingForOperand = false;
 }
 //! [22]
@@ -299,7 +299,7 @@ void Calculator::changeSignClicked()
     double value = text.toDouble();
 
     if (value > 0.0) {
-        text.prepend(tr("-"));
+        text.prepend("-");
     } else if (value < 0.0) {
         text.remove(0, 1);
     }
@@ -383,20 +383,20 @@ Button *Calculator::createButton(const QString &text, const char *member)
 void Calculator::abortOperation()
 {
     clearAll();
-    display->setText(tr("####"));
+    display->setText("####");
 }
 //! [36]
 
 //! [38]
 bool Calculator::calculate(double rightOperand, const QString &pendingOperator)
 {
-    if (pendingOperator == tr("+")) {
+    if (pendingOperator == "+") {
         sumSoFar += rightOperand;
-    } else if (pendingOperator == tr("-")) {
+    } else if (pendingOperator == "-") {
         sumSoFar -= rightOperand;
-    } else if (pendingOperator == tr("\303\227")) {
+    } else if (pendingOperator == "\303\227") {
         factorSoFar *= rightOperand;
-    } else if (pendingOperator == tr("\303\267")) {
+    } else if (pendingOperator == "\303\267") {
         if (rightOperand == 0.0)
             return false;
         factorSoFar /= rightOperand;

SingleApplication/examples/sending_arguments/CMakeLists.txt

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

SingleApplication/examples/sending_arguments/main.cpp

@@ -11,6 +11,9 @@ int main(int argc, char *argv[])
     // If this is a secondary instance
     if( app.isSecondary() ) {
         app.sendMessage( app.arguments().join(' ').toUtf8() );
+        qDebug() << "App already running.";
+        qDebug() << "Primary instance PID: " << app.primaryPid();
+        qDebug() << "Primary instance user: " << app.primaryUser();
         return 0;
     } else {
         QObject::connect(

SingleApplication/singleapplication.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,176 +20,255 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <QtCore/QTime>
-#include <QtCore/QThread>
-#include <QtCore/QDateTime>
+#include <QtCore/QElapsedTimer>
 #include <QtCore/QByteArray>
 #include <QtCore/QSharedMemory>
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.10 or later")
-#endif
-#include <QRandomGenerator>
-#endif
+
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
 /**
-	@brief Constructor. Checks and fires up LocalServer or closes the program
-	if another instance already exists
-	@param argc
-	@param argv
-	@param {bool} allowSecondaryInstances
-*/
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout )
-	: app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
+ * @brief Constructor. Checks and fires up LocalServer or closes the program
+ * if another instance already exists
+ * @param argc
+ * @param argv
+ * @param allowSecondary Whether to enable secondary instance support
+ * @param options Optional flags to toggle specific behaviour
+ * @param timeout Maximum time blocking functions are allowed during app load
+ */
+SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, const QString &userData )
+    : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
 {
-	Q_D(SingleApplication);
+    Q_D( SingleApplication );
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-	// On Android and iOS since the library is not supported fallback to
-	// standard QApplication behaviour by simply returning at this point.
-	qWarning() << "SingleApplication is not supported on Android and iOS systems.";
-	return;
+    // On Android and iOS since the library is not supported fallback to
+    // standard QApplication behaviour by simply returning at this point.
+    qWarning() << "SingleApplication is not supported on Android and iOS systems.";
+    return;
 #endif
 
-	// Store the current mode of the program
-	d->options = options;
+    // 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();
+    // Add any unique user data
+    if ( ! userData.isEmpty() )
+        d->addAppData( userData );
+
+    // Generating an application ID used for identifying the shared memory
+    // block and QLocalServer
+    d->genBlockServerName();
+
+    // To mitigate QSharedMemory issues with large amount of processes
+    // attempting to attach at the same time
+    SingleApplicationPrivate::randomSleep();
 
 #ifdef Q_OS_UNIX
-	// By explicitly attaching it and then deleting it we make sure that the
-	// memory is deleted even after the process has crashed on Unix.
-	d->memory = new QSharedMemory( d->blockServerName );
-	d->memory->attach();
-	delete d->memory;
+    // 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
+        if( ! d->memory->lock() ){
+          qCritical() << "SingleApplication: Unable to lock memory block after create.";
+          abortSafely();
+        }
+        d->initializeMemoryBlock();
+    } else {
+        if( d->memory->error() == QSharedMemory::AlreadyExists ){
+          // Attempt to attach to the memory segment
+          if( ! d->memory->attach() ){
+              qCritical() << "SingleApplication: Unable to attach to shared memory block.";
+              abortSafely();
+          }
+          if( ! d->memory->lock() ){
+            qCritical() << "SingleApplication: Unable to lock memory block after attach.";
+            abortSafely();
+          }
+        } else {
+          qCritical() << "SingleApplication: Unable to create block.";
+          abortSafely();
+        }
+    }
 
-	InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-	QElapsedTimer time;
-	time.start();
+    auto *inst = static_cast<InstancesInfo*>( d->memory->data() );
+    QElapsedTimer time;
+    time.start();
 
-	// Make sure the shared memory block is initialised and in consistent state
-	while( true ) {
-		d->memory->lock();
+    // Make sure the shared memory block is initialised and in consistent state
+    while( true ){
+      // If the shared memory block's checksum is valid continue
+      if( d->blockChecksum() == inst->checksum ) break;
 
-		if( d->blockChecksum() == inst->checksum ) break;
+      // If more than 5s have elapsed, assume the primary instance crashed and
+      // assume it's position
+      if( time.elapsed() > 5000 ){
+          qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
+          d->initializeMemoryBlock();
+      }
 
-		if( time.elapsed() > 5000 ) {
-			qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
-			d->initializeMemoryBlock();
-		}
+      // Otherwise wait for a random period and try again. The random sleep here
+      // limits the probability of a collision between two racing apps and
+      // allows the app to initialise faster
+      if( ! d->memory->unlock() ){
+        qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
+        qDebug() << d->memory->errorString();
+      }
+      SingleApplicationPrivate::randomSleep();
+      if( ! d->memory->lock() ){
+        qCritical() << "SingleApplication: Unable to lock memory after random wait.";
+        abortSafely();
+      }
+    }
 
-		d->memory->unlock();
+    if( inst->primary == false ){
+        d->startPrimary();
+        if( ! d->memory->unlock() ){
+          qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
+          qDebug() << d->memory->errorString();
+        }
+        return;
+    }
 
-		// Random sleep here limits the probability of a collision between two racing apps
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
-		qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
-		QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.10 or later")
-#endif
-		quint32 value = QRandomGenerator::global()->generate();
-		QThread::sleep(8 + static_cast<unsigned long>(value / RAND_MAX * 10));
-#endif
-	}
+    // Check if another instance can be started
+    if( allowSecondary ){
+        d->startSecondary();
+        if( d->options & Mode::SecondaryNotification ){
+            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
+        }
+        if( ! d->memory->unlock() ){
+          qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
+          qDebug() << d->memory->errorString();
+        }
+        return;
+    }
 
-	if( inst->primary == false) {
-		d->startPrimary();
-		d->memory->unlock();
-		return;
-	}
+    if( ! d->memory->unlock() ){
+      qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
+      qDebug() << d->memory->errorString();
+    }
 
-	// 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->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
 
-	d->memory->unlock();
+    delete d;
 
-	d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+    ::exit( EXIT_SUCCESS );
+}
 
-	delete d;
-
-	::exit( EXIT_SUCCESS );
+SingleApplication::~SingleApplication()
+{
+    Q_D( SingleApplication );
+    delete d;
 }
 
 /**
-	@brief Destructor
-*/
-SingleApplication::~SingleApplication()
+ * Checks if the current application instance is primary.
+ * @return Returns true if the instance is primary, false otherwise.
+ */
+bool SingleApplication::isPrimary() const
 {
-	Q_D(SingleApplication);
-	delete d;
+    Q_D( const SingleApplication );
+    return d->server != nullptr;
 }
 
-bool SingleApplication::isPrimary()
+/**
+ * Checks if the current application instance is secondary.
+ * @return Returns true if the instance is secondary, false otherwise.
+ */
+bool SingleApplication::isSecondary() const
 {
-	Q_D(SingleApplication);
-	return d->server != nullptr;
+    Q_D( const SingleApplication );
+    return d->server == nullptr;
 }
 
-bool SingleApplication::isSecondary()
+/**
+ * Allows you to identify an instance by returning unique consecutive instance
+ * ids. It is reset when the first (primary) instance of your app starts and
+ * only incremented afterwards.
+ * @return Returns a unique instance id.
+ */
+quint32 SingleApplication::instanceId() const
 {
-	Q_D(SingleApplication);
-	return d->server == nullptr;
+    Q_D( const SingleApplication );
+    return d->instanceNumber;
 }
 
-quint32 SingleApplication::instanceId()
+/**
+ * Returns the OS PID (Process Identifier) of the process running the primary
+ * instance. Especially useful when SingleApplication is coupled with OS.
+ * specific APIs.
+ * @return Returns the primary instance PID.
+ */
+qint64 SingleApplication::primaryPid() const
 {
-	Q_D(SingleApplication);
-	return d->instanceNumber;
+    Q_D( const SingleApplication );
+    return d->primaryPid();
 }
 
-qint64 SingleApplication::primaryPid()
+/**
+ * Returns the username the primary instance is running as.
+ * @return Returns the username the primary instance is running as.
+ */
+QString SingleApplication::primaryUser() const
 {
-	Q_D(SingleApplication);
-	return d->primaryPid();
+    Q_D( const SingleApplication );
+    return d->primaryUser();
 }
 
-bool SingleApplication::sendMessage( QByteArray message, int timeout )
+/**
+ * Returns the username the current instance is running as.
+ * @return Returns the username the current instance is running as.
+ */
+QString SingleApplication::currentUser() const
 {
-	Q_D(SingleApplication);
-
-	// Nobody to connect to
-	if( isPrimary() ) return false;
-
-	// Make sure the socket is connected
-	d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
-
-	d->socket->write( message );
-	bool dataWritten = d->socket->waitForBytesWritten( timeout );
-	d->socket->flush();
-	return dataWritten;
+    return SingleApplicationPrivate::getUsername();
+}
+
+/**
+ * Sends message to the Primary Instance.
+ * @param message The message to send.
+ * @param timeout the maximum timeout in milliseconds for blocking functions.
+ * @return true if the message was sent successfuly, false otherwise.
+ */
+bool SingleApplication::sendMessage( const QByteArray &message, int timeout )
+{
+    Q_D( SingleApplication );
+
+    // Nobody to connect to
+    if( isPrimary() ) return false;
+
+    // Make sure the socket is connected
+    if( ! d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect ) )
+      return false;
+
+    d->socket->write( message );
+    bool dataWritten = d->socket->waitForBytesWritten( timeout );
+    d->socket->flush();
+    return dataWritten;
+}
+
+/**
+ * Cleans up the shared memory block and exits with a failure.
+ * This function halts program execution.
+ */
+void SingleApplication::abortSafely()
+{
+    Q_D( SingleApplication );
+
+    qCritical() << "SingleApplication: " << d->memory->error() << d->memory->errorString();
+    delete d;
+    ::exit( EXIT_FAILURE );
+}
+
+QStringList SingleApplication::userData() const
+{
+    Q_D( const SingleApplication );
+    return d->appData();
 }

SingleApplication/singleapplication.h

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

SingleApplication/singleapplication.pri

@@ -1,7 +1,8 @@
 QT += core network
-CONFIG += c++17
+CONFIG += c++11
 
-HEADERS += $$PWD/singleapplication.h \
+HEADERS += $$PWD/SingleApplication \
+    $$PWD/singleapplication.h \
     $$PWD/singleapplication_p.h
 SOURCES += $$PWD/singleapplication.cpp \
     $$PWD/singleapplication_p.cpp

SingleApplication/singleapplication_p.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -33,412 +33,454 @@
 #include <cstddef>
 
 #include <QtCore/QDir>
+#include <QtCore/QThread>
 #include <QtCore/QByteArray>
 #include <QtCore/QDataStream>
+#include <QtCore/QElapsedTimer>
 #include <QtCore/QCryptographicHash>
 #include <QtNetwork/QLocalServer>
 #include <QtNetwork/QLocalSocket>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QtCore/QRandomGenerator>
+#else
+#include <QtCore/QDateTime>
+#endif
+
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
 #ifdef Q_OS_UNIX
-	#include <unistd.h>
-	#include <sys/types.h>
-	#include <pwd.h>
+    #include <unistd.h>
+    #include <sys/types.h>
+    #include <pwd.h>
 #endif
 
 #ifdef Q_OS_WIN
-#include <windows.h>
-#include <lmcons.h>
+    #ifndef NOMINMAX
+        #define NOMINMAX 1
+    #endif
+    #include <windows.h>
+    #include <lmcons.h>
 #endif
 
 SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
-	: q_ptr( q_ptr )
+    : q_ptr( q_ptr )
 {
-	server = nullptr;
-	socket = nullptr;
-	memory = nullptr;
-	instanceNumber = -1;
+    server = nullptr;
+    socket = nullptr;
+    memory = nullptr;
+    instanceNumber = 0;
 }
 
 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();
+    if( memory != nullptr ){
+        memory->lock();
+        auto *inst = static_cast<InstancesInfo*>(memory->data());
+        if( server != nullptr ){
+            server->close();
+            delete server;
+            inst->primary = false;
+            inst->primaryPid = -1;
+            inst->primaryUser[0] =  '\0';
+            inst->checksum = blockChecksum();
+        }
+        memory->unlock();
 
-	delete memory;
+        delete memory;
+    }
+}
+
+QString SingleApplicationPrivate::getUsername()
+{
+#ifdef Q_OS_WIN
+      wchar_t username[UNLEN + 1];
+      // Specifies size of the buffer on input
+      DWORD usernameLength = UNLEN + 1;
+      if( GetUserNameW( username, &usernameLength ) )
+          return QString::fromWCharArray( username );
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+      return QString::fromLocal8Bit( qgetenv( "USERNAME" ) );
+#else
+      return qEnvironmentVariable( "USERNAME" );
+#endif
+#endif
+#ifdef Q_OS_UNIX
+      QString username;
+      uid_t uid = geteuid();
+      struct passwd *pw = getpwuid( uid );
+      if( pw )
+          username = QString::fromLocal8Bit( pw->pw_name );
+      if ( username.isEmpty() ){
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+          username = QString::fromLocal8Bit( qgetenv( "USER" ) );
+#else
+          username = qEnvironmentVariable( "USER" );
+#endif
+      }
+      return username;
+#endif
 }
 
 void SingleApplicationPrivate::genBlockServerName()
 {
-	QCryptographicHash appData( QCryptographicHash::Sha256 );
-	appData.addData( "SingleApplication", 17 );
-	appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
-	appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
-	appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
+    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 ( ! appDataList.isEmpty() )
+        appData.addData( appDataList.join( "" ).toUtf8() );
 
-	if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
+    if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ){
+        appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
+    }
+
+    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ){
 #ifdef Q_OS_WIN
-		appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
+        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 ) {
-#ifdef Q_OS_WIN
-		wchar_t username [ UNLEN + 1 ];
-		// Specifies size of the buffer on input
-		DWORD usernameLength = UNLEN + 1;
-		if( GetUserNameW( username, &usernameLength ) ) {
-			appData.addData( QString::fromWCharArray(username).toUtf8() );
-		} else {
-			appData.addData( qgetenv("USERNAME") );
-		}
-#endif
-#ifdef Q_OS_UNIX
-		QByteArray username;
-		uid_t uid = geteuid();
-		struct passwd *pw = getpwuid(uid);
-		if( pw ) {
-			username = pw->pw_name;
-		}
-		if( username.isEmpty() ) {
-			username = qgetenv("USER");
-		}
-		appData.addData(username);
-#endif
-	}
+    // User level block requires a user specific data in the hash
+    if( options & SingleApplication::Mode::User ){
+        appData.addData( getUsername().toUtf8() );
+    }
 
-	// Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
-	// server naming requirements.
-	blockServerName = appData.result().toBase64().replace("/", "_");
+    // 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()
+void SingleApplicationPrivate::initializeMemoryBlock() const
 {
-	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-	inst->primary = false;
-	inst->secondary = 0;
-	inst->primaryPid = -1;
-	inst->checksum = blockChecksum();
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
+    inst->primary = false;
+    inst->secondary = 0;
+    inst->primaryPid = -1;
+    inst->primaryUser[0] =  '\0';
+    inst->checksum = blockChecksum();
 }
 
 void SingleApplicationPrivate::startPrimary()
 {
-	Q_Q(SingleApplication);
+    // Reset the number of connections
+    auto *inst = static_cast <InstancesInfo*>( memory->data() );
 
-	// Successful creation means that no main process exists
-	// So we start a QLocalServer to listen for connections
-	QLocalServer::removeServer( blockServerName );
-	server = new QLocalServer();
+    inst->primary = true;
+    inst->primaryPid = QCoreApplication::applicationPid();
+    qstrncpy( inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser) );
+    inst->checksum = blockChecksum();
+    instanceNumber = 0;
+    // Successful creation means that no main process exists
+    // So we start a QLocalServer to listen for connections
+    QLocalServer::removeServer( blockServerName );
+    server = new QLocalServer();
 
-	// Restrict access to the socket according to the
-	// SingleApplication::Mode::User flag on User level or no restrictions
-	if( options & SingleApplication::Mode::User ) {
-		server->setSocketOptions( QLocalServer::UserAccessOption );
-	} else {
-		server->setSocketOptions( QLocalServer::WorldAccessOption );
-	}
+    // Restrict access to the socket according to the
+    // SingleApplication::Mode::User flag on User level or no restrictions
+    if( options & SingleApplication::Mode::User ){
+        server->setSocketOptions( QLocalServer::UserAccessOption );
+    } else {
+        server->setSocketOptions( QLocalServer::WorldAccessOption );
+    }
 
-	server->listen( blockServerName );
-	QObject::connect(
-				server,
-				&QLocalServer::newConnection,
-				this,
-				&SingleApplicationPrivate::slotConnectionEstablished
-				);
-
-	// Reset the number of connections
-	InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
-
-	inst->primary = true;
-	inst->primaryPid = q->applicationPid();
-	inst->checksum = blockChecksum();
-
-	instanceNumber = 0;
+    server->listen( blockServerName );
+    QObject::connect(
+        server,
+        &QLocalServer::newConnection,
+        this,
+        &SingleApplicationPrivate::slotConnectionEstablished
+    );
 }
 
 void SingleApplicationPrivate::startSecondary()
 {
+  auto *inst = static_cast <InstancesInfo*>( memory->data() );
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber = inst->secondary;
 }
 
-void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
+bool 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();
-	}
+    QElapsedTimer time;
+    time.start();
 
-	// If already connected - we are done;
-	if( socket->state() == QLocalSocket::ConnectedState )
-		return;
+    // Connect to the Local Server of the Primary Instance if not already
+    // connected.
+    if( socket == nullptr ){
+        socket = new QLocalSocket();
+    }
 
-	// If not connect
-	if( socket->state() == QLocalSocket::UnconnectedState ||
-		socket->state() == QLocalSocket::ClosingState ) {
-		socket->connectToServer( blockServerName );
-	}
+    if( socket->state() == QLocalSocket::ConnectedState ) return true;
 
-	// Wait for being connected
-	if( socket->state() == QLocalSocket::ConnectingState ) {
-		socket->waitForConnected( msecs );
-	}
+    if( socket->state() != QLocalSocket::ConnectedState ){
 
-	// 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);
+        while( true ){
+            randomSleep();
+
+          if( socket->state() != QLocalSocket::ConnectingState )
+            socket->connectToServer( blockServerName );
+
+          if( socket->state() == QLocalSocket::ConnectingState ){
+              socket->waitForConnected( static_cast<int>(msecs - time.elapsed()) );
+          }
+
+          // If connected break out of the loop
+          if( socket->state() == QLocalSocket::ConnectedState ) break;
+
+          // If elapsed time since start is longer than the method timeout return
+          if( time.elapsed() >= msecs ) return false;
+        }
+    }
+
+    // Initialisation message according to the SingleApplication protocol
+    QByteArray initMsg;
+    QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-		writeStream.setVersion(QDataStream::Qt_5_6);
+    writeStream.setVersion(QDataStream::Qt_5_6);
 #endif
 
-		writeStream << blockServerName.toLatin1();
-		writeStream << static_cast<quint8>(connectionType);
-		writeStream << instanceNumber;
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-		quint16 checksum =
-				qChecksum(
-					initMsg.constData(),
-					static_cast<quint32>(initMsg.length()));
+    writeStream << blockServerName.toLatin1();
+    writeStream << static_cast<quint8>(connectionType);
+    writeStream << instanceNumber;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
 #else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
+    quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
-		quint16 checksum =
-				qChecksum(
-					QByteArrayView(
-						initMsg.constData(),
-						static_cast<quint32>(initMsg.length())));
-#endif
-		writeStream << checksum;
+    writeStream << checksum;
 
-		// The header indicates the message length that follows
-		QByteArray header;
-		QDataStream headerStream(&header, QIODevice::WriteOnly);
+    // 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 );
+    bool result = socket->waitForBytesWritten( static_cast<int>(msecs - time.elapsed()) );
+    socket->flush();
+    return result;
 }
 
-quint16 SingleApplicationPrivate::blockChecksum()
+quint16 SingleApplicationPrivate::blockChecksum() const
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	return qChecksum(
-				static_cast <const char *>( memory->data() ),
-				offsetof( InstancesInfo, checksum )
-				);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory->constData()), 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 )));
-
+    quint16 checksum = qChecksum(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum));
 #endif
+    return checksum;
 }
 
-qint64 SingleApplicationPrivate::primaryPid()
+qint64 SingleApplicationPrivate::primaryPid() const
 {
-	qint64 pid;
+    qint64 pid;
 
-	memory->lock();
-	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-	pid = inst->primaryPid;
-	memory->unlock();
+    memory->lock();
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
+    pid = inst->primaryPid;
+    memory->unlock();
 
-	return pid;
+    return pid;
+}
+
+QString SingleApplicationPrivate::primaryUser() const
+{
+    QByteArray username;
+
+    memory->lock();
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
+    username = inst->primaryUser;
+    memory->unlock();
+
+    return QString::fromUtf8( username );
 }
 
 /**
-	@brief Executed when a connection has been made to the LocalServer
-*/
+ * @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, &QLocalSocket::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::destroyed,
+        [nextConnSocket, this](){
+            connectionMap.remove(nextConnSocket);
+        }
+    );
+
+    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
+        [nextConnSocket, this](){
+            auto &info = connectionMap[nextConnSocket];
+            switch(info.stage){
+            case StageHeader:
+                readInitMessageHeader(nextConnSocket);
+                break;
+            case StageBody:
+                readInitMessageBody(nextConnSocket);
+                break;
+            case StageConnected:
+                Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
+                break;
+            default:
+                break;
+            };
+        }
+    );
 }
 
 void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
 {
-	if (!connectionMap.contains( sock )) {
-		return;
-	}
+    if (!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;
 
-#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 ) ) );
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
 #else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
+    const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
 #endif
-	const quint16 actualChecksum =
-			qChecksum(
-				QByteArrayView(
-					msgBytes.constData(),
-					static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
-#endif
-	bool isValid = readStream.status() == QDataStream::Ok &&
-			QLatin1String(latin1Name) == blockServerName &&
-			msgChecksum == actualChecksum;
 
-	if( !isValid ) {
-		sock->close();
-		return;
-	}
+    bool isValid = readStream.status() == QDataStream::Ok &&
+                   QLatin1String(latin1Name) == blockServerName &&
+                   msgChecksum == actualChecksum;
 
-	info.instanceId = instanceId;
-	info.stage = StageConnected;
+    if( !isValid ){
+        sock->close();
+        return;
+    }
 
-	if( connectionType == NewInstance ||
-		( connectionType == SecondaryInstance &&
-		  options & SingleApplication::Mode::SecondaryNotification ) )
-	{
-		Q_EMIT q->instanceStarted();
-	}
+    info.instanceId = instanceId;
+    info.stage = StageConnected;
 
-	if (sock->bytesAvailable() > 0) {
-		Q_EMIT this->slotDataAvailable( sock, instanceId );
-	}
+    if( connectionType == NewInstance ||
+        ( connectionType == SecondaryInstance &&
+          options & SingleApplication::Mode::SecondaryNotification ) )
+    {
+        Q_EMIT q->instanceStarted();
+    }
+
+    if (sock->bytesAvailable() > 0){
+        Q_EMIT this->slotDataAvailable( sock, instanceId );
+    }
 }
 
 void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
 {
-	Q_Q(SingleApplication);
-	Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
+    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  );
+}
+
+void SingleApplicationPrivate::randomSleep()
+{
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 )
+    QThread::msleep( QRandomGenerator::global()->bounded( 8u, 18u ));
+#else
+    qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
+    QThread::msleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ));
+#endif
+}
+
+void SingleApplicationPrivate::addAppData(const QString &data)
+{
+    appDataList.push_back(data);
+}
+
+QStringList SingleApplicationPrivate::appData() const
+{
+    return appDataList;
 }

SingleApplication/singleapplication_p.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2016
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -38,62 +38,67 @@
 #include "singleapplication.h"
 
 struct InstancesInfo {
-	bool primary;
-	quint32 secondary;
-	qint64 primaryPid;
-	quint16 checksum;
+    bool primary;
+    quint32 secondary;
+    qint64 primaryPid;
+    char primaryUser[128];
+    quint16 checksum; // Must be the last field
 };
 
 struct ConnectionInfo {
-	explicit ConnectionInfo() :
-		msgLen(0), instanceId(0), stage(0) {}
-	qint64 msgLen;
-	quint32 instanceId;
-	quint8 stage;
+    qint64 msgLen = 0;
+    quint32 instanceId = 0;
+    quint8 stage = 0;
 };
 
 class SingleApplicationPrivate : public QObject {
-	Q_OBJECT
-	public:
-	enum ConnectionType : quint8 {
-		InvalidConnection = 0,
-		NewInstance = 1,
-		SecondaryInstance = 2,
-		Reconnect = 3
-	};
-	enum ConnectionStage : quint8 {
-		StageHeader = 0,
-		StageBody = 1,
-		StageConnected = 2,
-	};
-	Q_DECLARE_PUBLIC(SingleApplication)
-	
-	SingleApplicationPrivate( SingleApplication *q_ptr );
-	~SingleApplicationPrivate();
-	
-	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() override;
+
+    static QString getUsername();
+    void genBlockServerName();
+    void initializeMemoryBlock() const;
+    void startPrimary();
+    void startSecondary();
+    bool connectToPrimary( int msecs, ConnectionType connectionType );
+    quint16 blockChecksum() const;
+    qint64 primaryPid() const;
+    QString primaryUser() const;
+    void readInitMessageHeader(QLocalSocket *socket);
+    void readInitMessageBody(QLocalSocket *socket);
+    static void randomSleep();
+    void addAppData(const QString &data);
+    QStringList appData() const;
+
+    SingleApplication *q_ptr;
+    QSharedMemory *memory;
+    QLocalSocket *socket;
+    QLocalServer *server;
+    quint32 instanceNumber;
+    QString blockServerName;
+    SingleApplication::Options options;
+    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+    QStringList appDataList;
+
+public Q_SLOTS:
+    void slotConnectionEstablished();
+    void slotDataAvailable( QLocalSocket*, quint32 );
+    void slotClientConnectionClosed( QLocalSocket*, quint32 );
 };
 
 #endif // SINGLEAPPLICATION_P_H

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

@@ -1,7 +1,7 @@
 {
   "id": "org.qelectrotech.QElectroTech",
   "runtime": "org.kde.Platform",
-  "runtime-version": "5.14",
+  "runtime-version": "5.15",
   "sdk": "org.kde.Sdk",
   "command": "qelectrotech",
   "rename-desktop-file": "qelectrotech.desktop",
@@ -10,17 +10,61 @@
   "copy-icon": true,
   "finish-args": [
     "--socket=wayland",
-    "--socket=x11",
+    "--socket=fallback-x11",
     "--device=dri",
     "--share=ipc",
     "--filesystem=host"
   ],
   "modules": [
+    {
+      "name": "tkinter",
+      "buildsystem": "simple",
+      "build-commands": [
+         "pip3 install --prefix=${FLATPAK_DEST} ."
+            ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/iwalton3/tkinter-standalone",
+          "commit": "2301112d142ebaf7532b25600c77d1a2edc9ef04"
+        }
+            ],
+      "modules": [
+                {
+          "name": "tcl",
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tcl8.6.11-src.tar.gz",
+              "sha256": "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258"
+            }
+          ],
+          "subdir": "unix",
+          "post-install": [
+              "chmod +w ${FLATPAK_DEST}/lib/libtcl8.6.so"
+          ]
+                },
+                {
+          "name": "tk",
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tk8.6.11-src.tar.gz",
+              "sha256": "5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282"
+            }
+          ],
+          "subdir": "unix",
+          "post-install": [
+              "chmod +w ${FLATPAK_DEST}/lib/libtk8.6.so"
+          ]
+                }
+      ]
+    },
     {
       "name": "qelectrotech",
       "buildsystem": "qmake",
       "post-install": [
-        "mv /app/share/mime/packages/qelectrotech.xml /app/share/mime/packages/org.qelectrotech.QElectroTech.xml"
+        "mv ${FLATPAK_DEST}/share/mime/packages/qelectrotech.xml ${FLATPAK_DEST}/share/mime/packages/org.qelectrotech.QElectroTech.xml"
       ],
       "sources": [
         {
@@ -32,6 +76,34 @@
           "path": "patches/0001-build-Fix-the-installation-paths.patch"
         }
       ]
-    }
+    },
+    {
+    "name": "python3-PySimpleGUI",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
+            "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
+        }
+    ]
+},
+    {
+    "name": "python3-qet-tb-generator",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} qet-tb-generator"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/45/be/d5940d365ebf256e490bc6c10837244e0b8dda08a7d790691767263c318d/qet_tb_generator-1.2.5.tar.gz",
+            "sha256": "37c3298602244f3152fbb7601caba9b4862bac782991fbb472eab91afb70d09c"
+        }
+    ]
+}
   ]
 }

build-aux/snap/snapcraft.yaml

@@ -60,6 +60,7 @@ parts:
     plugin: python
     python-version: python3
     source: https://github.com/qelectrotech/qet_tb_generator.git
+    python-packages: [PySimpleGUI]
     stage-packages: 
       - python3-lxml
       - python3-tk

cmake/define_definitions.cmake

@@ -39,10 +39,12 @@ if(${QET_LANG_PATH} STRGREATER "")
   message("QET_LANG_PATH              " ${INSTALL_PREFIX}${QET_LANG_PATH})
   add_definitions(-DQET_LANG_PATH=${INSTALL_PREFIX}${QET_LANG_PATH})
 endif()
+if (NOT MINGW)
 if(${QET_EXAMPLES_PATH} STRGREATER "")
   message("QET_EXAMPLES_PATH          " ${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
   add_definitions(-DQET_EXAMPLES_PATH=${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
 endif()
+endif()
 
 message("QET_LICENSE_PATH           " ${QET_LICENSE_PATH})
 message("QET_MIME_XML_PATH          " ${QET_MIME_XML_PATH})

cmake/fetch_kdeaddons.cmake

@@ -19,9 +19,9 @@ message(" - fetch_kdeaddons")
 if(DEFINED BUILD_WITH_KF5)
   Include(FetchContent)
 
-  set(BUILD_KF5_YES "YES")
+  option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES)
 
-  if(DEFINED BUILD_KF5_YES)
+  if(BUILD_KF5)
 
     if(NOT DEFINED KF5_GIT_TAG)
       #https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924

cmake/fetch_pugixml.cmake

@@ -18,9 +18,16 @@ message(" - fetch_pugixml")
 
 Include(FetchContent)
 
-FetchContent_Declare(
-  pugixml
-  GIT_REPOSITORY https://github.com/zeux/pugixml.git
-  GIT_TAG        v1.11.1)
+option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
 
-FetchContent_MakeAvailable(pugixml)
+if(BUILD_PUGIXML)
+
+  FetchContent_Declare(
+    pugixml
+    GIT_REPOSITORY https://github.com/zeux/pugixml.git
+    GIT_TAG        v1.11.4)
+
+  FetchContent_MakeAvailable(pugixml)
+else()
+  find_package(pugixml REQUIRED)
+endif()

cmake/fetch_singleapplication.cmake

@@ -26,6 +26,6 @@ Include(FetchContent)
 FetchContent_Declare(
   SingleApplication
   GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
-  GIT_TAG        v3.1.5)
+  GIT_TAG        v3.2.0)
 
 FetchContent_MakeAvailable(SingleApplication)

cmake/git_last_commit_sha.cmake

@@ -28,9 +28,6 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
   # This strips terminating newline in the variable
   string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}")
 
-  # This adds to definitions => .cpp
-  add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")
-
   if(NOT GIT_COMMIT_RESULT EQUAL "0")
     message(
       FATAL_ERROR
@@ -39,3 +36,6 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
       ", please check")
   endif()
 endif()
+
+# This adds to definitions => .cpp
+add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")

cmake/qet_compilation_vars.cmake

@@ -52,6 +52,8 @@ set(QET_RES_FILES
   ${QET_DIR}/sources/editor/ui/lineeditor.ui
   ${QET_DIR}/sources/editor/ui/polygoneditor.ui
   ${QET_DIR}/sources/editor/ui/rectangleeditor.ui
+  ${QET_DIR}/sources/editor/ui/qetelementeditor.ui
+  ${QET_DIR}/sources/editor/ui/terminaleditor.ui
   ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.ui
   ${QET_DIR}/sources/factory/ui/addtabledialog.ui
   ${QET_DIR}/sources/NameList/ui/namelistdialog.ui
@@ -260,12 +262,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/editor/elementscene.h
   ${QET_DIR}/sources/editor/elementview.cpp
   ${QET_DIR}/sources/editor/elementview.h
-  ${QET_DIR}/sources/editor/qetelementeditor.cpp
-  ${QET_DIR}/sources/editor/qetelementeditor.h
   ${QET_DIR}/sources/editor/styleeditor.cpp
   ${QET_DIR}/sources/editor/styleeditor.h
-  ${QET_DIR}/sources/editor/terminaleditor.cpp
-  ${QET_DIR}/sources/editor/terminaleditor.h
 
   ${QET_DIR}/sources/editor/esevent/eseventaddarc.cpp
   ${QET_DIR}/sources/editor/esevent/eseventaddarc.h
@@ -320,8 +318,12 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/editor/ui/polygoneditor.h
   ${QET_DIR}/sources/editor/ui/rectangleeditor.cpp
   ${QET_DIR}/sources/editor/ui/rectangleeditor.h
+  ${QET_DIR}/sources/editor/ui/terminaleditor.cpp
+  ${QET_DIR}/sources/editor/ui/terminaleditor.h
   ${QET_DIR}/sources/editor/ui/texteditor.cpp
   ${QET_DIR}/sources/editor/ui/texteditor.h
+  ${QET_DIR}/sources/editor/ui/qetelementeditor.h
+  ${QET_DIR}/sources/editor/ui/qetelementeditor.cpp
 
   ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.cpp
   ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.h
@@ -371,6 +373,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/print/projectprintwindow.cpp
   ${QET_DIR}/sources/print/projectprintwindow.h
 
+  ${QET_DIR}/sources/properties/elementdata.cpp
+  ${QET_DIR}/sources/properties/elementdata.h
   ${QET_DIR}/sources/properties/propertiesinterface.cpp
   ${QET_DIR}/sources/properties/propertiesinterface.h
   ${QET_DIR}/sources/properties/reportproperties.cpp
@@ -379,6 +383,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/properties/terminaldata.h
   ${QET_DIR}/sources/properties/xrefproperties.cpp
   ${QET_DIR}/sources/properties/xrefproperties.h
+  ${QET_DIR}/sources/properties/userproperties.cpp
+  ${QET_DIR}/sources/properties/userproperties.h
 
   ${QET_DIR}/sources/PropertiesEditor/propertieseditordialog.h
   ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.cpp

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

@@ -14,7 +14,7 @@
         <name lang="hu">Beérkező hivatkozás</name>
         <name lang="nl">Referentie Vorig</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon x2="-1" y2="4" y4="-4" x1="-1" x3="9" y3="0" closed="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" x4="-1" antialias="true"/>

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

@@ -14,7 +14,7 @@
         <name lang="ru">Следующая страница</name>
         <name lang="cs">Další list</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon y3="0" y2="4" x4="-9" x3="2" x1="-9" x2="-9" y4="-4" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" closed="false" antialias="true"/>

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

@@ -29,7 +29,7 @@
         <elementInformation name="plant" show="1"></elementInformation>
         <elementInformation name="label" show="1"></elementInformation>
     </elementInformations>
-    <informations>titus&#xd;
+    <informations>titus
 titus0818@yahoo.com</informations>
     <description>
         <line y1="-16" x1="0" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="13" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>

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

@@ -15,7 +15,7 @@
         <name lang="ru">Однополюсный + нейтраль</name>
 	<name lang="hu">F + N</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-5" y="-25.45" tagg="label" size="9" rotate="true" text="_"/>

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

@@ -15,7 +15,7 @@
         <name lang="ru">Трёхполюсный</name>
 	<name lang="hu">3F</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-2" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>

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

@@ -15,7 +15,7 @@
         <name lang="ru">Трёхполюсный + нейтраль</name>
 	<name lang="hu">3F + N</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-7" y="-44.45" tagg="label" size="9" rotate="true" text="_"/>

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

@@ -15,7 +15,7 @@
         <name lang="ru">Фаза</name>
 	<name lang="hu">F</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-6" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>

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

@@ -28,7 +28,7 @@
         <elementInformation name="plant" show="1"></elementInformation>
         <elementInformation name="label" show="1"></elementInformation>
     </elementInformations>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <dynamic_text uuid="{0af57a27-1887-4576-8b51-200ca996e582}" Halignment="AlignLeft" frame="false" x="2" Valignment="AlignTop" text_from="ElementInfo" y="-22.5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="1" rotation="0" text_width="-1">

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

@@ -10,7 +10,7 @@
         <name lang="cs">Kabel 3G</name>
         <name lang="hu">Kábel 2 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <text x="12" y="9" size="4" text="2"/>

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

@@ -10,7 +10,7 @@
         <name lang="cs">Kabel 4G</name>
         <name lang="hu">Kábel 3 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-12.05" y2="11.95" x2="-8.05"/>

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

@@ -10,7 +10,7 @@
         <name lang="cs">Kabel 3G</name>
         <name lang="hu">Kábel 2 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="17.95" y2="11.95" x2="21.95"/>

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

@@ -8,7 +8,7 @@
         <name lang="cs">Kabel 4G</name>
         <name lang="hu">Kábel 3 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-33.05" y2="11.95" x2="-29.05"/>

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

@@ -8,7 +8,7 @@
         <name lang="cs">Kabel 5G</name>
         <name lang="hu">Kábel 4 + N + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line end1="none" x1="-42.05" y1="7.95" x2="-38.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

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

@@ -8,7 +8,7 @@
         <name lang="cs">Kabel 3G</name>
         <name lang="hu">Kábel 2 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line end1="none" x1="-23.05" y1="7.95" x2="-19.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

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

@@ -7,7 +7,7 @@
         <name lang="hu">Kábel 2 + PE</name>
     </names>
     <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line x2="1.95" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05" length2="1.5" antialias="true" y2="1.95" end2="none" x1="-2.05" length1="1.5"/>

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

@@ -10,7 +10,7 @@
         <name lang="fr">Cable 3 phases+terre</name>
         <name lang="hu">Kábel 3 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line x1="-2.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="1.95" y2="1.95" antialias="true"/>

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

@@ -10,7 +10,7 @@
         <name lang="fr">Cable 6 phases+terre</name>
         <name lang="hu">Kábel 6 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input size="4" tagg="none" rotate="true" x="38" y="-4" text="6"/>

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

@@ -9,7 +9,7 @@
         <name lang="es">Sección 1 conductor</name>
         <name lang="hu">1 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="false" length1="1.5" x2="9.91885" end2="none" x1="-10.8483" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>

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

@@ -9,7 +9,7 @@
         <name lang="es">Sección 2 conductores</name>
         <name lang="hu">2 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>

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

@@ -9,7 +9,7 @@
         <name lang="es">Sección 2 conductores</name>
         <name lang="hu">2 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="true" length1="1.5" x2="21.95" end2="none" x1="17.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>

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

@@ -9,7 +9,7 @@
         <name lang="es">Sección 3 conductores</name>
         <name lang="hu">3 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>

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

@@ -14,7 +14,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-15" y2="10" x2="-10" y3="20" x3="-10"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/sectionneur_3_fusibles+neutre.elmt

@@ -15,7 +15,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="30" y3="20" x3="30"/>

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

@@ -15,7 +15,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-33" y2="0" x2="-26"/>

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

@@ -15,7 +15,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-15" y2="10" x2="-10" y3="20" x3="-10"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_2f-1.elmt

@@ -1,4 +1,4 @@
-<definition hotspot_y="52" version="0.51" hotspot_x="56" link_type="simple" width="70" type="element" height="100">
+<definition hotspot_y="52" version="0.51" hotspot_x="56" link_type="master" width="70" type="element" height="100">
     <uuid uuid="{2d6c186b-0578-4682-90c9-f77843432e9f}"/>
     <names>
         <name lang="cs">Motorový spouštěč 1P+N</name>
@@ -12,6 +12,9 @@
         <name lang="ar">قاطع مغناطيسي-حراري GV</name>
         <name lang="hu">Motorvédő kapcsoló 1 pólusú GV</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <polygon x1="0" y1="14" x5="0" y4="4" y5="4" x6="0" y7="-25" x2="0" y6="-6" y2="10" y3="10" x7="-7" antialias="true" x3="5" closed="false" x4="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_2f-2.elmt

@@ -1,4 +1,4 @@
-<definition hotspot_y="52" width="70" version="0.51" type="element" height="100" hotspot_x="56" link_type="simple">
+<definition hotspot_y="52" width="70" version="0.51" type="element" height="100" hotspot_x="56" link_type="master">
     <uuid uuid="{ec5fa3cd-6769-4a35-aaa9-6bc5ba4fc779}"/>
     <names>
         <name lang="fr">Disjoncteur Magnéto-thermique GV 2P</name>
@@ -8,6 +8,9 @@
         <name lang="cs">Motorový spouštěč 2P</name>
         <name lang="hu">Motorvédő kapcsoló  2 pólusú GV</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <polygon y2="10" x3="-15" y4="4" x2="-20" y3="10" x5="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x4="-15" closed="false" y1="14" y6="-6" x7="-27" y5="4" antialias="true" y7="-25" x6="-20"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_4f-1.elmt

@@ -1,4 +1,4 @@
-<definition hotspot_y="52" version="0.51" hotspot_x="56" link_type="simple" width="110" type="element" height="100">
+<definition hotspot_y="52" version="0.51" hotspot_x="56" link_type="master" width="110" type="element" height="100">
     <uuid uuid="{2424a938-847f-447f-a4ad-d9b6ef730fd9}"/>
     <names>
         <name lang="de">Motorschutzschalter</name>
@@ -12,6 +12,9 @@
         <name lang="ar">قاطع مغناطيسي-حراري GV</name>
         <name lang="hu">Motorvédő kapcsoló 3F + N pólusú</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <line end1="none" x1="40" y1="39" x2="40" length1="1.5" y2="28" antialias="false" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_4f-2.elmt

@@ -1,4 +1,4 @@
-<definition hotspot_y="50" width="110" version="0.51" type="element" height="100" hotspot_x="56" link_type="simple">
+<definition hotspot_y="50" width="110" version="0.51" type="element" height="100" hotspot_x="56" link_type="master">
     <uuid uuid="{686e19c6-6bce-4ced-8c01-2d7f58a78386}"/>
     <names>
         <name lang="el">Θερμομαγνητικό</name>
@@ -12,6 +12,9 @@
         <name lang="de">Motorschutzschalter</name>
         <name lang="hu">Motorvédő kapcsoló 4 pólusú GV</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <line y2="28" end1="none" length2="1.5" x2="40" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length1="1.5" y1="39" end2="none" antialias="false"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/fa4202_disjoncteur_moteur_3p.elmt

@@ -1,4 +1,4 @@
-<definition type="element" link_type="simple" hotspot_x="31" hotspot_y="4" version="0.5" width="90" height="70">
+<definition type="element" link_type="master" hotspot_x="31" hotspot_y="4" version="0.5" width="90" height="70">
 <uuid uuid="{98ADF831-42F0-4EDE-9267-6733EEBEAF62}"/><names>
         <name lang="en">Motor circuit breaker</name>
         <name lang="es">Disyuntor termico magnetico 3P mando manual con auto retorno y boton de desenclave</name>        
@@ -10,6 +10,9 @@
         <name lang="pl">Wyłącznik silnikowy</name>
         <name lang="hu">Motorvédő kapcsoló 3 pólusú</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>

elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/fa4213_disjoncteur_moteur_3p_n.elmt

@@ -1,4 +1,4 @@
-<definition type="element" link_type="simple" hotspot_x="33" hotspot_y="5" version="0.5" width="110" height="70">
+<definition type="element" link_type="master" hotspot_x="33" hotspot_y="5" version="0.5" width="110" height="70">
 <uuid uuid="{C33FE39E-B2EE-4EC0-BC3F-4EB76E9BCEA0}"/><names>
         <name lang="en">Motor circuit breaker with neutral</name>
         <name lang="es">Disyuntor termico magnetico 3P+N mando manual con auto retorno y boton de desenclave</name>
@@ -10,6 +10,9 @@
         <name lang="pl">Wyłącznik silnikowy</name>
         <name lang="hu">Motorvédő kapcsoló 3F + N pólusú</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="simple" width="70" type="element" height="110">
+<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="master" width="70" type="element" height="110">
     <uuid uuid="{68830151-5901-40f6-b94d-dc68b85165a2}"/>
     <names>
         <name lang="fr">Disjoncteur differentiel 1P+N</name>
@@ -8,6 +8,9 @@
         <name lang="cs">Jističochránič 2P</name>
         <name lang="hu">Differenciál-védőkapcsoló 1P+N termikus és zárlatvédelemmel</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <line end1="none" x1="-29.6203" y1="28" x2="10" length1="1.5" y2="28" antialias="false" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="simple" width="110" type="element" height="110">
+<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="master" width="110" type="element" height="110">
     <uuid uuid="{3fa48846-98c0-43e1-8a96-330d4dc11ceb}"/>
     <names>
         <name lang="cs">Jističochránič 3P+N</name>
@@ -12,6 +12,9 @@
         <name lang="ar">قاطع مغناطيسي-حراري GV</name>
         <name lang="hu">Differenciál-védőkapcsoló 3P+N termikus és zárlatvédelemmel</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <line end1="none" x1="-29.6203" y1="28" x2="49.5887" length1="1.5" y2="28" antialias="false" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="simple" width="70" type="element" height="110">
+<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="master" width="70" type="element" height="110">
     <uuid uuid="{20f65431-6f1f-4e09-9c73-68a1431c40a1}"/>
     <names>
         <name lang="fr">Disjoncteur differentiel 2P</name>
@@ -8,6 +8,9 @@
         <name lang="cs">Jističochránič 2P</name>
         <name lang="hu">Differenciál-védőkapcsoló 2P termikus és zárlatvédelemmel</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <polygon x1="-20" y1="14" x5="-20" y4="4" y5="4" x6="-20" y7="-25" x2="-20" y6="-6" y2="10" y3="10" x7="-27" antialias="true" x3="-15" closed="false" x4="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="simple" width="90" type="element" height="110">
+<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="master" width="90" type="element" height="110">
     <uuid uuid="{1e746e43-1906-4ea0-99a6-261e3c862dba}"/>
     <names>
         <name lang="cs">Jističochránič 3P</name>
@@ -12,6 +12,9 @@
         <name lang="ar">قاطع مغناطيسي-حراري GV</name>
         <name lang="hu">Differenciál-védőkapcsoló 3P termikus és zárlatvédelemmel</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <text text="I>" size="9" y="25" x="-24"/>

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

@@ -1,4 +1,4 @@
-<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="simple" width="110" type="element" height="110">
+<definition hotspot_y="50" version="0.51" hotspot_x="56" link_type="master" width="110" type="element" height="110">
     <uuid uuid="{fee3faef-5f4a-4a0b-bf0e-b6e93d9f9425}"/>
     <names>
         <name lang="de">Motorschutzschalter</name>
@@ -12,6 +12,9 @@
         <name lang="ar">قاطع مغناطيسي-حراري GV</name>
         <name lang="hu">Differenciál-védőkapcsoló 4P termikus és zárlatvédelemmel</name>
     </names>
+    <kindInformations>
+        <kindInformation name="type" show="1">protection</kindInformation>
+    </kindInformations>
     <informations></informations>
     <description>
         <polygon x1="-20" y1="14" x5="-20" y4="4" y5="4" x6="-20" y7="-25" x2="-20" y6="-6" y2="10" y3="10" x7="-27" antialias="true" x3="-15" closed="false" x4="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

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

@@ -12,6 +12,7 @@
         <name lang="pt">Descarregador de faísca</name>
         <name lang="fr">Éclateur</name>
         <name lang="nl">Vonkbrug</name>
+        <name lang="hu">Szikraköz</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -8,6 +8,7 @@
         <name lang="cs">Varistor</name>
         <name lang="it">Varistore Metal-oxide</name>
         <name lang="nl">Varistor Metal-oxide</name>
+        <name lang="hu">Fém-oxid varisztor</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>

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

@@ -10,10 +10,11 @@
         <name lang="el">Προστασία από υπέρταση</name>
         <name lang="fr">Parafoudre</name>
         <name lang="en">Surge protection</name>
+        <name lang="hu">Túlfeszültség védő</name>
         <name lang="es">Protección contra descargas 2</name>
     </names>
     <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <dynamic_text z="1" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="18" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-15.45" uuid="{daef117a-d243-49f7-b089-6a8ffe076f69}" Halignment="AlignLeft">

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

@@ -2,6 +2,7 @@
 <uuid uuid="{5FC5912D-A466-4E02-8051-7F08868D3FB5}"/><names>
         <name lang="de">Blitzschutz</name>
         <name lang="en">Surge protector</name>
+        <name lang="hu">Túlfeszültség védő</name>
         <name lang="es">Protección contra descargas</name>
         <name lang="it">Scaricatore</name>
         <name lang="fr">Parafoudre</name>

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

@@ -11,6 +11,7 @@
         <name lang="pl">Ogranicznik przepięć</name>
         <name lang="ar">حامي من الصواعق</name>
         <name lang="en">Surge protection</name>
+        <name lang="hu">Túlfeszültség védő</name>
     </names>
     <elementInformations>
         <elementInformation show="1" name="unity"></elementInformation>

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

@@ -8,6 +8,7 @@
         <name lang="cs">Bleskojistka, ochrana proti přepětí</name>
         <name lang="fr">Parafoudre</name>
         <name lang="en">Surge protector</name>
+        <name lang="hu">Túlfeszültség védő</name>
         <name lang="es">Protección contra descargas</name>
     </names>
     <elementInformations>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/qet_directory

@@ -11,5 +11,6 @@
         <name lang="el">Προστασία από υπέρταση</name>
         <name lang="nl">Overspanningsbeveiliging</name>
         <name lang="da">Overspændingsbeskyttelse</name>
+        <name lang="hu">Túlfeszültség védelem</name>
     </names>
 </qet-directory>

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

@@ -8,6 +8,7 @@
         <name lang="pl">Odgromnik gazowyładowczy dwuelektrodowy</name>
         <name lang="cs">Plynová bleskojistka</name>
         <name lang="nl">gasontladingsbuis</name>
+        <name lang="hu">Védőgázas szimetrikus kisülőcső</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>

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

@@ -8,6 +8,7 @@
         <name lang="pl">Odgromnik gazowyładowczy trójelektrodowy</name>
         <name lang="cs">Dvojitá plynová bleskojistka</name>
         <name lang="nl">Symmetrische gasontlading buis</name>
+        <name lang="hu">Védőgázas kisülőcső</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>

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

@@ -11,6 +11,7 @@
         <name lang="es">Bobina</name>
         <name lang="cs">Cívka relé</name>
         <name lang="nl">Spoel</name>
+        <name lang="hu">Tekercs</name>
         <name lang="be">Relais spoel (algemeen)</name> 
     </names>
     <kindInformations>

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

@@ -12,6 +12,7 @@
         <name lang="cs">Bistabilní remanentní relé</name>
         <name lang="nl">spoel remanent</name>
         <name lang="be">Spoel KA remanent</name>
+        <name lang="hu">Tekercs</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

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

@@ -11,6 +11,7 @@
         <name lang="es">Bobina KA con enclavamiento mecánico</name>
         <name lang="cs">Mechanické blokovací relé</name>
         <name lang="nl">spoel met vergrendeling</name>
+        <name lang="hu">Tekercs</name>
         <name lang="be">Spoel KA met mechanische vergrendeling</name>
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_tempo_repos-travail.elmt

@@ -9,6 +9,7 @@
         <name lang="cs">Relé se zpožděným zapnutím a vypnutím</name>
         <name lang="de">Relais ansprech- und rückfallverzögert</name>
         <name lang="it">Bobina di relè ritardato</name>
+        <name lang="hu">Tekercs be/ki késleltetéssel</name>
         <name lang="el">Πηνίο χρονικού, καθυστέρηση ενεργοποίησης-απενεργοποίησης</name>
         <name lang="ar">ملف مُؤقت مع تأخير الإستجابة و تأخير الإعتاق</name>
         <name lang="pl">Cewka przekaźnika działającego ze zwłoką przy wzbudzeniu i odwzbudzeniu</name>

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

@@ -2,6 +2,7 @@
 <uuid uuid="{7E996B1F-B537-44D9-A3E9-DB5F30487400}"/><names>
         <name lang="be">Spoel met uitschakel vertraging</name>
         <name lang="en">Coil with off delay</name>
+        <name lang="hu">Tekercs ki késleltetéssel</name>
         <name lang="fr">Bobine tempo repos</name>
         <name lang="ru">Обмотка</name>
         <name lang="es">Bobina de reposo temporizado</name>

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

@@ -2,6 +2,7 @@
 <uuid uuid="{14D69713-ADDE-4ACD-8654-50E3E60B61F7}"/><names>
         <name lang="be">Spoel met inschakel vertraging</name>
         <name lang="en">Coil with on delay</name>
+        <name lang="hu">Tekercs be késleltetéssel</name>
         <name lang="fr">Bobine tempo travail</name>
         <name lang="ru">Обмотка</name>
         <name lang="es">Bobina de trabajo temporizado</name>

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

@@ -2,6 +2,7 @@
     <uuid uuid="{45a179e7-866e-4756-965f-d2445ced8dd2}"/>
     <names>
         <name lang="cs">Časové relé</name>
+        <name lang="hu">Időzítő relé</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">coil</kindInformation>

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

@@ -8,6 +8,7 @@
         <name lang="pl">Przekaźnik prądu przemiennego</name>
         <name lang="cs">Cívka relé pro AC napájení</name>
         <name lang="es">Relé de CA</name>
+        <name lang="hu">Tekercs AC</name>
         <name lang="nl">Relais voor wisselspanning</name>
         <name lang="be">Relais AC (wisselspanning)</name>
     </names>

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

@@ -8,6 +8,7 @@
         <name lang="cs">Cívka relé pro DC napájení</name>
         <name lang="de">Spule mit Gleichstrombetätigung</name>
         <name lang="it">Relè DC</name>
+        <name lang="hu">Tekercs DC</name>
         <name lang="el">Πηνίο συνεχούς</name>
         <name lang="pl">Przekaźnik prądu przemiennego</name>
     </names>

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

@@ -9,7 +9,8 @@
         <name lang="cs">Elektronické relé</name>
         <name lang="nl">relais electronisch</name>
         <name lang="es">Relé electrónico</name>
-        <name lang="be">Electronisch relais</name> 
+        <name lang="be">Electronisch relais</name>
+        <name lang="hu">Tranzisztoros működtetés</name> 
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

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

@@ -9,6 +9,7 @@
         <name lang="es"> Relé insensible a la CA</name>
         <name lang="nl">relais ongevoelig voor wisselspanning</name>
         <name lang="el">Ρελέ με αντοχή σε AC</name>
+        <name lang="hu">AC-ra érzéketlen relé</name>
         <name lang="be">Relais ongevoelig voor AC (wisselspanning)</name>
     </names>
     <kindInformations>

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

@@ -10,6 +10,7 @@
         <name lang="cs">Polarizované relé</name>
         <name lang="es">Relé polarizado</name>
         <name lang="nl">relay polair</name>
+        <name lang="hu">Polarizált relé</name>
         <name lang="be">Relais gepolariseerd</name>
     </names>
     <kindInformations>

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

@@ -9,6 +9,7 @@
         <name lang="cs">Rychlé relé</name>
         <name lang="es">Relé rapido</name>
         <name lang="nl">relais snel</name>
+        <name lang="hu">Gyors működésű relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

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

@@ -8,6 +8,7 @@
         <name lang="es">Relé de remanencia</name>
         <name lang="cs">Bistabilní remanentní relé</name>
         <name lang="nl">remanent relais</name>
+        <name lang="hu">Remanencia relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

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

@@ -4,6 +4,7 @@
         <name lang="fr">Relais à mise au repos retardée</name>
         <name lang="es">Relé con retardo de apertura</name>
         <name lang="nl">spoel afvalvertraagd</name>
+        <name lang="hu">Nyugvó (elejtés) késleltetésű relé</name>
         <name lang="cs">Relé se zpožděným vypnutím</name>
         <name lang="de">Relais rückfallverzögert</name>
         <name lang="it">Relè ritardato all'apertura</name>

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

@@ -9,6 +9,7 @@
         <name lang="es">Relé de trabajo y reposo retardado</name>
         <name lang="cs">Relé se zpožděným zapnutím a vypnutím</name>
         <name lang="nl">spoel opkom en afval vertraagd</name>
+        <name lang="hu">Meghúzás és elengedés késleltetésű relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

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

@@ -9,6 +9,7 @@
         <name lang="es">Relé de sobrecarga termica</name>
         <name lang="cs">Tepelné relé</name>
         <name lang="nl">Thermisch relais</name>
+        <name lang="hu">Thermikus túlterhelés védelmi relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

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

@@ -7,6 +7,7 @@
         <name lang="cs">Relé se zpožděným zapnutím</name>
         <name lang="de">Relais ansprechverzögert</name>
         <name lang="it">Relè ritardato alla chiusura</name>
+        <name lang="hu">Meghúzás késleltetésű relé</name>
         <name lang="el">Πηνίο χρονικού, καθυστέρηση ενεργοποίησης</name>
         <name lang="pl">Przekaźnik działający ze zwłoką przy wzbudzeniu</name>
     </names>

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

@@ -8,6 +8,7 @@
         <name lang="pl">Przekaźnik z blokadą mechaniczną</name>
         <name lang="es">Relé con enclavamiento mecánico</name>
         <name lang="cs">Mechanické blokovací relé</name>
+        <name lang="hu">Relé mechanikus retesszel</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/qet_directory

@@ -14,5 +14,6 @@
         <name lang="nl">Spoelen</name>
         <name lang="be">Spoelen</name>
         <name lang="da">Spoler</name>
+        <name lang="hu">Tekercsek/relék</name>
     </names>
 </qet-directory>

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

@@ -7,6 +7,7 @@
         <name lang="de">Blinkrelais</name>
         <name lang="it">Relè ciclico</name>
         <name lang="el">Πηνίο ρελέ παλμού</name>
+        <name lang="hu">"Villogó" relé</name>
         <name lang="pl">Przekaźnik migowy (cykliczny)</name>
     </names>
     <kindInformations>

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

@@ -9,6 +9,7 @@
         <name lang="es">Relé polarizado, de trabajo en una dirección de la corriente en la bobina</name>
         <name lang="cs">Polarizované monostabilní relé</name>
         <name lang="nl">Polair relais</name>
+        <name lang="hu">Polarizált relé</name>
     </names>
     <informations>License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>

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

@@ -10,6 +10,7 @@
         <name lang="el">Ηλεκτρονικό ρελέ</name>
         <name lang="ar">مُرحّل استاتيكي</name>
         <name lang="pl">Przekaźnik statyczny</name>
+        <name lang="hu">Szilárd test relé</name>
     </names>
     <kindInformations/>
     <informations>Author: The QElectroTech team

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

@@ -6,6 +6,7 @@
         <name lang="fr">Relais temporisé repos à commande externe</name>
         <name lang="pl">Przekaźnik z opuźnionym powrotem, z wejściem sterującym</name>
         <name lang="cs">Zpožděné relé s externím ovládáním</name>
+        <name lang="hu">Elengedeés késleltetésű relé külső paranccsal</name>
         <name lang="el">Πηνίο καθυστέρησης απενεργοποίησης με εξωτερική εντολή</name>
     </names>
     <kindInformations>

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

@@ -9,6 +9,7 @@
         <name lang="pl">Cewka</name>
         <name lang="es">Relé biestable</name>
         <name lang="cs">Bistabilní relé</name>
+        <name lang="hu">Bistabil relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

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

@@ -8,6 +8,7 @@
         <name lang="pl">Łącznik zdalnie sterowany</name>
         <name lang="es">Interruptor a control remoto 1P1T</name>
         <name lang="cs">Dálkově ovládaný spínač</name>
+        <name lang="hu">Távoli vezérlésű relé</name>
         <name lang="nl">Afstand bestuurbaar schakelaar</name>
     </names>
     <kindInformations>

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

@@ -4,6 +4,7 @@
         <name lang="fr">Relais temporisé</name>
         <name lang="en">Timed relay</name>
         <name lang="cs">Časové relé</name>
+        <name lang="hu">Ütemadó relé</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">coil</kindInformation>