Add a combo box to change the QPicture scale of element picture

This is a test commit to see if we can fix the wrong scale of element in some screen size.: Add a QComboBox into the QToolBar of the diagram editor to change the current scale factor of the element QPicture.
Minor
2025-12-17 20:50:34 +01:00 · 2021-04-17 09:50:32 +02:00 · 2021-04-12 06:40:59 +02:00 · 2021-04-12 06:36:16 +02:00 · 2021-04-11 14:08:21 +02:00 · 2021-04-11 14:03:02 +02:00
588 changed files with 49927 additions and 39673 deletions
--- a/CMakeLists.txt
+++ b/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()
--- a/README.md
+++ b/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:

@@ -173,6 +174,6 @@ If you love QElectroTech, you can help developers to buy new hardware to test
 and implement new features. Thanks in advance for your generous donations.

 For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)
-or at [leetchi.com](https://www.leetchi.com/c/qelectroteck)
+


--- a/SingleApplication/CHANGELOG.md
+++ b/SingleApplication/CHANGELOG.md
@@ -1,6 +1,73 @@
 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__
 ----------

--- a/SingleApplication/CMakeLists.txt
+++ b/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})
--- a/SingleApplication/LICENSE
+++ b/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
--- a/SingleApplication/README.md
+++ b/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
--- a/SingleApplication/SingleApplication
+++ b/SingleApplication/SingleApplication
@@ -0,0 +1 @@
+#include "singleapplication.h"
--- a/SingleApplication/examples/basic/CMakeLists.txt
+++ b/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)
+
--- a/SingleApplication/examples/basic/basic.pro
+++ b/SingleApplication/examples/basic/basic.pro
--- a/SingleApplication/examples/basic/main.cpp
+++ b/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();
 }
