Merge branch 'master' into qt6_cmake_joshua

# Conflicts:
#	CMakeLists.txt

.github/workflows/windows-msi.yml

@@ -289,7 +289,12 @@ jobs:
           retention-days: 1
           if-no-files-found: error
 
+      # Qt6 stays on the unsigned/experimental track (no signing request for
+      # this flavor), and forks never have the SignPath secrets, so guard on
+      # both: only qt5, and only in the upstream repo.
+      # (cf. DieterMayerOSS:fix/msi-signing-fork-guard, d3f60c88)
       - name: Sign MSI via SignPath
+        if: matrix.flavor == 'qt5' && github.repository == 'qelectrotech/qelectrotech-source-mirror'
         uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: ${{ secrets.SIGNPATH_API_TOKEN }}

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "pugixml"]
-	path = pugixml
-	url = https://github.com/zeux/pugixml.git
-[submodule "SingleApplication"]
-	path = SingleApplication
-	url = https://github.com/itay-grudev/SingleApplication.git
 [submodule "elements"]
 	path = elements
 	url = https://github.com/qelectrotech/qelectrotech-elements.git

CMakeLists.txt

@@ -14,19 +14,24 @@
 # 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.5...4.2)
 
 project(qelectrotech
         VERSION 0.100.1
         DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
         HOMEPAGE_URL "https://qelectrotech.org/"
-        LANGUAGES CXX)
+        LANGUAGES C CXX)
 
 include(cmake/copyright_message.cmake)
 
 set(QET_DIR ${PROJECT_SOURCE_DIR})
+include(cmake/qet_compilation_vars.cmake)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
+qt_standard_project_setup()
 
 # QT_VERSION_MAJOR is chosen explicitly by whoever configures the build,
 # via -DQT_VERSION_MAJOR=5 or -DQT_VERSION_MAJOR=6.
@@ -36,7 +41,7 @@ set(QET_DIR ${PROJECT_SOURCE_DIR})
 # includes below, so every subdirectory and every FetchContent dependency
 # sees a consistent, already-defined value.
 if(NOT DEFINED QT_VERSION_MAJOR)
-    set(QT_VERSION_MAJOR 5)
+    set(QT_VERSION_MAJOR 6)
 endif()
 
 # Some third-party CMake projects we pull in via FetchContent (e.g.
@@ -49,10 +54,10 @@ endif()
 set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (5 or 6)" FORCE)
 
 # Add sub directories
-option(PACKAGE_TESTS "Build the tests" ON)
+option(PACKAGE_TESTS "Build the tests" NO)
 if(PACKAGE_TESTS)
-    message("Add sub directory tests")
-    add_subdirectory(tests)
+  message("Add sub directory tests")
+  add_subdirectory(tests)
 endif()
 
 include(cmake/paths_compilation_installation.cmake)
@@ -63,10 +68,9 @@ 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)
@@ -82,7 +86,7 @@ find_package(
 # when the GuiPrivate component is explicitly requested. Qt5 has no such
 # component package and creates the target implicitly with Gui, so only
 # request it on Qt6 - requesting it on Qt5 fails the whole configure.
-if(QT_VERSION_MAJOR GREATER_EQUAL 6)
+if(QT_VERSION_MAJOR GREATER_EQUAL 5)
     find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS GuiPrivate)
 endif()
 
@@ -107,11 +111,11 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
 # lupdate rewriting a .ts while lrelease read the same file made the build
 # fail with "Premature end of document".
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
-if(QT_VERSION_MAJOR EQUAL 6)
-    qt6_add_translation(QM_FILES ${TS_FILES})
-else()
-    qt5_add_translation(QM_FILES ${TS_FILES})
-endif()
+#if(QT_VERSION_MAJOR EQUAL 6)
+#    qt6_add_translation(QM_FILES ${TS_FILES})
+#else()
+#    qt5_add_translation(QM_FILES ${TS_FILES})
+#endif()
 
 add_custom_target(update_translations
     COMMAND $<TARGET_FILE:Qt${QT_VERSION_MAJOR}::lupdate> ${CMAKE_SOURCE_DIR}/sources -ts ${TS_FILES}
@@ -120,89 +124,74 @@ add_custom_target(update_translations
     VERBATIM
 )
 
-# als laatse
 include(cmake/define_definitions.cmake)
 
-# On Windows, WIN32 sets /SUBSYSTEM:WINDOWS to suppress the console window.
-# Qt automatically links qtmain.lib which provides the WinMain entry point,
-# so no source code change is needed.
-if(WIN32)
-    add_executable(
-        ${PROJECT_NAME}
-        WIN32
-        ${QET_RES_FILES}
-        ${QET_SRC_FILES}
-        ${QM_FILES}
-        ${QET_DIR}/qelectrotech.qrc
-    )
+qt_add_executable(
+  ${PROJECT_NAME}
+  ${QET_RES_FILES}
+  ${QET_SRC_FILES}
+  ${QM_FILES}
+  ${QET_DIR}/qelectrotech.qrc
+  )
+
+if(QMFILES_AS_RESOURCE)
+  qt_add_translations(${PROJECT_NAME} TS_FILES ${TS_FILES} RESOURCE_PREFIX "/lang")
 else()
-    add_executable(
-        ${PROJECT_NAME}
-        ${QET_RES_FILES}
-        ${QET_SRC_FILES}
-        ${QM_FILES}
-        ${QET_DIR}/qelectrotech.qrc
-    )
+  qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+  set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
+  qt_add_translation(QM_FILES ${TS_FILES})
 endif()
 
+find_package(SQLite3 REQUIRED)
+
 target_link_libraries(
-    ${PROJECT_NAME}
-    PUBLIC
-    PRIVATE
-    pugixml::pugixml
-    SingleApplication::SingleApplication
-    SQLite3::SQLite3
-    ${KF5_PRIVATE_LIBRARIES}
-    ${QET_PRIVATE_LIBRARIES}
-)
+  ${PROJECT_NAME}
+  PUBLIC
+  PRIVATE
+  pugixml::pugixml
+  SingleApplication::SingleApplication
+  SQLite::SQLite3
+  ${KF6_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}/pugixml/src
-    ${QET_DIR}/sources/dataBase
-    ${QET_DIR}/sources/dataBase/ui
-    ${QET_DIR}/sources/factory/ui
-    ${QET_DIR}/sources/print
-    ${QET_DIR}/sources/svg
-)
-
-if(NOT BUILD_WITH_KF5)
-    target_include_directories(
-        ${PROJECT_NAME}
-        PRIVATE
-        ${QET_DIR}/sources/ui/nokde
-    )
-endif()
+  ${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/dataBase
+  ${QET_DIR}/sources/dataBase/ui
+  ${QET_DIR}/sources/factory/ui
+  ${QET_DIR}/sources/print
+  ${QET_DIR}/sources/svg
+  )
 
 install(TARGETS ${PROJECT_NAME})
-
 if (NOT MINGW)
     install(DIRECTORY ico/breeze-icons/16x16   DESTINATION ${QET_ICONS_PATH})
     install(DIRECTORY ico/breeze-icons/22x22   DESTINATION ${QET_ICONS_PATH})

