Test

.clang-format

@@ -1,67 +0,0 @@
----
-BasedOnStyle: LLVM
-AlignAfterOpenBracket: AlwaysBreak
-AlignConsecutiveMacros: 'true'
-AlignConsecutiveAssignments: 'true'
-AlignConsecutiveDeclarations: 'true'
-AlignEscapedNewlines: Right
-AlignOperands: 'true'
-AlignTrailingComments: 'true'
-AllowAllArgumentsOnNextLine: 'false'
-AllowAllConstructorInitializersOnNextLine: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'true'
-AllowShortBlocksOnASingleLine: 'true'
-AllowShortCaseLabelsOnASingleLine: 'true'
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Always
-AllowShortLambdasOnASingleLine: All
-AllowShortLoopsOnASingleLine: 'true'
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: 'true'
-AlwaysBreakTemplateDeclarations: 'Yes'
-BinPackArguments: 'false'
-BinPackParameters: 'false'
-BreakAfterJavaFieldAnnotations: 'true'
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Allman
-BreakBeforeTernaryOperators: 'false'
-BreakConstructorInitializers: AfterColon
-BreakInheritanceList: AfterColon
-BreakStringLiterals: 'true'
-ColumnLimit: '80'
-CompactNamespaces: 'false'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
-Cpp11BracedListStyle: 'true'
-FixNamespaceComments: 'true'
-IncludeBlocks: Regroup
-IndentCaseLabels: 'false'
-IndentPPDirectives: AfterHash
-IndentWidth: '4'
-JavaScriptWrapImports: 'true'
-Language: Cpp
-MaxEmptyLinesToKeep: '1'
-NamespaceIndentation: All
-PointerAlignment: Left
-ReflowComments: 'true'
-SortIncludes: 'true'
-SortUsingDeclarations: 'true'
-SpaceAfterCStyleCast: 'true'
-SpaceAfterLogicalNot: 'true'
-SpaceAfterTemplateKeyword: 'true'
-SpaceBeforeAssignmentOperators: 'true'
-SpaceBeforeCpp11BracedList: 'true'
-SpaceBeforeCtorInitializerColon: 'true'
-SpaceBeforeInheritanceColon: 'true'
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: 'true'
-SpaceInEmptyParentheses: 'false'
-SpacesInAngles: 'false'
-SpacesInCStyleCastParentheses: 'false'
-SpacesInContainerLiterals: 'false'
-SpacesInParentheses: 'false'
-SpacesInSquareBrackets: 'false'
-Standard: Cpp11
-TabWidth: '4'
-UseTab: Always
-
-...

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

@@ -1,20 +0,0 @@
-name: Publish Candidate Snap
-
-on:
-  push:
-    branches:
-      - "snap/latest/candidate"
-  workflow_dispatch:
-
-jobs:
-  publish_amd64:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: snapcore/action-build@v1
-      id: build
-    - uses: snapcore/action-publish@v1
-      with:
-        store_login: ${{ secrets.STORE_LOGIN }}
-        snap: ${{ steps.build.outputs.snap }}
-        release: candidate

.gitignore

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

CMakeLists.txt

@@ -1,133 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-include(cmake/hoto_update_cmake_message.cmake)
-
-cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
-
-project(qelectrotech
-  VERSION 0.8.0
-  DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
-  HOMEPAGE_URL "https://qelectrotech.org/"
-  LANGUAGES CXX)
-
-include(cmake/copyright_message.cmake)
-
-set(QET_DIR ${PROJECT_SOURCE_DIR})
-
-# Add sub directories
-option(PACKAGE_TESTS "Build the tests" ON)
-if(PACKAGE_TESTS)
-  message("Add sub directorie tests")
-  add_subdirectory(tests)
-endif()
-
-include(cmake/paths_compilation_installation.cmake)
-include(cmake/start_options.cmake)
-include(cmake/developer_options.cmake)
-include(cmake/git_update_submodules.cmake)
-include(cmake/git_last_commit_sha.cmake)
-include(cmake/fetch_kdeaddons.cmake)
-include(cmake/fetch_singleapplication.cmake)
-include(cmake/fetch_pugixml.cmake)
-include(cmake/qet_compilation_vars.cmake)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-SET(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-find_package(
-  QT
- NAMES
-  Qt6
-  Qt5
- COMPONENTS
-  ${QET_COMPONENTS}
- REQUIRED
- )
-
-find_package(
-  Qt${QT_VERSION_MAJOR}
- COMPONENTS
- ${QET_COMPONENTS}
- REQUIRED)
-
-set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
-qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
-set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
-qt5_add_translation(QM_FILES ${TS_FILES})
-
-# als laatse
-include(cmake/define_definitions.cmake)
-
-add_executable(
-  ${PROJECT_NAME}
-  ${QET_RES_FILES}
-  ${QET_SRC_FILES}
-  ${QM_FILES}
-  ${QET_DIR}/qelectrotech.qrc
-  )
-
-target_link_libraries(
-  ${PROJECT_NAME}
-  PUBLIC
-  PRIVATE
-  pugixml::pugixml
-  SingleApplication::SingleApplication
-  ${KF5_PRIVATE_LIBRARIES}
-  ${QET_PRIVATE_LIBRARIES}
-  )
-
-target_include_directories(
-  ${PROJECT_NAME}
-  PRIVATE
-  ${QET_DIR}/sources/titleblock
-  ${QET_DIR}/sources/ui
-  ${QET_DIR}/sources/qetgraphicsitem
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui
-  ${QET_DIR}/sources/richtext
-  ${QET_DIR}/sources/factory
-  ${QET_DIR}/sources/properties
-  ${QET_DIR}/sources/dvevent
-  ${QET_DIR}/sources/editor
-  ${QET_DIR}/sources/editor/esevent
-  ${QET_DIR}/sources/editor/graphicspart
-  ${QET_DIR}/sources/editor/ui
-  ${QET_DIR}/sources/editor/UndoCommand
-  ${QET_DIR}/sources/undocommand
-  ${QET_DIR}/sources/diagramevent
-  ${QET_DIR}/sources/ElementsCollection
-  ${QET_DIR}/sources/ElementsCollection/ui
-  ${QET_DIR}/sources/autoNum
-  ${QET_DIR}/sources/autoNum/ui
-  ${QET_DIR}/sources/ui/configpage
-  ${QET_DIR}/sources/SearchAndReplace
-  ${QET_DIR}/sources/SearchAndReplace/ui
-  ${QET_DIR}/sources/NameList
-  ${QET_DIR}/sources/NameList/ui
-  ${QET_DIR}/sources/utils
-  ${QET_DIR}/sources/pugixml
-  ${QET_DIR}/sources/dataBase
-  ${QET_DIR}/sources/dataBase/ui
-  ${QET_DIR}/sources/factory/ui
-  ${QET_DIR}/sources/print
-  )

CONTRIBUTING.md

@@ -1,121 +0,0 @@
-# How to contribute
- 
-I'm really glad you're reading this,
-because we need volunteer developers to help
-this project come to fruition.
-
-
-Here are some important resources:
-
-* [Qet code style](https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet)
-* [git Documentation](https://git-scm.com/doc)
-
-## Testing
-
-## Submitting changes
-
-Always write a clear log message for your commits.
-One-line messages are fine for small changes,
-but bigger changes should look like this:
-
-    $ git commit -m "A brief summary of the commit
-    > 
-    > A paragraph describing what changed and its impact."
-
-* It is always appropriate to keep the commits small.
-* For major changes it is recommended to use branches.
-
-### Interactive Staging
-https://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging
-
-issue: you have modified a class but you want to write it in 2 commits
-
- ´git add -p´ or ´git add -i´
-
-
-    /qet> git add -i
-
-
-               staged     unstaged path
-      1:    unchanged        +1/-1 sources/diagram.cpp
-
-    *** Commands ***
-      1: status       2: update       3: revert       4: add untracked
-      5: patch        6: diff         7: quit         8: help
-
-
-    What now> 5
-
-
-               staged     unstaged path
-      1:    unchanged        +1/-1 sources/diagram.cpp
-    Patch update>> 1
-               staged     unstaged path
-    * 1:    unchanged        +1/-1 sources/diagram.cpp
-    Patch update>>
-    diff --git a/sources/diagram.cpp b/sources/diagram.cpp
-    index bffca653f..9bd2280f7 100644
-    --- a/sources/diagram.cpp
-    +++ b/sources/diagram.cpp
-    @@ -103,9 +103,9 @@ Diagram::Diagram(QETProject *project) :
-        connect(&border_and_titleblock,
-                &BorderTitleBlock::titleBlockFolioChanged,
-                this, &Diagram::updateLabels);
-    -       connect(this, &Diagram::diagramActivated,
-    +       foo(do_a);
-    -       adjust(diagramActivated);
-    +       bar(do_c);
-        adjustSceneRect();
-     }
-
-
-    (1/1) Stage this hunk [y,n,q,a,d,s,e,?]? s
-
-
-    Split into 2 hunks.
-    @@ -103,5 +103,5 @@
-        connect(&border_and_titleblock,
-                &BorderTitleBlock::titleBlockFolioChanged,
-                this, &Diagram::updateLabels);
-    -       connect(this, &Diagram::diagramActivated,
-    +       foo(do_a);
-
-
-    (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? y
-
-
-    @@ -107,5 +107,5 @@
-                this, &Diagram::loadElmtFolioSeq);
-    -       adjust(diagramActivated);
-    +       bar(do_c);
-        adjustSceneRect();
-     }
-
-
-    (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? n
-
-
-    *** Commands ***
-      1: status       2: update       3: revert       4: add untracked
-      5: patch        6: diff         7: quit         8: help
-    What now>What now>7
-    Bye.
-
-    git commit -m "Mod Signal Slot to funsion"
-
-## Coding conventions
-
-Start reading our code and you'll get the hang of it.
-We optimize for readability:
-
-  * We use tabs to indent, and interpret tabs as taking up to 8 spaces.
-    see https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet
-  * We try to keep to at most 80 characters per line.
-  * Try to make your code understandable.
-    You may put comments in, but comments invariably tend to stale out when
-    the code they were describing changes.
-    Often splitting a function into two
-    makes the intention of the code much clearer.
-    
-Thanks,
-QElectroTech

ChangeLog

@@ -1,96 +1,19 @@
 ====== ChangeLog from 0.7 to 0.8 ======
 
-
-* Moving the main QET repository SVN trunk to GIT.
-* Add a mirror of the main QET repository, which is synced to hosted at tuxfamily.org to Github.
-* Doxyfile update add QCH file for doxygen-generated docs using qhelpgenerator and then import them into Qt Creator.
-* Improve portability of Doxyfile (Simon).
-* Fix deprecated warnings (Simon).
-* Wrap code for better readability (Simon, Damian).
-
-
-
-
-* Elements collection :
-Improve collection 7378 elements in 1092 categories
-Thanks Sebastien, Dinozzo, Simon,  Rafał, Arnaud, Bisku, Fernando, Riesermauf, Alexis, david, Plc-user, Christophe, Michele,  Galexis, Jevgenijs, Gabor, 
-Benoit Michel, Franck, Ludovic, Cyrille, ossau2mation,  Mitzot,  Edgar, Nuri, Friskolon, Baboune41, Wiktor, shateks, Dik, Shateks,  Marcin
-
+* Element editor :
+* with Ctrl key you can moving by keyboard primitives selected by 0.1 point instead by 1 points, added the same feature for moving the selected aera.
+* Improve polygon widget editor on elements editor.
 
 * Diagram editor :
-
-* The export of the nomenclature to csv file has been completely rewritten :
-It is now possible to choose which information to export as well as the order in which it should be displayed.
-An option allows filtering by type of element: all, terminal block, button / switch.
-Another option allows to display or not the column headers in the csv file.
-With these options, it is possible to create a nomenclature, an order list, but also for printing labels: list of terminals and list of buttons / switches.
-It is possible to save / load a configuration easily.
-Finally, the work being done by an SQLite database, a text field allows the user to create his own SQL query.
-
-* Add Conductors numbering to csv file.
-
-* Add new summary table.
-
-* add BOM creation dialog :
-nomenclature is now integrated into the project (accompanied by several parameters in order to be customizable).
-Tables can have a name.
-Tables an be added to any folio.
-Font margin and alignment (right center left) separately adjustable for headers and table cells.
-Position size and number of lines is adjustable.
-Possibility of linking several tables together, especially when the entire nomenclature cannot be contained in a folio.
-Automatic adjustment of the size of the table in relation to the folio.
-Option to apply the geometry of an array to all the array linked to it, so that everything is homogeneous.
-Save / load table configuration and content to make creation faster.
-Option to automatically adjust the table to the folio.
-Option to automatically add new tables in new folios if the nomenclature cannot be contained in 1 to N folios / tables.
-
-* Table content:
-Fully customizable, you display what you want or want (info to display in the desired order, filter on type of element, filter on content of the info "contains, not contains, not empty etc ..." ).
-The content being generated from a sqlite database, you can write your own request.
+* User can choose now folio list emplacement in project by select position number in settings :
+1 for the first position
+2 for the second position
+etc
+0 for always at the end of project
+Because index folio is 0 and not 1 we apply -1 in formula to not complicate your life..
 
 
-* Loading of element collections is now faster (thanks to the pugixml parser)
-* The loading of collections of elements no longer freezes QElectroTech.
-* The appearance and disappearance of the search / replace menu is animated.
-* Fix wrong position of slave xref after open a saved project
 
-* Add font color of the conductors (Simon).
-* Add section and color properties for wires.
-
-* config dialog : 
-* Add QScrollArea to configdialog and resize to max_screen (Simon).
-* Add gui resize depending on screen size (Simon).
-* Add Screen info user (Simon).
-* Mod ScrollArea on demand (Simon).
-
-
-* Element editor:
-* Polygon editing widget, when you click on a point in the list, the corresponding point changes color in order to better visualize what you are doing.
-On this same list, a right click opens a contextual menu allowing to delete the selected point or inserted a point after the selected one.
-When holding the ctrl + directional arrow key, the selected parts move by 0.1 instead of 1 point.
-* with Ctrl key you can moving by keyboard primitives selected by 0.1 point instead by 1 points, added the same feature for moving the selected aera.
-* Added 140 web standard colors In Element editor (Arnaud).
-
-* Add multiedit feature (martin).
-* Add terminals uuid for next features (martin).
-
-
-* Windows :
-* Fix bad fonts rendering if Qt version >= 5.13.1.
-See : https://bugreports.qt.io/browse/QTBUG-83161
-* Fix backup file on windows
-For unknown reason KautoSaveFile don't write the file on Windows if file
-is open in another part of the code.
-No error is returned and use the method :
-qint64 QIODevice::write(const QByteArray &byteArray) return the good
-number of bytes written but the real file stay empty.
-Probably the problem don't come from KautoSaveFile but QFileDevice or
-QIODevice on windows.
-
-The fix consist to open the file just before write on it and close it
-just after.
-
-* writeToFile on a other Thread to improve this for windows performance (Simon).
 
 
 * macOS :
@@ -99,31 +22,46 @@ just after.
 (removed by Qt upstream) https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=ea47d152b35158ba07a55d009f57df0e4c2a048f;hp=08cc9b9991ae9ab51bed5b857b6257401401ff6f
 
 
-* Add Snap packages :
-* thanks Max for help.
-https://snapcraft.io/qelectrotech
-See: https://qelectrotech.org/forum/viewtopic.php?id=1426
-* Use kde-neon extension
-The kde-neon extension reduces our boilerplate in snapcraft.yaml
-and reduces the snap size considerably, as we do not need to ship
-any library that is already included in the kde-frameworks-5-core18
-snap itself.
 
-This limits qelectrotech builds to the architectures supported
-by kde-frameworks-5-core18, i.e. only amd64.
-
-https://git.tuxfamily.org/qet/qet.git/log/?qt=grep&q=snap
-
-
-
-* Add Flatpak packages : 
-* thanks Mathieu for help.
-See: https://github.com/qelectrotech/qelectrotech-source-mirror/pull/18
-* remove the file name extension added
+* For the Flatpak package : remove the file name extension added
 automatically to the saved files even if the user sets an unknown file
 extension for the program.
 
-https://git.tuxfamily.org/qet/qet.git/log/?qt=grep&q=flatpak
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

ELEMENTS.LICENSE

@@ -175,15 +175,3 @@ Dette værk er licenseret under Creative Commons Attribution 3.0 License.
 For at se en kopi af denne licens, besøg
 http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
-
-[ja]
-QElectroTech と一緒に提供される要素コレクションは現状のまま提供され、
-あなたの目的や作業に適合することを保証するものではありません。
-回路図での要素の利用、変更、統合は、回路図の最終的なライセンスに関わらず
-無条件で許可されます。
-回路図とは別に QElectroTech コレクションの全部または一部を
-変更の有無に関わらず再配布する場合は CC-BY ライセンスを尊重しなければなりません:
-この作品は Creative Commons Attribution 3.0 の下でライセンスされます。
-ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、
-「Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.」に
-手紙を送ってください。

INSTALL

@@ -140,14 +140,3 @@ $ qmake (qmake-qt5 for Debian baserede systemer)
 $ make
 # umask 0022
 # make install
-
-[ja]
-必要条件 :
-libQt5 (パッケージ libqt5* を参照)
-cupsys-bsd 印刷用
-
-コンパイルの方法 :
-$ qmake (Debian ベースのシステムでは qmake-qt5)
-$ make
-# umask 0022
-# make install

README

@@ -50,7 +50,3 @@ QET gebruikt XML voor de elementen en schema's en omvat een schematische editor,
 [da]
 QElectroTech er et Qt5 program til at redigere elektriske diagrammer.
 Det bruger XML filer for symboler og diagrammer og inkluderer diagram, symbol og titelblok redigering.
-
-[ja]
-QElectroTech は電気回路図を作成する Qt5 アプリケーションです。
-QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。

SingleApplication/singleapplication.cpp

@@ -27,169 +27,163 @@
 #include <QtCore/QSharedMemory>
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
 #else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.10 or later")
-#endif
 #include <QRandomGenerator>
 #endif
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
 /**
-	@brief Constructor. Checks and fires up LocalServer or closes the program
-	if another instance already exists
-	@param argc
-	@param argv
-	@param {bool} allowSecondaryInstances
-*/
+ * @brief Constructor. Checks and fires up LocalServer or closes the program
+ * if another instance already exists
+ * @param argc
+ * @param argv
+ * @param {bool} allowSecondaryInstances
+ */
 SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout )
-	: app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
+    : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
 {
-	Q_D(SingleApplication);
+    Q_D(SingleApplication);
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-	// On Android and iOS since the library is not supported fallback to
-	// standard QApplication behaviour by simply returning at this point.
-	qWarning() << "SingleApplication is not supported on Android and iOS systems.";
-	return;
+    // On Android and iOS since the library is not supported fallback to
+    // standard QApplication behaviour by simply returning at this point.
+    qWarning() << "SingleApplication is not supported on Android and iOS systems.";
+    return;
 #endif
 
-	// Store the current mode of the program
-	d->options = options;
+    // Store the current mode of the program
+    d->options = options;
 
-	// Generating an application ID used for identifying the shared memory
-	// block and QLocalServer
-	d->genBlockServerName();
+    // Generating an application ID used for identifying the shared memory
+    // block and QLocalServer
+    d->genBlockServerName();
 
 #ifdef Q_OS_UNIX
-	// By explicitly attaching it and then deleting it we make sure that the
-	// memory is deleted even after the process has crashed on Unix.
-	d->memory = new QSharedMemory( d->blockServerName );
-	d->memory->attach();
-	delete d->memory;
+    // By explicitly attaching it and then deleting it we make sure that the
+    // memory is deleted even after the process has crashed on Unix.
+    d->memory = new QSharedMemory( d->blockServerName );
+    d->memory->attach();
+    delete d->memory;
 #endif
-	// Guarantee thread safe behaviour with a shared memory block.
-	d->memory = new QSharedMemory( d->blockServerName );
+    // Guarantee thread safe behaviour with a shared memory block.
+    d->memory = new QSharedMemory( d->blockServerName );
 
-	// Create a shared memory block
-	if( d->memory->create( sizeof( InstancesInfo ) ) ) {
-		// Initialize the shared memory block
-		d->memory->lock();
-		d->initializeMemoryBlock();
-		d->memory->unlock();
-	} else {
-		// Attempt to attach to the memory segment
-		if( ! d->memory->attach() ) {
-			qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-			qCritical() << d->memory->errorString();
-			delete d;
-			::exit( EXIT_FAILURE );
-		}
-	}
+    // Create a shared memory block
+    if( d->memory->create( sizeof( InstancesInfo ) ) ) {
+        // Initialize the shared memory block
+        d->memory->lock();
+        d->initializeMemoryBlock();
+        d->memory->unlock();
+    } else {
+        // Attempt to attach to the memory segment
+        if( ! d->memory->attach() ) {
+            qCritical() << "SingleApplication: Unable to attach to shared memory block.";
+            qCritical() << d->memory->errorString();
+            delete d;
+            ::exit( EXIT_FAILURE );
+        }
+    }
 
-	InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-	QElapsedTimer time;
-	time.start();
+    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
+    QElapsedTimer time;
+    time.start();
 
-	// Make sure the shared memory block is initialised and in consistent state
-	while( true ) {
-		d->memory->lock();
+    // Make sure the shared memory block is initialised and in consistent state
+    while( true ) {
+        d->memory->lock();
 
-		if( d->blockChecksum() == inst->checksum ) break;
+        if( d->blockChecksum() == inst->checksum ) break;
 
-		if( time.elapsed() > 5000 ) {
-			qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
-			d->initializeMemoryBlock();
-		}
+        if( time.elapsed() > 5000 ) {
+            qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
+            d->initializeMemoryBlock();
+        }
 
-		d->memory->unlock();
+        d->memory->unlock();
 
-		// Random sleep here limits the probability of a collision between two racing apps
+        // 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 ) );
+        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")
+	quint32 value = QRandomGenerator::global()->generate();
+        QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( value ) / RAND_MAX * 10 ) );
 #endif
-		quint32 value = QRandomGenerator::global()->generate();
-		QThread::sleep(8 + static_cast<unsigned long>(value / RAND_MAX * 10));
-#endif
-	}
+    }
 
-	if( inst->primary == false) {
-		d->startPrimary();
-		d->memory->unlock();
-		return;
-	}
+    if( inst->primary == false) {
+        d->startPrimary();
+        d->memory->unlock();
+        return;
+    }
 
-	// Check if another instance can be started
-	if( allowSecondary ) {
-		inst->secondary += 1;
-		inst->checksum = d->blockChecksum();
-		d->instanceNumber = inst->secondary;
-		d->startSecondary();
-		if( d->options & Mode::SecondaryNotification ) {
-			d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
-		}
-		d->memory->unlock();
-		return;
-	}
+    // Check if another instance can be started
+    if( allowSecondary ) {
+        inst->secondary += 1;
+        inst->checksum = d->blockChecksum();
+        d->instanceNumber = inst->secondary;
+        d->startSecondary();
+        if( d->options & Mode::SecondaryNotification ) {
+            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
+        }
+        d->memory->unlock();
+        return;
+    }
 
-	d->memory->unlock();
+    d->memory->unlock();
 
-	d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
 
-	delete d;
+    delete d;
 
-	::exit( EXIT_SUCCESS );
+    ::exit( EXIT_SUCCESS );
 }
 
 /**
-	@brief Destructor
-*/
+ * @brief Destructor
+ */
 SingleApplication::~SingleApplication()
 {
-	Q_D(SingleApplication);
-	delete d;
+    Q_D(SingleApplication);
+    delete d;
 }
 
 bool SingleApplication::isPrimary()
 {
-	Q_D(SingleApplication);
-	return d->server != nullptr;
+    Q_D(SingleApplication);
+    return d->server != nullptr;
 }
 
 bool SingleApplication::isSecondary()
 {
-	Q_D(SingleApplication);
-	return d->server == nullptr;
+    Q_D(SingleApplication);
+    return d->server == nullptr;
 }
 
 quint32 SingleApplication::instanceId()
 {
-	Q_D(SingleApplication);
-	return d->instanceNumber;
+    Q_D(SingleApplication);
+    return d->instanceNumber;
 }
 
 qint64 SingleApplication::primaryPid()
 {
-	Q_D(SingleApplication);
-	return d->primaryPid();
+    Q_D(SingleApplication);
+    return d->primaryPid();
 }
 
 bool SingleApplication::sendMessage( QByteArray message, int timeout )
 {
-	Q_D(SingleApplication);
+    Q_D(SingleApplication);
 
-	// Nobody to connect to
-	if( isPrimary() ) return false;
+    // Nobody to connect to
+    if( isPrimary() ) return false;
 
-	// Make sure the socket is connected
-	d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
+    // Make sure the socket is connected
+    d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
 
-	d->socket->write( message );
-	bool dataWritten = d->socket->waitForBytesWritten( timeout );
-	d->socket->flush();
-	return dataWritten;
+    d->socket->write( message );
+    bool dataWritten = d->socket->waitForBytesWritten( timeout );
+    d->socket->flush();
+    return dataWritten;
 }