--- a/SingleApplication/examples/calculator/CMakeLists.txt
+++ b/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)
--- a/SingleApplication/examples/calculator/calculator.cpp
+++ b/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;
--- a/SingleApplication/examples/sending_arguments/CMakeLists.txt
+++ b/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)
--- a/SingleApplication/examples/sending_arguments/main.cpp
+++ b/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(
--- a/SingleApplication/examples/sending_arguments/sending_arguments.pro
+++ b/SingleApplication/examples/sending_arguments/sending_arguments.pro
--- a/SingleApplication/singleapplication.cpp
+++ b/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,32 +20,26 @@
 // 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 )
+ * @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
@@ -57,10 +51,18 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
    // Store the current mode of the program
    d->options = options;

+    // Add any unique user data
+    if ( ! userData.isEmpty() )
+        d->addAppData( userData );
+
    // Generating an application ID used for identifying the shared memory
    // block and QLocalServer
    d->genBlockServerName();

+    // To mitigate QSharedMemory issues with large amount of processes
+    // attempting to attach at the same time
+    SingleApplicationPrivate::randomSleep();
+
 #ifdef Q_OS_UNIX
    // By explicitly attaching it and then deleting it we make sure that the
    // memory is deleted even after the process has crashed on Unix.
@@ -72,71 +74,86 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
    d->memory = new QSharedMemory( d->blockServerName );

    // Create a shared memory block
-	if( d->memory->create( sizeof( InstancesInfo ) ) ) {
+    if( d->memory->create( sizeof( InstancesInfo ) )){
        // Initialize the shared memory block
-		d->memory->lock();
+        if( ! d->memory->lock() ){
+          qCritical() << "SingleApplication: Unable to lock memory block after create.";
+          abortSafely();
+        }
        d->initializeMemoryBlock();
-		d->memory->unlock();
    } else {
+        if( d->memory->error() == QSharedMemory::AlreadyExists ){
          // Attempt to attach to the memory segment
-		if( ! d->memory->attach() ) {
+          if( ! d->memory->attach() ){
              qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-			qCritical() << d->memory->errorString();
-			delete d;
-			::exit( EXIT_FAILURE );
+              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() );
+    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();
-
+    while( true ){
+      // If the shared memory block's checksum is valid continue
      if( d->blockChecksum() == inst->checksum ) break;

-		if( time.elapsed() > 5000 ) {
+      // 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();
      }

-		d->memory->unlock();
-
-		// Random sleep here limits the probability of a collision between two racing apps
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
-		qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
-		QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.10 or later")
-#endif
-		quint32 value = QRandomGenerator::global()->generate();
-		QThread::sleep(8 + static_cast<unsigned long>(value / RAND_MAX * 10));
-#endif
+      // Otherwise wait for a random period and try again. The random sleep here
+      // limits the probability of a collision between two racing apps and
+      // allows the app to initialise faster
+      if( ! d->memory->unlock() ){
+        qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
+        qDebug() << d->memory->errorString();
+      }
+      SingleApplicationPrivate::randomSleep();
+      if( ! d->memory->lock() ){
+        qCritical() << "SingleApplication: Unable to lock memory after random wait.";
+        abortSafely();
+      }
    }

-	if( inst->primary == false) {
+    if( inst->primary == false ){
        d->startPrimary();
-		d->memory->unlock();
+        if( ! d->memory->unlock() ){
+          qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
+          qDebug() << d->memory->errorString();
+        }
        return;
    }

    // Check if another instance can be started
-	if( allowSecondary ) {
-		inst->secondary += 1;
-		inst->checksum = d->blockChecksum();
-		d->instanceNumber = inst->secondary;
+    if( allowSecondary ){
        d->startSecondary();
-		if( d->options & Mode::SecondaryNotification ) {
+        if( d->options & Mode::SecondaryNotification ){
            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
        }
-		d->memory->unlock();
+        if( ! d->memory->unlock() ){
+          qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
+          qDebug() << d->memory->errorString();
+        }
        return;
    }

-	d->memory->unlock();
+    if( ! d->memory->unlock() ){
+      qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
+      qDebug() << d->memory->errorString();
+    }

    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );

@@ -145,51 +162,113 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
    ::exit( EXIT_SUCCESS );
 }

-/**
-	@brief Destructor
-*/
 SingleApplication::~SingleApplication()
 {
-	Q_D(SingleApplication);
+    Q_D( SingleApplication );
    delete d;
 }

-bool SingleApplication::isPrimary()
+/**
+ * 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);
+    Q_D( const SingleApplication );
    return d->server != nullptr;
 }

-bool SingleApplication::isSecondary()
+/**
+ * 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);
+    Q_D( const SingleApplication );
    return d->server == nullptr;
 }

-quint32 SingleApplication::instanceId()
+/**
+ * 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);
+    Q_D( const SingleApplication );
    return d->instanceNumber;
 }

-qint64 SingleApplication::primaryPid()
+/**
+ * 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);
+    Q_D( const SingleApplication );
    return d->primaryPid();
 }

-bool SingleApplication::sendMessage( QByteArray message, int timeout )
+/**
+ * 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);
+    Q_D( const SingleApplication );
+    return d->primaryUser();
+}
+
+/**
+ * Returns the username the current instance is running as.
+ * @return Returns the username the current instance is running as.
+ */
+QString SingleApplication::currentUser() const
+{
+    return SingleApplicationPrivate::getUsername();
+}
+
+/**
+ * Sends message to the Primary Instance.
+ * @param message The message to send.
+ * @param timeout the maximum timeout in milliseconds for blocking functions.
+ * @return true if the message was sent successfuly, false otherwise.
+ */
+bool SingleApplication::sendMessage( const QByteArray &message, int timeout )
+{
+    Q_D( SingleApplication );

    // Nobody to connect to
    if( isPrimary() ) return false;

    // Make sure the socket is connected
-	d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
+    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();
+}
--- a/SingleApplication/singleapplication.h
+++ b/SingleApplication/singleapplication.h
@@ -25,7 +25,6 @@

 #include <QtCore/QtGlobal>
 #include <QtNetwork/QLocalSocket>
-#include <QElapsedTimer>

 #ifndef QAPPLICATION_CLASS
  #define QAPPLICATION_CLASS QCoreApplication
@@ -36,26 +35,26 @@
 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;
+    using app_t = QAPPLICATION_CLASS;

-	public:
+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
+     * @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,
@@ -67,68 +66,87 @@ class SingleApplication : public QAPPLICATION_CLASS
    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
+     * @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();
+    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}
+     * @brief Returns if the instance is the primary instance
+     * @returns {bool}
     */
-	bool isPrimary();
+    bool isPrimary() const;

    /**
-		@brief Returns if the instance is a secondary instance
-		@returns {bool}
+     * @brief Returns if the instance is a secondary instance
+     * @returns {bool}
     */
-	bool isSecondary();
+    bool isSecondary() const;

    /**
-		@brief Returns a unique identifier for the current instance
-		@returns {qint32}
+     * @brief Returns a unique identifier for the current instance
+     * @returns {qint32}
     */
-	quint32 instanceId();
+    quint32 instanceId() const;

    /**
-		@brief Returns the process ID (PID) of the primary instance
-		@returns {qint64}
+     * @brief Returns the process ID (PID) of the primary instance
+     * @returns {qint64}
     */
-	qint64 primaryPid();
+    qint64 primaryPid() 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.
+     * @brief Returns the username of the user running the primary instance
+     * @returns {QString}
     */
-	bool sendMessage( QByteArray message, int timeout = 100 );
+    QString primaryUser() const;

-	Q_SIGNALS:
+    /**
+     * @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:
+private:
    SingleApplicationPrivate *d_ptr;
    Q_DECLARE_PRIVATE(SingleApplication)
+    void abortSafely();
 };

 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
--- a/SingleApplication/singleapplication.pri
+++ b/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
--- a/SingleApplication/singleapplication_p.cpp
+++ b/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,12 +33,20 @@
 #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"

@@ -49,8 +57,11 @@
 #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 )
@@ -59,28 +70,62 @@ SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
    server = nullptr;
    socket = nullptr;
    memory = nullptr;
-	instanceNumber = -1;
+    instanceNumber = 0;
 }

 SingleApplicationPrivate::~SingleApplicationPrivate()
 {
-	if( socket != nullptr ) {
+    if( socket != nullptr ){
        socket->close();
        delete socket;
    }

+    if( memory != nullptr ){
        memory->lock();
-	InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-	if( server != nullptr ) {
+        auto *inst = static_cast<InstancesInfo*>(memory->data());
+        if( server != nullptr ){
            server->close();
            delete server;
            inst->primary = false;
            inst->primaryPid = -1;
+            inst->primaryUser[0] =  '\0';
            inst->checksum = blockChecksum();
        }
        memory->unlock();

        delete memory;
+    }
+}
+
+QString SingleApplicationPrivate::getUsername()
+{
+#ifdef Q_OS_WIN
+      wchar_t username[UNLEN + 1];
+      // Specifies size of the buffer on input
+      DWORD usernameLength = UNLEN + 1;
+      if( GetUserNameW( username, &usernameLength ) )
+          return QString::fromWCharArray( username );
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+      return QString::fromLocal8Bit( qgetenv( "USERNAME" ) );
+#else
+      return qEnvironmentVariable( "USERNAME" );
+#endif
+#endif
+#ifdef Q_OS_UNIX
+      QString username;
+      uid_t uid = geteuid();
+      struct passwd *pw = getpwuid( uid );
+      if( pw )
+          username = QString::fromLocal8Bit( pw->pw_name );
+      if ( username.isEmpty() ){
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+          username = QString::fromLocal8Bit( qgetenv( "USER" ) );
+#else
+          username = qEnvironmentVariable( "USER" );
+#endif
+      }
+      return username;
+#endif
 }

 void SingleApplicationPrivate::genBlockServerName()
@@ -91,11 +136,14 @@ void SingleApplicationPrivate::genBlockServerName()
    appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
    appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );

-	if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ) {
+    if ( ! appDataList.isEmpty() )
+        appData.addData( appDataList.join( "" ).toUtf8() );
+
+    if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ){
        appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
    }

-	if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
+    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ){
 #ifdef Q_OS_WIN
        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
 #else
@@ -104,29 +152,8 @@ void SingleApplicationPrivate::genBlockServerName()
    }

    // 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
+    if( options & SingleApplication::Mode::User ){
+        appData.addData( getUsername().toUtf8() );
    }

    // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
@@ -134,19 +161,26 @@ void SingleApplicationPrivate::genBlockServerName()
    blockServerName = appData.result().toBase64().replace("/", "_");
 }

-void SingleApplicationPrivate::initializeMemoryBlock()
+void SingleApplicationPrivate::initializeMemoryBlock() const
 {
-	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+    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() );

+    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 );
@@ -154,7 +188,7 @@ void SingleApplicationPrivate::startPrimary()

    // Restrict access to the socket according to the
    // SingleApplication::Mode::User flag on User level or no restrictions
-	if( options & SingleApplication::Mode::User ) {
+    if( options & SingleApplication::Mode::User ){
        server->setSocketOptions( QLocalServer::UserAccessOption );
    } else {
        server->setSocketOptions( QLocalServer::WorldAccessOption );
@@ -167,47 +201,51 @@ void SingleApplicationPrivate::startPrimary()
        this,
        &SingleApplicationPrivate::slotConnectionEstablished
    );
-
-	// Reset the number of connections
-	InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
-
-	inst->primary = true;
-	inst->primaryPid = q->applicationPid();
-	inst->checksum = blockChecksum();
-
-	instanceNumber = 0;
 }

 void SingleApplicationPrivate::startSecondary()
 {
+  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 )
 {
+    QElapsedTimer time;
+    time.start();
+
    // Connect to the Local Server of the Primary Instance if not already
    // connected.
-	if( socket == nullptr ) {
+    if( socket == nullptr ){
        socket = new QLocalSocket();
    }

-	// If already connected - we are done;
-	if( socket->state() == QLocalSocket::ConnectedState )
-		return;
+    if( socket->state() == QLocalSocket::ConnectedState ) return true;

-	// If not connect
-	if( socket->state() == QLocalSocket::UnconnectedState ||
-		socket->state() == QLocalSocket::ClosingState ) {
+    if( socket->state() != QLocalSocket::ConnectedState ){
+
+        while( true ){
+            randomSleep();
+
+          if( socket->state() != QLocalSocket::ConnectingState )
            socket->connectToServer( blockServerName );
+
+          if( socket->state() == QLocalSocket::ConnectingState ){
+              socket->waitForConnected( static_cast<int>(msecs - time.elapsed()) );
          }

-	// Wait for being connected
-	if( socket->state() == QLocalSocket::ConnectingState ) {
-		socket->waitForConnected( msecs );
+          // 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
-	if( socket->state() == QLocalSocket::ConnectedState ) {
-		// Notify the parent that a new instance had been started;
    QByteArray initMsg;
    QDataStream writeStream(&initMsg, QIODevice::WriteOnly);

@@ -218,21 +256,10 @@ void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne
    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()));
+#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")
-#endif
-		quint16 checksum =
-				qChecksum(
-					QByteArrayView(
-						initMsg.constData(),
-						static_cast<quint32>(initMsg.length())));
+    quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
    writeStream << checksum;

@@ -247,68 +274,72 @@ void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne

    socket->write( header );
    socket->write( initMsg );
+    bool result = socket->waitForBytesWritten( static_cast<int>(msecs - time.elapsed()) );
    socket->flush();
-		socket->waitForBytesWritten( msecs );
-	}
+    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;

    memory->lock();
-	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
    pid = inst->primaryPid;
    memory->unlock();

    return pid;
 }

+QString SingleApplicationPrivate::primaryUser() const
+{
+    QByteArray username;
+
+    memory->lock();
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
+    username = inst->primaryUser;
+    memory->unlock();
+
+    return QString::fromUtf8( username );
+}
+
 /**
-	@brief Executed when a connection has been made to the LocalServer
-*/
+ * @brief Executed when a connection has been made to the LocalServer
+ */
 void SingleApplicationPrivate::slotConnectionEstablished()
 {
    QLocalSocket *nextConnSocket = server->nextPendingConnection();
    connectionMap.insert(nextConnSocket, ConnectionInfo());

    QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-					 [nextConnSocket, this]() {
+        [nextConnSocket, this](){
            auto &info = connectionMap[nextConnSocket];
            Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
        }
    );

-	QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
+    QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
+
+    QObject::connect(nextConnSocket, &QLocalSocket::destroyed,
        [nextConnSocket, this](){
            connectionMap.remove(nextConnSocket);
-		nextConnSocket->deleteLater();
        }
    );

    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-					 [nextConnSocket, this]() {
+        [nextConnSocket, this](){
            auto &info = connectionMap[nextConnSocket];
-		switch(info.stage) {
+            switch(info.stage){
            case StageHeader:
                readInitMessageHeader(nextConnSocket);
                break;
@@ -327,11 +358,11 @@ void SingleApplicationPrivate::slotConnectionEstablished()

 void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
 {
-	if (!connectionMap.contains( sock )) {
+    if (!connectionMap.contains( sock )){
        return;
    }

-	if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
+    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ){
        return;
    }

@@ -348,7 +379,7 @@ void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
    info.stage = StageBody;
    info.msgLen = msgLen;

-	if ( sock->bytesAvailable() >= (qint64) msgLen ) {
+    if ( sock->bytesAvailable() >= (qint64) msgLen ){
        readInitMessageBody( sock );
    }
 }
@@ -357,12 +388,12 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
 {
    Q_Q(SingleApplication);

-	if (!connectionMap.contains( sock )) {
+    if (!connectionMap.contains( sock )){
        return;
    }

    ConnectionInfo &info = connectionMap[sock];
-	if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
+    if( sock->bytesAvailable() < ( qint64 )info.msgLen ){
        return;
    }

@@ -392,26 +423,17 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
    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")
-#endif
-	const quint16 actualChecksum =
-			qChecksum(
-				QByteArrayView(
-					msgBytes.constData(),
-					static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
+    const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
 #endif
+
    bool isValid = readStream.status() == QDataStream::Ok &&
                   QLatin1String(latin1Name) == blockServerName &&
                   msgChecksum == actualChecksum;

-	if( !isValid ) {
+    if( !isValid ){
        sock->close();
        return;
    }
@@ -426,7 +448,7 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
        Q_EMIT q->instanceStarted();
    }

-	if (sock->bytesAvailable() > 0) {
+    if (sock->bytesAvailable() > 0){
        Q_EMIT this->slotDataAvailable( sock, instanceId );
    }
 }
@@ -442,3 +464,23 @@ void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedS
    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;
+}
--- a/SingleApplication/singleapplication_p.h
+++ b/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
@@ -41,20 +41,19 @@ struct InstancesInfo {
    bool primary;
    quint32 secondary;
    qint64 primaryPid;
-	quint16 checksum;
+    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:
+Q_OBJECT
+public:
    enum ConnectionType : quint8 {
        InvalidConnection = 0,
        NewInstance = 1,
@@ -69,17 +68,22 @@ class SingleApplicationPrivate : public QObject {
    Q_DECLARE_PUBLIC(SingleApplication)

    SingleApplicationPrivate( SingleApplication *q_ptr );
-	~SingleApplicationPrivate();
+    ~SingleApplicationPrivate() override;

+    static QString getUsername();
    void genBlockServerName();
-	void initializeMemoryBlock();
+    void initializeMemoryBlock() const;
    void startPrimary();
    void startSecondary();
-	void connectToPrimary(int msecs, ConnectionType connectionType );
-	quint16 blockChecksum();
-	qint64 primaryPid();
+    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;
@@ -89,8 +93,9 @@ class SingleApplicationPrivate : public QObject {
    QString blockServerName;
    SingleApplication::Options options;
    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+    QStringList appDataList;

-	public Q_SLOTS:
+public Q_SLOTS:
    void slotConnectionEstablished();
    void slotDataAvailable( QLocalSocket*, quint32 );
    void slotClientConnectionClosed( QLocalSocket*, quint32 );
--- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json
+++ b/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,50 @@
          "path": "patches/0001-build-Fix-the-installation-paths.patch"
        }
      ]
+    },
+    {
+    "name": "python3.6.0",
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz",
+            "sha256": "b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622"
+        }
+    ],
+    "config-opts": ["--enable-shared"],
+    "post-install": [
+        "chmod +w ${FLATPAK_DEST}/lib/libpython3.6m.so.1.0",
+        "chmod +w ${FLATPAK_DEST}/lib/libpython3.so"
+    ]
+},
+    {
+    "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/9e/c3/aaad3309a5f2ca08e2fa0ab01123bb6fafb15a92854bff88042039192a67/qet_tb_generator-1.1.7.tar.gz",
+            "sha256": "f626ab7bf4d9091fc85f63d33136585e611272b347499b448ece4e33cc04eeed"
        }
    ]
+},
+    {
+      "name": "DXFtoQET-2020-1",
+      "buildsystem": "qmake",
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/qelectrotech/DXFtoQET-2020.git",
+          "commit": "01fbb2afe0fe66782cb1d1f901c73616c7d5299d"
+        }
+      ],
+      "post-install": [
+        "mkdir -p ${FLATPAK_DEST}/bin",
+        "cp DXFtoQET ${FLATPAK_DEST}/bin/"
+        ]
+}
+  ]
 }
--- a/cmake/define_definitions.cmake
+++ b/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})
--- a/cmake/fetch_kdeaddons.cmake
+++ b/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
--- a/cmake/fetch_pugixml.cmake
+++ b/cmake/fetch_pugixml.cmake
@@ -18,9 +18,16 @@ message(" - fetch_pugixml")

 Include(FetchContent)

-FetchContent_Declare(
+option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
+
+if(BUILD_PUGIXML)
+
+  FetchContent_Declare(
    pugixml
    GIT_REPOSITORY https://github.com/zeux/pugixml.git
-  GIT_TAG        v1.11.1)
+    GIT_TAG        v1.11.4)

-FetchContent_MakeAvailable(pugixml)
+  FetchContent_MakeAvailable(pugixml)
+else()
+  find_package(pugixml REQUIRED)
+endif()
--- a/cmake/fetch_singleapplication.cmake
+++ b/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)
--- a/cmake/git_last_commit_sha.cmake
+++ b/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}")
--- a/cmake/qet_compilation_vars.cmake
+++ b/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
--- a/elements/10_electric/10_allpole/100_folio_referencing/01coming_arrow.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/100_folio_referencing/02going_arrow.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/110_network_supplies/ground1.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_1pn.elmt
+++ b/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="_"/>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3p.elmt
+++ b/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="_"/>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3pn.elmt
+++ b/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="_"/>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_p.elmt
+++ b/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="_"/>
--- a/elements/10_electric/10_allpole/110_network_supplies/terre.elmt
+++ b/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">
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable1.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable2.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable3.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable5.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable6.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/kabel3g.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/kabel4g.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/kabel7g.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section1conducteur.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section2-1conducteurs.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section2conducteurs.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section3.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/porte_fusible_bi.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/sectionneur_3_fusibles+neutre.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/sectionneur_3_fusibles.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/sectionneur_fusible_bi.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_2f-1.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_2f-2.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_4f-1.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/dis_mag_term_4f-2.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/fa4202_disjoncteur_moteur_3p.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/12_magneto_thermal_circuit_breakers/fa4213_disjoncteur_moteur_3p_n.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/int_diff5.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/int_diff6.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/int_diff7.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/int_diff8.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/int_diff9.elmt
+++ b/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"/>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/eclateur.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/mov.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre-2.elmt
+++ b/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">
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre4.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre_3.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/qet_directory
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/tube_a_gaz.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/tube_a_gaz_limiteur_de_tension.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine3.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_ka_a_remanence.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_ka_a_verrouillage_mecanique.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_tempo_repos-travail.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_tempo_repos.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_tempo_travail.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_courant_alter.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_courant_continue.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_electronique.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_electronique.elmt
@@ -10,6 +10,7 @@
        <name lang="nl">relais electronisch</name>
        <name lang="es">Relé electrónico</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>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais.elmt
@@ -7,7 +7,7 @@
        <name lang="es">Contacto relé térmico (NA)</name>
        <name lang="cs">Kontakt (NO) tepelného jističe</name>
    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#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:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-12.6286" y2="3" x2="-16.1714"/>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais_nf.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais_nf.elmt
@@ -7,7 +7,7 @@
        <name lang="es">Contacto relé térmico (NC)</name>
        <name lang="cs">Kontakt (NC) tepelného jističe</name>
    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#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:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7.67895" y2="0" x2="-10.9053"/>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/qet_directory
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/qet_directory
@@ -13,5 +13,6 @@
        <name lang="cs">Relé, stykače a kontakty</name>
        <name lang="da">Relæer, kontaktorer og kontakter</name>
        <name lang="ja">継電器、接触器、接点</name>
+        <name lang="hu">Relék, kontaktorok és érintkezők</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_monophase.elmt
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_monophase.elmt
@@ -11,7 +11,7 @@
        <name lang="cs">Jednofázový autotransformátor</name>
        <name lang="nl">enkelfase autotransformator</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="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="8" y2="-35" x2="8"/>
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_triphase.elmt
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_triphase.elmt
@@ -11,7 +11,7 @@
        <name lang="cs">Třífázový autotransformátor</name>
        <name lang="nl">driefase autotransformator</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="20" y="17.6667" size="5" text="___V"/>
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_triphase_neutre.elmt
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_triphase_neutre.elmt
@@ -11,7 +11,7 @@
        <name lang="cs">Třífázový autotransformátor + neutrál</name>
        <name lang="nl">driefase autotransformator + Nul</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="20" y="17.6667" size="5" text="___V"/>
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/transformateur_triphase.elmt
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/transformateur_triphase.elmt
@@ -11,7 +11,7 @@
        <name lang="cs">Třífázový transformátor</name>
        <name lang="nl">Driefase transformator</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="-16" y="-31.6667" size="4" text="A1"/>
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/transformateur_triphase_neutre.elmt
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/transformateur_triphase_neutre.elmt
@@ -11,7 +11,7 @@
        <name lang="cs">Třífázový transformátor + neutrál</name>
        <name lang="nl">driefase transformator + Nul</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 x4="-12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="-34" y2="30" x2="-34" y3="19" x3="-27" y4="19"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-azul.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-azul.elmt
@@ -7,7 +7,7 @@
        <name lang="es">Lámpara azul</name>
        <name lang="cs">Kontrolka</name>
    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <ellipse width="14.5169" x="-7.5012" y="-6.95514" antialias="true" height="13.3034" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-red.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-red.elmt
@@ -7,7 +7,7 @@
        <name lang="es">Lámpara roja</name>
        <name lang="cs">Kontrolka</name>
    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <polygon style="line-style:normal;line-weight:normal;filling:red;color:red" x1="-6.61784" x2="-8.37626" x3="-8.37626" x4="-7.49705" antialias="false" x5="-4.85942" x6="-0.463379" x7="3.05345" x8="5.69108" x9="7.4495" y1="-5.31158" y10="-0.849266" y2="-2.3367" y11="-3.82414" y3="0.638173" y4="3.61305" y12="-6.0553" y5="5.84421" x10="7.4495" y13="-6.79902" y6="7.33165" x11="6.57029" y14="-6.79902" y7="6.58793" x12="4.81187" y15="-5.31158" y8="4.35677" x13="1.29504" y9="2.12561" x14="-3.10101" x15="-6.61784"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-verde.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-verde.elmt
@@ -8,7 +8,7 @@
        <name lang="ca">Lum verda</name>
        <name lang="cs">Kontrolka</name>
    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <ellipse width="14.5169" x="-7.5012" y="-6.95514" antialias="true" height="13.3034" style="line-style:normal;line-weight:normal;filling:green;color:black"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/haut_parleur.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/haut_parleur.elmt
@@ -12,7 +12,7 @@
        <name lang="pl">Głośnik</name>
        <name lang="nl">Luidspreker</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 y="1.55" text="_" x="14" rotate="true" size="9" tagg="label"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/contact_012.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/contact_012.elmt
@@ -14,7 +14,7 @@
    <kindInformations>
        <kindInformation show="1" name="type">commutator</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 y1="0" length1="1.5" y2="0" antialias="false" x1="-5" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" x2="7"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_01.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_01.elmt
@@ -14,7 +14,7 @@
    <kindInformations>
        <kindInformation show="1" name="type">commutator</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 style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y3="-10" y2="10" closed="false" x2="30" x3="24" x1="30" y1="20"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_02.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_02.elmt
@@ -14,7 +14,7 @@
    <kindInformations>
        <kindInformation show="1" name="type">commutator</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 y1="20" y3="-10" x3="36" antialias="true" x2="30" y2="10" x1="30" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt
@@ -11,7 +11,7 @@
        <name lang="es">Interruptor de 3 posiciones</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 end1="none" x1="47" x2="23" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="0"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_001.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_001.elmt
@@ -13,7 +13,7 @@
    <kindInformations>
        <kindInformation name="type" show="1">commutator</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 x2="7" y2="-3" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x1="3" end2="none" length2="1.5" antialias="true" y1="3"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_002.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_002.elmt
@@ -13,7 +13,7 @@
    <kindInformations>
        <kindInformation name="type" show="1">commutator</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" y1="3" length2="1.5" y2="-3" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="true" end2="none" end1="none" x1="-2" x2="2"/>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_008.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_008.elmt
@@ -13,7 +13,7 @@
    <kindInformations>
        <kindInformation show="1" name="type">commutator</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 antialias="false" end1="none" x1="15" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="11" end2="simple" y2="-4" y1="-4" length2="0.5"/>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
joshua	de2f161566	Add a combo box to change the QPicture scale of element picture This is a test commit to see if we can fix the wrong scale of element in some screen size.: Add a QComboBox into the QToolBar of the diagram editor to change the current scale factor of the element QPicture.	2021-04-17 09:50:32 +02:00
Laurent Trinques	b8d9d38d31	Minor	2021-04-12 06:40:59 +02:00
Laurent Trinques	c05d76c633	Flatpak update org.qelectrotech.QElectroTech.json	2021-04-12 06:36:16 +02:00
joshua	5a8197b2b3	Element query widget : make code more readable	2021-04-11 14:08:21 +02:00
joshua	c1169f0e04	Element nomenclature sql query minor fix Filter "is empty" don't work for any case : We must to filter for NULL and empty string then replace the sql sentence "value IS NULL" by "(value IS NULL OR value = '')"	2021-04-11 14:03:02 +02:00
joshua	794af49a3a	Element nomenclature SQL query : minor fix the filter "is not empty" in nomenclature don't work for every case. Replace SQL sentence "IS NULL" by "!= ''" because an empty string is not a NULL value string, but a NULL value string is like an empty string	2021-04-11 12:39:38 +02:00
Laurent Trinques	8ef0d0b2f0	Flatpak fix location patch	2021-04-09 16:22:41 +02:00
Laurent Trinques	3729bec350	Flatpak update flatpak/org.qelectrotech.QElectroTech.json	2021-04-09 16:15:26 +02:00
Laurent Trinques	157377e1c1	Faltpak update org.qelectrotech.QElectroTech.json see :https://github.com/flathub/flathub/pull/2146	2021-04-09 16:01:14 +02:00
joshua	7cb47f3b9e	Fix unwanted moving part in element editor. Fix an unwanted behavior when the properties dock widget is displayed : 1 there is no selection 2 the dock widget width is set to minimum 3 select a part, the dock widget gain new widgets used to edit the current selected part and the width of the dock grow so the width of the QGraphicsView is reduced and cause a mouse move event. When this case occur the part is moved but they should not.	2021-04-07 12:56:43 +02:00
joshua	9db15f91e7	Improve gui layout for low resolution screen	2021-04-07 12:34:56 +02:00
plc-user	c54ee9b66d	Bug-Fixing on an element	2021-04-07 01:05:42 +02:00
Laurent Trinques	7a2c62d4d2	Minor: update readme.md files	2021-04-04 17:21:50 +02:00
joshua	7f5b446fc9	Use QStringLiteral and QLatin1String.	2021-04-02 19:16:32 +02:00
Laurent Trinques	bba1f07f57	Revert "Flatpak add --socket=cups for work with LAN printers" This reverts commit `d32c322e5a`.	2021-03-31 16:16:41 +02:00
Laurent Trinques	d32c322e5a	Flatpak add --socket=cups for work with LAN printers	2021-03-31 15:03:18 +02:00
joshua	8960981f09	Use QStringLiteral and QLatin1String.	2021-03-30 20:48:56 +02:00
joshua	f2f50084e0	Use QStringLiteral and QLatin1String. According to the Qt documentation (https://doc.qt.io/qt-5/qstring.html#QStringLiteral) (https://woboq.com/blog/qstringliteral.html), use QStringLiteral and QLatin1String is better on some conditions (faster). This commit change the code related to the loading of a project (in qetproject class), let see if loading time is improved.	2021-03-30 19:59:14 +02:00
Ole Carlsen	48be92cde5	Updated Danish translation	2021-03-29 20:18:26 +02:00
Kevin Tee	845431179d	Update qelectrotech.appdata.xml Add missing release tag. I also suggest changing the license of this file. This document suggest using permissive license, also it can be accept to Flathub. https://freedesktop.org/software/appstream/docs/chap-Quickstart.html#qsr-app-contents I suggest MIT, what do you think?	2021-03-29 05:50:47 +02:00
Kevin Tee	f6161af258	Update qelectrotech.appdata.xml I forgot missing closing release tag.	2021-03-29 05:50:47 +02:00
Kevin Tee	8755a12698	Update qelectrotech.appdata.xml I'm not sure about the date for this 2021-02-21	2021-03-28 18:52:41 +02:00
Kevin Tee	a361e16a8e	Update qelectrotech.appdata.xml add content rating, release date, and license according to SPDX.	2021-03-28 18:52:41 +02:00
Laurent Trinques	0f8f26e177	Refrersh splash	2021-03-23 00:58:56 +01:00
joshua	d53bb22509	Make MachineInfo a singleton class Because on windows MachineInfo take a little time to init, we make it to a singleton. MachineInfo is build the first time in main.cpp. Now all other places where we use MachineInfo (aboutqetdialog and configdialog) gui don't hang anymore in waiting to MachineInfo finish to build.	2021-03-22 19:20:07 +01:00
joshua	3d25beaea0	Rename class Machine_info to MachinInfo Rename to follow the code style of QElectroTech	2021-03-22 19:01:46 +01:00
Laurent Trinques	1a3656f7be	Add MINGW flag for cmake	2021-03-22 08:15:37 +01:00
Joshua Claveau	7de810bac4	little fix	2021-03-21 19:06:12 +01:00
Joshua Claveau	1b6cf7d5f3	Project properties dialog launch a little more faster (especially on windows) Instead of build machine_info class which take time, only to get the max width and height of screens, call of methods Machine_info::i_max_screen_width() and Machine_info::i_max_screen_height() are now static and compute only this. The project properties dialog is now faster because don't wait the end build of machine_info.	2021-03-21 19:01:54 +01:00
Joshua Claveau	6cf79e6e75	Qet start a little more faster (especially on windows) Machine_Info class take time on windows even in powerful computer. Run the machine_info in main.cpp in parallel into another thread.	2021-03-21 18:36:03 +01:00
artgg7300	8fdb9ba21a	translated hungarian element names	2021-03-20 20:22:52 +01:00
Simon De Backer	a4adcf4865	Fix cmake user properties class for commit `44db25e76b`	2021-03-18 21:22:39 +01:00
Gleb Popov	9300130aaf	Add installation phase to CMake build system	2021-03-18 13:44:26 +01:00
Gleb Popov	d7dd32ff1a	Fix CMake build when git revision can't be determined	2021-03-18 13:44:15 +01:00
Gleb Popov	564f38396f	Add CMake option to allow using system pugixml library	2021-03-18 13:44:04 +01:00
Gleb Popov	ab5dd39556	Add CMake option to allow using system KF5 libraries	2021-03-18 13:43:50 +01:00
Gleisson Jesuino Joaquim Cardoso	b12a4525a2	Update PT_BR translation	2021-03-17 22:00:38 +01:00
Laurent Trinques	e0f2a66f3c	Update Mongolian translation, thanks Nathalie	2021-03-17 09:59:12 +01:00
Laurent Trinques	20f5c3e443	Minor update README.md files	2021-03-15 23:44:26 +01:00
Paweł Śmiech	ea730a2fa1	Polish translation update	2021-03-14 21:03:08 +01:00
anvilex	28d98a1a30	Update qelectrotech.xml 1. Russian translation added.	2021-03-14 15:30:48 +01:00
anvilex	a75565e30d	Update x-qet-titleblock.xml 1. Russian translation added. 2. German translation added.	2021-03-13 22:08:16 +01:00
anvilex	6ededf94bf	Update x-qet-titleblock.desktop 1. Russian translation added. 2. Englisch translation improved. 3. German translation improved.	2021-03-13 22:07:21 +01:00
anvilex	9ca44f2557	Update qelectrotech.desktop Russian translation added	2021-03-13 22:02:33 +01:00
anvilex	9aad769a37	Update qelectrotech.appdata.xml 1. German translation added. 2. Russian translation improved.	2021-03-13 22:01:36 +01:00
plc-user	1f0f44233e	Update qet_directory	2021-03-13 22:00:24 +01:00
plc-user	5594197aab	some Bug-Fixing of elements	2021-03-13 22:00:24 +01:00
plc-user	13b6b0c6c9	removed HTML-Tag &#xd; from some element-informations	2021-03-13 12:19:47 +01:00
plc-user	b0e6ad46ac	centered some elements on DIN-rail (allows rotating without changing Y-position)	2021-03-13 12:19:47 +01:00
Lars Biskupek	b417edaff8	Fixed grammer issues in German language file	2021-03-12 06:39:53 +01:00
anvilex	301fa629d8	Update qet_fr_ru.qph	2021-03-12 06:32:55 +01:00
joshua	44db25e76b	Add user properties class Add a specific class for user properties instead of embedded user properties in properties interface.	2021-03-11 21:39:57 +01:00
joshua	d5df9703d0	Add new XML function	2021-03-11 20:20:07 +01:00
joshua	11b8ef927b	Revert "Merge branch 'XMLPropertiesNew'" Break a lot of thing. This reverts commit `1db1800572`, reversing changes made to `4c563821e8`.	2021-03-11 19:52:50 +01:00
joshua	83b69253dc	Revert "fix compile error" This reverts commit `b181311162`.	2021-03-11 19:49:46 +01:00
joshua	b96eff00ef	Revert "Fix for cmake" This reverts commit `4051bbd309`.	2021-03-11 19:49:32 +01:00
Laurent Trinques	4051bbd309	Fix for cmake	2021-03-11 07:59:54 +01:00
Martin Marmsoler	b181311162	fix compile error	2021-03-10 19:12:00 +01:00
joshua	1db1800572	Merge branch 'XMLPropertiesNew'	2021-03-09 19:09:31 +01:00
joshua	001e93bc6f	Forgoten revert ToXml()	2021-03-09 18:43:03 +01:00
Martin Marmsoler	6e17996d37	fix problem that default conductor is not found	2021-03-08 20:48:23 +01:00
Simon De Backer	4c563821e8	[Qt6] ad QCloseEvent to Widgets	2021-03-07 20:23:07 +01:00
Simon De Backer	a4872bf686	[Qt6] mod QRegExp to QRegularExpression note ad Core5Compat to Cmake	2021-03-07 20:21:39 +01:00
Simon De Backer	332d978043	[QT6] QtConcurrent its backwards now...function, object, args	2021-03-07 19:58:49 +01:00
Martin Marmsoler	755bcf640d	fix conductor properties xml load	2021-03-07 14:07:47 +01:00
joshua	38a825865c	Fix ftbfs on debian buster	2021-03-07 12:18:30 +01:00
Martin Marmsoler	5d3710c4b2	copy all toXML() from master commit `4b82c3a0c4` into the current branch, because the new concept will be used only for user properties	2021-03-07 10:09:45 +01:00
Martin Marmsoler	058824f29a	move all static xml functions to qetxml	2021-03-06 20:01:31 +01:00
joshua	4b82c3a0c4	Fix crash Fix crash for a special case (the first time since qet exist) when a conductor have all segments to 0 in the .qet file. See https://qelectrotech.org/forum/viewtopic.php?id=1964	2021-03-06 15:17:10 +01:00
Martin Marmsoler	ea793125a5	move m_change_connections to ElementItemEditor, so it must not be defined by every editor it self	2021-03-05 20:59:36 +01:00
Laurent Trinques	153aecbbf3	Flatpak change to --socket=fallback-x11	2021-03-05 18:17:25 +01:00
Martin	bc88f2ec2e	reimplement Priv function, so the ElementEditor gets called automatically	2021-03-05 17:38:51 +01:00
Martin	6887c543da	add possibilities to fill the userProperties	2021-03-05 07:56:35 +01:00
Martin Marmsoler	51ed21f9ef	Merge commit 'b021ac3e1fb98a56810773c7c701e3329efb3148' Conflicts: sources/qetgraphicsitem/element.h	2021-03-04 21:31:55 +01:00
Martin Marmsoler	221773ea8a	fix some issues	2021-03-04 21:25:04 +01:00
Martin Marmsoler	9d4b90da1a	Add userProperties	2021-03-04 19:18:28 +01:00
Thomas Gravekamp	b021ac3e1f	Add Williams EM symbols	2021-03-03 21:53:25 +01:00
joshua	faf4235bed	Terminal element info Provide only useful information for terminal	2021-03-03 21:28:22 +01:00
Laurent Trinques	0a51e22b7d	Update org.kde.Platform" to "runtime-version": "5.15"	2021-03-03 18:38:13 +01:00
Laurent Trinques	632fba5366	Add binary hungarian lang file	2021-03-03 14:28:01 +01:00
artgg7300	0ca883f114	translated hungarian lang file	2021-03-03 14:10:24 +01:00
Simon De Backer	170d856007	Fix Cmake did not compile	2021-03-02 22:15:44 +01:00
joshua	0424eb9fba	Mark deprecated method	2021-03-01 22:17:58 +01:00
Lars Biskupek	8210f06919	Update of German Language File qet_de	2021-03-01 20:41:40 +01:00
Ole Carlsen	468618adda	Danish translation updated	2021-03-01 20:28:58 +01:00
pavelfric	8141a75738	Updated Czech translations of elements.	2021-03-01 10:40:11 +01:00
dlee99	8f201a6e5d	modified: lang/qet_nl.qm modified: lang/qet_nl.ts	2021-02-28 22:18:33 +01:00
Lars Biskupek	b8745c0a6b	Update of German language file qet_de	2021-02-28 21:23:50 +01:00
Laurent Trinques	7c3bde9118	Update SingleApplication to upstream master	2021-02-28 18:05:18 +01:00
Martin Marmsoler	ed8c1dea9d	Merge commit '28cd389695248b56a99a417bc10640bb3e99c298'	2021-02-28 17:33:43 +01:00
Laurent Trinques	28cd389695	Upgrade pugixml XML parser to 1.11 release https://pugixml.org/docs/manual.html#v1.11	2021-02-28 17:12:53 +01:00
Laurent Trinques	56bb2a399b	Refresh splash size	2021-02-28 05:56:59 +01:00
Laurent Trinques	dc726792d3	Update *TS files	2021-02-28 05:53:40 +01:00
joshua	d8707a4ef2	Add dialog to inform user when open a non compatible project	2021-02-27 14:01:33 +01:00
Martin Marmsoler	01d6cdb920	Merge commit '77710e1cc5e597d06196d2ee163198176032987a' Conflicts: sources/conductorproperties.cpp sources/qetgraphicsitem/element.cpp sources/qetgraphicsitem/qetshapeitem.cpp	2021-02-27 07:49:24 +01:00
joshua	77710e1cc5	Remove compatibility of QetShapItem from version prior to svn 4075 Befor svn 4075 QetShapItem was saved as int in xml, after as a string. Remove retro-compatibility (int to string) svn 4075 is older than 5 years.	2021-02-25 20:47:43 +01:00
joshua	1d2c00819d	Element collection cache remove old code Remove old code use to drop table when qet was using mtime instead of uuid for check if an element was changed.	2021-02-25 20:31:14 +01:00
joshua	eee0469bd7	Remove retro compatibility of conductor text prior to qet 0.4 The property hide/show compatibility of conductor text is not maintained for project made before qet 0.4	2021-02-25 20:21:18 +01:00
joshua	5118037cb5	Remove retro compatibility of element label prior to qet 0.5 Compatibility is not maintained anymore with the old project which contain variable in the element information "label"	2021-02-25 19:42:14 +01:00
joshua	1f53c39290	Remove retro compatibility of element text item prior to qet 0.7 Compatibility is not maintained anymore with the old project which contain old element text item.	2021-02-25 19:35:04 +01:00
Martin	f499507b2d	fix load issue	2021-02-25 16:55:13 +01:00
joshua	b71aec9548	Fix wrong element type	2021-02-24 20:49:10 +01:00
joshua	c7798e1a80	Fix wrong element type	2021-02-24 20:41:47 +01:00
Martin	5430692359	remove not needed declaration, because the definition was already deleted. And so a linker error occured	2021-02-24 19:04:14 +01:00
Martin	02b7ead041	fix compile issues	2021-02-24 18:48:59 +01:00
Martin	ea364f9c4e	merge	2021-02-23 17:35:55 +01:00
Laurent Trinques	f97edad75a	DiagramView::mouseMoveEvent remove "DEV" in toolTip message mouse postion	2021-02-23 00:51:50 +01:00
Laurent Trinques	454b2c8a0f	Update splash to 0.9 version	2021-02-22 16:22:08 +01:00
Lars Biskupek	b2782bc460	Tab-stop definitions inserted where appropriate Tab stop definitions inserted in some dialogs, so that the order of tab-stops-moves corresponds as closely as possible to the fields' position in the window.	2021-02-22 13:47:39 +01:00
Lars Biskupek	059f0eb1b6	Modifications to SaveFile-Dialog for "Save As PDF" Fixed a typo that prevented existing PDF files from being displayed in SaveFileDialog for PDFs. The way the file name for the PDF is generated has changed. If the project has already been saved, the PDF has the same file name (with .pdf of course); If not, the file name is generated from the project title (= same behavior as Save as - dialog for a .qet project file).	2021-02-22 13:47:39 +01:00
joshua	ce318ac667	Element : start use ElementData Element now use ElementData for namelist and element information	2021-02-21 19:40:33 +01:00
joshua	be2067148e	Element editor : add terminal properties editable	2021-02-21 19:40:33 +01:00
joshua	444f62a1f8	element data : add terminal type enum and terminal function enum	2021-02-21 19:40:33 +01:00
joshua	8f85cacb06	QetElementEditor : Use elementData class	2021-02-21 19:40:33 +01:00
joshua	ffe3d98279	Add element data class	2021-02-21 19:40:33 +01:00
joshua	dea926e4b4	Remove unnecessary method	2021-02-21 19:40:33 +01:00
joshua	a1779d1a7a	Rewrite terminaleditor with ui file. Write terminal editor with ui file. The terminalData::type of a terminal can be edited with the terminal editor.	2021-02-21 19:40:33 +01:00
joshua	252106178b	Add enum Type to terminalData class	2021-02-21 19:40:32 +01:00
joshua	a00404bc9f	clean terminal and terminaldata class	2021-02-21 19:40:32 +01:00
joshua	e2ebb445a8	Terminal : remove unused code	2021-02-21 19:40:32 +01:00
joshua	24ec94d73e	QetElementEditor : rewrite gui with ui file	2021-02-21 19:40:32 +01:00
joshua	edb42caa16	Fix typo Fixed a typo that resulted in existing PDF files not being displayed in the dialog box "Save As PDF". Thanks Bisku	2021-02-21 19:38:53 +01:00
Pawel Śmiech	c110acc0ac	Polish translation updated Signed-off-by: Pawel Śmiech <pawel@localhost.localdomain>	2021-02-21 13:46:41 +01:00
Laurent Trinques	3467c09c1e	Change displayedVersion = "0.90-DEV"	2021-02-21 11:00:42 +01:00
Martin Marmsoler	b32a295b0c	fix issue when creating xml document	2020-10-20 12:01:55 +02:00
Martin Marmsoler	6251862f7a	default color was wrong	2020-10-20 08:54:56 +02:00
Martin Marmsoler	793770a72a	initialize TerminalData with nullpoint to not having an invalid value	2020-10-20 08:54:56 +02:00
Martin Marmsoler	aba16dc936	remove not needed variable	2020-10-20 08:54:56 +02:00
Martin Marmsoler	e5b8ba7e22	fix problems in partrectangle	2020-10-20 08:54:56 +02:00
Simon De Backer	dad32d5897	Add destructor to Machine_info class to fix segfault	2020-10-20 08:54:56 +02:00
Martin Marmsoler	9658a88c18	fix compile issues	2020-10-20 08:54:56 +02:00
Martin Marmsoler	12e301b887	replace 4 spaces by a tab	2020-10-20 08:54:56 +02:00
Martin Marmsoler	f3097fc537	rebase XMLProperties_New (`c0d9bf9`) to master	2020-10-20 08:54:14 +02:00
Martin Marmsoler	73b394527d	replace tabs by 4 spaces	2020-10-20 08:53:43 +02:00