README.md

@@ -59,6 +59,9 @@ Here are the technical choices made for the software development:
 
 If you wish to be informed of the latest developments, browse the [archive](https://listengine.tuxfamily.org/lists.tuxfamily.org/qet/) of the project mailing list where all commits (changes) are registered. This archive is publicly available, you don't need any account to access it.
 
+### Build QElectroTech under Windows
+To build QElectroTech under microsoft Windows, please follow [these instructions (french)](md/fr/fr_window_build_summary.md)
+
 
 # Features
 

build-aux/windows/QElectroTech.wxs

@@ -97,8 +97,13 @@
         <RegistryValue Root="HKCR" Key="QElectroTech.Document" Type="string" Value="QElectroTech Project" />
         <RegistryValue Root="HKCR" Key="QElectroTech.Document\DefaultIcon" Type="string"
                        Value="[INSTALLDIR]ico\qelectrotech.ico" />
+        <!-- Pass the same arguments as the shortcuts above: opening a .qet from
+             Explorer sets the working directory to the document's folder, so a
+             bare command line leaves QET unable to locate its data. Without the
+             lang-dir argument the UI falls back to the source language, which
+             is French. See issue #554. -->
         <RegistryValue Root="HKCR" Key="QElectroTech.Document\shell\open\command" Type="string"
-                       Value="&quot;[INSTALLDIR]bin\qelectrotech.exe&quot; &quot;%1&quot;" />
+                       Value="&quot;[INSTALLDIR]bin\qelectrotech.exe&quot; --common-elements-dir=&quot;[INSTALLDIR]elements/&quot; --common-tbt-dir=&quot;[INSTALLDIR]titleblocks/&quot; --lang-dir=&quot;[INSTALLDIR]lang/&quot; $(var.QtPlatformArgs) &quot;%1&quot;" />
       </Component>
     </ComponentGroup>
 

cmake/define_definitions.cmake

@@ -62,10 +62,15 @@ 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)
+if(BUILD_WITH_KF6 AND BUILD_KF6)
+  message("KF6_GIT_TAG               :" ${KF6_GIT_TAG})
+endif()
+if(NOT BUILD_WITH_KF6)
+  add_definitions(-DBUILD_WITHOUT_KF6)
 endif()
 message("QET_COMPONENTS            :" ${QET_COMPONENTS})
-message("QT_VERSION_MAJOR          :" ${QT_VERSION_MAJOR})
+message("Qt version                :" ${Qt6_VERSION})
+
+if(QMFILES_AS_RESOURCE)
+  add_definitions(-DQMFILES_AS_RESOURCE)
+endif()

cmake/developer_options.cmake

@@ -31,5 +31,8 @@ add_definitions(-DQT_MESSAGELOGCONTEXT)
 # In order to do so, uncomment the following line.
 #add_definitions(-DTODO_LIST)
 
-# Build with KF5
-option(BUILD_WITH_KF5 "Build with KF5" ON)
+# Build with KF6
+option(BUILD_WITH_KF6 "Build with KF6" ON)
+
+# Use translations as a Qt resource
+option(QMFILES_AS_RESOURCE "Use .qm files as Qt resource" ON)

cmake/fetch_kdeaddons.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006 The QElectroTech Team
+# Copyright 2006-2026 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -14,54 +14,42 @@
 # 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")
+option(BUILD_KF6 "Build KF6 libraries, use system ones otherwise" OFF)
+if(BUILD_KF6)
+  block(PROPAGATE KF6_GIT_TAG)
+    message(STATUS " - fetch_kdeaddons")
+    set(KDE_SKIP_TEST_SETTINGS ON)
+    set(KCOREADDONS_USE_QML OFF)
+    set(KWIDGETSADDONS_USE_QML OFF)
+    set(BUILD_TESTING OFF)
+    set(BUILD_DESIGNERPLUGIN OFF)
+    set(BUILD_QCH OFF)
+    set(BUILD_SHARED_LIBS OFF)
 
-if(BUILD_WITH_KF5)
-  Include(FetchContent)
+    Include(FetchContent)
 
-  option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES)
-
-  if(BUILD_KF5)
-
-    if(NOT DEFINED KF5_GIT_TAG)
-      #https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
-      set(KF5_GIT_TAG v5.77.0)
+    if(NOT DEFINED KF6_GIT_TAG)
+      set(KF6_GIT_TAG v6.22.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})
+      GIT_TAG        ${KF6_GIT_TAG})
     FetchContent_MakeAvailable(kcoreaddons)
 
     FetchContent_Declare(
       kwidgetsaddons
       GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
-      GIT_TAG        ${KF5_GIT_TAG})
+      GIT_TAG        ${KF6_GIT_TAG})
     FetchContent_MakeAvailable(kwidgetsaddons)
-  else()
-    find_package(KF5CoreAddons REQUIRED)
-    find_package(KF5WidgetsAddons REQUIRED)
-  endif()
-
-  set(KF5_PRIVATE_LIBRARIES
-    KF5::WidgetsAddons
-    KF5::CoreAddons
-    )
+  endblock()
+else()
+  find_package(KF6CoreAddons REQUIRED)
+  find_package(KF6WidgetsAddons REQUIRED)
 endif()
+
+set(KF6_PRIVATE_LIBRARIES
+  KF6::CoreAddons
+  KF6::WidgetsAddons
+)

cmake/fetch_pugixml.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006 The QElectroTech Team
+# Copyright 2006-2026 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -14,14 +14,10 @@
 # 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)
-
-option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
-
+option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" OFF)
 if(BUILD_PUGIXML)
-
+  Include(FetchContent)
+  message(" - fetch pugixml")
   FetchContent_Declare(
     pugixml
     GIT_REPOSITORY https://github.com/zeux/pugixml.git

cmake/fetch_singleapplication.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006 The QElectroTech Team
+# Copyright 2006-2026 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -16,9 +16,6 @@
 
 message(" - fetch_singleapplication")
 
-# https://github.com/itay-grudev/SingleApplication/issues/18
-#qmake
-#DEFINES += QAPPLICATION_CLASS=QGuiApplication
 set(QAPPLICATION_CLASS QApplication)
 
 Include(FetchContent)
@@ -26,6 +23,6 @@ Include(FetchContent)
 FetchContent_Declare(
   SingleApplication
   GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
-  GIT_TAG        v3.2.0)
+  GIT_TAG        v3.5.4)
 
 FetchContent_MakeAvailable(SingleApplication)

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

@@ -58,7 +58,10 @@ if(WIN32)
   set(QET_BINARY_PATH             "./")
   set(QET_COMMON_COLLECTION_PATH  "elements/")
   set(QET_COMMON_TBT_PATH         "titleblocks/")
-  set(QET_LANG_PATH               "l10n/")
+  # "lang/" and not "l10n/": that is where every Windows packaging actually
+  # puts the .qm files (see build-aux/windows/QElectroTech.wxs and the
+  # windows-build workflow), and what the shortcuts pass as --lang-dir.
+  set(QET_LANG_PATH               "lang/")
   set(QET_LICENSE_PATH            "./")
   # Liste des ressources Windows
 #RC_FILE = qelectrotech.rc