SingleApplication/singleapplication.h

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

SingleApplication/singleapplication.pri

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

SingleApplication/singleapplication_p.cpp

@@ -43,139 +43,139 @@
 #include "singleapplication_p.h"
 
 #ifdef Q_OS_UNIX
-	#include <unistd.h>
-	#include <sys/types.h>
-	#include <pwd.h>
+    #include <unistd.h>
+    #include <sys/types.h>
+    #include <pwd.h>
 #endif
 
 #ifdef Q_OS_WIN
-#include <windows.h>
-#include <lmcons.h>
+    #include <windows.h>
+    #include <lmcons.h>
 #endif
 
 SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
-	: q_ptr( q_ptr )
+    : q_ptr( q_ptr )
 {
-	server = nullptr;
-	socket = nullptr;
-	memory = nullptr;
-	instanceNumber = -1;
+    server = nullptr;
+    socket = nullptr;
+    memory = nullptr;
+    instanceNumber = -1;
 }
 
 SingleApplicationPrivate::~SingleApplicationPrivate()
 {
-	if( socket != nullptr ) {
-		socket->close();
-		delete socket;
-	}
+    if( socket != nullptr ) {
+        socket->close();
+        delete socket;
+    }
 
-	memory->lock();
-	InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-	if( server != nullptr ) {
-		server->close();
-		delete server;
-		inst->primary = false;
-		inst->primaryPid = -1;
-		inst->checksum = blockChecksum();
-	}
-	memory->unlock();
+    memory->lock();
+    InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+    if( server != nullptr ) {
+        server->close();
+        delete server;
+        inst->primary = false;
+        inst->primaryPid = -1;
+        inst->checksum = blockChecksum();
+    }
+    memory->unlock();
 
-	delete memory;
+    delete memory;
 }
 
 void SingleApplicationPrivate::genBlockServerName()
 {
-	QCryptographicHash appData( QCryptographicHash::Sha256 );
-	appData.addData( "SingleApplication", 17 );
-	appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
-	appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
-	appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
+    QCryptographicHash appData( QCryptographicHash::Sha256 );
+    appData.addData( "SingleApplication", 17 );
+    appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
+    appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
+    appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
 
-	if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ) {
-		appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
-	}
+    if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ) {
+        appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
+    }
 
-	if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
+    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
 #ifdef Q_OS_WIN
-		appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
+        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
 #else
-		appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
+        appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
 #endif
-	}
+    }
 
-	// User level block requires a user specific data in the hash
-	if( options & SingleApplication::Mode::User ) {
+    // User level block requires a user specific data in the hash
+    if( options & SingleApplication::Mode::User ) {
 #ifdef Q_OS_WIN
-		wchar_t username [ UNLEN + 1 ];
-		// Specifies size of the buffer on input
-		DWORD usernameLength = UNLEN + 1;
-		if( GetUserNameW( username, &usernameLength ) ) {
-			appData.addData( QString::fromWCharArray(username).toUtf8() );
-		} else {
-			appData.addData( qgetenv("USERNAME") );
-		}
+        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);
+        QByteArray username;
+        uid_t uid = geteuid();
+        struct passwd *pw = getpwuid(uid);
+        if( pw ) {
+            username = pw->pw_name;
+        }
+        if( username.isEmpty() ) {
+            username = qgetenv("USER");
+        }
+        appData.addData(username);
 #endif
-	}
+    }
 
-	// Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
-	// server naming requirements.
-	blockServerName = appData.result().toBase64().replace("/", "_");
+    // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
+    // server naming requirements.
+    blockServerName = appData.result().toBase64().replace("/", "_");
 }
 
 void SingleApplicationPrivate::initializeMemoryBlock()
 {
-	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-	inst->primary = false;
-	inst->secondary = 0;
-	inst->primaryPid = -1;
-	inst->checksum = blockChecksum();
+    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+    inst->primary = false;
+    inst->secondary = 0;
+    inst->primaryPid = -1;
+    inst->checksum = blockChecksum();
 }
 
 void SingleApplicationPrivate::startPrimary()
 {
-	Q_Q(SingleApplication);
+    Q_Q(SingleApplication);
 
-	// Successful creation means that no main process exists
-	// So we start a QLocalServer to listen for connections
-	QLocalServer::removeServer( blockServerName );
-	server = new QLocalServer();
+    // Successful creation means that no main process exists
+    // So we start a QLocalServer to listen for connections
+    QLocalServer::removeServer( blockServerName );
+    server = new QLocalServer();
 
-	// Restrict access to the socket according to the
-	// SingleApplication::Mode::User flag on User level or no restrictions
-	if( options & SingleApplication::Mode::User ) {
-		server->setSocketOptions( QLocalServer::UserAccessOption );
-	} else {
-		server->setSocketOptions( QLocalServer::WorldAccessOption );
-	}
+    // Restrict access to the socket according to the
+    // SingleApplication::Mode::User flag on User level or no restrictions
+    if( options & SingleApplication::Mode::User ) {
+      server->setSocketOptions( QLocalServer::UserAccessOption );
+    } else {
+      server->setSocketOptions( QLocalServer::WorldAccessOption );
+    }
 
-	server->listen( blockServerName );
-	QObject::connect(
-				server,
-				&QLocalServer::newConnection,
-				this,
-				&SingleApplicationPrivate::slotConnectionEstablished
-				);
+    server->listen( blockServerName );
+    QObject::connect(
+        server,
+        &QLocalServer::newConnection,
+        this,
+        &SingleApplicationPrivate::slotConnectionEstablished
+    );
 
-	// Reset the number of connections
-	InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
+    // Reset the number of connections
+    InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
 
-	inst->primary = true;
-	inst->primaryPid = q->applicationPid();
-	inst->checksum = blockChecksum();
+    inst->primary = true;
+    inst->primaryPid = q->applicationPid();
+    inst->checksum = blockChecksum();
 
-	instanceNumber = 0;
+    instanceNumber = 0;
 }
 
 void SingleApplicationPrivate::startSecondary()
@@ -184,261 +184,222 @@ void SingleApplicationPrivate::startSecondary()
 
 void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
 {
-	// Connect to the Local Server of the Primary Instance if not already
-	// connected.
-	if( socket == nullptr ) {
-		socket = new QLocalSocket();
-	}
+    // Connect to the Local Server of the Primary Instance if not already
+    // connected.
+    if( socket == nullptr ) {
+        socket = new QLocalSocket();
+    }
 
-	// If already connected - we are done;
-	if( socket->state() == QLocalSocket::ConnectedState )
-		return;
+    // If already connected - we are done;
+    if( socket->state() == QLocalSocket::ConnectedState )
+        return;
 
-	// If not connect
-	if( socket->state() == QLocalSocket::UnconnectedState ||
-		socket->state() == QLocalSocket::ClosingState ) {
-		socket->connectToServer( blockServerName );
-	}
+    // If not connect
+    if( socket->state() == QLocalSocket::UnconnectedState ||
+        socket->state() == QLocalSocket::ClosingState ) {
+        socket->connectToServer( blockServerName );
+    }
 
-	// Wait for being connected
-	if( socket->state() == QLocalSocket::ConnectingState ) {
-		socket->waitForConnected( msecs );
-	}
+    // Wait for being connected
+    if( socket->state() == QLocalSocket::ConnectingState ) {
+        socket->waitForConnected( msecs );
+    }
 
-	// Initialisation message according to the SingleApplication protocol
-	if( socket->state() == QLocalSocket::ConnectedState ) {
-		// Notify the parent that a new instance had been started;
-		QByteArray initMsg;
-		QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+    // Initialisation message according to the SingleApplication protocol
+    if( socket->state() == QLocalSocket::ConnectedState ) {
+        // Notify the parent that a new instance had been started;
+        QByteArray initMsg;
+        QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-		writeStream.setVersion(QDataStream::Qt_5_6);
+        writeStream.setVersion(QDataStream::Qt_5_6);
 #endif
 
-		writeStream << blockServerName.toLatin1();
-		writeStream << static_cast<quint8>(connectionType);
-		writeStream << instanceNumber;
+        writeStream << blockServerName.toLatin1();
+        writeStream << static_cast<quint8>(connectionType);
+        writeStream << instanceNumber;
+        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
+        writeStream << checksum;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-		quint16 checksum =
-				qChecksum(
-					initMsg.constData(),
-					static_cast<quint32>(initMsg.length()));
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
-		quint16 checksum =
-				qChecksum(
-					QByteArrayView(
-						initMsg.constData(),
-						static_cast<quint32>(initMsg.length())));
-#endif
-		writeStream << checksum;
-
-		// The header indicates the message length that follows
-		QByteArray header;
-		QDataStream headerStream(&header, QIODevice::WriteOnly);
+        // The header indicates the message length that follows
+        QByteArray header;
+        QDataStream headerStream(&header, QIODevice::WriteOnly);
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-		headerStream.setVersion(QDataStream::Qt_5_6);
+        headerStream.setVersion(QDataStream::Qt_5_6);
 #endif
-		headerStream << static_cast <quint64>( initMsg.length() );
+        headerStream << static_cast <quint64>( initMsg.length() );
 
-		socket->write( header );
-		socket->write( initMsg );
-		socket->flush();
-		socket->waitForBytesWritten( msecs );
-	}
+        socket->write( header );
+        socket->write( initMsg );
+        socket->flush();
+        socket->waitForBytesWritten( msecs );
+    }
 }
 
 quint16 SingleApplicationPrivate::blockChecksum()
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	return qChecksum(
-				static_cast <const char *>( memory->data() ),
-				offsetof( InstancesInfo, checksum )
-				);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
-	return qChecksum(
-				QByteArrayView(
-					static_cast <const char *>( memory->data() ),
-					offsetof( InstancesInfo, checksum )));
-
-#endif
+    return qChecksum(
+       static_cast <const char *>( memory->data() ),
+       offsetof( InstancesInfo, checksum )
+   );
 }
 
 qint64 SingleApplicationPrivate::primaryPid()
 {
-	qint64 pid;
+    qint64 pid;
 
-	memory->lock();
-	InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-	pid = inst->primaryPid;
-	memory->unlock();
+    memory->lock();
+    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+    pid = inst->primaryPid;
+    memory->unlock();
 
-	return pid;
+    return pid;
 }
 
 /**
-	@brief Executed when a connection has been made to the LocalServer
-*/
+ * @brief Executed when a connection has been made to the LocalServer
+ */
 void SingleApplicationPrivate::slotConnectionEstablished()
 {
-	QLocalSocket *nextConnSocket = server->nextPendingConnection();
-	connectionMap.insert(nextConnSocket, ConnectionInfo());
+    QLocalSocket *nextConnSocket = server->nextPendingConnection();
+    connectionMap.insert(nextConnSocket, ConnectionInfo());
 
-	QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-					 [nextConnSocket, this]() {
-		auto &info = connectionMap[nextConnSocket];
-		Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
-	}
-	);
+    QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
+        [nextConnSocket, this]() {
+            auto &info = connectionMap[nextConnSocket];
+            Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
+        }
+    );
 
-	QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-					 [nextConnSocket, this](){
-		connectionMap.remove(nextConnSocket);
-		nextConnSocket->deleteLater();
-	}
-	);
+    QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
+        [nextConnSocket, this](){
+            connectionMap.remove(nextConnSocket);
+            nextConnSocket->deleteLater();
+        }
+    );
 
-	QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-					 [nextConnSocket, this]() {
-		auto &info = connectionMap[nextConnSocket];
-		switch(info.stage) {
-			case StageHeader:
-				readInitMessageHeader(nextConnSocket);
-				break;
-			case StageBody:
-				readInitMessageBody(nextConnSocket);
-				break;
-			case StageConnected:
-				Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
-				break;
-			default:
-				break;
-		};
-	}
-	);
+    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
+        [nextConnSocket, this]() {
+            auto &info = connectionMap[nextConnSocket];
+            switch(info.stage) {
+            case StageHeader:
+                readInitMessageHeader(nextConnSocket);
+                break;
+            case StageBody:
+                readInitMessageBody(nextConnSocket);
+                break;
+            case StageConnected:
+                Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
+                break;
+            default:
+                break;
+            };
+        }
+    );
 }
 
 void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
 {
-	if (!connectionMap.contains( sock )) {
-		return;
-	}
+    if (!connectionMap.contains( sock )) {
+        return;
+    }
 
-	if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
-		return;
-	}
+    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
+        return;
+    }
 
-	QDataStream headerStream( sock );
+    QDataStream headerStream( sock );
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-	headerStream.setVersion( QDataStream::Qt_5_6 );
+    headerStream.setVersion( QDataStream::Qt_5_6 );
 #endif
 
-	// Read the header to know the message length
-	quint64 msgLen = 0;
-	headerStream >> msgLen;
-	ConnectionInfo &info = connectionMap[sock];
-	info.stage = StageBody;
-	info.msgLen = msgLen;
+    // Read the header to know the message length
+    quint64 msgLen = 0;
+    headerStream >> msgLen;
+    ConnectionInfo &info = connectionMap[sock];
+    info.stage = StageBody;
+    info.msgLen = msgLen;
 
-	if ( sock->bytesAvailable() >= (qint64) msgLen ) {
-		readInitMessageBody( sock );
-	}
+    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
+        readInitMessageBody( sock );
+    }
 }
 
 void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
 {
-	Q_Q(SingleApplication);
+    Q_Q(SingleApplication);
 
-	if (!connectionMap.contains( sock )) {
-		return;
-	}
+    if (!connectionMap.contains( sock )) {
+        return;
+    }
 
-	ConnectionInfo &info = connectionMap[sock];
-	if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
-		return;
-	}
+    ConnectionInfo &info = connectionMap[sock];
+    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
+        return;
+    }
 
-	// Read the message body
-	QByteArray msgBytes = sock->read(info.msgLen);
-	QDataStream readStream(msgBytes);
+    // Read the message body
+    QByteArray msgBytes = sock->read(info.msgLen);
+    QDataStream readStream(msgBytes);
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-	readStream.setVersion( QDataStream::Qt_5_6 );
+    readStream.setVersion( QDataStream::Qt_5_6 );
 #endif
 
-	// server name
-	QByteArray latin1Name;
-	readStream >> latin1Name;
+    // server name
+    QByteArray latin1Name;
+    readStream >> latin1Name;
 
-	// connection type
-	ConnectionType connectionType = InvalidConnection;
-	quint8 connTypeVal = InvalidConnection;
-	readStream >> connTypeVal;
-	connectionType = static_cast <ConnectionType>( connTypeVal );
+    // connection type
+    ConnectionType connectionType = InvalidConnection;
+    quint8 connTypeVal = InvalidConnection;
+    readStream >> connTypeVal;
+    connectionType = static_cast <ConnectionType>( connTypeVal );
 
-	// instance id
-	quint32 instanceId = 0;
-	readStream >> instanceId;
+    // instance id
+    quint32 instanceId = 0;
+    readStream >> instanceId;
 