cmake/qet_compilation_vars.cmake

@@ -24,6 +24,8 @@ message(" - qet_compilation_vars")
 # QT_VERSION_MAJOR, after the main find_package.
 # (Needed for QPdfEngine::drawHyperlink, the PDF internal links.)
 set(QET_COMPONENTS
+  Core
+  Gui
   LinguistTools
   PrintSupport
   Xml
@@ -118,10 +120,44 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/cli_export.h
   ${QET_DIR}/sources/pdf_links.cpp
   ${QET_DIR}/sources/pdf_links.h
+  ${QET_DIR}/sources/import/edz/edzarchive.cpp
+  ${QET_DIR}/sources/import/edz/edzarchive.h
+  ${QET_DIR}/sources/import/edz/edzpart.cpp
+  ${QET_DIR}/sources/import/edz/edzpart.h
+  ${QET_DIR}/sources/import/edz/edzelementbuilder.cpp
+  ${QET_DIR}/sources/import/edz/edzelementbuilder.h
+  ${QET_DIR}/sources/import/edz/edzimporter.cpp
+  ${QET_DIR}/sources/import/edz/edzimporter.h
+  ${QET_DIR}/sources/import/edz/edzsevenzip.cpp
+  ${QET_DIR}/sources/import/edz/edzsevenzip.h
+  ${QET_DIR}/sources/import/edz/lzma/7zAlloc.c
+  ${QET_DIR}/sources/import/edz/lzma/7zArcIn.c
+  ${QET_DIR}/sources/import/edz/lzma/7zBuf.c
+  ${QET_DIR}/sources/import/edz/lzma/7zCrc.c
+  ${QET_DIR}/sources/import/edz/lzma/7zCrcOpt.c
+  ${QET_DIR}/sources/import/edz/lzma/7zDec.c
+  ${QET_DIR}/sources/import/edz/lzma/7zFile.c
+  ${QET_DIR}/sources/import/edz/lzma/7zStream.c
+  ${QET_DIR}/sources/import/edz/lzma/Bcj2.c
+  ${QET_DIR}/sources/import/edz/lzma/Bra.c
+  ${QET_DIR}/sources/import/edz/lzma/Bra86.c
+  ${QET_DIR}/sources/import/edz/lzma/BraIA64.c
+  ${QET_DIR}/sources/import/edz/lzma/CpuArch.c
+  ${QET_DIR}/sources/import/edz/lzma/Delta.c
+  ${QET_DIR}/sources/import/edz/lzma/Lzma2Dec.c
+  ${QET_DIR}/sources/import/edz/lzma/LzmaDec.c
+  ${QET_DIR}/sources/import/edz/lzma/Ppmd7.c
+  ${QET_DIR}/sources/import/edz/lzma/Ppmd7Dec.c
   ${QET_DIR}/sources/borderproperties.cpp
   ${QET_DIR}/sources/borderproperties.h
   ${QET_DIR}/sources/bordertitleblock.cpp
   ${QET_DIR}/sources/bordertitleblock.h
+  # ${QET_DIR}/sources/colorbutton.cpp
+  # ${QET_DIR}/sources/colorbutton.h
+  # ${QET_DIR}/sources/colorcombobox.cpp
+  # ${QET_DIR}/sources/colorcombobox.h
+  # ${QET_DIR}/sources/colorcomboboxdelegate.cpp
+  # ${QET_DIR}/sources/colorcomboboxdelegate.h
   ${QET_DIR}/sources/conductorautonumerotation.cpp
   ${QET_DIR}/sources/conductorautonumerotation.h
   ${QET_DIR}/sources/conductornumexport.cpp
@@ -331,6 +367,8 @@ set(QET_SRC_FILES
   ${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/partplctable.cpp
+  ${QET_DIR}/sources/editor/graphicspart/partplctable.h
   ${QET_DIR}/sources/editor/graphicspart/partterminal.cpp
   ${QET_DIR}/sources/editor/graphicspart/partterminal.h
   ${QET_DIR}/sources/editor/graphicspart/parttext.cpp
@@ -410,6 +448,8 @@ set(QET_SRC_FILES
 
   ${QET_DIR}/sources/project/projectpropertieshandler.cpp
   ${QET_DIR}/sources/project/projectpropertieshandler.h
+  ${QET_DIR}/sources/project/projectusagetracker.cpp
+  ${QET_DIR}/sources/project/projectusagetracker.h
 
   ${QET_DIR}/sources/properties/elementdata.cpp
   ${QET_DIR}/sources/properties/elementdata.h
@@ -430,10 +470,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp
   ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h
 
-  ${QET_DIR}/pugixml/src/pugiconfig.hpp
-  ${QET_DIR}/pugixml/src/pugixml.cpp
-  ${QET_DIR}/pugixml/src/pugixml.hpp
-
   ${QET_DIR}/sources/qetgraphicsitem/conductor.cpp
   ${QET_DIR}/sources/qetgraphicsitem/conductor.h
   ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp
@@ -514,6 +550,9 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/svg/qetsvg.cpp
   ${QET_DIR}/sources/svg/qetsvg.h
 
+  ${QET_DIR}/sources/svg/qetsvg.cpp
+  ${QET_DIR}/sources/svg/qetsvg.h
+
   ${QET_DIR}/sources/titleblock/dimension.cpp
   ${QET_DIR}/sources/titleblock/dimension.h
   ${QET_DIR}/sources/titleblock/dimensionwidget.cpp
@@ -673,6 +712,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/ui/marginseditdialog.h
   ${QET_DIR}/sources/ui/masterpropertieswidget.cpp
   ${QET_DIR}/sources/ui/masterpropertieswidget.h
+  ${QET_DIR}/sources/ui/plclinkwidget.cpp
+  ${QET_DIR}/sources/ui/plclinkwidget.h
   ${QET_DIR}/sources/ui/multipastedialog.cpp
   ${QET_DIR}/sources/ui/multipastedialog.h
   ${QET_DIR}/sources/ui/potentialselectordialog.cpp
@@ -737,17 +778,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.h
   )
 
-if(NOT BUILD_WITH_KF5)
-  list(APPEND QET_SRC_FILES
-    ${QET_DIR}/sources/ui/nokde/kautosavefile.cpp
-    ${QET_DIR}/sources/ui/nokde/kautosavefile.h
-    ${QET_DIR}/sources/ui/nokde/kcolorbutton.cpp
-    ${QET_DIR}/sources/ui/nokde/kcolorbutton.h
-    ${QET_DIR}/sources/ui/nokde/kcolorcombo.cpp
-    ${QET_DIR}/sources/ui/nokde/kcolorcombo.h
-  )
-endif()
-
 set(TS_FILES
   ${QET_DIR}/lang/qet_ar.ts
   ${QET_DIR}/lang/qet_ca.ts
@@ -766,19 +796,17 @@ set(TS_FILES
   ${QET_DIR}/lang/qet_mn.ts
   ${QET_DIR}/lang/qet_nb.ts
   ${QET_DIR}/lang/qet_nl.ts
-  ${QET_DIR}/lang/qet_nl_BE.ts  
+  ${QET_DIR}/lang/qet_nl_BE.ts
   ${QET_DIR}/lang/qet_no.ts
   ${QET_DIR}/lang/qet_pl.ts
   ${QET_DIR}/lang/qet_pt.ts
   ${QET_DIR}/lang/qet_pt_BR.ts
   ${QET_DIR}/lang/qet_ro.ts
-  ${QET_DIR}/lang/qet_rs.ts  
   ${QET_DIR}/lang/qet_ru.ts
   ${QET_DIR}/lang/qet_sk.ts
   ${QET_DIR}/lang/qet_sl.ts
   ${QET_DIR}/lang/qet_sr.ts
   ${QET_DIR}/lang/qet_sv.ts
   ${QET_DIR}/lang/qet_tr.ts
-  ${QET_DIR}/lang/qet_uk.ts
   ${QET_DIR}/lang/qet_zh.ts
   )

md/fr/fr_window_build_msys2.md

@@ -0,0 +1,101 @@
+Compiler QElectroTech sous microsoft Windows 10 et 11 avec MSYS2
+================================
+Ce document décrit les étapes nécessaire afin de compilé QElectroTech sous Windows avec Qt6 et cmake en utilisant MSYS2.
+
+# MSYS2
+L'ensemble des outils nécessaire au développement et à la compilation de QElectroTech sous Windows sera installé par l’intermédiaire de [MSYS2](https://www.msys2.org/). Cela comprend entre autre le framework [Qt6](https://www.qt.io/development/qt-framework/qt6), les outils cmake, les dépendances ([kde framework](https://develop.kde.org/docs/), [sqlite](https://sqlite.org/), [pugixml](https://pugixml.org/)), les outils de compilation [minGW](https://www.mingw-w64.org/)...
+
+>Il sera nécessaire d'utiliser [winget](https://learn.microsoft.com/fr-fr/windows/package-manager/winget/), celui-ci est présent par défaut sous Windows 11, dans le cas de Windows 10, winget peut necessité d'être activé manuellement
+
+# Installer GIT et MSYS2 avec winget
+Avec power shell.
+```
+winget install Git.Git
+```
+puis
+```
+winget install MSYS2.MSYS2
+```
+
+
+
+## Mise à jour de MSYS2
+Lors de la première utilisation de MSYS2 il est nécessaire de mettre celui-ci à jour.
+
+Lancer "MSYS2 MSYS" depuis le menu démarré de Windows.
+Une fenêtre avec un shell s'ouvre, dans celui-ci lancer la commande :
+```
+pacman -Syu
+```
+A la fin de la mise à jour MSYS2 MSYS se fermera automatiquement. Ouvrez le à nouveau et relancé la commande
+```
+pacman -Syu
+```
+
+## Installation des outils de devellopement
+Toujours dans le shell MSYS2 MSYS lancer la commande suivante.
+```
+pacman -S mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-qt6-svg mingw-w64-ucrt-x86_64-qt6-base mingw-w64-ucrt-x86_64-sqlite3 mingw-w64-ucrt-x86_64-pugixml mingw-w64-ucrt-x86_64-kcoreaddons mingw-w64-ucrt-x86_64-kwidgetsaddons mingw-w64-ucrt-x86_64-extra-cmake-modules mingw-w64-ucrt-x86_64-gdb mingw-w64-ucrt-x86_64-qt6-translations mingw-w64-ucrt-x86_64-qt6-tools
+```
+> La quantité de paquets à installer est conséquent, en fonction de votre connexion internet cela peut prendre plusieurs dizaine de minute
+
+L'ensemble des outils est mantenant installé 😀
+
+# Installer Qt creator
+Télécharger [l'installateur online de Qt](https://www.qt.io/development/download-qt-installer-oss) et lancer l'installation en suivant les indications de ce dernier.
+
+>Dans le cas où vous comptez utilisé Qt Creator uniquement pour développez QElectroTech, lors de l'installation choisissez l'option "installation personnalisée" puis dans la page suivante sélectionné uniquement Qt Creator.
+
+## Configurer Qt creator
+Ouvrir Qt creator puis rendez vous dans "édition -> préférence -> kit"
+
+### Versions de Qt
+
+- Cliquer sur _ajouter_
+- Renseigner _Chemin de qmake_ (exemple C:\\msys64\\ucrt64\\bin\\qmake.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/qt_version.png)
+
+### Compilateurs
+- Cliquer sur _ajouter_ puis choisir _MinGW_.
+- Renseigner _Emplacement du compilateur C_ (exemple C:\\msys64\\ucrt64\\bin\\g++.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/compiler.png)
+
+### Débogueurs
+- Cliquer sur _ajouter_
+- Renseigner  _Chemin :_ (exemple C:\\msys64\\ucrt64\\bin\\gdb.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/debugger.png)
+
+### cmake
+- Outils -> _Ajouter_
+- Renseigner  _Chemin :_ (exemple C:\\msys64\\ucrt64\\bin\\cmake.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/cmake.png)
+
+### KIT
+Maintenant que tous les prérequis sont fait nous allons crée un kit utilisant les outils fournis par MSYS2. Cliquer sur _Ajouter_, un nouveau kit _manuel_ apparaît, nommer celui-ci par exemple _Qt6 msys2_ puis renseigner le compilateur, le débogueur, la version de Qt et Outils CMake en choisissant à chaque fois ceux que nous venons de créer.
+puis cliquer sur _appliquer_.
+
+![](assets/windows_msys2_setup/kit.png)
+
+Bravo 🥳🥳 vous avez terminé l'installation de la totalité des outils de développement.
+
+# Clonez le dépôts de QElectrotech
+Clonez le dépôt de QElectroTech comme vous le faite habituellement, sinon utilisez les commandes suivante dans power shell.
+
+Crée et/ou se rendre dans le dossier dans lequel vous voulez clonez le dépôt (dans l'exemple nous allons crée un dossier QElectroTech dans C:)
+
+```
+mkdir C:\QElectroTech
+cd C:\QElectroTech
+
+git clone --recursive https://github.com/qelectrotech/qelectrotech-source-mirror.git
+```
+
+Une fois le dépôt cloné lancer Qt creator puis choisir d'ouvrir un projet existant, en choisissant le _CMakeLists.txt_ se trouvant à la racine du projet QElectroTech, enfin dans l'assistant de création de projet choisir comme kit le kit que nous avons créer précédemment.

md/fr/fr_window_build_summary.md

@@ -0,0 +1,13 @@
+Compiler QElectroTech sous microsoft Windows 10 et 11
+================================
+Compiler QElectroTech pour et/ou sous Windows peut être effectué avec plusieurs méthode différente.
+Ce document énumère uniquement les différentes méthode possible
+
+N'est mentionné que les étapes nécessaire afin de compilé QElectroTech sous Windows avec Qt6 et cmake. Ce document ne traite pas la compilation avec Qt5 et qmake.
+
+>QElectroTech 0.100 est la dernière version à utiliser Qt5. Les version suivante sont développé avec Qt6 et utilise cmake au lieu de qmake.
+
+Il existe deux méthodes pour cela :
+
+1. [Utiliser msys2 (méthode recommandé)](fr_window_build_msys2.md)
+2. Télécharger et compiler l'ensemble des dépendances (non rédigé)

qelectrotech.pro

@@ -171,7 +171,9 @@ HEADERS += $$files(sources/*.h) \
            $$files(sources/xml/*.h) \
            $$files(sources/dxf/*.h) \
            $$files(sources/qet_elementscaler/*.h) \
-           $$files(sources/svg/*.h)
+           $$files(sources/svg/*.h) \
+           $$files(sources/import/edz/*.h) \
+           $$files(sources/import/edz/lzma/*.h)
 
 SOURCES += $$files(sources/*.cpp) \
            $$files(sources/editor/*.cpp) \
@@ -215,11 +217,17 @@ SOURCES += $$files(sources/*.cpp) \
            $$files(sources/xml/*.cpp) \
            $$files(sources/dxf/*.cpp) \
            $$files(sources/qet_elementscaler/*.cpp) \
-           $$files(sources/svg/*.cpp)
+           $$files(sources/svg/*.cpp) \
+           $$files(sources/import/edz/*.cpp) \
+           $$files(sources/import/edz/lzma/*.c)
 
 # Needed for use promote QTreeWidget in terminalstripeditor.ui
 INCLUDEPATH += sources/TerminalStrip/ui
 
+# Needed for the EPLAN .edz importer (PR #513) and its bundled lzma/7z sources
+INCLUDEPATH += sources/import/edz
+INCLUDEPATH += sources/import/edz/lzma
+
 # Liste des fichiers qui seront incorpores au binaire en tant que ressources Qt
 RESOURCES += qelectrotech.qrc
 
@@ -230,7 +238,26 @@ RESOURCES += qelectrotech.qrc
 TRANSLATIONS += lang/*.ts
 
 # Modules Qt utilises par l'application
-QT += xml svg network sql widgets printsupport concurrent KWidgetsAddons KCoreAddons gui-private
+QT += xml svg network sql widgets printsupport concurrent gui-private
+
+# KDE Frameworks 5 (KWidgetsAddons, KCoreAddons) are optional.
+#
+# Pass CONFIG+=no_kf5 to qmake to build against the Qt-only replacements in
+# sources/ui/nokde instead. This mirrors the CMake option BUILD_WITH_KF5=OFF
+# and is the easiest route on Windows/MinGW, where KF5 is awkward to obtain.
+#
+#     qmake CONFIG+=no_kf5 qelectrotech.pro
+#
+# sources/ui/nokde is only added to the include path in that configuration, so
+# a normal KF5 build is unaffected.
+no_kf5 {
+    DEFINES     += BUILD_WITHOUT_KF5
+    INCLUDEPATH += sources/ui/nokde
+    HEADERS     += $$files(sources/ui/nokde/*.h)
+    SOURCES     += $$files(sources/ui/nokde/*.cpp)
+} else {
+    QT += KWidgetsAddons KCoreAddons
+}
 
 # Private Qt GUI headers (needed for QPdfEngine::drawHyperlink)
 # gui-private should add this automatically, but some distros need it explicit

sources/ElementsCollection/elementscollectionmodel.cpp

@@ -25,9 +25,8 @@
 #include "xmlelementcollection.h"
 #include "xmlprojectelementcollectionitem.h"
 
-
+#include <QFutureWatcher>
 #include <QtConcurrentMap>
-
 /**
 	@brief ElementsCollectionModel::ElementsCollectionModel
 	Constructor
@@ -290,9 +289,12 @@ void ElementsCollectionModel::loadCollections(bool common_collection,
 	connect(watcher, &QFutureWatcher<void>::progressRangeChanged,
 			this, &ElementsCollectionModel::loadingProgressRangeChanged);
 	connect(watcher, &QFutureWatcher<void>::finished,
-			this, &ElementsCollectionModel::loadingFinished);
-	connect(watcher, &QFutureWatcher<void>::finished, watcher, &QFutureWatcher<void>::deleteLater);
-
+		this, &ElementsCollectionModel::loadingFinished);
+	connect(
+		watcher,
+		&QFutureWatcher<void>::finished,
+		watcher,
+		&QFutureWatcher<void>::deleteLater);
 
 	m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData);
 	watcher->setFuture(m_future);

sources/ElementsCollection/elementscollectionwidget.cpp

@@ -19,6 +19,7 @@
 
 #include "../editor/ui/qetelementeditor.h"
 #include "../elementscategoryeditor.h"
+#include "../import/edz/edzimporter.h"
 #include "../newelementwizard.h"
 #include "../qetapp.h"
 #include "../qetdiagrameditor.h"
@@ -32,8 +33,14 @@
 #include "fileelementcollectionitem.h"
 #include "xmlprojectelementcollectionitem.h"
 
+#include <QCheckBox>
 #include <QDesktopServices>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QFileDialog>
+#include <QLabel>
 #include <QMenu>
+#include <QPushButton>
 #include <QTimer>
 #include <QUrl>
 #include <QVBoxLayout>
@@ -158,6 +165,8 @@ void ElementsCollectionWidget::setUpAction()
 					  tr("Nouveau dossier"), this);
 	m_new_element = new QAction(QET::Icons::ElementNew,
 					tr("Nouvel élément"), this);
+	m_import_edz = new QAction(QET::Icons::ElementNew,
+					tr("Importer une pièce EPLAN (.edz)…"), this);
 	m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis,
 					  tr("Afficher uniquement ce dossier"),
 					  this);
@@ -247,6 +256,8 @@ void ElementsCollectionWidget::setUpConnection()
 		this, &ElementsCollectionWidget::newDirectory);
 	connect(m_new_element, &QAction::triggered,
 		this, &ElementsCollectionWidget::newElement);
+	connect(m_import_edz, &QAction::triggered,
+		this, &ElementsCollectionWidget::importEdz);
 	connect(m_show_this_dir, &QAction::triggered,
 		this, &ElementsCollectionWidget::showThisDir);
 	connect(m_show_all_dir, &QAction::triggered,
@@ -329,6 +340,7 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
 			{
 				if (!feci->isMacrosCollection()) {
 					m_context_menu->addAction(m_new_element);
+					m_context_menu->addAction(m_import_edz);
 				}
 				m_context_menu->addAction(m_new_directory);
 				if (!feci->isCollectionRoot())
@@ -599,6 +611,108 @@ void ElementsCollectionWidget::newElement()
 			&ElementsCollectionWidget::locationWasSaved);
 }
 
+/**
+	@brief ElementsCollectionWidget::confirmEdzImportTerms
+	Show the EPLAN (.edz) import warning dialog. The user must tick the
+	acknowledgement checkbox before the Import button is enabled.
+	@return true if the user accepted the terms, false otherwise.
+*/
+bool ElementsCollectionWidget::confirmEdzImportTerms()
+{
+	QDialog dialog(this);
+	dialog.setWindowTitle(tr("Avertissement — Importation d'un fichier EPLAN (.edz)"));
+
+	QLabel *text = new QLabel(
+		tr("Le format .edz peut provenir de deux sources différentes :\n"
+		   "\n"
+		   "• Le portail EPLAN Data Portal (dataportal.eplan.com), soumis "
+		   "aux conditions d'utilisation de l'environnement EPLAN Cloud ;\n"
+		   "• Le site d'un fabricant de composants (ou d'un distributeur) "
+		   "qui met ses fichiers .edz à disposition directement, selon ses "
+		   "propres conditions.\n"
+		   "\n"
+		   "QElectroTech ne peut pas déterminer automatiquement l'origine "
+		   "du fichier que vous importez, ni les conditions qui s'y "
+		   "appliquent.\n"
+		   "\n"
+		   "En important ce fichier, vous confirmez que :\n"
+		   "\n"
+		   "• vous connaissez son origine et êtes autorisé à l'utiliser "
+		   "dans ce contexte, au regard des conditions applicables à cette "
+		   "source ;\n"
+		   "• cette importation est effectuée à vos propres risques et "
+		   "responsabilité ;\n"
+		   "• ni QElectroTech, ni ses mainteneurs, ni ses contributeurs ne "
+		   "peuvent être tenus responsables d'une utilisation non conforme "
+		   "de ces données."),
+		&dialog);
+	text->setWordWrap(true);
+
+	QCheckBox *accept_box = new QCheckBox(
+		tr("J'ai lu et j'accepte ces conditions."), &dialog);
+
+	QDialogButtonBox *buttons = new QDialogButtonBox(
+		QDialogButtonBox::Cancel, &dialog);
+	QPushButton *import_button = buttons->addButton(
+		tr("Importer"), QDialogButtonBox::AcceptRole);
+	import_button->setDefault(true);
+	import_button->setEnabled(false);
+
+	connect(accept_box, &QCheckBox::toggled,
+		import_button, &QPushButton::setEnabled);
+	connect(buttons, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
+	connect(buttons, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
+
+	QVBoxLayout *layout = new QVBoxLayout(&dialog);
+	layout->addWidget(text);
+	layout->addWidget(accept_box);
+	layout->addWidget(buttons);
+
+	return dialog.exec() == QDialog::Accepted;
+}
+
+/**
+	@brief ElementsCollectionWidget::importEdz
+	Import an EPLAN Data Portal part (.edz) as a QET element into the directory
+	pointed at by the context menu.
+*/
+void ElementsCollectionWidget::importEdz()
+{
+	ElementCollectionItem *eci = elementCollectionItemForIndex(
+				m_index_at_context_menu);
+
+	if (!eci || eci->type() != FileElementCollectionItem::Type) {
+		return;
+	}
+	FileElementCollectionItem *feci =
+			static_cast<FileElementCollectionItem*>(eci);
+	if (feci->isCommonCollection() || !feci->isDir()) {
+		return;
+	}
+
+	if (!confirmEdzImportTerms()) {
+		return;
+	}
+
+	const QString edz_path = QFileDialog::getOpenFileName(
+		this, tr("Importer une pièce EPLAN"), QString(),
+		tr("Pièces EPLAN (*.edz)"));
+	if (edz_path.isEmpty()) {
+		return;
+	}
+
+	EdzImporter importer;
+	if (!importer.importToDirectory(edz_path, feci->fileSystemPath())) {
+		QET::QetMessageBox::critical(
+			this, tr("Import EPLAN"),
+			tr("Impossible d'importer cette pièce :\n%1")
+				.arg(importer.errorString()));
+		return;
+	}
+
+	reload();
+}
+
 /**
 	@brief ElementsCollectionWidget::showThisDir
 	Hide all directories except the pointed dir;
@@ -835,14 +949,8 @@ void ElementsCollectionWidget::search()
 	}
 
 	hideCollection(true);
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	const QStringList text_list = text.split("+", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
+
 	const QStringList text_list = text.split("+", Qt::SkipEmptyParts);
-#endif
 	QModelIndexList match_index;
 	for (QString txt : text_list) {
 		match_index << m_model->match(m_showed_index.isValid()

sources/ElementsCollection/elementscollectionwidget.h

@@ -72,6 +72,8 @@ class ElementsCollectionWidget : public QWidget
 		void editDirectory();
 		void newDirectory();
 		void newElement();
+		bool confirmEdzImportTerms();
+		void importEdz();
 		void showThisDir();
 		void resetShowThisDir();
 		void dirProperties();
@@ -112,6 +114,7 @@ class ElementsCollectionWidget : public QWidget
 				*m_edit_dir,
 				*m_new_directory,
 				*m_new_element,
+				*m_import_edz,
 				*m_show_this_dir,
 				*m_show_all_dir,
 				*m_dir_propertie;

sources/ElementsCollection/elementslocation.cpp

@@ -806,13 +806,13 @@ bool ElementsLocation::setXml(const QDomDocument &xml_document) const
 			QRegularExpression rx("^(.*)/(.*\\.elmt)$");
 			QRegularExpressionMatch match = rx.match(path_);
 
-			if (match.hasMatch())
+			if (auto regex_match = rx.match(path_); regex_match.hasMatch())
 			{
 				return project()
 					->embeddedElementCollection()
 					->addElementDefinition(
-						match.captured(1),
-						match.captured(2),
+						regex_match.captured(1),
+						regex_match.captured(2),
 						xml_document.documentElement());
 			}
 			else

sources/ElementsCollection/elementslocation.h

@@ -20,7 +20,7 @@
 
 #include "../NameList/nameslist.h"
 #include "../diagramcontext.h"
-#include "pugixml/src/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <QIcon>
 #include <QString>

sources/ElementsCollection/elementstreeview.cpp

@@ -87,11 +87,7 @@ void ElementsTreeView::startElementDrag(const ElementsLocation &location)
 {
 	if (! location.exist()) return;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
-	QDrag* drag = new QDrag(this);
-#else
-	QScopedPointer<QDrag> drag(new QDrag(this));
-#endif
+	auto drag = new QDrag{this};
 
 	QString location_str = location.toString();
 	QMimeData *mime_data = new QMimeData();

sources/ElementsCollection/fileelementcollectionitem.cpp

@@ -327,6 +327,26 @@ void FileElementCollectionItem::setUpData()
 			{ search_list.append(context.value(key).toString()); }
 			search_list.append(localName(loc));
 			setData(search_list.join(" "));
+
+			// Tooltip: show what a truncated tree label can't - the full
+			// localized name and the descriptive element information.
+			// Reuses the location/context already parsed for the search
+			// index above; the collection path stays as the last line
+			// (it used to be the whole tooltip).
+			QStringList tip;
+			tip << localName(loc);
+			for (const auto &key : { QStringLiteral("description"),
+									 QStringLiteral("manufacturer"),
+									 QStringLiteral("manufacturer_reference") })
+			{
+				const QString value = context.value(key).toString();
+				if (!value.isEmpty())
+					tip << value;
+			}
+			tip << collectionPath();
+			tip.removeDuplicates();
+			setToolTip(tip.join(QLatin1Char('\n')));
+			return;
 		}
 	}
 
@@ -363,7 +383,7 @@ void FileElementCollectionItem::setUpIcon()
 			setIcon(QET::Icons::Folder);
 		} else {
 			if (m_path.endsWith(".qetmak")) {
-				setIcon(QIcon());
+				setIcon(QET::Icons::PartRectangle);
 			} else {
 				ElementsLocation loc(collectionPath());
 				setIcon(loc.icon());

sources/ElementsCollection/xmlelementcollection.cpp

@@ -186,23 +186,22 @@ QDomElement XmlElementCollection::child(const QDomElement &parent_element,
 	if (parent_element.ownerDocument() != m_dom_document)
 		return QDomElement();
 
-		//Get all childs element of parent_element
-	QDomNodeList child_list = parent_element.childNodes();
-	QString tag_name(child_name.endsWith(".elmt")? "element" : "category");
-	QList <QDomElement> found_dom_element;
-	for (int i=0 ; i<child_list.length() ; i++)
+		/* Walk the siblings directly instead of the previous
+		 * childNodes()+item(i) double pass: QDomNodeList::item(i) restarts
+		 * from the first child every call, which made this loop quadratic
+		 * in the number of children. This lookup runs several times per
+		 * element instance while loading a project, on the "import"
+		 * category that holds every embedded definition. */
+	const QString tag_name = child_name.endsWith(QLatin1String(".elmt"))
+			? QStringLiteral("element") : QStringLiteral("category");
+	for (QDomElement child_element = parent_element.firstChildElement(tag_name) ;
+		 !child_element.isNull() ;
+		 child_element = child_element.nextSiblingElement(tag_name))
 	{
-		QDomElement child_element = child_list.item(i).toElement();
-		if (child_element.tagName() == tag_name)
-			found_dom_element << child_element;
+		if (child_element.attribute(QStringLiteral("name")) == child_name)
+			return child_element;
 	}
 
-	if (found_dom_element.isEmpty()) return QDomElement();
-
-	foreach (QDomElement elmt, found_dom_element)
-		if (elmt.attribute("name") == child_name)
-			return elmt;
-
 	return QDomElement();
 }
 

sources/NameList/nameslist.h

@@ -17,7 +17,7 @@
 */
 #ifndef NAMES_LIST_H
 #define NAMES_LIST_H
-#include "pugixml/src/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <QtXml>
 /**

sources/SearchAndReplace/ui/searchandreplacewidget.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 	Copyright 2006-2026 The QElectroTech Team
 	This file is part of QElectroTech.
 
@@ -475,7 +475,7 @@ void SearchAndReplaceWidget::setUpConenctions()
 
 	connect(ui->m_tree_widget, &QTreeWidget::customContextMenuRequested, [this](const QPoint &pos)
 	{
-		if (m_diagram_hash.keys().contains(ui->m_tree_widget->currentItem()))
+		if (m_diagram_hash.contains(ui->m_tree_widget->currentItem()))
 		{
 			QMenu *menu = new QMenu(ui->m_tree_widget);
 			menu->addAction(m_select_elements);
@@ -951,28 +951,28 @@ void SearchAndReplaceWidget::on_m_tree_widget_itemDoubleClicked(
 {
 	Q_UNUSED(column)
 
-	if (m_diagram_hash.keys().contains(item))
+	if (m_diagram_hash.contains(item))
 	{
 		QPointer<Diagram> diagram = m_diagram_hash.value(item);
 		if(diagram) {
 			diagram.data()->showMe();
 		}
 	}
-	else if (m_element_hash.keys().contains(item))
+	else if (m_element_hash.contains(item))
 	{
 		QPointer<Element> elmt = m_element_hash.value(item);
 		if (elmt && elmt->diagram()) {
 			elmt.data()->diagram()->showMe();
 		}
 	}
-	else if (m_text_hash.keys().contains(item))
+	else if (m_text_hash.contains(item))
 	{
 		QPointer<IndependentTextItem> text = m_text_hash.value(item);
 		if (text && text->diagram()) {
 			text.data()->diagram()->showMe();
 		}
 	}
-	else if (m_conductor_hash.keys().contains(item))
+	else if (m_conductor_hash.contains(item))
 	{
 		QPointer<Conductor> cond = m_conductor_hash.value(item);
 		if (cond && cond->diagram()) {
@@ -1013,7 +1013,7 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
 		m_last_selected.data()->setSelected(false);
 	}
 
-	if (m_element_hash.keys().contains(current))
+	if (m_element_hash.contains(current))
 	{
 		QPointer<Element> elmt = m_element_hash.value(current);
 		if (elmt)
@@ -1022,7 +1022,7 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
 			elmt.data()->setHighlighted(true);
 		}
 	}
-	else if (m_text_hash.keys().contains(current))
+	else if (m_text_hash.contains(current))
 	{
 		QPointer<IndependentTextItem> text = m_text_hash.value(current);
 		if (text)
@@ -1031,7 +1031,7 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
 			m_last_selected = text;
 		}
 	}
-	else if (m_conductor_hash.keys().contains(current))
+	else if (m_conductor_hash.contains(current))
 	{
 		QPointer<Conductor> cond = m_conductor_hash.value(current);
 		if (cond)
@@ -1144,7 +1144,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 			&& qtwi->checkState(0) == Qt::Checked)
 	{
 		if (ui->m_folio_pb->text().endsWith(tr(" [édité]")) &&
-			m_diagram_hash.keys().contains(qtwi))
+			m_diagram_hash.contains(qtwi))
 		{
 			QPointer<Diagram> d = m_diagram_hash.value(qtwi);
 			if (d) {
@@ -1152,7 +1152,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 			}
 		}
 		else if (ui->m_element_pb->text().endsWith(tr(" [édité]")) &&
-				 m_element_hash.keys().contains(qtwi))
+				 m_element_hash.contains(qtwi))
 		{
 			QPointer<Element> e = m_element_hash.value(qtwi);
 			if (e) {
@@ -1160,7 +1160,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 			}
 		}
 		else if (!ui->m_replace_le->text().isEmpty() &&
-				 m_text_hash.keys().contains(qtwi))
+				 m_text_hash.contains(qtwi))
 		{
 			m_worker.m_indi_text = ui->m_replace_le->text();
 			QPointer<IndependentTextItem> t =
@@ -1171,7 +1171,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 
 		}
 		else if (ui->m_conductor_pb->text().endsWith(tr(" [édité]")) &&
-				 m_conductor_hash.keys().contains(qtwi))
+				 m_conductor_hash.contains(qtwi))
 		{
 			QPointer<Conductor> c = m_conductor_hash.value(qtwi);
 			if (c) {
@@ -1187,7 +1187,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 			QList <IndependentTextItem *>tl;
 			QList <Conductor *>cl;
 
-			if (m_diagram_hash.keys().contains(qtwi))
+			if (m_diagram_hash.contains(qtwi))
 			{
 				QPointer<Diagram> d =
 						m_diagram_hash.value(qtwi);
@@ -1195,7 +1195,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 					dl.append(d.data());
 				}
 			}
-			else if (m_element_hash.keys().contains(qtwi))
+			else if (m_element_hash.contains(qtwi))
 			{
 				QPointer<Element> e =
 						m_element_hash.value(qtwi);
@@ -1203,7 +1203,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 					el.append(e.data());
 				}
 			}
-			else if (m_text_hash.keys().contains(qtwi))
+			else if (m_text_hash.contains(qtwi))
 			{
 				QPointer<IndependentTextItem> t =
 						m_text_hash.value(qtwi);
@@ -1211,7 +1211,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
 					tl.append(t.data());
 				}
 			}
-			else if (m_conductor_hash.keys().contains(qtwi))
+			else if (m_conductor_hash.contains(qtwi))
 			{
 				QPointer<Conductor> c =
 						m_conductor_hash.value(qtwi);

sources/TerminalStrip/physicalterminal.cpp

@@ -130,12 +130,7 @@ bool PhysicalTerminal::setLevelOf(const QSharedPointer<RealTerminal> &terminal,
 	const int i = m_real_terminal.indexOf(terminal);
 	if (i >= 0)
 	{
-#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
-		m_real_terminal.swapItemsAt(i, std::min<int>(level, static_cast<int>(m_real_terminal.size())-1));
-#else
-		auto j = std::min(level, m_real_terminal.size()-1);
-		std::swap(m_real_terminal.begin()[i], m_real_terminal.begin()[j]);
-#endif
+		m_real_terminal.swapItemsAt(i, std::min(static_cast<qsizetype>(level), m_real_terminal.size()-1));
 		return true;
 	}
 	return false;

sources/TerminalStrip/terminalstripdata.cpp

@@ -64,11 +64,8 @@ bool TerminalStripData::fromXml(const QDomElement &xml_element)
 					"due to wrong tag name. Expected " << this->xmlTagName() << " used " << xml_element.tagName();
 		return false;
 	}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+
 	m_uuid = QUuid::fromString(xml_element.attribute(QStringLiteral("uuid")));
-#else
-	m_uuid = QUuid(xml_element.attribute(QStringLiteral("uuid")));
-#endif
 
 	for (auto &xml_info :
 		 QETXML::findInDomElement(xml_element.firstChildElement(QStringLiteral("informations")),

sources/TerminalStrip/ui/terminalstriptreedockwidget.cpp

@@ -35,11 +35,7 @@ TerminalStripTreeDockWidget::TerminalStripTreeDockWidget(QETProject *project, QW
 	ui->setupUi(this);
     setProject(project);
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
 	ui->m_tree_view->expandRecursively(ui->m_tree_view->rootIndex());
-#else
-	ui->m_tree_view->expandAll();
-#endif
 }
 
 TerminalStripTreeDockWidget::~TerminalStripTreeDockWidget()
@@ -93,11 +89,7 @@ void TerminalStripTreeDockWidget::reload()
 
 	buildTree();
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
 	ui->m_tree_view->expandRecursively(ui->m_tree_view->rootIndex());
-#else
-	ui->m_tree_view->expandAll();
-#endif
 
 		//Reselect the tree widget item of the current edited strip
    auto item = m_item_strip_H.key(current_);

sources/autoNum/assignvariables.cpp

@@ -275,6 +275,12 @@ namespace autonum
 
 		str.replace("%{void}", QString());
 
+		str.replace("%{plc_type}", dc.value("plc_type").toString());
+		str.replace("%{plc_address}", dc.value("plc_address").toString());
+		str.replace("%{plc_function}", dc.value("plc_function").toString());
+		str.replace("%{plc_comment}", dc.value("plc_comment").toString());
+		str.replace("%{plc_crossref}", dc.value("plc_crossref").toString());
+
 		return str;
 	}
 

sources/bordertitleblock.cpp

@@ -55,11 +55,7 @@ BorderTitleBlock::BorderTitleBlock(QObject *parent) :
 	m_titleblock_template_renderer = new TitleBlockTemplateRenderer(this);
 	m_titleblock_template_renderer -> setTitleBlockTemplate(QETApp::defaultTitleBlockTemplate());
 
-	// disable the QPicture-based cache from Qt 4.8 to avoid rendering errors and crashes
-#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)	// ### Qt 6: remove
-#else
 	m_titleblock_template_renderer -> setUseCache(false);
-#endif
 
 	// dimensions par defaut du schema
 	importBorder(BorderProperties());
@@ -898,9 +894,13 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(
 		const DiagramContext &initial_context) {
 	// Our final DiagramContext is the initial one (which is supposed to bring
 	// project-wide properties), overridden by the "additional fields" one...
+	// An empty page-level value means the variable was auto-added to the
+	// folio's Custom tab (#495) but never actually set by the user, so it
+	// must not shadow a real project-level value of the same name (#531).
 	DiagramContext context = initial_context;
 	foreach (QString key, additional_fields_.keys()) {
-		context.addValue(key, additional_fields_[key]);
+		if (!additional_fields_[key].toString().isEmpty())
+			context.addValue(key, additional_fields_[key]);
 	}
 
 	// ... overridden by the historical and/or dynamically generated fields

sources/conductornumexport.cpp

@@ -72,14 +72,7 @@ bool ConductorNumExport::toCsv()
 		if (file.open(QIODevice::WriteOnly | QIODevice::Text))
 		{
 			QTextStream stream(&file);
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)	// ### Qt 6: remove
-			stream << wiresNum() << endl;
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.15 or later")
-#endif
 			stream << wiresNum() << &Qt::endl(stream);
-#endif
 		}
 		else {
 			return false;

sources/conductorproperties.cpp

@@ -811,14 +811,7 @@ void ConductorProperties::readStyle(const QString &style_string) {
 	if (style_string.isEmpty()) return;
 
 	// recupere la liste des couples style / valeur
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	QStringList styles = style_string.split(";", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code QString::SkipEmptyParts for QT 5.14 or later")
-#endif
 	QStringList styles = style_string.split(";", Qt::SkipEmptyParts);
-#endif
 
 	QRegularExpression Rx("^(?<name>[a-z-]+): (?<value>[a-z-]+)$");
 	if (!Rx.isValid())

sources/dataBase/projectdatabase.cpp

@@ -114,6 +114,11 @@ QSqlQuery projectDataBase::newQuery(const QString &query) {
 */
 void projectDataBase::addElement(Element *element)
 {
+	if (!element || !element->diagram()) {
+		qDebug() << "projectDataBase::addElement: null element or diagram";
+		return;
+	}
+
 	m_insert_elements_query.bindValue(":uuid", element->uuid().toString());
 	m_insert_elements_query.bindValue(":diagram_uuid", element->diagram()->uuid().toString());
 	m_insert_elements_query.bindValue(":pos", element->diagram()->convertPosition(element->scenePos()).toString());

sources/dataBase/ui/elementquerywidget.cpp

@@ -47,14 +47,8 @@ ElementQueryWidget::ElementQueryWidget(QWidget *parent) :
 	m_button_group.addButton(ui->m_coil_cb, 4);
 	m_button_group.addButton(ui->m_protection_cb, 5);
 	m_button_group.addButton(ui->m_thumbnail_cb, 6);
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)	// ### Qt 6: remove
-	connect(&m_button_group, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), [this](int id)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.15 or later")
-#endif
+
 	connect(&m_button_group, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::idClicked), [this](int id)
-#endif
 	{
 		auto check_box = static_cast<QCheckBox *>(m_button_group.button(0));
 		if (id == 0)