-	// checksum
-	quint16 msgChecksum = 0;
-	readStream >> msgChecksum;
+    // checksum
+    quint16 msgChecksum = 0;
+    readStream >> msgChecksum;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	const quint16 actualChecksum =
-			qChecksum(
-				msgBytes.constData(),
-				static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
-	const quint16 actualChecksum =
-			qChecksum(
-				QByteArrayView(
-					msgBytes.constData(),
-					static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
-#endif
-	bool isValid = readStream.status() == QDataStream::Ok &&
-			QLatin1String(latin1Name) == blockServerName &&
-			msgChecksum == actualChecksum;
+    const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
 
-	if( !isValid ) {
-		sock->close();
-		return;
-	}
+    bool isValid = readStream.status() == QDataStream::Ok &&
+                   QLatin1String(latin1Name) == blockServerName &&
+                   msgChecksum == actualChecksum;
 
-	info.instanceId = instanceId;
-	info.stage = StageConnected;
+    if( !isValid ) {
+        sock->close();
+        return;
+    }
 
-	if( connectionType == NewInstance ||
-		( connectionType == SecondaryInstance &&
-		  options & SingleApplication::Mode::SecondaryNotification ) )
-	{
-		Q_EMIT q->instanceStarted();
-	}
+    info.instanceId = instanceId;
+    info.stage = StageConnected;
 
-	if (sock->bytesAvailable() > 0) {
-		Q_EMIT this->slotDataAvailable( sock, instanceId );
-	}
+    if( connectionType == NewInstance ||
+        ( connectionType == SecondaryInstance &&
+          options & SingleApplication::Mode::SecondaryNotification ) )
+    {
+        Q_EMIT q->instanceStarted();
+    }
+
+    if (sock->bytesAvailable() > 0) {
+        Q_EMIT this->slotDataAvailable( sock, instanceId );
+    }
 }
 
 void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
 {
-	Q_Q(SingleApplication);
-	Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
+    Q_Q(SingleApplication);
+    Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
 }
 
 void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
 {
-	if( closedSocket->bytesAvailable() > 0 )
-		Q_EMIT slotDataAvailable( closedSocket, instanceId  );
+    if( closedSocket->bytesAvailable() > 0 )
+        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
 }

SingleApplication/singleapplication_p.h

@@ -38,62 +38,62 @@
 #include "singleapplication.h"
 
 struct InstancesInfo {
-	bool primary;
-	quint32 secondary;
-	qint64 primaryPid;
-	quint16 checksum;
+    bool primary;
+    quint32 secondary;
+    qint64 primaryPid;
+    quint16 checksum;
 };
 
 struct ConnectionInfo {
-	explicit ConnectionInfo() :
-		msgLen(0), instanceId(0), stage(0) {}
-	qint64 msgLen;
-	quint32 instanceId;
-	quint8 stage;
+    explicit ConnectionInfo() :
+        msgLen(0), instanceId(0), stage(0) {}
+    qint64 msgLen;
+    quint32 instanceId;
+    quint8 stage;
 };
 
 class SingleApplicationPrivate : public QObject {
-	Q_OBJECT
-	public:
-	enum ConnectionType : quint8 {
-		InvalidConnection = 0,
-		NewInstance = 1,
-		SecondaryInstance = 2,
-		Reconnect = 3
-	};
-	enum ConnectionStage : quint8 {
-		StageHeader = 0,
-		StageBody = 1,
-		StageConnected = 2,
-	};
-	Q_DECLARE_PUBLIC(SingleApplication)
-	
-	SingleApplicationPrivate( SingleApplication *q_ptr );
-	~SingleApplicationPrivate();
-	
-	void genBlockServerName();
-	void initializeMemoryBlock();
-	void startPrimary();
-	void startSecondary();
-	void connectToPrimary(int msecs, ConnectionType connectionType );
-	quint16 blockChecksum();
-	qint64 primaryPid();
-	void readInitMessageHeader(QLocalSocket *socket);
-	void readInitMessageBody(QLocalSocket *socket);
-	
-	SingleApplication *q_ptr;
-	QSharedMemory *memory;
-	QLocalSocket *socket;
-	QLocalServer *server;
-	quint32 instanceNumber;
-	QString blockServerName;
-	SingleApplication::Options options;
-	QMap<QLocalSocket*, ConnectionInfo> connectionMap;
-	
-	public Q_SLOTS:
-	void slotConnectionEstablished();
-	void slotDataAvailable( QLocalSocket*, quint32 );
-	void slotClientConnectionClosed( QLocalSocket*, quint32 );
+Q_OBJECT
+public:
+    enum ConnectionType : quint8 {
+        InvalidConnection = 0,
+        NewInstance = 1,
+        SecondaryInstance = 2,
+        Reconnect = 3
+    };
+    enum ConnectionStage : quint8 {
+        StageHeader = 0,
+        StageBody = 1,
+        StageConnected = 2,
+    };
+    Q_DECLARE_PUBLIC(SingleApplication)
+
+    SingleApplicationPrivate( SingleApplication *q_ptr );
+     ~SingleApplicationPrivate();
+
+    void genBlockServerName();
+    void initializeMemoryBlock();
+    void startPrimary();
+    void startSecondary();
+    void connectToPrimary(int msecs, ConnectionType connectionType );
+    quint16 blockChecksum();
+    qint64 primaryPid();
+    void readInitMessageHeader(QLocalSocket *socket);
+    void readInitMessageBody(QLocalSocket *socket);
+
+    SingleApplication *q_ptr;
+    QSharedMemory *memory;
+    QLocalSocket *socket;
+    QLocalServer *server;
+    quint32 instanceNumber;
+    QString blockServerName;
+    SingleApplication::Options options;
+    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+
+public Q_SLOTS:
+    void slotConnectionEstablished();
+    void slotDataAvailable( QLocalSocket*, quint32 );
+    void slotClientConnectionClosed( QLocalSocket*, quint32 );
 };
 
 #endif // SINGLEAPPLICATION_P_H

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

@@ -1,6 +1,6 @@
-From 2a390b5188fe070295090b1bd37273d12963b371 Mon Sep 17 00:00:00 2001
-From: Laurent Trinques <scorpio@qelectrotech.org>
-Date: Sat, 26 Sep 2020 22:52:52 +0200
+From 579ee22f1d2bef560ec90d324a0e476b81faf495 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <mathieu@hashbang.fr>
+Date: Tue, 7 Jan 2020 14:39:08 +0100
 Subject: [PATCH] build: Fix the installation paths
 
 ---
@@ -8,37 +8,37 @@ Subject: [PATCH] build: Fix the installation paths
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/qelectrotech.pro b/qelectrotech.pro
-index 2901a30d5..1019a9870 100644
+index 07e51fb..2a86b91 100644
 --- a/qelectrotech.pro
 +++ b/qelectrotech.pro
 @@ -5,20 +5,20 @@
  # Chemins utilises pour la compilation et l'installation de QET
  unix {
-         # Chemins UNIX
--        COMPIL_PREFIX              = '/usr/local/'
--        INSTALL_PREFIX             = '/usr/local/'
-+        COMPIL_PREFIX              = '/app/'
-+        INSTALL_PREFIX             = '/app/'
-         QET_BINARY_PATH            = 'bin/'
-         QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
-         QET_COMMON_TBT_PATH        = 'share/qelectrotech/titleblocks/'
-         QET_LANG_PATH              = 'share/qelectrotech/lang/'
-         QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
--        QET_LICENSE_PATH           = 'doc/qelectrotech/'
--        QET_MIME_XML_PATH          = '../share/mime/application/'
--        QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
--        QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
-+        QET_LICENSE_PATH           = 'share/doc/qelectrotech/'
-+        QET_MIME_XML_PATH          = 'share/mime/application/'
-+        QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
-+        QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
-         QET_DESKTOP_PATH           = 'share/applications/'
-         QET_ICONS_PATH             = 'share/icons/hicolor/'
--        QET_MAN_PATH               = 'man/'
-+        QET_MAN_PATH               = 'share/man/'
-         QET_APPDATA_PATH           = 'share/appdata'
+ 	# Chemins UNIX
+-	COMPIL_PREFIX              = '/usr/local/'
+-	INSTALL_PREFIX             = '/usr/local/'
++	COMPIL_PREFIX              = '/app/'
++	INSTALL_PREFIX             = '/app/'
+ 	QET_BINARY_PATH            = 'bin/'
+ 	QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
+ 	QET_COMMON_TBT_PATH        = 'share/qelectrotech/titleblocks/'
+ 	QET_LANG_PATH              = 'share/qelectrotech/lang/'
+ 	QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
+-	QET_LICENSE_PATH           = 'doc/qelectrotech/'
+-	QET_MIME_XML_PATH          = '../share/mime/application/'
+-	QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
+-	QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
++	QET_LICENSE_PATH           = 'share/doc/qelectrotech/'
++	QET_MIME_XML_PATH          = 'share/mime/application/'
++	QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
++	QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
+ 	QET_DESKTOP_PATH           = 'share/applications/'
+ 	QET_ICONS_PATH             = 'share/icons/hicolor/'
+-	QET_MAN_PATH               = 'man/'
++	QET_MAN_PATH               = 'share/man/'
+ 	QET_APPDATA_PATH           = 'share/appdata'
  }
  win32 {
 -- 
-2.28.0
+2.24.1
 

build-aux/linux/fedora/README.elements

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

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

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

build-aux/snap/snapcraft.yaml

@@ -1,7 +1,7 @@
 name: qelectrotech
 title: QElectroTech
-base: core20
-version: "0.8.0"
+base: core18
+adopt-info: qelectrotech
 license: GPL-2.0
 summary: Electrical diagram editor
 description: |
@@ -10,7 +10,10 @@ description: |
 
 grade: stable
 confinement: strict
-compression: lzo
+
+architectures:
+  - build-on: amd64
+    run-on: amd64
 
 layout:
   /usr/local/share/qelectrotech:
@@ -27,14 +30,15 @@ apps:
     extensions: [kde-neon]
     plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
     environment: &env
+      __EGL_VENDOR_LIBRARY_DIRS: $SNAP/kf5/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
       TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
+      QT_QPA_PLATFORMTHEME: gtk3
+      QT_AUTO_SCREEN_SCALE_FACTOR: 1
       HOME: $SNAP_USER_COMMON
-      PYTHONPATH: $SNAP:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3.8:$SNAP/usr/lib/python3.8/lib-dynload
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.6/site-packages:$SNAP/usr/lib/python3.6:$SNAP/usr/lib/python3.6/lib-dynload
 
   qet-tb-generator:
-    command: bin/qet_tb_generator
-    command-chain:
-      - bin/qelectrotech-launch
+    command: bin/qelectrotech-launch $SNAP/bin/qet_tb_generator
     extensions: [kde-neon]
     plugs: *plugs
     environment: *env
@@ -54,8 +58,8 @@ parts:
 
   qet-tb-generator:
     plugin: python
-    source: https://github.com/raulroda/qet_tb_generator-plugin.git
-    python-packages: [PySimpleGUI]
+    python-version: python3
+    source: https://github.com/qelectrotech/qet_tb_generator.git
     stage-packages: 
       - python3-lxml
       - python3-tk
@@ -64,15 +68,15 @@ parts:
   kde-sdk-setup:
     plugin: nil
     build-snaps:
-      - kde-frameworks-5-qt-5-15-3-core20-sdk
+      - kde-frameworks-5-core18-sdk
     build-packages:
       - g++
       - mesa-common-dev
       - libglvnd-dev
       - rsync
     override-build: |
-      rsync -a --ignore-existing /snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current/ /
-
+      rsync -a --ignore-existing /snap/kde-frameworks-5-core18-sdk/current/ /
+      
   dxf-to-qet:
     after: [kde-sdk-setup]
     plugin: nil
@@ -87,15 +91,17 @@ parts:
     after: [kde-sdk-setup]
     plugin: nil
     source: .
-    stage-packages: [ git, sqlite3, xdg-user-dirs ]
     build-packages:
       - git
-      - libsqlite3-dev
-    override-build: |
-      modified_displayed_version="${SNAPCRAFT_PROJECT_VERSION}.snap"
+    override-pull: |
+      snapcraftctl pull
+      snap_version=$(git describe --dirty)
+      modified_displayed_version=$snap_version".snap"
       sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
+      snapcraftctl set-version "$snap_version"
+    override-build: |
       qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
-      make -j${SNAPCRAFT_PARALLEL_BUILD_COUNT}
+      make -j$(nproc)
       make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
     override-stage: |
       snapcraftctl stage
@@ -106,14 +112,11 @@ parts:
   cleanup:
     after: [qelectrotech, dxf-to-qet, qet-tb-generator]
     plugin: nil
-    build-snaps: [kde-frameworks-5-qt-5-15-3-core20]
+    build-snaps: [core18, kde-frameworks-5-core18]
     override-prime: |
+      # Remove all files from snap that are already included in the base snap or in
+      # any connected content snaps
       set -eux
-      for snap in "kde-frameworks-5-qt-5-15-3-core20"; do  # List all content-snaps you're using here
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" "$SNAPCRAFT_PRIME/usr/{}" \;
+      for snap in "core18" "kde-frameworks-5-core18"; do  # List all content-snaps and base snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
       done
-      for cruft in bug lintian man; do
-        rm -rf $SNAPCRAFT_PRIME/usr/share/$cruft
-      done
-      find $SNAPCRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
-      find $SNAPCRAFT_PRIME/usr/share -type d -empty -delete

cmake/copyright_message.cmake

@@ -1,34 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(
-  "_____________________________________________________________________"
-  "\nCopyright 2006 The QElectroTech Team"
-  "\nThis file is part of QElectroTech."
-
-  "\n\nQElectroTech is free software: you can redistribute it and/or modify"
-  "\nit under the terms of the GNU General Public License as published by"
-  "\nthe Free Software Foundation, either version 2 of the License, or"
-  "\n(at your option) any later version."
-
-  "\nQElectroTech is distributed in the hope that it will be useful,"
-  "\nbut WITHOUT ANY WARRANTY; without even the implied warranty of"
-  "\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"
-  "\nGNU General Public License for more details."
-
-  "\n\nYou should have received a copy of the GNU General Public License"
-  "\nalong with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.\n"
-  "_____________________________________________________________________")

cmake/define_definitions.cmake

@@ -1,71 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-# Paths used for compilation and installation of QET
-
-message(" - define_definitions")
-
-message("Paths used for compilation and installation of QET")
-message("--------------------------------------------------")
-message("COMPIL_PREFIX              " ${COMPIL_PREFIX})
-message("INSTALL_PREFIX             " ${INSTALL_PREFIX})
-message("QET_BINARY_PATH            " ${QET_BINARY_PATH})
-
-if(${QET_COMMON_COLLECTION_PATH} STRGREATER "")
-  message("QET_COMMON_COLLECTION_PATH " ${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH})
-  add_definitions(-DQET_COMMON_COLLECTION_PATH=${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH})
-endif()
-if(${QET_COMMON_TBT_PATH} STRGREATER "")
-  message("QET_COMMON_TBT_PATH        " ${INSTALL_PREFIX}${QET_COMMON_TBT_PATH})
-  add_definitions(-DQET_COMMON_TBT_PATH=${INSTALL_PREFIX}${QET_COMMON_TBT_PATH})
-endif()
-if(${QET_LANG_PATH_RELATIVE_TO_BINARY_PATH})
-  add_definitions(-DQET_LANG_PATH_RELATIVE_TO_BINARY_PATH)
-endif()
-if(${QET_LANG_PATH} STRGREATER "")
-  message("QET_LANG_PATH              " ${INSTALL_PREFIX}${QET_LANG_PATH})
-  add_definitions(-DQET_LANG_PATH=${INSTALL_PREFIX}${QET_LANG_PATH})
-endif()
-if(${QET_EXAMPLES_PATH} STRGREATER "")
-  message("QET_EXAMPLES_PATH          " ${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
-  add_definitions(-DQET_EXAMPLES_PATH=${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
-endif()
-
-message("QET_LICENSE_PATH           " ${QET_LICENSE_PATH})
-message("QET_MIME_XML_PATH          " ${QET_MIME_XML_PATH})
-message("QET_MIME_DESKTOP_PATH      " ${QET_MIME_DESKTOP_PATH})
-message("QET_MIME_PACKAGE_PATH      " ${QET_MIME_PACKAGE_PATH})
-message("QET_DESKTOP_PATH           " ${QET_DESKTOP_PATH})
-message("QET_ICONS_PATH             " ${QET_ICONS_PATH})
-message("QET_MAN_PATH               " ${QET_MAN_PATH})
-message("QET_APPDATA_PATH           " ${QET_APPDATA_PATH})
-message("ICON                       " ${ICON})
-message("--------------------------------------------------")
-message("PROJECT_NAME              :" ${PROJECT_NAME})
-message("PROJECT_VERSION           :" ${PROJECT_VERSION})
-message("PROJECT_DESCRIPTION       :" ${PROJECT_DESCRIPTION})
-message("PROJECT_HOMEPAGE_URL      :" ${PROJECT_HOMEPAGE_URL})
-message("PROJECT_SOURCE_DIR        :" ${PROJECT_SOURCE_DIR})
-message("QET_DIR                   :" ${QET_DIR})
-message("GIT_COMMIT_SHA            :" ${GIT_COMMIT_SHA})
-
-if(BUILD_WITH_KF5)
-  message("KF5_GIT_TAG               :" ${KF5_GIT_TAG})
-else()
-  add_definitions(-DBUILD_WITHOUT_KF5)
-endif()
-message("QET_COMPONENTS            :" ${QET_COMPONENTS})
-message("QT_VERSION_MAJOR          :" ${QT_VERSION_MAJOR})

cmake/developer_options.cmake

@@ -1,35 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - developer_options")
-
-# warn on *any* usage of deprecated APIs
-add_definitions(-DQT_DEPRECATED_WARNINGS)
-
-# You can make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# disables all the APIs deprecated before Qt 6.0.0
-#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
-
-# to enable function names and line numbers even for release builds
-add_definitions(-DQT_MESSAGELOGCONTEXT)
-
-# You can make your code warn on compile time for the TODO's
-# In order to do so, uncomment the following line.
-#add_definitions(-DTODO_LIST)
-
-# Build with KF5
-option(BUILD_WITH_KF5 "Build with KF5" ON)

cmake/fetch_kdeaddons.cmake

@@ -1,67 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - fetch_kdeaddons")
-
-if(DEFINED BUILD_WITH_KF5)
-  Include(FetchContent)
-
-  set(BUILD_KF5_YES "YES")
-
-  if(DEFINED BUILD_KF5_YES)
-
-    if(NOT DEFINED KF5_GIT_TAG)
-      #https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
-      set(KF5_GIT_TAG v5.77.0)
-    endif()
-
-    # Fix stop the run autotests of kcoreaddons
-    # see
-    # https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98
-    # issue:
-    # CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
-    # Cannot find source file:
-    # see
-    # https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
-    set(KDE_SKIP_TEST_SETTINGS "TRUE")
-    set(BUILD_TESTING "0")
-    FetchContent_Declare(
-      ecm
-      GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
-      GIT_TAG        ${KF5_GIT_TAG})
-    FetchContent_MakeAvailable(ecm)
-
-    FetchContent_Declare(
-      kcoreaddons
-      GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
-      GIT_TAG        ${KF5_GIT_TAG})
-    FetchContent_MakeAvailable(kcoreaddons)
-
-    FetchContent_Declare(
-      kwidgetsaddons
-      GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
-      GIT_TAG        ${KF5_GIT_TAG})
-    FetchContent_MakeAvailable(kwidgetsaddons)
-  else()
-    find_package(KF5CoreAddons REQUIRED)
-    find_package(KF5WidgetsAddons REQUIRED)
-  endif()
-
-  set(KF5_PRIVATE_LIBRARIES
-    KF5::WidgetsAddons
-    KF5::CoreAddons
-    )
-endif()

cmake/fetch_pugixml.cmake

@@ -1,26 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - fetch_pugixml")
-
-Include(FetchContent)
-
-FetchContent_Declare(
-  pugixml
-  GIT_REPOSITORY https://github.com/zeux/pugixml.git
-  GIT_TAG        v1.11.1)
-
-FetchContent_MakeAvailable(pugixml)

cmake/fetch_singleapplication.cmake

@@ -1,31 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - fetch_singleapplication")
-
-# https://github.com/itay-grudev/SingleApplication/issues/18
-#qmake
-#DEFINES += QAPPLICATION_CLASS=QGuiApplication
-set(QAPPLICATION_CLASS QApplication)
-
-Include(FetchContent)
-
-FetchContent_Declare(
-  SingleApplication
-  GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
-  GIT_TAG        v3.1.5)
-
-FetchContent_MakeAvailable(SingleApplication)

cmake/git_last_commit_sha.cmake

@@ -1,41 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - git_last_commit_sha")
-
-find_package(Git QUIET)
-
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-  #get GIT COMMIT SHA
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} -C ${QET_DIR} rev-parse --verify HEAD
-    OUTPUT_VARIABLE  GIT_COMMIT_SHA
-    RESULT_VARIABLE GIT_COMMIT_RESULT)
-
-  # This strips terminating newline in the variable
-  string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}")
-
-  # This adds to definitions => .cpp
-  add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")
-
-  if(NOT GIT_COMMIT_RESULT EQUAL "0")
-    message(
-      FATAL_ERROR
-      "git rev-parse --verify HEAD failed with "
-      ${GIT_COMMIT_RESULT}
-      ", please check")
-  endif()
-endif()

cmake/git_update_submodules.cmake

@@ -1,35 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - git_update_submodules")
-
-find_package(Git QUIET)
-
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-  # updates all git submodules
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    RESULT_VARIABLE GIT_SUBMOD_RESULT)
-
-  if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-    message(
-      FATAL_ERROR
-      "git submodule update --init failed with "
-      ${GIT_SUBMOD_RESULT}
-      ", please checkout submodules")
-  endif()
-endif()

cmake/hoto_update_cmake_message.cmake

@@ -1,25 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-if(${CMAKE_VERSION} VERSION_LESS 3.14)
-  message(
-    "_____________________________________________________________________")
-  message("to update Cmake on linux:")
-  message("https://github.com/Kitware/CMake/")
-  message("linux => cmake-3.19.1-Linux-x86_64.sh")
-  message("         sudo ./cmake.sh --prefix=/usr/local/ --exclude-subdir")
-  message("windows good luck :)")
-endif()

cmake/paths_compilation_installation.cmake

@@ -1,69 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-# Paths used for compilation and installation of QET
-
-message(" - paths_compilation_installation")
-
-if(UNIX AND NOT APPLE)
-  # for Linux, BSD, Solaris, Minix
-  set(COMPIL_PREFIX               "/usr/local/")
-  set(INSTALL_PREFIX              "/usr/local/")
-  set(QET_BINARY_PATH             "bin/")
-  set(QET_COMMON_COLLECTION_PATH  "share/qelectrotech/elements/")
-  set(QET_COMMON_TBT_PATH         "share/qelectrotech/titleblocks/")
-  set(QET_LANG_PATH               "share/qelectrotech/lang/")
-  set(QET_EXAMPLES_PATH           "share/qelectrotech/examples/")
-  set(QET_LICENSE_PATH            "doc/qelectrotech/")
-  set(QET_MIME_XML_PATH           "../share/mime/application/")
-  set(QET_MIME_DESKTOP_PATH       "../share/mimelnk/application/")
-  set(QET_MIME_PACKAGE_PATH       "../share/mime/packages/")
-  set(QET_DESKTOP_PATH            "share/applications/")
-  set(QET_ICONS_PATH              "share/icons/hicolor/")
-  set(QET_MAN_PATH                "man/")
-  set(QET_APPDATA_PATH            "share/appdata")
-endif()
-
-if(APPLE)
-  # for MacOS X or iOS, watchOS, tvOS (since 3.10.3)
-  set(COMPIL_PREFIX               "./")
-  set(INSTALL_PREFIX              "/usr/local/")
-  set(QET_BINARY_PATH             "bin/")
-  set(QET_COMMON_COLLECTION_PATH  "../Resources/elements/")
-  set(QET_COMMON_TBT_PATH         "../Resources/titleblocks/")
-  set(QET_LANG_PATH               "../Resources/lang/")
-  set(QET_EXAMPLES_PATH           "share/qelectrotech/examples/")
-  set(QET_LICENSE_PATH            "doc/qelectrotech/")
-  set(QET_MIME_XML_PATH           "../share/mime/application/")
-  set(QET_MIME_DESKTOP_PATH       "../share/mimelnk/application/")
-  set(QET_DESKTOP_PATH            "share/applications/")
-  set(QET_ICONS_PATH              "share/icons/hicolor/")
-  set(QET_MAN_PATH                "man/")
-  set(ICON                        "ico/mac_icon/qelectrotech.icns")
-endif()
-
-if(WIN32)
-  # for Windows operating system in general
-  set(COMPIL_PREFIX               "./")
-  set(INSTALL_PREFIX              "./")
-  set(QET_BINARY_PATH             "./")
-  set(QET_COMMON_COLLECTION_PATH  "elements/")
-  set(QET_COMMON_TBT_PATH         "titleblocks/")
-  set(QET_LANG_PATH               "l10n/")
-  set(QET_LICENSE_PATH            "./")
-  # Liste des ressources Windows
-#RC_FILE = qelectrotech.rc
-endif()

cmake/qet_compilation_vars.cmake

@@ -1,639 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - qet_compilation_vars")
-
-set(QET_COMPONENTS
-  LinguistTools
-  PrintSupport
-  Xml
-  Svg
-  Sql
-  Network
-  Widgets
-  Concurrent)
-
-set(QET_PRIVATE_LIBRARIES
-  Qt::PrintSupport
-  Qt::Gui
-  Qt::Xml
-  Qt::Svg
-  Qt::Sql
-  Qt::Network
-  Qt::Widgets
-  Qt::Concurrent
-  )
-
-set(QET_RES_FILES
-  ${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.ui
-  ${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.ui
-  ${QET_DIR}/sources/autoNum/ui/folioautonumbering.ui
-  ${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.ui
-  ${QET_DIR}/sources/autoNum/ui/numparteditorw.ui
-  ${QET_DIR}/sources/autoNum/ui/selectautonumw.ui
-  ${QET_DIR}/sources/dataBase/ui/elementquerywidget.ui
-  ${QET_DIR}/sources/dataBase/ui/summaryquerywidget.ui
-  ${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.ui
-  ${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.ui
-  ${QET_DIR}/sources/editor/ui/ellipseeditor.ui
-  ${QET_DIR}/sources/editor/ui/lineeditor.ui
-  ${QET_DIR}/sources/editor/ui/polygoneditor.ui
-  ${QET_DIR}/sources/editor/ui/rectangleeditor.ui
-  ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.ui
-  ${QET_DIR}/sources/factory/ui/addtabledialog.ui
-  ${QET_DIR}/sources/NameList/ui/namelistdialog.ui
-  ${QET_DIR}/sources/NameList/ui/namelistwidget.ui
-  ${QET_DIR}/sources/print/projectprintwindow.ui
-  ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.ui
-  ${QET_DIR}/sources/richtext/addlinkdialog.ui
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.ui
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.ui
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.ui
-  ${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.ui
-  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.ui
-  ${QET_DIR}/sources/ui/aboutqetdialog.ui
-  ${QET_DIR}/sources/ui/alignmenttextdialog.ui
-  ${QET_DIR}/sources/ui/bomexportdialog.ui
-  ${QET_DIR}/sources/ui/borderpropertieswidget.ui
-  ${QET_DIR}/sources/ui/compositetexteditdialog.ui
-  ${QET_DIR}/sources/ui/conductorpropertiesdialog.ui
-  ${QET_DIR}/sources/ui/conductorpropertieswidget.ui
-  ${QET_DIR}/sources/ui/configsaveloaderwidget.ui
-  ${QET_DIR}/sources/ui/diagramcontextwidget.ui
-  ${QET_DIR}/sources/ui/diagramselection.ui
-  ${QET_DIR}/sources/ui/dialogwaiting.ui
-  ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.ui
-  ${QET_DIR}/sources/ui/elementinfopartwidget.ui
-  ${QET_DIR}/sources/ui/elementinfowidget.ui
-  ${QET_DIR}/sources/ui/formulaassistantdialog.ui
-  ${QET_DIR}/sources/ui/imagepropertieswidget.ui
-  ${QET_DIR}/sources/ui/importelementdialog.ui
-  ${QET_DIR}/sources/ui/importelementtextpatterndialog.ui
-  ${QET_DIR}/sources/ui/linksingleelementwidget.ui
-  ${QET_DIR}/sources/ui/marginseditdialog.ui
-  ${QET_DIR}/sources/ui/masterpropertieswidget.ui
-  ${QET_DIR}/sources/ui/multipastedialog.ui
-  ${QET_DIR}/sources/ui/potentialselectordialog.ui
-  ${QET_DIR}/sources/ui/reportpropertiewidget.ui
-  ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.ui
-  ${QET_DIR}/sources/ui/titleblockpropertieswidget.ui
-  ${QET_DIR}/sources/ui/xrefpropertieswidget.ui
-  ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.ui
-  )
-set(QET_SRC_FILES
-  ${QET_DIR}/sources/borderproperties.cpp
-  ${QET_DIR}/sources/borderproperties.h
-  ${QET_DIR}/sources/bordertitleblock.cpp
-  ${QET_DIR}/sources/bordertitleblock.h
-  ${QET_DIR}/sources/conductorautonumerotation.cpp
-  ${QET_DIR}/sources/conductorautonumerotation.h
-  ${QET_DIR}/sources/conductornumexport.cpp
-  ${QET_DIR}/sources/conductornumexport.h
-  ${QET_DIR}/sources/conductorprofile.cpp
-  ${QET_DIR}/sources/conductorprofile.h
-  ${QET_DIR}/sources/conductorproperties.cpp
-  ${QET_DIR}/sources/conductorproperties.h
-  ${QET_DIR}/sources/conductorsegment.cpp
-  ${QET_DIR}/sources/conductorsegment.h
-  ${QET_DIR}/sources/conductorsegmentprofile.h
-  ${QET_DIR}/sources/configdialog.cpp
-  ${QET_DIR}/sources/configdialog.h
-  ${QET_DIR}/sources/configpage.h
-  ${QET_DIR}/sources/configpages.cpp
-  ${QET_DIR}/sources/configpages.h
-  ${QET_DIR}/sources/createdxf.cpp
-  ${QET_DIR}/sources/createdxf.h
-  ${QET_DIR}/sources/diagramcommands.cpp
-  ${QET_DIR}/sources/diagramcommands.h
-  ${QET_DIR}/sources/diagramcontent.cpp
-  ${QET_DIR}/sources/diagramcontent.h
-  ${QET_DIR}/sources/diagramcontext.cpp
-  ${QET_DIR}/sources/diagramcontext.h
-  ${QET_DIR}/sources/diagram.cpp
-  ${QET_DIR}/sources/diagram.h
-  ${QET_DIR}/sources/diagramposition.cpp
-  ${QET_DIR}/sources/diagramposition.h
-  ${QET_DIR}/sources/diagramview.cpp
-  ${QET_DIR}/sources/diagramview.h
-  ${QET_DIR}/sources/elementdialog.cpp
-  ${QET_DIR}/sources/elementdialog.h
-  ${QET_DIR}/sources/elementprovider.cpp
-  ${QET_DIR}/sources/elementprovider.h
-  ${QET_DIR}/sources/elementscategoryeditor.cpp
-  ${QET_DIR}/sources/elementscategoryeditor.h
-  ${QET_DIR}/sources/elementscollectioncache.cpp
-  ${QET_DIR}/sources/elementscollectioncache.h
-  ${QET_DIR}/sources/elementsmover.cpp
-  ${QET_DIR}/sources/elementsmover.h
-  ${QET_DIR}/sources/elementspanel.cpp
-  ${QET_DIR}/sources/elementspanel.h
-  ${QET_DIR}/sources/elementspanelwidget.cpp
-  ${QET_DIR}/sources/elementspanelwidget.h
-  ${QET_DIR}/sources/elementtextpattern.cpp
-  ${QET_DIR}/sources/elementtextpattern.h
-  ${QET_DIR}/sources/elementtextsmover.cpp
-  ${QET_DIR}/sources/elementtextsmover.h
-  ${QET_DIR}/sources/exportdialog.cpp
-  ${QET_DIR}/sources/exportdialog.h
-  ${QET_DIR}/sources/exportproperties.cpp
-  ${QET_DIR}/sources/exportproperties.h
-  ${QET_DIR}/sources/exportpropertieswidget.cpp
-  ${QET_DIR}/sources/exportpropertieswidget.h
-  ${QET_DIR}/sources/genericpanel.cpp
-  ${QET_DIR}/sources/genericpanel.h
-  ${QET_DIR}/sources/machine_info.cpp
-  ${QET_DIR}/sources/machine_info.h
-  ${QET_DIR}/sources/main.cpp
-  ${QET_DIR}/sources/newelementwizard.cpp
-  ${QET_DIR}/sources/newelementwizard.h
-  ${QET_DIR}/sources/projectconfigpages.cpp
-  ${QET_DIR}/sources/projectconfigpages.h
-  ${QET_DIR}/sources/projectview.cpp
-  ${QET_DIR}/sources/projectview.h
-  ${QET_DIR}/sources/qetapp.cpp
-  ${QET_DIR}/sources/qetapp.h
-  ${QET_DIR}/sources/qetarguments.cpp
-  ${QET_DIR}/sources/qetarguments.h
-  ${QET_DIR}/sources/qet.cpp
-  ${QET_DIR}/sources/qetdiagrameditor.cpp
-  ${QET_DIR}/sources/qetdiagrameditor.h
-  ${QET_DIR}/sources/qet.h
-  ${QET_DIR}/sources/qeticons.cpp
-  ${QET_DIR}/sources/qeticons.h
-  ${QET_DIR}/sources/qetinformation.cpp
-  ${QET_DIR}/sources/qetinformation.h
-  ${QET_DIR}/sources/qetmainwindow.cpp
-  ${QET_DIR}/sources/qetmainwindow.h
-  ${QET_DIR}/sources/qetmessagebox.cpp
-  ${QET_DIR}/sources/qetmessagebox.h
-  ${QET_DIR}/sources/qetproject.cpp
-  ${QET_DIR}/sources/qetproject.h
-  ${QET_DIR}/sources/qetregexpvalidator.cpp
-  ${QET_DIR}/sources/qetregexpvalidator.h
-  ${QET_DIR}/sources/qetresult.cpp
-  ${QET_DIR}/sources/qetresult.h
-  ${QET_DIR}/sources/qetxml.cpp
-  ${QET_DIR}/sources/qetxml.h
-  ${QET_DIR}/sources/qfilenameedit.cpp
-  ${QET_DIR}/sources/qfilenameedit.h
-  ${QET_DIR}/sources/qgimanager.cpp
-  ${QET_DIR}/sources/qgimanager.h
-  ${QET_DIR}/sources/qtextorientationspinboxwidget.cpp
-  ${QET_DIR}/sources/qtextorientationspinboxwidget.h
-  ${QET_DIR}/sources/qtextorientationwidget.cpp
-  ${QET_DIR}/sources/qtextorientationwidget.h
-  ${QET_DIR}/sources/recentfiles.cpp
-  ${QET_DIR}/sources/recentfiles.h
-  ${QET_DIR}/sources/titleblockcell.cpp
-  ${QET_DIR}/sources/titleblockcell.h
-  ${QET_DIR}/sources/titleblockproperties.cpp
-  ${QET_DIR}/sources/titleblockproperties.h
-  ${QET_DIR}/sources/titleblocktemplate.cpp
-  ${QET_DIR}/sources/titleblocktemplate.h
-  ${QET_DIR}/sources/titleblocktemplaterenderer.cpp
-  ${QET_DIR}/sources/titleblocktemplaterenderer.h
-
-  ${QET_DIR}/sources/autoNum/assignvariables.cpp
-  ${QET_DIR}/sources/autoNum/assignvariables.h
-  ${QET_DIR}/sources/autoNum/numerotationcontextcommands.cpp
-  ${QET_DIR}/sources/autoNum/numerotationcontextcommands.h
-  ${QET_DIR}/sources/autoNum/numerotationcontext.cpp
-  ${QET_DIR}/sources/autoNum/numerotationcontext.h
-  ${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.cpp
-  ${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.h
-  ${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.cpp
-  ${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.h
-  ${QET_DIR}/sources/autoNum/ui/folioautonumbering.cpp
-  ${QET_DIR}/sources/autoNum/ui/folioautonumbering.h
-  ${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.cpp
-  ${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.h
-  ${QET_DIR}/sources/autoNum/ui/numparteditorw.cpp
-  ${QET_DIR}/sources/autoNum/ui/numparteditorw.h
-  ${QET_DIR}/sources/autoNum/ui/selectautonumw.cpp
-  ${QET_DIR}/sources/autoNum/ui/selectautonumw.h
-
-  ${QET_DIR}/sources/dataBase/projectdatabase.cpp
-  ${QET_DIR}/sources/dataBase/projectdatabase.h
-
-  ${QET_DIR}/sources/dataBase/ui/elementquerywidget.cpp
-  ${QET_DIR}/sources/dataBase/ui/elementquerywidget.h
-  ${QET_DIR}/sources/dataBase/ui/summaryquerywidget.cpp
-  ${QET_DIR}/sources/dataBase/ui/summaryquerywidget.h
-
-  ${QET_DIR}/sources/diagramevent/diagrameventaddelement.cpp
-  ${QET_DIR}/sources/diagramevent/diagrameventaddelement.h
-  ${QET_DIR}/sources/diagramevent/diagrameventaddimage.cpp
-  ${QET_DIR}/sources/diagramevent/diagrameventaddimage.h
-  ${QET_DIR}/sources/diagramevent/diagrameventaddshape.cpp
-  ${QET_DIR}/sources/diagramevent/diagrameventaddshape.h
-  ${QET_DIR}/sources/diagramevent/diagrameventaddtext.cpp
-  ${QET_DIR}/sources/diagramevent/diagrameventaddtext.h
-  ${QET_DIR}/sources/diagramevent/diagrameventinterface.cpp
-  ${QET_DIR}/sources/diagramevent/diagrameventinterface.h
-
-  ${QET_DIR}/sources/dvevent/dveventinterface.cpp
-  ${QET_DIR}/sources/dvevent/dveventinterface.h
-
-  ${QET_DIR}/sources/editor/arceditor.cpp
-  ${QET_DIR}/sources/editor/arceditor.h
-  ${QET_DIR}/sources/editor/editorcommands.cpp
-  ${QET_DIR}/sources/editor/editorcommands.h
-  ${QET_DIR}/sources/editor/elementcontent.h
-  ${QET_DIR}/sources/editor/elementitemeditor.cpp
-  ${QET_DIR}/sources/editor/elementitemeditor.h
-  ${QET_DIR}/sources/editor/elementprimitivedecorator.cpp
-  ${QET_DIR}/sources/editor/elementprimitivedecorator.h
-  ${QET_DIR}/sources/editor/elementscene.cpp
-  ${QET_DIR}/sources/editor/elementscene.h
-  ${QET_DIR}/sources/editor/elementview.cpp
-  ${QET_DIR}/sources/editor/elementview.h
-  ${QET_DIR}/sources/editor/qetelementeditor.cpp
-  ${QET_DIR}/sources/editor/qetelementeditor.h
-  ${QET_DIR}/sources/editor/styleeditor.cpp
-  ${QET_DIR}/sources/editor/styleeditor.h
-  ${QET_DIR}/sources/editor/terminaleditor.cpp
-  ${QET_DIR}/sources/editor/terminaleditor.h
-
-  ${QET_DIR}/sources/editor/esevent/eseventaddarc.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventaddarc.h
-  ${QET_DIR}/sources/editor/esevent/eseventadddynamictextfield.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventadddynamictextfield.h
-  ${QET_DIR}/sources/editor/esevent/eseventaddellipse.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventaddellipse.h
-  ${QET_DIR}/sources/editor/esevent/eseventaddline.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventaddline.h
-  ${QET_DIR}/sources/editor/esevent/eseventaddpolygon.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventaddpolygon.h
-  ${QET_DIR}/sources/editor/esevent/eseventaddrect.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventaddrect.h
-  ${QET_DIR}/sources/editor/esevent/eseventaddterminal.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventaddterminal.h
-  ${QET_DIR}/sources/editor/esevent/eseventaddtext.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventaddtext.h
-  ${QET_DIR}/sources/editor/esevent/eseventinterface.cpp
-  ${QET_DIR}/sources/editor/esevent/eseventinterface.h
-
-  ${QET_DIR}/sources/editor/graphicspart/abstractpartellipse.cpp
-  ${QET_DIR}/sources/editor/graphicspart/abstractpartellipse.h
-  ${QET_DIR}/sources/editor/graphicspart/customelementgraphicpart.cpp
-  ${QET_DIR}/sources/editor/graphicspart/customelementgraphicpart.h
-  ${QET_DIR}/sources/editor/graphicspart/customelementpart.cpp
-  ${QET_DIR}/sources/editor/graphicspart/customelementpart.h
-  ${QET_DIR}/sources/editor/graphicspart/partarc.cpp
-  ${QET_DIR}/sources/editor/graphicspart/partarc.h
-  ${QET_DIR}/sources/editor/graphicspart/partdynamictextfield.cpp
-  ${QET_DIR}/sources/editor/graphicspart/partdynamictextfield.h
-  ${QET_DIR}/sources/editor/graphicspart/partellipse.cpp
-  ${QET_DIR}/sources/editor/graphicspart/partellipse.h
-  ${QET_DIR}/sources/editor/graphicspart/partline.cpp
-  ${QET_DIR}/sources/editor/graphicspart/partline.h
-  ${QET_DIR}/sources/editor/graphicspart/partpolygon.cpp
-  ${QET_DIR}/sources/editor/graphicspart/partpolygon.h
-  ${QET_DIR}/sources/editor/graphicspart/partrectangle.cpp
-  ${QET_DIR}/sources/editor/graphicspart/partrectangle.h
-  ${QET_DIR}/sources/editor/graphicspart/partterminal.cpp
-  ${QET_DIR}/sources/editor/graphicspart/partterminal.h
-  ${QET_DIR}/sources/editor/graphicspart/parttext.cpp
-  ${QET_DIR}/sources/editor/graphicspart/parttext.h
-  ${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.cpp
-  ${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.h
-  ${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.cpp
-  ${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.h
-  ${QET_DIR}/sources/editor/ui/ellipseeditor.cpp
-  ${QET_DIR}/sources/editor/ui/ellipseeditor.h
-  ${QET_DIR}/sources/editor/ui/lineeditor.cpp
-  ${QET_DIR}/sources/editor/ui/lineeditor.h
-  ${QET_DIR}/sources/editor/ui/polygoneditor.cpp
-  ${QET_DIR}/sources/editor/ui/polygoneditor.h
-  ${QET_DIR}/sources/editor/ui/rectangleeditor.cpp
-  ${QET_DIR}/sources/editor/ui/rectangleeditor.h
-  ${QET_DIR}/sources/editor/ui/texteditor.cpp
-  ${QET_DIR}/sources/editor/ui/texteditor.h
-
-  ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.cpp
-  ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.h
-
-  ${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.cpp
-  ${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.h
-  ${QET_DIR}/sources/ElementsCollection/elementcollectionitem.cpp
-  ${QET_DIR}/sources/ElementsCollection/elementcollectionitem.h
-  ${QET_DIR}/sources/ElementsCollection/elementscollectionmodel.cpp
-  ${QET_DIR}/sources/ElementsCollection/elementscollectionmodel.h
-  ${QET_DIR}/sources/ElementsCollection/elementscollectionwidget.cpp
-  ${QET_DIR}/sources/ElementsCollection/elementscollectionwidget.h
-  ${QET_DIR}/sources/ElementsCollection/elementslocation.cpp
-  ${QET_DIR}/sources/ElementsCollection/elementslocation.h
-  ${QET_DIR}/sources/ElementsCollection/elementstreeview.cpp
-  ${QET_DIR}/sources/ElementsCollection/elementstreeview.h
-  ${QET_DIR}/sources/ElementsCollection/fileelementcollectionitem.cpp
-  ${QET_DIR}/sources/ElementsCollection/fileelementcollectionitem.h
-  ${QET_DIR}/sources/ElementsCollection/xmlelementcollection.cpp
-  ${QET_DIR}/sources/ElementsCollection/xmlelementcollection.h
-  ${QET_DIR}/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp
-  ${QET_DIR}/sources/ElementsCollection/xmlprojectelementcollectionitem.h
-
-  ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.cpp
-  ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.h
-
-  ${QET_DIR}/sources/factory/elementfactory.cpp
-  ${QET_DIR}/sources/factory/elementfactory.h
-  ${QET_DIR}/sources/factory/elementpicturefactory.cpp
-  ${QET_DIR}/sources/factory/elementpicturefactory.h
-  ${QET_DIR}/sources/factory/propertieseditorfactory.cpp
-  ${QET_DIR}/sources/factory/propertieseditorfactory.h
-  ${QET_DIR}/sources/factory/qetgraphicstablefactory.cpp
-  ${QET_DIR}/sources/factory/qetgraphicstablefactory.h
-
-  ${QET_DIR}/sources/factory/ui/addtabledialog.cpp
-  ${QET_DIR}/sources/factory/ui/addtabledialog.h
-
-  ${QET_DIR}/sources/NameList/nameslist.cpp
-  ${QET_DIR}/sources/NameList/nameslist.h
-
-  ${QET_DIR}/sources/NameList/ui/namelistdialog.cpp
-  ${QET_DIR}/sources/NameList/ui/namelistdialog.h
-  ${QET_DIR}/sources/NameList/ui/namelistwidget.cpp
-  ${QET_DIR}/sources/NameList/ui/namelistwidget.h
-
-  ${QET_DIR}/sources/print/projectprintwindow.cpp
-  ${QET_DIR}/sources/print/projectprintwindow.h
-
-  ${QET_DIR}/sources/properties/propertiesinterface.cpp
-  ${QET_DIR}/sources/properties/propertiesinterface.h
-  ${QET_DIR}/sources/properties/reportproperties.cpp
-  ${QET_DIR}/sources/properties/reportproperties.h
-  ${QET_DIR}/sources/properties/terminaldata.cpp
-  ${QET_DIR}/sources/properties/terminaldata.h
-  ${QET_DIR}/sources/properties/xrefproperties.cpp
-  ${QET_DIR}/sources/properties/xrefproperties.h
-
-  ${QET_DIR}/sources/PropertiesEditor/propertieseditordialog.h
-  ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.cpp
-  ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.h
-  ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp
-  ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h
-
-  ${QET_DIR}/sources/pugixml/pugiconfig.hpp
-  ${QET_DIR}/sources/pugixml/pugixml.cpp
-  ${QET_DIR}/sources/pugixml/pugixml.hpp
-
-  ${QET_DIR}/sources/qetgraphicsitem/conductor.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/conductor.h
-  ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/crossrefitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/crossrefitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/diagramimageitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/diagramimageitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/diagramtextitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/diagramtextitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/dynamicelementtextitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/dynamicelementtextitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/element.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/element.h
-  ${QET_DIR}/sources/qetgraphicsitem/elementtextitemgroup.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/elementtextitemgroup.h
-  ${QET_DIR}/sources/qetgraphicsitem/independenttextitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/independenttextitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/masterelement.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/masterelement.h
-  ${QET_DIR}/sources/qetgraphicsitem/qetgraphicsitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/qetgraphicsitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/qetshapeitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/qetshapeitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/qgraphicsitemutility.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/qgraphicsitemutility.h
-  ${QET_DIR}/sources/qetgraphicsitem/reportelement.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/reportelement.h
-  ${QET_DIR}/sources/qetgraphicsitem/simpleelement.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/simpleelement.h
-  ${QET_DIR}/sources/qetgraphicsitem/slaveelement.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/slaveelement.h
-  ${QET_DIR}/sources/qetgraphicsitem/terminal.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/terminalelement.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/terminalelement.h
-  ${QET_DIR}/sources/qetgraphicsitem/terminal.h
-
-
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/projectdbmodel.h
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h
-
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h
-
-  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandleritem.cpp
-  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
-  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp
-  ${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h
-
-  ${QET_DIR}/sources/QPropertyUndoCommand/qpropertyundocommand.cpp
-  ${QET_DIR}/sources/QPropertyUndoCommand/qpropertyundocommand.h
-
-  ${QET_DIR}/sources/QWidgetAnimation/qwidgetanimation.cpp
-  ${QET_DIR}/sources/QWidgetAnimation/qwidgetanimation.h
-
-  ${QET_DIR}/sources/richtext/richtexteditor.cpp
-  ${QET_DIR}/sources/richtext/richtexteditor_p.h
-  ${QET_DIR}/sources/richtext/ui_addlinkdialog.h
-
-  ${QET_DIR}/sources/SearchAndReplace/searchandreplaceworker.cpp
-  ${QET_DIR}/sources/SearchAndReplace/searchandreplaceworker.h
-
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.h
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.cpp
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.h
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.cpp
-  ${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.h
-  ${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.cpp
-  ${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.h
-  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
-  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.h
-
-  ${QET_DIR}/sources/titleblock/dimension.cpp
-  ${QET_DIR}/sources/titleblock/dimension.h
-  ${QET_DIR}/sources/titleblock/dimensionwidget.cpp
-  ${QET_DIR}/sources/titleblock/dimensionwidget.h
-  ${QET_DIR}/sources/titleblock/gridlayoutanimation.cpp
-  ${QET_DIR}/sources/titleblock/gridlayoutanimation.h
-  ${QET_DIR}/sources/titleblock/helpercell.cpp
-  ${QET_DIR}/sources/titleblock/helpercell.h
-  ${QET_DIR}/sources/titleblock/integrationmovetemplateshandler.cpp
-  ${QET_DIR}/sources/titleblock/integrationmovetemplateshandler.h
-  ${QET_DIR}/sources/titleblock/movetemplateshandler.h
-  ${QET_DIR}/sources/titleblock/qettemplateeditor.cpp
-  ${QET_DIR}/sources/titleblock/qettemplateeditor.h
-  ${QET_DIR}/sources/titleblock/splittedhelpercell.cpp
-  ${QET_DIR}/sources/titleblock/splittedhelpercell.h
-  ${QET_DIR}/sources/titleblock/templatecellsset.cpp
-  ${QET_DIR}/sources/titleblock/templatecellsset.h
-  ${QET_DIR}/sources/titleblock/templatecellwidget.cpp
-  ${QET_DIR}/sources/titleblock/templatecellwidget.h
-  ${QET_DIR}/sources/titleblock/templatecommands.cpp
-  ${QET_DIR}/sources/titleblock/templatecommands.h
-  ${QET_DIR}/sources/titleblock/templatedeleter.cpp
-  ${QET_DIR}/sources/titleblock/templatedeleter.h
-  ${QET_DIR}/sources/titleblock/templatelocationchooser.cpp
-  ${QET_DIR}/sources/titleblock/templatelocationchooser.h
-  ${QET_DIR}/sources/titleblock/templatelocation.cpp
-  ${QET_DIR}/sources/titleblock/templatelocation.h
-  ${QET_DIR}/sources/titleblock/templatelocationsaver.cpp
-  ${QET_DIR}/sources/titleblock/templatelocationsaver.h
-  ${QET_DIR}/sources/titleblock/templatelogomanager.cpp
-  ${QET_DIR}/sources/titleblock/templatelogomanager.h
-  ${QET_DIR}/sources/titleblock/templatescollection.cpp
-  ${QET_DIR}/sources/titleblock/templatescollection.h
-  ${QET_DIR}/sources/titleblock/templateview.cpp
-  ${QET_DIR}/sources/titleblock/templateview.h
-  ${QET_DIR}/sources/titleblock/templatevisualcell.cpp
-  ${QET_DIR}/sources/titleblock/templatevisualcell.h
-
-  ${QET_DIR}/sources/ui/aboutqetdialog.cpp
-  ${QET_DIR}/sources/ui/aboutqetdialog.h
-  ${QET_DIR}/sources/ui/abstractelementpropertieseditorwidget.cpp
-  ${QET_DIR}/sources/ui/abstractelementpropertieseditorwidget.h
-  ${QET_DIR}/sources/ui/alignmenttextdialog.cpp
-  ${QET_DIR}/sources/ui/alignmenttextdialog.h
-  ${QET_DIR}/sources/ui/bomexportdialog.cpp
-  ${QET_DIR}/sources/ui/bomexportdialog.h
-  ${QET_DIR}/sources/ui/borderpropertieswidget.cpp
-  ${QET_DIR}/sources/ui/borderpropertieswidget.h
-  ${QET_DIR}/sources/ui/compositetexteditdialog.cpp
-  ${QET_DIR}/sources/ui/compositetexteditdialog.h
-  ${QET_DIR}/sources/ui/conductorpropertiesdialog.cpp
-  ${QET_DIR}/sources/ui/conductorpropertiesdialog.h
-  ${QET_DIR}/sources/ui/conductorpropertieswidget.cpp
-  ${QET_DIR}/sources/ui/conductorpropertieswidget.h
-  ${QET_DIR}/sources/ui/configsaveloaderwidget.cpp
-  ${QET_DIR}/sources/ui/configsaveloaderwidget.h
-  ${QET_DIR}/sources/ui/diagramcontextwidget.cpp
-  ${QET_DIR}/sources/ui/diagramcontextwidget.h
-  ${QET_DIR}/sources/ui/diagrampropertiesdialog.cpp
-  ${QET_DIR}/sources/ui/diagrampropertiesdialog.h
-  ${QET_DIR}/sources/ui/diagrampropertieseditordockwidget.cpp
-  ${QET_DIR}/sources/ui/diagrampropertieseditordockwidget.h
-  ${QET_DIR}/sources/ui/diagramselection.cpp
-  ${QET_DIR}/sources/ui/diagramselection.h
-  ${QET_DIR}/sources/ui/dialogwaiting.cpp
-  ${QET_DIR}/sources/ui/dialogwaiting.h
-  ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.cpp
-  ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.h
-  ${QET_DIR}/sources/ui/dynamicelementtextmodel.cpp
-  ${QET_DIR}/sources/ui/dynamicelementtextmodel.h
-  ${QET_DIR}/sources/ui/elementinfopartwidget.cpp
-  ${QET_DIR}/sources/ui/elementinfopartwidget.h
-  ${QET_DIR}/sources/ui/elementinfowidget.cpp
-  ${QET_DIR}/sources/ui/elementinfowidget.h
-  ${QET_DIR}/sources/ui/elementpropertieswidget.cpp
-  ${QET_DIR}/sources/ui/elementpropertieswidget.h
-  ${QET_DIR}/sources/ui/formulaassistantdialog.cpp
-  ${QET_DIR}/sources/ui/formulaassistantdialog.h
-  ${QET_DIR}/sources/ui/imagepropertieswidget.cpp
-  ${QET_DIR}/sources/ui/imagepropertieswidget.h
-  ${QET_DIR}/sources/ui/importelementdialog.cpp
-  ${QET_DIR}/sources/ui/importelementdialog.h
-  ${QET_DIR}/sources/ui/importelementtextpatterndialog.cpp
-  ${QET_DIR}/sources/ui/importelementtextpatterndialog.h
-  ${QET_DIR}/sources/ui/inditextpropertieswidget.cpp
-  ${QET_DIR}/sources/ui/inditextpropertieswidget.h
-  ${QET_DIR}/sources/ui/linksingleelementwidget.cpp
-  ${QET_DIR}/sources/ui/linksingleelementwidget.h
-  ${QET_DIR}/sources/ui/marginseditdialog.cpp
-  ${QET_DIR}/sources/ui/marginseditdialog.h
-  ${QET_DIR}/sources/ui/masterpropertieswidget.cpp
-  ${QET_DIR}/sources/ui/masterpropertieswidget.h
-  ${QET_DIR}/sources/ui/multipastedialog.cpp
-  ${QET_DIR}/sources/ui/multipastedialog.h
-  ${QET_DIR}/sources/ui/potentialselectordialog.cpp
-  ${QET_DIR}/sources/ui/potentialselectordialog.h
-  ${QET_DIR}/sources/ui/projectpropertiesdialog.cpp
-  ${QET_DIR}/sources/ui/projectpropertiesdialog.h
-  ${QET_DIR}/sources/ui/reportpropertiewidget.cpp
-  ${QET_DIR}/sources/ui/reportpropertiewidget.h
-  ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.cpp
-  ${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.h
-  ${QET_DIR}/sources/ui/titleblockpropertieswidget.cpp
-  ${QET_DIR}/sources/ui/titleblockpropertieswidget.h
-  ${QET_DIR}/sources/ui/xrefpropertieswidget.cpp
-  ${QET_DIR}/sources/ui/xrefpropertieswidget.h
-  ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.cpp
-
-  ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.h
-
-  ${QET_DIR}/sources/undocommand/addelementtextcommand.cpp
-  ${QET_DIR}/sources/undocommand/addelementtextcommand.h
-  ${QET_DIR}/sources/undocommand/addgraphicsobjectcommand.cpp
-  ${QET_DIR}/sources/undocommand/addgraphicsobjectcommand.h
-  ${QET_DIR}/sources/undocommand/changeelementinformationcommand.cpp
-  ${QET_DIR}/sources/undocommand/changeelementinformationcommand.h
-  ${QET_DIR}/sources/undocommand/changetitleblockcommand.cpp
-  ${QET_DIR}/sources/undocommand/changetitleblockcommand.h
-  ${QET_DIR}/sources/undocommand/deleteqgraphicsitemcommand.cpp
-  ${QET_DIR}/sources/undocommand/deleteqgraphicsitemcommand.h
-  ${QET_DIR}/sources/undocommand/itemmodelcommand.cpp
-  ${QET_DIR}/sources/undocommand/itemmodelcommand.h
-  ${QET_DIR}/sources/undocommand/linkelementcommand.cpp
-  ${QET_DIR}/sources/undocommand/linkelementcommand.h
-  ${QET_DIR}/sources/undocommand/rotateselectioncommand.cpp
-  ${QET_DIR}/sources/undocommand/rotateselectioncommand.h
-  ${QET_DIR}/sources/undocommand/rotatetextscommand.cpp
-  ${QET_DIR}/sources/undocommand/rotatetextscommand.h
-
-  ${QET_DIR}/sources/utils/conductorcreator.cpp
-  ${QET_DIR}/sources/utils/conductorcreator.h
-  ${QET_DIR}/sources/utils/macosxopenevent.cpp
-  ${QET_DIR}/sources/utils/macosxopenevent.h
-  ${QET_DIR}/sources/utils/qetutils.cpp
-  ${QET_DIR}/sources/utils/qetutils.h
-  )
-
-set(TS_FILES
-  ${QET_DIR}/lang/qet_ca.ts
-  ${QET_DIR}/lang/qet_de.ts
-  ${QET_DIR}/lang/qet_es.ts
-  ${QET_DIR}/lang/qet_fr.ts
-  ${QET_DIR}/lang/qet_it.ts
-  ${QET_DIR}/lang/qet_mn.ts
-  ${QET_DIR}/lang/qet_pt_br.ts
-  ${QET_DIR}/lang/qet_ru.ts
-  ${QET_DIR}/lang/qet_sr.ts
-  ${QET_DIR}/lang/qet_zh.ts
-  ${QET_DIR}/lang/qet_be.ts
-  ${QET_DIR}/lang/qet_da.ts
-  ${QET_DIR}/lang/qet_en.ts
-  ${QET_DIR}/lang/qet_fi.ts
-  ${QET_DIR}/lang/qet_hu.ts
-  ${QET_DIR}/lang/qet_nl.ts
-  ${QET_DIR}/lang/qet_pl.ts
-  ${QET_DIR}/lang/qet_ro.ts
-  ${QET_DIR}/lang/qet_sk.ts
-  ${QET_DIR}/lang/qet_ar.ts
-  ${QET_DIR}/lang/qet_cs.ts
-  ${QET_DIR}/lang/qet_el.ts
-  ${QET_DIR}/lang/qet_hr.ts
-  ${QET_DIR}/lang/qet_ja.ts
-  ${QET_DIR}/lang/qet_nb.ts
-  ${QET_DIR}/lang/qet_no.ts
-  ${QET_DIR}/lang/qet_pt.ts
-  ${QET_DIR}/lang/qet_sl.ts
-  ${QET_DIR}/lang/qet_tr.ts
-  )

cmake/start_options.cmake

@@ -1,29 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-message(" - start_options")
-
-# Comment the line below to deactivate the --common-elements-dir option
-add_definitions(-DQET_ALLOW_OVERRIDE_CED_OPTION)
-
-# Comment the line below to disable the --common-tbt-dir option
-add_definitions(-DQET_ALLOW_OVERRIDE_CTBTD_OPTION)
-
-# Comment the line below to deactivate the --config-dir option
-add_definitions(-DQET_ALLOW_OVERRIDE_CD_OPTION)
-
-#comment the line below to disable the project database export
-#add_definitions(-DQET_EXPORT_PROJECT_DB) #error Todo

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-<definition type="element" height="80" hotspot_y="40" version="0.70" width="50" hotspot_x="23" link_type="simple">
+<definition type="element" orientation="dyyy" height="80" hotspot_y="40" version="0.70" width="50" hotspot_x="23" link_type="simple">
     <uuid uuid="{65b9e889-c2eb-4d85-aa9e-c1dff55678f5}"/>
     <names>
         <name lang="en">Three-pole source + PEN</name>
@@ -11,8 +11,7 @@
         <name lang="ru">Трёхполюсный + PEN</name>
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
-        <name lang="cs">Přípojnice 3f+PEN pravá</name>
-	<name lang="hu">3F + PEN</name>
+        <name lang="cs">3 fáze + PEN pravý</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team

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

@@ -1,7 +1,7 @@
-<definition type="element" height="100" hotspot_y="40" version="0.70" width="40" hotspot_x="20" link_type="simple">
+<definition type="element" orientation="dyyy" height="100" hotspot_y="40" version="0.70" width="40" hotspot_x="20" link_type="simple">
     <uuid uuid="{b4b70d3d-8784-4323-b17b-d8ff3677cdc1}"/>
     <names>
-        <name lang="en">Three-pole source + N + PE</name>
+        <name lang="en">Three-pole source + PEN</name>
         <name lang="el">Τριφασικό + PEN</name>
         <name lang="es">Fuente tripolar + PEN</name>
         <name lang="nl">driefasen + aardenul</name>
@@ -11,8 +11,7 @@
         <name lang="ru">Трёхполюсный + PEN</name>
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
-        <name lang="cs">Přípojnice 3f+N+PE pravá</name>
-	<name lang="hu">3F + N + PE</name>
+        <name lang="cs">3 fáze + N+PE pravý</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team

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

@@ -1,4 +1,4 @@
-<definition height="50" width="30" link_type="terminal" hotspot_x="16" version="0.80" type="element" hotspot_y="29">
+<definition height="50" width="30" link_type="terminal" hotspot_x="16" version="0.80" orientation="dyyy" type="element" hotspot_y="29">
     <uuid uuid="{a98ac40d-9055-4b9b-88ab-cffe6b08ed37}"/>
     <names>
         <name lang="ro">Masă</name>
@@ -14,7 +14,6 @@
         <name lang="es">Masa</name>
         <name lang="ar">هيكل معدني</name>
         <name lang="fr">Masse</name>
-	<name lang="hu">Test</name>
     </names>
     <elementInformations>
         <elementInformation name="comment" show="1"></elementInformation>

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

@@ -1,4 +1,4 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="9" height="30" hotspot_y="20" type="element">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="9" orientation="dyyy" height="30" hotspot_y="20" type="element">
     <uuid uuid="{5983fe6f-de69-4368-a387-a6ce3b9c2951}"/>
     <names>
         <name lang="pt">Massa</name>
@@ -13,7 +13,6 @@
         <name lang="en">Chassis</name>
         <name lang="fr">Masse</name>
         <name lang="ru">Шасси</name>
-	<name lang="hu">Vázszerkezet</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -5,14 +5,11 @@
         <name lang="fr">Sources réseau</name>
         <name lang="it">Alimentazione da rete</name>
         <name lang="pl">Sieć elektroenergetyczna</name>
-    	<name lang="pt_br">Alimentação</name>
         <name lang="de">Netzquellen</name>
         <name lang="el">Παροχές δικτύου</name>
         <name lang="nl">Netvoedingen</name>
-        <name lang="cs">Napájení</name>
-    	<name lang="es">Fuentes de red</name>
+        <name lang="cs">Síťové zdroje</name>
+		<name lang="es">Fuentes de red</name>
         <name lang="da">Netværkskilder</name>
-        <name lang="ja">電源網</name>
-        <name lang="hu">Hálózati források</name>
     </names>
 </qet-directory>

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

@@ -1,18 +1,17 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="60" hotspot_y="30" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
     <uuid uuid="{35f2834a-308b-4e79-bc2a-1c00486b24e7}"/>
     <names>
         <name lang="es">Fuente unipolo + PE +N</name>
         <name lang="nl">1 fase + aarde + nul</name>
         <name lang="el">Μονοφασικό +N +PE</name>
         <name lang="de">Wechselstrom + PE +N</name>
-        <name lang="cs">Přípojnice 1f+N+PE</name>
+        <name lang="cs">1 fáze + PE +N</name>
         <name lang="pl">Linia jednofazowa (trójprzewodowa)</name>
         <name lang="it">Sorgente unipolare + PE +N</name>
         <name lang="ar">مصدر وحيد القطبية + أرضي PE + محايد N</name>
         <name lang="en">Single-pole source + PE +N</name>
         <name lang="fr">Source unipolaire + PE +N</name>
         <name lang="ru">Однополюсный + PE +N</name>
-	<name lang="hu">F + N + PE</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,18 +1,17 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="22" height="40" hotspot_y="20" type="element">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="22" orientation="dyyy" height="40" hotspot_y="20" type="element">
     <uuid uuid="{fd042050-e73b-4f95-b4c1-834aa403b07a}"/>
     <names>
         <name lang="es">Fuente unipolo + PEN</name>
         <name lang="nl">1 fase + aardenul</name>
         <name lang="el">Μονοφασικό +PEN</name>
         <name lang="de">Wechselstrom + PEN</name>
-        <name lang="cs">Přípojnice 1f+PEN</name>
+        <name lang="cs">1 fáze + PEN</name>
         <name lang="pl">Linia jednofazowa (TN-C)</name>
         <name lang="it">Sorgente unipolare + PEN</name>
         <name lang="ar">مصدر وحيد القطبية +PEN</name>
         <name lang="en">Single-pole source +PEN</name>
         <name lang="fr">Source unipolaire + PEN</name>
         <name lang="ru">Однополюсный + PEN</name>
-	<name lang="hu">F + PEN</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="40" hotspot_y="20" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="40" hotspot_y="20" type="element">
     <uuid uuid="{457a0c01-871c-40fd-83d7-14033333fb95}"/>
     <names>
         <name lang="pt">Fonte unipolar + neutro</name>
@@ -6,14 +6,13 @@
         <name lang="nl">Wisselspanning L + nul N</name>
         <name lang="el">Μονοφασικό + Ουδέτερος</name>
         <name lang="de">Wechselstrom L + N</name>
-        <name lang="cs">Přípojnice 1f+N</name>
+        <name lang="cs">Jednopólový zdroj + nulový</name>
         <name lang="pl">Linia jednofazowa (dwuprzewodowa)</name>
         <name lang="it">Sorgente unipolare + neutro</name>
         <name lang="ar">مصدر وحيد القطبية + محايد N</name>
         <name lang="en">Single-pole source + neutral</name>
         <name lang="fr">Source unipolaire + neutre</name>
         <name lang="ru">Однополюсный + нейтраль</name>
-	<name lang="hu">F + N</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="60" hotspot_y="30" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
     <uuid uuid="{03b9e482-cb45-4bee-8030-96b93624fc60}"/>
     <names>
         <name lang="pt">Fonte tripolar</name>
@@ -6,14 +6,13 @@
         <name lang="nl">3fasen</name>
         <name lang="el">Τριφασικό</name>
         <name lang="de">Drehstrom</name>
-        <name lang="cs">Přípojnice 3f</name>
+        <name lang="cs">Třípólový zdroj</name>
         <name lang="pl">Linia trójfazowa (trójprzewodowa)</name>
         <name lang="it">Sorgente tripolare</name>
         <name lang="ar">مصدر ثلاثي القطبيّة</name>
         <name lang="en">Three-pole source</name>
         <name lang="fr">Source tripolaire</name>
         <name lang="ru">Трёхполюсный</name>
-	<name lang="hu">3F</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,18 +1,17 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="100" hotspot_y="50" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="100" hotspot_y="50" type="element">
     <uuid uuid="{0e017749-6c0f-44c0-8726-6804be8bbee7}"/>
     <names>
         <name lang="es">Fuente tripolar + PE +N</name>
         <name lang="nl">driefase + aarde + nul</name>
         <name lang="el">Τριφασικό +N +PE</name>
         <name lang="de">Drehstrom + PE +N</name>
-        <name lang="cs">Přípojnice 3f+N+PE</name>
+        <name lang="cs">3 fáze + PE +N</name>
         <name lang="pl">Linia trójfazowa (pięcioprzewodowa)</name>
         <name lang="it">Sorgente tripolare +PE + N</name>
         <name lang="ar">مصدر ثلاثي القطبية + PE + N</name>
         <name lang="en">Three-pole source + PE +N</name>
         <name lang="fr">Source tripolaire + PE +N</name>
         <name lang="ru">Трёхполюсный + PE +N</name>
-	<name lang="hu">3F + N + PE</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,18 +1,17 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="23" height="80" hotspot_y="41" type="element">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="23" orientation="dyyy" height="80" hotspot_y="41" type="element">
     <uuid uuid="{c0913e95-3b3c-4dc2-a74d-bc73ded78c32}"/>
     <names>
         <name lang="es">Fuente tripolar + PEN</name>
         <name lang="nl">driefasen + aardenul</name>
         <name lang="el">Τριφασικό + PEN</name>
         <name lang="de">Drehstrom + PEN</name>
-        <name lang="cs">Přípojnice 3f+PEN</name>
+        <name lang="cs">3 fáze + PEN</name>
         <name lang="pl">Linia trójfazowa (PEN)</name>
         <name lang="it">Sorgente tripolare + PEN</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
         <name lang="en">Three-pole source + PEN</name>
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ru">Трёхполюсный + PEN</name>
-	<name lang="hu">3F + PEN</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="80" hotspot_y="40" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="80" hotspot_y="40" type="element">
     <uuid uuid="{8bfb1790-0735-47d5-88a2-8b4d91aba2f1}"/>
     <names>
         <name lang="pt">Fonte tripolar + neutro</name>
@@ -6,14 +6,13 @@
         <name lang="nl">Driefasen + nul</name>
         <name lang="el">Τριφασικό + Ουδέτερος</name>
         <name lang="de">Dreiphasig + Neutral</name>
-        <name lang="cs">Přípojnice 3f+N</name>
+        <name lang="cs">Třípólový zdroj + nulový</name>
         <name lang="pl">Linia trójfazowa (czteroprzewodowa)</name>
         <name lang="it">Sorgente tripolare + neutro</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + محايد</name>
         <name lang="en">Three-pole source + neutral</name>
         <name lang="fr">Source tripolaire + neutre</name>
         <name lang="ru">Трёхполюсный + нейтраль</name>
-	<name lang="hu">3F + N</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="10" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
     <uuid uuid="{b5ad2e41-804d-4745-99be-e8951cffdf98}"/>
     <names>
         <name lang="pt">Fonte de neutro</name>
@@ -6,14 +6,13 @@
         <name lang="nl">Nul voeding</name>
         <name lang="el">Ουδέτερος</name>
         <name lang="de">Neutralleiter</name>
-        <name lang="cs">Přípojnice N</name>
+        <name lang="cs">Nulový zdroj</name>
         <name lang="pl">Przewód neutralny</name>
         <name lang="it">Sorgente neutro</name>
         <name lang="ar">مصدر محايد</name>
         <name lang="en">Neutral source</name>
         <name lang="fr">Source neutre</name>
         <name lang="ru">Нейтраль</name>
-	<name lang="hu">N</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="10" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
     <uuid uuid="{7693c5e0-762b-4309-8d97-cb74619f9efd}"/>
     <names>
         <name lang="pt">Fonte de fase</name>
@@ -6,14 +6,13 @@
         <name lang="nl">Fase</name>
         <name lang="el">Φάση</name>
         <name lang="de">Phase</name>
-        <name lang="cs">Přípojnice L</name>
+        <name lang="cs">Fázový zdroj</name>
         <name lang="pl">Przewód liniowy</name>
         <name lang="it">Sorgente fase</name>
         <name lang="ar">مصدر وجه</name>
         <name lang="en">Phase source</name>
         <name lang="fr">Source phase</name>
         <name lang="ru">Фаза</name>
-	<name lang="hu">F</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="34" height="100" hotspot_y="40" type="element">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="100" hotspot_y="40" type="element">
     <uuid uuid="{4b9794cf-e7c0-4f59-aa0a-bb1fce4dfe48}"/>
     <names>
         <name lang="es">Punto de distribución TN-C > TN-S</name>
@@ -11,7 +11,6 @@
         <name lang="en">Distribution point TN-C >TN-S</name>
         <name lang="fr">Point de distribution TN-C >TN-S</name>
         <name lang="ru">Распределительный пункт TN-C >TN-S</name>
-	<name lang="hu">3F + PEN szétválasztva TN-C-ről TN-S-re</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,8 +1,8 @@
-<definition height="30" width="20" link_type="terminal" hotspot_x="10" version="0.80" type="element" hotspot_y="19">
+<definition height="30" width="20" link_type="terminal" hotspot_x="10" version="0.80" orientation="dyyy" type="element" hotspot_y="19">
     <uuid uuid="{e4e753a8-9fde-4e8e-9256-0cf99d67e3de}"/>
     <names>
         <name lang="pt">Terra</name>
-        <name lang="cs">Uzemnění</name>
+        <name lang="cs">Země</name>
         <name lang="it">Terra</name>
         <name lang="el">Γείωση</name>
         <name lang="nl">Aarde</name>
@@ -13,7 +13,6 @@
         <name lang="es">Tierra</name>
         <name lang="ar">تأريض</name>
         <name lang="fr">Terre</name>
-	    <name lang="hu">Földelő</name>
     </names>
     <elementInformations>
         <elementInformation name="comment" show="1"></elementInformation>

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

@@ -1,17 +0,0 @@
-<definition width="20" height="20" hotspot_y="9" type="element" link_type="simple" hotspot_x="9" version="0.60">
-    <uuid uuid="{079913f8-18b5-4524-84bd-aadf75dfefbf}"/>
-    <names>
-        <name lang="cs">Bod</name>
-        <name lang="de">Verbindung</name>
-        <name lang="hu">Keresztezés pont alakzatban</name>
-    </names>
-    <informations></informations>
-    <description>
-        <circle diameter="4" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-2" x="-2"/>
-        <input rotate="true" text=" " tagg="label" size="9" y="-3" x="-11"/>
-        <terminal orientation="e" y="0" x="2"/>
-        <terminal orientation="w" y="0" x="-2"/>
-        <terminal orientation="s" y="2" x="0"/>
-        <terminal orientation="n" y="-2" x="0"/>
-    </description>
-</definition>

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

@@ -1,8 +1,7 @@
-<definition hotspot_x="11" hotspot_y="4" version="0.70" type="element" height="20" link_type="terminal" width="30">
+<definition hotspot_x="11" hotspot_y="4" version="0.70" type="element" height="20" orientation="dyyy" link_type="terminal" width="30">
     <uuid uuid="{141e7e1e-4f7f-456d-9f04-52c32109b969}"/>
     <names>
         <name lang="en">Combine</name>
-        <name lang="de">Klemmstelle (2)</name>
         <name lang="fr">Jonction</name>
         <name lang="es">Unión</name>
         <name lang="it">Collegamento</name>
@@ -10,7 +9,6 @@
         <name lang="ar">وصلة</name>
         <name lang="ru">Соединение</name>
         <name lang="cs">Spoj</name>
-        <name lang="hu">Egyesítő három vezetékhez</name>
     </names>
     <elementInformations/>
     <informations></informations>

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

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

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

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

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

@@ -1,8 +1,7 @@
-<definition width="10" hotspot_y="14" hotspot_x="5" height="30" link_type="terminal" version="0.70" type="element">
+<definition width="10" hotspot_y="14" hotspot_x="5" height="30" link_type="terminal" orientation="dyyy" version="0.70" type="element">
     <uuid uuid="{b5abb4c2-455d-45ff-95f2-328521f4e2e1}"/>
     <names>
         <name lang="en">Jump</name>
-        <name lang="de">Sprung</name>
         <name lang="fr">Saut</name>
         <name lang="ar">قفز</name>
         <name lang="cs">Skok</name>
@@ -10,7 +9,6 @@
         <name lang="pl">Brak połączenia</name>
         <name lang="ru">Перемычка</name>
         <name lang="es">Puente</name>
-        <name lang="hu">Átugrás összekötés nélkül</name>
     </names>
     <elementInformations/>
     <informations></informations>

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

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

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

@@ -6,13 +6,10 @@
         <name lang="fr">Connections</name>
         <name lang="it">Collegamenti</name>
         <name lang="pl">Połączenia</name>
-    	<name lang="pt_br">Conexões</name>
         <name lang="cs">Spojení</name>
         <name lang="el">Ενώσεις</name>
         <name lang="nl">Verbindingen</name>
-	<name lang="es">Conexiones</name>
+		<name lang="es">Conexiones</name>
         <name lang="da">Forbindelser</name>
-        <name lang="ja">接続</name>
-        <name lang="hu">Csatlakozások</name>
     </names>
 </qet-directory>

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-<definition width="120" version="0.3" hotspot_x="71" hotspot_y="10" height="40" type="element">
+<definition width="120" version="0.3" hotspot_x="71" hotspot_y="10" height="40" type="element" orientation="dyyy">
     <names>
         <name lang="ar">كايبل طورين + تأريض</name>
         <name lang="de">Kabel 3G</name>
@@ -7,8 +7,7 @@
         <name lang="fr">Cable 2 phases+terre</name>
         <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
         <name lang="es">Cable 2 fases+tierra</name>
-        <name lang="cs">Kabel 3G</name>
-        <name lang="hu">Kábel 2 + PE</name>
+        <name lang="cs">Označení drátového propojení - 2 fáze + země</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="120" version="0.3" hotspot_x="70" hotspot_y="10" height="40" type="element">
+<definition width="120" version="0.3" hotspot_x="70" hotspot_y="10" height="40" type="element" orientation="dyyy">
     <names>
         <name lang="ar">كايبل ثلاثي الطور + تأريض</name>
         <name lang="de">Kabel 4G</name>
@@ -7,8 +7,7 @@
         <name lang="fr">Cable 3 phases+terre</name>
         <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
         <name lang="es">Cable 3 fases+tierra</name>
-        <name lang="cs">Kabel 4G</name>
-        <name lang="hu">Kábel 3 + PE</name>
+        <name lang="cs">Označení drátového propojení - 3 fáze + země</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="60" hotspot_y="10" height="40" type="element">
+<definition width="100" version="0.3" hotspot_x="60" hotspot_y="10" height="40" type="element" orientation="dyyy">
     <names>
         <name lang="ar">كايبل بطورين و تأريض</name>
         <name lang="de">Kabel 3G</name>
@@ -7,8 +7,7 @@
         <name lang="fr">Cable 2 phases+terre</name>
         <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
         <name lang="es">Cable 2 fases+tierra</name>
-        <name lang="cs">Kabel 3G</name>
-        <name lang="hu">Kábel 2 + PE</name>
+        <name lang="cs">Označení drátového propojení - 2 fáze + země</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,12 +1,10 @@
-<definition width="130" version="0.3" hotspot_x="88" hotspot_y="18" height="40" type="element">
+<definition width="130" version="0.3" hotspot_x="88" hotspot_y="18" height="40" type="element" orientation="dyyy">
     <names>
         <name lang="ar">كايبل رباعي النواة</name>
         <name lang="It">Cavo ? 4G</name>
         <name lang="fr">Cable 4G</name>
         <name lang="pl">Przewód czterożyłowy</name>
         <name lang="es">Cable 4G</name>
-        <name lang="cs">Kabel 4G</name>
-        <name lang="hu">Kábel 3 + PE</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,12 +1,10 @@
-<definition hotspot_y="3" version="0.51" hotspot_x="47" link_type="simple" width="100" type="element" height="20">
+<definition hotspot_y="3" orientation="dyyy" version="0.51" hotspot_x="47" link_type="simple" width="100" type="element" height="20">
     <uuid uuid="{9923c1a5-b49a-4243-923e-cde9d916ea2b}"/>
     <names>
         <name lang="fr">Cable 5G</name>
         <name lang="it">Cavo Type 5G</name>
         <name lang="es">Cable 5G</name>
         <name lang="pl">Przewód pięciożyłowy</name>
-        <name lang="cs">Kabel 5G</name>
-        <name lang="hu">Kábel 4 + N + PE</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,12 +1,10 @@
-<definition hotspot_y="3" version="0.51" hotspot_x="29" link_type="simple" width="60" type="element" height="20">
+<definition hotspot_y="3" orientation="dyyy" version="0.51" hotspot_x="29" link_type="simple" width="60" type="element" height="20">
     <uuid uuid="{5f981421-4c54-4cd5-929e-7f77dab94fef}"/>
     <names>
         <name lang="It">Cavo ? 3G</name>
         <name lang="fr">Cable 3G</name>
         <name lang="es">Cable 3G</name>
         <name lang="pl">Przewód trójżyłowy</name>
-        <name lang="cs">Kabel 3G</name>
-        <name lang="hu">Kábel 2 + PE</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,15 +1,14 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="9" type="element">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
     <uuid uuid="{4b9a04b1-0d35-4d54-b5cb-b573ed3a9b0d}"/>
     <names>
         <name lang="de">Kabel 3x</name>
-        <name lang="cs">Kabel 3x</name>
+        <name lang="cs">Označení drátového propojení 3 vodiče</name>
         <name lang="pl">Oznaczenie przewodu trójżyłowego</name>
         <name lang="it">Cavo a 3 conduttori</name>
         <name lang="en">Cable 3 wires</name>
         <name lang="es">Cable 3 alambres</name>
         <name lang="fr">Cable 3 brins</name>
         <name lang="ru">Кабель 3 жилы</name>
-        <name lang="hu">Kábel 3 + PE</name>
     </names>
     <informations></informations>
     <description>

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

@@ -1,10 +1,10 @@
-<definition width="60" link_type="simple" version="0.5" hotspot_x="21" height="10" hotspot_y="-6" type="element">
+<definition width="60" link_type="simple" version="0.5" hotspot_x="21" orientation="dyyy" height="10" hotspot_y="-6" type="element">
     <uuid uuid="{822e6fc1-0104-4d3a-ba3c-995c24c79cf2}"/>
     <names>
         <name lang="nl">Scherm</name>
         <name lang="el">Πλέγμα</name>
         <name lang="de">Schirm</name>
-        <name lang="cs">Stínění</name>
+        <name lang="cs">Obrazovka</name>
         <name lang="pl">Ekran 3</name>
         <name lang="it">Schermo</name>
         <name lang="ar">شاشة</name>
@@ -12,7 +12,6 @@
         <name lang="es">Pantalla</name>
         <name lang="fr">Ecran</name>
         <name lang="ru">Экран</name>
-        <name lang="hu">Árnyékolás</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,15 +1,14 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="20" hotspot_y="9" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
     <uuid uuid="{6ac285f9-6492-40cb-be58-9ba565ea1921}"/>
     <names>
         <name lang="de">Kabelader</name>
-        <name lang="cs">Vodič kabelu</name>
+        <name lang="cs">Vedení kabelu</name>
         <name lang="pl">Połączenie przewodu</name>
         <name lang="it">Conduttore di un cavo</name>
         <name lang="en">Wire of cable</name>
         <name lang="es">Alambre del cable</name>
         <name lang="fr">Fil de cable</name>
         <name lang="ru">Жила кабеля</name>
-        <name lang="hu">Kábelér</name>
     </names>
     <informations></informations>
     <description>

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

@@ -1,14 +1,13 @@
-<definition width="20" link_type="simple" version="0.5" hotspot_x="10" height="20" hotspot_y="9" type="element">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="20" hotspot_y="9" type="element">
     <uuid uuid="{374ed6b3-7329-4cad-ac8c-200b17508460}"/>
     <names>
         <name lang="de">Verdrahtung</name>
-        <name lang="cs">Vodič kabelu</name>
+        <name lang="cs">Drátové propojení</name>
         <name lang="pl">Oznaczenie przewodu</name>
         <name lang="it">Conduttura</name>
         <name lang="en">Wiring</name>
         <name lang="es">Alambrado</name>
         <name lang="fr">Filerie</name>
-        <name lang="hu">Vezeték</name>
     </names>
     <informations></informations>
     <description>

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

@@ -1,10 +1,9 @@
-<definition width="70" hotspot_x="35" hotspot_y="5" version="0.80" type="element" height="10" link_type="simple">
+<definition width="70" hotspot_x="35" hotspot_y="5" orientation="dyyy" version="0.80" type="element" height="10" link_type="simple">
     <uuid uuid="{3cfdc90d-f114-4ecd-9ab2-37786c279287}"/>
     <names>
         <name lang="de">Kabel 3G</name>
         <name lang="fr">Cable 3G</name>
         <name lang="cs">Kabel 3G</name>
-        <name lang="hu">Kábel 2 + PE</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team&#xd;

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

@@ -1,4 +1,4 @@
-<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="36" hotspot_y="5" width="90">
+<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="36" hotspot_y="5" orientation="dyyy" width="90">
     <uuid uuid="{e02f4582-b5dd-4f81-ba71-e3d5521b4152}"/>
     <names>
         <name lang="ru">Кабель 3 жилы + PE</name>
@@ -8,7 +8,6 @@
         <name lang="es">Cable 3 fases+tierra</name>
         <name lang="it">Cavo 3 fasi + terra</name>
         <name lang="fr">Cable 3 phases+terre</name>
-        <name lang="hu">Kábel 3 + PE</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="73" hotspot_y="5" width="150">
+<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="73" hotspot_y="5" orientation="dyyy" width="150">
     <uuid uuid="{d1007c67-032b-4925-8560-aac9e547d6ae}"/>
     <names>
         <name lang="ru">Кабель 6 жилы + PE</name>
@@ -8,7 +8,6 @@
         <name lang="es">Cable 6 fases+tierra</name>
         <name lang="it">Cavo  fasi + terra</name>
         <name lang="fr">Cable 6 phases+terre</name>
-        <name lang="hu">Kábel 6 + PE</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,17 +1,16 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="14" height="20" hotspot_y="4" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="14" orientation="dyyy" height="20" hotspot_y="4" type="element">
     <uuid uuid="{a0e9e33a-ee38-4c08-8f40-c307da8d822b}"/>
     <names>
         <name lang="el">Διατομή αγωγού</name>
         <name lang="es">Clasificación de sección</name>
         <name lang="nl">Doorsnede</name>
         <name lang="de">Verdrahtungsquerschnitt</name>
-        <name lang="cs">Průřez vodiče</name>
+        <name lang="cs">Průřez drátovým propojením</name>
         <name lang="pl">Pole przekróju przewodu</name>
         <name lang="it">Sezione della nomenclatura</name>
         <name lang="ar">تسمية مساحة المقطع </name>
         <name lang="en">Wiring section</name>
         <name lang="fr">Section de fil</name>
-        <name lang="hu">Vezeték keresztmetszet</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -6,13 +6,10 @@
         <name lang="fr">Câbles et filerie</name>
         <name lang="it">Cavi e collegamenti</name>
         <name lang="pl">Przewody i kable</name>
-    	<name lang="pt_br">Cabos e fiação</name>
         <name lang="de">Kabel und Verdrahtung</name>
         <name lang="el">Καλώδια και καλωδίωση</name>
         <name lang="nl">Kabels en draden</name>
-        <name lang="cs">Kabely a vodiče</name>
+        <name lang="cs">Kabely a drátové propojení</name>
         <name lang="da">Kabler og ledninger</name>
-        <name lang="ja">ケーブルと配線</name>
-        <name lang="hu">Kábelek és vezetékek</name>
     </names>
 </qet-directory>

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

@@ -1,13 +1,12 @@
-<definition width="30" link_type="simple" version="0.5" hotspot_x="15" height="10" hotspot_y="5" type="element">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="10" hotspot_y="5" type="element">
     <uuid uuid="{b96a76a6-a798-497b-a044-dd933756d175}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 1 Leiter</name>
-        <name lang="cs">Označení vodiče</name>
+        <name lang="cs">Označení drátového propojení 1 vodič</name>
         <name lang="pl">Oznaczenie pola przekroju przewodu jednożyłowego</name>
         <name lang="it">Sezione 1 conduttore</name>
         <name lang="fr">Section 1 conducteur</name>
         <name lang="es">Sección 1 conductor</name>
-        <name lang="hu">1 ér keresztmetszet</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,13 +1,12 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="16" height="10" hotspot_y="5" type="element">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="10" hotspot_y="5" type="element">
     <uuid uuid="{448ac784-f459-4f8f-bd3f-d911802b3369}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 2 Leiter</name>
-        <name lang="cs">Označení žil 2 vodiče</name>
+        <name lang="cs">Označení drátového propojení 2 vodiče</name>
         <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
         <name lang="it">Sezione 2 conduttori</name>
         <name lang="fr">Section 2 conducteurs</name>
         <name lang="es">Sección 2 conductores</name>
-        <name lang="hu">2 ér keresztmetszet</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,13 +1,12 @@
-<definition width="40" link_type="simple" version="0.5" hotspot_x="14" height="10" hotspot_y="5" type="element">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="14" orientation="dyyy" height="10" hotspot_y="5" type="element">
     <uuid uuid="{c94d9e16-e3bb-4117-b037-466a15edcb14}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 2 Leiter</name>
-        <name lang="cs">Označení žil 2 vodiče</name>
+        <name lang="cs">Označení drátového propojení 2 vodiče</name>
         <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
         <name lang="it">Sezione 2 conduttori</name>
         <name lang="fr">Section 2 conducteurs</name>
         <name lang="es">Sección 2 conductores</name>
-        <name lang="hu">2 ér keresztmetszet</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,13 +1,12 @@
-<definition width="70" link_type="simple" version="0.5" hotspot_x="16" height="10" hotspot_y="5" type="element">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="10" hotspot_y="5" type="element">
     <uuid uuid="{9d939952-9c2b-4b12-898f-262abc91e845}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition 3 Leiter</name>
-        <name lang="cs">Označení žil 3 vodiče</name>
+        <name lang="cs">Označení drátového propojení 3 vodiče</name>
         <name lang="pl">Oznaczenie pola przekroju przewodu trójżyłowego</name>
         <name lang="it">Sezione 3 conduttori</name>
         <name lang="fr">Section 3 conducteurs</name>
         <name lang="es">Sección 3 conductores</name>
-        <name lang="hu">3 ér keresztmetszet</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,4 +1,4 @@
-<definition height="80" hotspot_y="39" hotspot_x="17" version="0.5" width="40" link_type="simple" type="element">
+<definition height="80" hotspot_y="39" hotspot_x="17" version="0.5" orientation="dyyy" width="40" link_type="simple" type="element">
     <uuid uuid="{9d2d8902-b36a-4974-b46d-4de6741f6b9b}"/>
     <names>
         <name lang="en">Terminal strip label</name>
@@ -6,8 +6,6 @@
         <name lang="fr">Label de bornier</name>
         <name lang="de">Klemmleisten-BMK</name>
         <name lang="pl">Etykieta listwy zaciskowej</name>
-        <name lang="cs">Štítek svorkovnice</name>
-        <name lang="hu">Sorkapocstömb jelölő</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
     <uuid uuid="{2d155649-d0f5-419b-b94a-a13d3fcf38c7}"/>
     <names>
         <name lang="fr">Borne (continuité)</name>
@@ -6,8 +6,6 @@
         <name lang="en">Terminal (feed-through)</name>
         <name lang="es">Clema (introducción atravesada)</name>
         <name lang="pl">Zacisk</name>
-        <name lang="cs">Svorka průchozí</name>
-        <name lang="hu">Sorkapocs átmenő</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
     <uuid uuid="{da19301b-f6e7-478f-a6dd-eb72e497883b}"/>
     <names>
         <name lang="fr">Borne (terre)</name>
@@ -6,8 +6,6 @@
         <name lang="en">Terminal (Grounding)</name>
         <name lang="es">Clema (Aterrizada)</name>
         <name lang="pl">Zacisk uziemiający</name>
-        <name lang="cs">Svorka zemnící</name>
-        <name lang="hu">Sorkapocs földelő</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="110" height="20" type="element" hotspot_x="55" link_type="simple" hotspot_y="13">
+<definition orientation="dyyy" version="0.51" width="110" height="20" type="element" hotspot_x="55" link_type="simple" hotspot_y="13">
     <uuid uuid="{17db296d-b50e-47ea-9125-aa9c1837b523}"/>
     <names>
         <name lang="fr">Interruption bornier</name>
@@ -6,8 +6,6 @@
         <name lang="en">Discontinuation terminal strip</name>
         <name lang="es">Clema de descontinuación</name>
         <name lang="it">Morsettiera d'interruzione</name>
-        <name lang="cs">Přerušení svorkovnice</name>
-        <name lang="hu">Sorkapocstömb megszakítása</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="50" height="110" type="element" hotspot_x="15" link_type="simple" hotspot_y="54">
+<definition orientation="dyyy" version="0.51" width="50" height="110" type="element" hotspot_x="15" link_type="simple" hotspot_y="54">
     <uuid uuid="{387b403b-d81d-45ca-957d-e9014fe009a7}"/>
     <names>
         <name lang="fr">Borne double-étage (continuité)</name>
@@ -6,8 +6,6 @@
         <name lang="en">Terminal double-level (feed-through)</name>
         <name lang="es">Clema de doble nivel (Introducción atravesada)</name>
         <name lang="it">Morsettiera a doppio livello (interconnesso)</name>
-        <name lang="cs">Dvoupatrová svorkovnice</name>
-        <name lang="hu">Kétemeletes sorkapocs</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="10" hotspot_y="5" hotspot_x="5" version="0.5" width="30" link_type="simple" type="element">
+<definition height="10" hotspot_y="5" hotspot_x="5" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
     <uuid uuid="{9a3ee0a0-5a0e-4f0c-93dd-396ddc3d7f11}"/>
     <names>
         <name lang="de">Einlegebrücke</name>
@@ -6,8 +6,6 @@
         <name lang="en">Insertion bridge</name>
         <name lang="es">Puente de inserción</name>
         <name lang="it">Barra di connessione</name>
-        <name lang="cs">Propojka svorkovnic</name>
-        <name lang="hu">Sorkapocs áthidalás</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="50" height="10" type="element" hotspot_x="5" link_type="simple" hotspot_y="5">
+<definition orientation="dyyy" version="0.51" width="50" height="10" type="element" hotspot_x="5" link_type="simple" hotspot_y="5">
     <uuid uuid="{5075e5fb-c219-4643-89b8-8096d090ff3d}"/>
     <names>
         <name lang="en">Insertion bridge (double width)</name>
@@ -6,8 +6,6 @@
         <name lang="de">Einlegebrücke (doppelte Breite)</name>
         <name lang="fr">Barette de pontage (largeur double)</name>
         <name lang="it">Barra di connessione (larghezza doppia)</name>
-        <name lang="cs">Propojka svorkovnic (dvojitá šířka)</name>
-        <name lang="hu">Sorkapocs áthidalás dupla széles</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" width="510" link_type="simple" type="element">
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="510" link_type="simple" type="element">
     <uuid uuid="{c17e98a3-738f-4c7a-ac89-91bb4c08fb45}"/>
     <names>
         <name lang="fr">Connecteur 25 fiches</name>
@@ -6,8 +6,6 @@
         <name lang="es">Conector de 25 pins</name>
         <name lang="de">Stecker 25-polig</name>
         <name lang="it">Connettore 25 poli</name>
-        <name lang="cs">Konektor 25 pinů</name>
-        <name lang="hu">25 tűs áthidalás</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="80" hotspot_y="67" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
+<definition height="80" hotspot_y="67" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
     <uuid uuid="{116e1210-b7f9-4737-a94f-1034ecb45cc4}"/>
     <names>
         <name lang="fr">Appareil (connexion en bas)</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on bottom)</name>
         <name lang="es">Dispositivo (conexión por debajo)</name>
         <name lang="it">Dispositivo (connessione in basso)</name>
-        <name lang="cs">Zařízení (připojení zdola)</name>
-        <name lang="hu">Eszköz (alsó csatlakozás)</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="80" hotspot_y="13" hotspot_x="15" version="0.5" width="30" link_type="simple" type="element">
+<definition height="80" hotspot_y="13" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
     <uuid uuid="{e396fc1b-28d7-4978-879a-9b666a2648d3}"/>
     <names>
         <name lang="fr">Appareil (connexion en bas)</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on top)</name>
         <name lang="es">Dispositivo (conexión por encima)</name>
         <name lang="it">Dispositivo (connessione in alto)</name>
-        <name lang="cs">Zařízení (připojení shora)</name>
-        <name lang="hu">Eszköz (felső csatlakozás)</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="67">
+<definition orientation="dyyy" version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="67">
     <uuid uuid="{bf7c6c86-5f96-4644-9f0f-004abccc79ad}"/>
     <names>
         <name lang="fr">Appareil (connexion en bas) - début</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on bottom) - beginning</name>
         <name lang="es">Dispositivo (conexión por debajo)- iniciando</name>
         <name lang="it">Dispositivo (connessione in basso) iniziale</name>
-        <name lang="cs">Zařízení (připojení zdola) – začátek</name>
-        <name lang="hu">Eszköz (alsó csatlakozás) kezdő tag</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="67">
+<definition orientation="dyyy" version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="67">
     <uuid uuid="{57a6e367-5c77-4d2b-bb60-0ca0651bdd31}"/>
     <names>
         <name lang="fr">Appareil (connexion en bas) - milieu</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on bottom) - middle</name>
         <name lang="es">Dispositivo (conexión por debajo) en medio</name>
         <name lang="it">Dispositivo (connessione in basso) centrale</name>
-        <name lang="cs">Zařízení (připojení zdola) – střed</name>
-        <name lang="hu">Eszköz (alsó csatlakozás) közbülső tag</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="67">
+<definition orientation="dyyy" version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="67">
     <uuid uuid="{d5016921-dc3b-4078-b45d-1cfe04796e14}"/>
     <names>
         <name lang="fr">Appareil (connexion en bas) - fin</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on bottom) - end</name>
         <name lang="es">Dispositivo (conexión por debajo) final</name>
         <name lang="it">Dispositivo (connessione in basso) finale</name>
-        <name lang="cs">Zařízení (připojení zdola) – konec</name>
-        <name lang="hu">Eszköz (alsó csatlakozás) záró tag</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
+<definition orientation="dyyy" version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
     <uuid uuid="{dfdbecfd-e99b-4f8f-ae0d-038e657bae8d}"/>
     <names>
         <name lang="fr">Appareil (connexion en haut)</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on top)</name>
         <name lang="es">Dispositivo (conexión por encima)</name>
         <name lang="it">Dispositivo (connessione in alto)</name>
-        <name lang="cs">Zařízení (připojení shora)</name>
-        <name lang="hu">Eszköz (felső csatlakozás)</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
+<definition orientation="dyyy" version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
     <uuid uuid="{6a07de91-ed73-49b3-b01b-0b49a450697a}"/>
     <names>
         <name lang="fr">Appareil (connexion en haut) - début</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on top) - beginning</name>
         <name lang="es">Dispositivo (conexión por encima) iniciando</name>
         <name lang="it">Dispositivo (connessione in alto) iniziale</name>
-        <name lang="cs">Zařízení (připojení shora) – začátek</name>
-        <name lang="hu">Eszköz (felső csatlakozás) kezdő tag</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
+<definition orientation="dyyy" version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
     <uuid uuid="{b153ee35-af29-4798-9252-577a6ed2737a}"/>
     <names>
         <name lang="fr">Appareil (connexion en haut) - milieu</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on top) - middle</name>
         <name lang="es">Dispositivo (conexión por encima) en medio</name>
         <name lang="it">Dispositivo (connessione in alto) medio</name>
-        <name lang="cs">Zařízení (připojení shora) – střed</name>
-        <name lang="hu">Eszköz (felső csatlakozás) közbülső tag</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
+<definition orientation="dyyy" version="0.51" width="30" height="80" type="element" hotspot_x="15" link_type="simple" hotspot_y="13">
     <uuid uuid="{4aea9d8c-0dc6-4be7-b988-7ee87ae439fc}"/>
     <names>
         <name lang="fr">Appareil (connexion en haut) - fin</name>
@@ -6,8 +6,6 @@
         <name lang="en">Device (connection on top) - end</name>
         <name lang="es">Dispositivo (conexión por encima) final</name>
         <name lang="it">Dispositivo (connessione in alto) finale</name>
-        <name lang="cs">Zařízení (připojení shora) – konec</name>
-        <name lang="hu">Eszköz (felső csatlakozás) záró tag</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="70" hotspot_y="34" hotspot_x="4" version="0.5" width="10" link_type="simple" type="element">
+<definition height="70" hotspot_y="34" hotspot_x="4" version="0.5" orientation="dyyy" width="10" link_type="simple" type="element">
     <uuid uuid="{2ac227dc-33a0-49f5-b8a0-b834d9386b60}"/>
     <names>
         <name lang="de">Kabel Bezeichnungsschild</name>
@@ -6,8 +6,6 @@
         <name lang="en">Cable tag</name>
         <name lang="es">Etiqueta de cable</name>
         <name lang="it">Etichetta del cavo</name>
-        <name lang="cs">Kabelový štítek</name>
-        <name lang="hu">Kábel címke</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="20" hotspot_y="12" hotspot_x="4" version="0.5" width="30" link_type="simple" type="element">
+<definition height="20" hotspot_y="12" hotspot_x="4" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
     <uuid uuid="{ce9e32d1-edd6-4bf2-a6f4-a519b878d80d}"/>
     <names>
         <name lang="de">Kabel Ader nach oben</name>
@@ -6,8 +6,6 @@
         <name lang="es">alambre del cable hacia arriba</name>
         <name lang="fr">Cable brin vers le haut</name>
         <name lang="it">Conduttore del cavo verso l'alto</name>
-        <name lang="cs">Kabelové připojení nahoru</name>
-        <name lang="hu">Kábelér felfelé</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition height="20" hotspot_y="6" hotspot_x="4" version="0.5" width="30" link_type="simple" type="element">
+<definition height="20" hotspot_y="6" hotspot_x="4" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
     <uuid uuid="{2935f975-67f8-4e41-ad18-7fbb24e67465}"/>
     <names>
         <name lang="de">Kabel Ader nach unten</name>
@@ -6,8 +6,6 @@
         <name lang="es">Alambre del cable hacia abajo</name>
         <name lang="fr">Cable brin vers le bas</name>
         <name lang="it">Conduttore del cavo verso il basso</name>
-        <name lang="cs">Kabeové připojení dolů</name>
-        <name lang="hu">Kábelér lefelé</name>
     </names>
     <informations/>
     <description>

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

@@ -1,4 +1,4 @@
-<definition version="0.51" width="130" height="20" type="element" hotspot_x="15" link_type="simple" hotspot_y="12">
+<definition orientation="dyyy" version="0.51" width="130" height="20" type="element" hotspot_x="15" link_type="simple" hotspot_y="12">
     <uuid uuid="{079ef7df-a292-4e16-a6a2-dd813f7f1e41}"/>
     <names>
         <name lang="de">Verdrahtungsdefinition</name>
@@ -6,8 +6,6 @@
         <name lang="es">Definición del alambre</name>
         <name lang="fr">Définition de filerie</name>
         <name lang="it">Definizione del conduttore</name>
-        <name lang="cs">Typ kabelu</name>
-        <name lang="hu">Vezeték meghatározás</name>
     </names>
     <informations>EN 60617: 06-14-03</informations>
     <description>