Merge remote-tracking branch 'origin/master' into qt6_cmake_joshua

# Conflicts:
#	CMakeLists.txt

CMakeLists.txt

@@ -14,25 +14,30 @@
 # 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)
+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)
+  VERSION 0.100.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})
+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()
 
 # 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)
@@ -43,126 +48,98 @@ 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
-    Qt5
-    COMPONENTS
-    ${QET_COMPONENTS}
-    REQUIRED
-)
-
-find_package(
-    Qt${QT_VERSION_MAJOR}
-    COMPONENTS
-    ${QET_COMPONENTS}
-    REQUIRED)
-
-find_package(SQLite3 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)
 
-# 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
-    SQLite::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
-)
+  ${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})
-    install(DIRECTORY ico/breeze-icons/32x32   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/48x48   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/64x64   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY elements    DESTINATION share/qelectrotech)
-    install(DIRECTORY examples    DESTINATION share/qelectrotech)
-    install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
-    install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
-    install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
-    install(FILES misc/qelectrotech.xml    DESTINATION share/mime/packages)
-    install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
-    install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+
+install(DIRECTORY ico/breeze-icons/16x16 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/22x22 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/32x32 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/48x48 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/64x64 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY elements DESTINATION share/qelectrotech)
+install(DIRECTORY examples DESTINATION share/qelectrotech)
+install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
+install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
+install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
+install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
+install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
+if(NOT QMFILES_AS_RESOURCE)
+  install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+endif()
 endif()

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
 

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(DEFINED 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,18 +14,14 @@
 # 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
-    GIT_TAG        v1.11.4)
+    GIT_TAG        v1.15)
 
   FetchContent_MakeAvailable(pugixml)
 else()

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/qet_compilation_vars.cmake

@@ -17,6 +17,8 @@
 message(" - qet_compilation_vars")
 
 set(QET_COMPONENTS
+  Core
+  Gui
   LinguistTools
   PrintSupport
   Xml
@@ -110,6 +112,12 @@ set(QET_SRC_FILES
   ${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
@@ -418,10 +426,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
@@ -500,6 +504,9 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
   ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.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
@@ -713,6 +720,8 @@ set(QET_SRC_FILES
 
   ${QET_DIR}/sources/xml/terminalstripitemxml.cpp
   ${QET_DIR}/sources/xml/terminalstripitemxml.h
+  ${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.cpp
+  ${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.h
   )
 
 set(TS_FILES
@@ -739,13 +748,11 @@ set(TS_FILES
   ${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é)

sources/ElementsCollection/elementscollectionmodel.cpp

@@ -26,12 +26,7 @@
 #include "xmlprojectelementcollectionitem.h"
 
 #include <QFutureWatcher>
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
 #include <QtConcurrentMap>
-#else
-#include <QtConcurrentRun>
-#endif
-
 /**
 	@brief ElementsCollectionModel::ElementsCollectionModel
 	Constructor
@@ -294,14 +289,14 @@ 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);
 
-	#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData);
-	#else
-	qDebug() << "Help code for QT 6 or later";
-	#endif
 	watcher->setFuture(m_future);
 }
 

sources/ElementsCollection/elementscollectionwidget.cpp

@@ -835,14 +835,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/elementslocation.cpp

@@ -803,13 +803,13 @@ bool ElementsLocation::setXml(const QDomDocument &xml_document) const
 			QString			   path_ = collectionPath(false);
 			QRegularExpression rx("^(.*)/(.*\\.elmt)$");
 
-			if (rx.exactMatch(path_))
+			if (auto regex_match = rx.match(path_); regex_match.hasMatch())
 			{
 				return project()
 					->embeddedElementCollection()
 					->addElementDefinition(
-						rx.cap(1),
-						rx.cap(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

@@ -361,7 +361,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/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/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp

@@ -18,6 +18,7 @@
 #include "terminalstripdrawer.h"
 
 #include <QPainter>
+#include <QHash>
 
 namespace TerminalStripDrawer {
 

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(level, 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/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());

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/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)

sources/diagram.cpp

@@ -1514,14 +1514,6 @@ bool Diagram::fromXml(QDomElement &document,
 	if (content_ptr) {
 		content_ptr -> m_elements           = added_elements;
 		content_ptr -> m_conductors_to_move = added_conductors;
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-		content_ptr -> m_text_fields        = added_texts.toSet();
-		content_ptr -> m_images			    = added_images.toSet();
-		content_ptr -> m_shapes			    = added_shapes.toSet();
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 		content_ptr -> m_text_fields	= QSet<IndependentTextItem *>(
 					added_texts.begin(),
 					added_texts.end());
@@ -1532,7 +1524,6 @@ bool Diagram::fromXml(QDomElement &document,
 					added_shapes.begin(),
 					added_shapes.end());
 		content_ptr->m_terminal_strip.swap(added_strips);
-#endif
 		content_ptr->m_tables.swap(added_tables);
 	}
 

sources/diagramcontext.h

@@ -17,7 +17,7 @@
 */
 #ifndef DIAGRAM_CONTEXT_H
 #define DIAGRAM_CONTEXT_H
-#include "pugixml/src/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <QDomElement>
 #include <QHash>

sources/diagramview.cpp

@@ -210,17 +210,10 @@ void DiagramView::handleElementDrop(QDropEvent *event)
 		return;
 	}
 
-	QPointF drop_pos;
-	#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	drop_pos = mapToScene(event->pos());
-	#else
-	drop_pos = event->position();
-	#endif
-
 	if (location.path().endsWith(".qetmak")) {
-		diagram()->setEventInterface(new DiagramEventAddMacro(location, diagram(), drop_pos));
+		diagram()->setEventInterface(new DiagramEventAddMacro(location, diagram(), event->position()));
 	} else {
-		diagram()->setEventInterface(new DiagramEventAddElement(location, diagram(), drop_pos));
+		diagram()->setEventInterface(new DiagramEventAddElement(location, diagram(), event->position()));
 	}
 
 	//Set focus to the view to get event
@@ -290,17 +283,8 @@ void DiagramView::handleTextDrop(QDropEvent *e) {
 		iti -> setHtml (e -> mimeData() -> text());
 	}
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-
-	m_diagram->undoStack().push(new AddGraphicsObjectCommand(
-									iti, m_diagram, mapToScene(e->pos())));
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	m_diagram->undoStack().push(new AddGraphicsObjectCommand(
 									iti, m_diagram, e->position()));
-#endif
 }
 
 /**
@@ -458,14 +442,7 @@ void DiagramView::mousePressEvent(QMouseEvent *e)
 	if (m_event_interface && m_event_interface->mousePressEvent(e)) return;
 
 		//Start drag view when hold the middle button
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		m_drag_last_pos = e->pos();
 		viewport()->setCursor(Qt::ClosedHandCursor);
@@ -515,14 +492,7 @@ void DiagramView::mouseMoveEvent(QMouseEvent *e)
 	if (m_event_interface && m_event_interface->mouseMoveEvent(e)) return;
 
 		// Drag the view
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->buttons() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->buttons() == Qt::MiddleButton)
-#endif
 	{
 		QScrollBar *h = horizontalScrollBar();
 		QScrollBar *v = verticalScrollBar();
@@ -583,14 +553,7 @@ void DiagramView::mouseReleaseEvent(QMouseEvent *e)
 	if (m_event_interface && m_event_interface->mouseReleaseEvent(e)) return;
 
 		// Stop drag view
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		viewport()->setCursor(Qt::ArrowCursor);
 	}
@@ -624,14 +587,7 @@ void DiagramView::mouseReleaseEvent(QMouseEvent *e)
 			QMenu *menu = new QMenu(this);
 			menu->addAction(act);
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-			menu->popup(e->globalPos());
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 			menu->popup(e->pos());
-#endif
 		}
 
 		m_free_rubberbanding = false;
@@ -1355,7 +1311,6 @@ void DiagramView::createTemplateFromSelection()
 	QFile file(full_path);
 	if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
 		QTextStream out(&file);
-		out.setCodec("UTF-8");
 		out << macro_doc.toString(4);
 		file.close();
 		qDebug() << "Template successfully saved to:" << full_path;

sources/editor/editorcommands.cpp

@@ -276,14 +276,7 @@ void ChangeZValueCommand::applyRaise(const QList<QGraphicsItem *> &items_list) {
 	for (int i = my_items_list.count() - 2 ; i >= 0 ; -- i) {
 		if (my_items_list[i] -> isSelected()) {
 			if (!my_items_list[i +1] -> isSelected()) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)	// ### Qt 6: remove
-				my_items_list.swap(i, i + 1);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.13 or later")
-#endif
 				my_items_list.swapItemsAt(i, i + 1);
-#endif
 			}
 		}
 	}
@@ -301,14 +294,7 @@ void ChangeZValueCommand::applyLower(const QList<QGraphicsItem *> &items_list) {
 	for (int i = 1 ; i < my_items_list.count() ; ++ i) {
 		if (my_items_list[i] -> isSelected()) {
 			if (!my_items_list[i - 1] -> isSelected()) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)	// ### Qt 6: remove
-				my_items_list.swap(i, i - 1);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.13 or later")
-#endif
 				my_items_list.swapItemsAt(i, i - 1);
-#endif
 			}
 		}
 	}

sources/editor/elementview.cpp

@@ -372,14 +372,7 @@ ElementContent ElementView::pasteWithOffset(const QDomDocument &xml_document) {
 */
 void ElementView::mousePressEvent(QMouseEvent* e)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		setCursor( (Qt::ClosedHandCursor));
 		reference_view_ = e->pos();
@@ -394,14 +387,7 @@ void ElementView::mousePressEvent(QMouseEvent* e)
 */
 void ElementView::mouseMoveEvent(QMouseEvent* e)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->buttons() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->buttons() == Qt::MiddleButton)
-#endif
 	{
 		QScrollBar *h = horizontalScrollBar();
 		QScrollBar *v = verticalScrollBar();
@@ -420,14 +406,7 @@ void ElementView::mouseMoveEvent(QMouseEvent* e)
 */
 void ElementView::mouseReleaseEvent(QMouseEvent* e)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		setCursor(Qt::ArrowCursor);
 		adjustSceneRect();

sources/editor/graphicspart/customelementgraphicpart.cpp

@@ -519,14 +519,7 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 	resetStyles();
 
 		//Get the list of pair style/value
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	QStringList styles = qde.attribute("style").split(";", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 	QStringList styles = qde.attribute("style").split(";", Qt::SkipEmptyParts);
-#endif
 
 		//Check each pair of style
 	QRegularExpression rx("^\\s*([a-z-]+)\\s*:\\s*([a-zA-Z-]+)\\s*$");

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -220,7 +220,7 @@ void DynamicTextFieldEditor::fillInfoComboBox()
 	QStringList strl;
 	auto type = elementEditor()->elementScene()->elementData().m_type;
 
-	if(type & ElementData::AllReport) {
+	if((type & ElementData::AllReport) || (type == ElementData::ConductorDefinition)) {
 		strl = QETInformation::folioReportInfoKeys();
 	}
 	else {
@@ -365,7 +365,8 @@ void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
 void DynamicTextFieldEditor::on_m_composite_text_pb_clicked()
 {
 	bool isReport = false;
-	if (elementEditor()->elementScene()->elementData().m_type & ElementData::AllReport) {
+	auto type = elementEditor()->elementScene()->elementData().m_type;
+	if ((type & ElementData::AllReport) || (type == ElementData::ConductorDefinition)) {
 		isReport = true;
 	}
 

sources/editor/ui/elementpropertieseditorwidget.cpp

@@ -133,6 +133,7 @@ void ElementPropertiesEditorWidget::setUpInterface()
 	ui->m_base_type_cb->addItem (tr("Renvoi de folio précédent"), ElementData::PreviousReport);
 	ui->m_base_type_cb->addItem (tr("Bornier"), ElementData::Terminal);
 	ui->m_base_type_cb->addItem (tr("Vignette"), ElementData::Thumbnail);
+	ui->m_base_type_cb->addItem (tr("Définition de conducteur"), ElementData::ConductorDefinition);
 
 		// Slave option
 	ui->m_state_cb->addItem(tr("Normalement ouvert"),       ElementData::NO);
@@ -188,6 +189,9 @@ void ElementPropertiesEditorWidget::updateTree()
 		case ElementData::PreviousReport:
 			ui->m_tree->setDisabled(true);
 			break;
+		case ElementData::ConductorDefinition:
+			ui->m_tree->setDisabled(true);
+			break;
 		case ElementData::Master:
 			ui->m_tree->setEnabled(true);
 			break;
@@ -287,11 +291,9 @@ void ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged(int in
 	ui->m_master_gb->setVisible(master);
 	ui->m_terminal_gb->setVisible(terminal);
 
-#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
 	ui->tabWidget->setTabVisible(1,
 								 (type_ == ElementData::Simple ||
 								  type_ == ElementData::Master));
-#endif
 
 	updateTree();
 }

sources/editor/ui/qetelementeditor.cpp

@@ -736,40 +736,62 @@ bool QETElementEditor::checkElement()
 	QList<QETWarning> warnings;
 	QList<QETWarning> errors;
 
-		// Warning #1: Element haven't got terminal
-		// (except for report, because report must have one terminal and this checking is do below)
+	// Warning #1: Element haven't got terminal
+	// (except for report and conductor definition, because they must have one terminal and this checking is done below)
 	if (!m_elmt_scene -> containsTerminals() &&
-		!(m_elmt_scene->elementData().m_type & ElementData::AllReport)) {
+		!(m_elmt_scene->elementData().m_type & ElementData::AllReport) &&
+		m_elmt_scene->elementData().m_type != ElementData::ConductorDefinition) {
 		warnings << qMakePair(
-						tr("Absence de borne", "warning title"),
-						tr(
-							"<br>En l'absence de borne, l'élément ne pourra être"
-			" relié à d'autres éléments par l'intermédiaire de conducteurs.",
-							"warning description"
-		)
-						);
-	}
+			tr("Absence de borne", "warning title"),
+							  tr(
+								  "<br>En l'absence de borne, l'élément ne pourra être"
+								  " relié à d'autres éléments par l'intermédiaire de conducteurs.",
+			"warning description"
+							  )
+		);
+		}
 
 		// Check folio report element
-	if (m_elmt_scene->elementData().m_type & ElementData::AllReport)
-	{
-		int terminal =0;
+		if (m_elmt_scene->elementData().m_type & ElementData::AllReport)
+		{
+			int terminal =0;
 
-		for(auto qgi : m_elmt_scene -> items()) {
-			if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
-				terminal ++;
+			for(auto qgi : m_elmt_scene -> items()) {
+				if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
+					terminal ++;
+				}
+			}
+
+			//Error folio report must have only one terminal
+			if (terminal != 1) {
+				errors << qMakePair (tr("Absence de borne"),
+									 tr("<br><b>Erreur</b> :"
+									 "<br>Les reports de folio doivent posséder une seul borne."
+									 "<br><b>Solution</b> :"
+									 "<br>Verifier que l'élément ne possède qu'une seul borne"));
 			}
 		}
 
-			//Error folio report must have only one terminal
-		if (terminal != 1) {
-			errors << qMakePair (tr("Absence de borne"),
-								 tr("<br><b>Erreur</b> :"
-								"<br>Les reports de folio doivent posséder une seul borne."
-								"<br><b>Solution</b> :"
-								"<br>Verifier que l'élément ne possède qu'une seul borne"));
+		// Check conductor definition element
+		if (m_elmt_scene->elementData().m_type == ElementData::ConductorDefinition)
+		{
+			int terminal =0;
+
+			for(auto qgi : m_elmt_scene -> items()) {
+				if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
+					terminal ++;
+				}
+			}
+
+			// Error: Conductor definition must have exactly one terminal
+			if (terminal != 1) {
+				errors << qMakePair (tr("Nombre de bornes incorrect"),
+									 tr("<br><b>Erreur</b> :"
+									 "<br>Les définitions de conducteur ne peuvent posséder qu'une seule borne."
+									 "<br><b>Solution</b> :"
+									 "<br>Vérifier que l'élément ne possède qu'une seule borne"));
+			}
 		}
-	}
 
 	if (!errors.count() && !warnings.count()) {
 		return(true);

sources/editor/ui/terminaleditor.cpp

@@ -61,7 +61,7 @@ void TerminalEditor::updateForm()
 	ui->m_y_dsb->setValue(m_part->property("y").toReal());
 	ui->m_orientation_cb->setCurrentIndex(ui->m_orientation_cb->findData(m_part->property("orientation")));
 	ui->m_name_le->setText(m_part->terminalName());
-	ui->m_type_cb->setCurrentIndex(ui->m_orientation_cb->findData(m_part->terminalType()));
+	ui->m_type_cb->setCurrentIndex(ui->m_type_cb->findData(m_part->terminalType()));
 
 	activeConnections(true);
 }
@@ -122,6 +122,9 @@ void TerminalEditor::init()
 	ui->m_type_cb->addItem(tr("Générique"),         TerminalData::Generic);
 	ui->m_type_cb->addItem(tr("Bornier intérieur"), TerminalData::Inner);
 	ui->m_type_cb->addItem(tr("Bornier extérieur"), TerminalData::Outer);
+	ui->m_type_cb->addItem(tr("NO (contact SW)"),   TerminalData::No);
+	ui->m_type_cb->addItem(tr("NC (contact SW)"),   TerminalData::Nc);
+	ui->m_type_cb->addItem(tr("Commun (contact SW)"), TerminalData::Common);
 }
 
 /**

sources/editor/ui/texteditor.cpp

@@ -335,6 +335,7 @@ void TextEditor::setUpWidget(QWidget *parent)
 
 	m_size_sb = new QSpinBox(parent);
 	m_size_sb->setObjectName(QString::fromUtf8("m_size_sb"));
+	m_size_sb->setMinimum(4);
 
 	gridLayout->addWidget(m_size_sb, 2, 1, 1, 1);
 

sources/factory/elementpicturefactory.cpp

@@ -567,14 +567,7 @@ void ElementPictureFactory::setPainterStyle(const QDomElement &dom, QPainter &pa
 	pen.setCapStyle(Qt::SquareCap);
 
 		//Get the couples style/value
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	const QStringList styles = dom.attribute("style").split(";", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 	const QStringList styles = dom.attribute("style").split(";", Qt::SkipEmptyParts);
-#endif
 
 	QRegularExpression rx("^(?<name>[a-z-]+):(?<value>[a-zA-Z-]+)$");
 	if (!rx.isValid())

sources/machine_info.cpp

@@ -188,10 +188,8 @@ void MachineInfo::send_info_to_debug()
 	QDirIterator it1(QETApp::commonElementsDir().toLatin1(),nameFilters,  QDir::Files, QDirIterator::Subdirectories);
 			while (it1.hasNext())
 			{
-				if(it1.next() > 0 )
-				{
+				it1.next();
 				commomElementsDir ++;
-				}
 			}
 	qInfo()<< " Common Elements count:"<< commomElementsDir << "Elements";
 	
@@ -200,10 +198,8 @@ void MachineInfo::send_info_to_debug()
 	QDirIterator it2(QETApp::customElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
 			while (it2.hasNext())
 			{
-				if(it2.next() > 0 )
-				{
+				it2.next();
 				customElementsDir ++;
-				}
 			}
 	qInfo()<< " Custom Elements count:"<< customElementsDir << "Elements";
 	
@@ -211,10 +207,8 @@ void MachineInfo::send_info_to_debug()
 	QDirIterator it3(QETApp::companyElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
 			while (it3.hasNext())
 			{
-				if(it3.next() > 0 )
-				{
+				it3.next();
 				companyElementsDir ++;
-				}
 			}
 	qInfo()<< " Company Elements count:"<< companyElementsDir << "Elements";
 	

sources/main.cpp

@@ -174,24 +174,9 @@ int main(int argc, char **argv)
 	QCoreApplication::setApplicationName("QElectroTech");
 	//Creation and execution of the application
 	//HighDPI
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
-#endif
 
-
-#if QT_VERSION > QT_VERSION_CHECK(5, 7, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
-	QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
-
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-qputenv("QT_ENABLE_HIGHDPI_SCALING", "1");
-QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFactorRoundingPolicy());
-#endif
+	qputenv("QT_ENABLE_HIGHDPI_SCALING", "1");
+	QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFactorRoundingPolicy());
 
 
 	SingleApplication app(argc, argv, true);

sources/print/projectprintwindow.cpp

@@ -190,25 +190,28 @@ ProjectPrintWindow::~ProjectPrintWindow()
  */
 void ProjectPrintWindow::requestPaint()
 {
-	#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-		#ifdef Q_OS_WIN
-			#ifdef QT_DEBUG
-			qDebug() << "--";
-			qDebug() << "DiagramPrintDialog::print  printer_->resolution() before " << m_printer->resolution();
-			qDebug() << "DiagramPrintDialog::print  screennumber " << QApplication::desktop()->screenNumber();
-			#endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#ifdef Q_OS_WIN
+	auto screen = this->screen();
+	if(screen)
+	{
+#ifdef QT_DEBUG
+		qDebug() << "--";
+		qDebug() << "DiagramPrintDialog::print  printer_->resolution() before " << m_printer->resolution();
+		qDebug() << "DiagramPrintDialog::print  screennumber " << screen->name();
+#endif
 
-			QScreen *srn = QApplication::screens().at(QApplication::desktop()->screenNumber());
-			qreal dotsPerInch = (qreal)srn->logicalDotsPerInch();
-			m_printer->setResolution(dotsPerInch);
+		qreal dotsPerInch = (qreal)screen->logicalDotsPerInch();
+		m_printer->setResolution(dotsPerInch);
 
-			#ifdef QT_DEBUG
-				qDebug() << "DiagramPrintDialog::print  dotsPerInch " << dotsPerInch;
-				qDebug() << "DiagramPrintDialog::print  printer_->resolution() after" << m_printer->resolution();
-			qDebug() << "--";
-			#endif
-		#endif
-	#endif
+#ifdef QT_DEBUG
+		qDebug() << "DiagramPrintDialog::print  dotsPerInch " << dotsPerInch;
+		qDebug() << "DiagramPrintDialog::print  printer_->resolution() after" << m_printer->resolution();
+		qDebug() << "--";
+#endif
+	}
+#endif
+#endif
 
 	if (!m_project->diagrams().count()) {
 		return;
@@ -265,9 +268,9 @@ void ProjectPrintWindow::printDiagram(Diagram *diagram, bool fit_page, QPainter
 #if TODO_LIST
 #pragma message("@TODO remove code for QT 6 or later")
 #endif
-	qDebug()<<"Help code for QT 6 or later";
-	auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) :
-									printer->pageRect(QPrinter::Millimeter);
+		qDebug()<<"Help code for QT 6 or later";
+		auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) :
+								printer->pageRect(QPrinter::Millimeter);
 #endif
 		auto used_width  = printed_rect.width();
 		auto used_height = printed_rect.height();
@@ -341,7 +344,7 @@ QRect ProjectPrintWindow::diagramRect(Diagram *diagram, const ExportProperties &
 		diagram_rect.setHeight(diagram_rect.height() - titleblock_height);
 	}
 
-		//Adjust the border of diagram to 1px (width of the line)
+	//Adjust the border of diagram to 1px (width of the line)
 	diagram_rect.adjust(0,0,1,1);
 
 	return (diagram_rect.toAlignedRect());
@@ -356,7 +359,7 @@ QRect ProjectPrintWindow::diagramRect(Diagram *diagram, const ExportProperties &
  * with the orientation and the paper format used by the actual printer
  */
 int ProjectPrintWindow::horizontalPagesCount(
-		Diagram *diagram, const ExportProperties &option, bool full_page) const
+	Diagram *diagram, const ExportProperties &option, bool full_page) const
 {
 	QRect printable_area;
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
@@ -385,7 +388,7 @@ int ProjectPrintWindow::horizontalPagesCount(
  * with the orientation and paper format used by the actual printer
  */
 int ProjectPrintWindow::verticalPagesCount(
-		Diagram *diagram, const ExportProperties &option, bool full_page) const
+	Diagram *diagram, const ExportProperties &option, bool full_page) const
 {
 	QRect printable_area;
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
@@ -511,7 +514,7 @@ void ProjectPrintWindow::loadPageSetupForCurrentPrinter()
 		QString value = settings.value("orientation", "landscape").toString();
 		m_printer->setPageOrientation(
 			value == "landscape" ? QPageLayout::Landscape :
-								   QPageLayout::Portrait);
+				QPageLayout::Portrait);
 	}
 	if (settings.contains("papersize"))
 	{
@@ -780,9 +783,9 @@ void ProjectPrintWindow::print()
 void ProjectPrintWindow::on_m_date_cb_userDateChanged(const QDate &date)
 {
 	auto index = ui->m_date_from_cb->currentIndex();
-		// 0 = all date
-		// 1 = from the date
-		// 2 = at the date
+	// 0 = all date
+	// 1 = from the date
+	// 2 = at the date
 
 	if (index) { on_m_uncheck_all_clicked();  }
 	else       { on_m_check_all_pb_clicked(); }
@@ -792,7 +795,7 @@ void ProjectPrintWindow::on_m_date_cb_userDateChanged(const QDate &date)
 	{
 		auto diagram_date = diagram->border_and_titleblock.date();
 		if ( (index == 1 && diagram_date >= date) ||
-			 (index == 2 && diagram_date == date) )
+			(index == 2 && diagram_date == date) )
 			m_diagram_list_hash.value(diagram)->setChecked(true);
 	}
 

sources/properties/elementdata.cpp

@@ -45,14 +45,26 @@ QDomElement ElementData::toXml(QDomDocument &xml_element) const {
 bool ElementData::fromXml(const QDomElement &xml_element)
 {
 	if(xml_element.tagName() != QLatin1String("definition") ||
-	   xml_element.attribute(QStringLiteral("type")) != QLatin1String("element")) {
+		xml_element.attribute(QStringLiteral("type")) != QLatin1String("element")) {
 		return false;
-	}
+		}
+
+		// --- HIER STARTET UNSER DEBUG-BLOCK ---
+		// Wir holen den String aus der XML und speichern ihn kurz zwischen
+		QString raw_type_string = xml_element.attribute(QStringLiteral("link_type"), QStringLiteral("simple"));
+
+	qDebug() << "\n=== NEUES BAUTEIL WIRD GELADEN ===";
+	qDebug() << "[XML Parser] Roher 'link_type' String aus der .elmt Datei:" << raw_type_string;
+
+	// Jetzt übergeben wir ihn an deine Übersetzungs-Funktion
+	m_type = typeFromString(raw_type_string);
+
+	qDebug() << "[XML Parser] Übersetzter ElementData-Typ:" << typeToString(m_type);
+	// --- HIER ENDET UNSER DEBUG-BLOCK ---
 
-	m_type = typeFromString(xml_element.attribute(QStringLiteral("link_type"), QStringLiteral("simple")));
 	kindInfoFromXml(xml_element);
 	m_informations.fromXml(xml_element.firstChildElement(QStringLiteral("elementInformations")),
-							QStringLiteral("elementInformation"));
+						   QStringLiteral("elementInformation"));
 	m_names_list.fromXml(xml_element);
 
 	auto xml_draw_info = xml_element.firstChildElement(QStringLiteral("informations"));
@@ -323,6 +335,8 @@ QString ElementData::typeToString(ElementData::Type type)
 			return QStringLiteral("terminal");
 		case ElementData::Thumbnail:
 			return  QStringLiteral("thumbnail");
+		case ElementData::ConductorDefinition:
+			return QStringLiteral("conductor_definition");
 		default:
 			qDebug() << "ElementData::typeToString : type don't exist"
 					 << "return failsafe value 'simple'";
@@ -346,6 +360,8 @@ ElementData::Type ElementData::typeFromString(const QString &string)
 		return ElementData::Terminal;
 	} else if (string == QLatin1String("thumbnail")) {
 		return ElementData::Thumbnail;
+	} else if (string == QLatin1String("conductor_definition")) {
+		return ElementData::ConductorDefinition;
 	}
 
 		//Return simple if nothing match

sources/properties/elementdata.h

@@ -41,7 +41,8 @@ class ElementData : public PropertiesInterface
 			Master         = 8,
 			Slave          = 16,
 			Terminal       = 32,
-			Thumbnail      = 64};
+			Thumbnail      = 64,
+			ConductorDefinition = 128};
 		Q_ENUM(Type)
 		Q_DECLARE_FLAGS(Types, Type)
 

sources/properties/terminaldata.cpp

@@ -174,6 +174,12 @@ QString TerminalData::typeToString(TerminalData::Type type)
 			return QString("Inner");
 		case Outer :
 			return QString("Outer");
+		case No :
+			return QString("No");
+		case Nc :
+			return QString("Nc");
+		case Common :
+			return QString("Common");
 	}
 	return QString("Generic");
 }
@@ -193,6 +199,12 @@ TerminalData::Type TerminalData::typeFromString(const QString &string)
 		return TerminalData::Inner;
 	} else if (string == "Outer") {
 		return TerminalData::Outer;
+	} else if (string == "No") {
+		return TerminalData::No;
+	} else if (string == "Nc") {
+		return TerminalData::Nc;
+	} else if (string == "Common") {
+		return TerminalData::Common;
 	} else {
 		qDebug() << "TerminalData::typeFromString, argument string is invalid"
 					" failsafe type 'TerminalData::Generic' is returned";

sources/properties/terminaldata.h

@@ -41,7 +41,10 @@ class TerminalData : public PropertiesInterface
 		enum Type {
 			Generic,
 			Inner,
-			Outer
+			Outer,
+			No,     ///< Normally Open terminal (for SW contacts)
+			Nc,     ///< Normally Closed terminal (for SW contacts)
+			Common  ///< Common terminal (for SW contacts)
 		};
 		Q_ENUM(Type)
 

sources/properties/xrefproperties.cpp

@@ -29,6 +29,7 @@
 XRefProperties::XRefProperties()
 {
 	m_show_power_ctc = true;
+	m_show_terminal_name = true;
 	m_display = Cross;
 	m_snap_to = Bottom;
 	m_prefix_keys << "power" << "delay" << "switch";
@@ -48,6 +49,7 @@ void XRefProperties::toSettings(QSettings &settings,
 				const QString prefix) const
 {
 	settings.setValue(prefix % "showpowerctc", m_show_power_ctc);
+	settings.setValue(prefix % "showterminalname", m_show_terminal_name);
 	QString display = m_display == Cross? "cross" : "contacts";
 	settings.setValue(prefix % "displayhas", display);
 	QString snap = m_snap_to == Bottom? "bottom" : "label";
@@ -78,6 +80,7 @@ void XRefProperties::fromSettings(const QSettings &settings,
 				  const QString prefix)
 {
 	m_show_power_ctc = settings.value(prefix % "showpowerctc", true).toBool();
+	m_show_terminal_name = settings.value(prefix % "showterminalname", true).toBool();
 	QString display = settings.value(prefix % "displayhas", "cross").toString();
 	display == "cross"? m_display = Cross : m_display = Contacts;
 	QString snap = settings.value(prefix % "snapto", "label").toString();
@@ -107,6 +110,7 @@ QDomElement XRefProperties::toXml(QDomDocument &xml_document) const
 	xml_element.setAttribute("type", m_key);
 
 	xml_element.setAttribute("showpowerctc", m_show_power_ctc? "true" : "false");
+	xml_element.setAttribute("showterminalname", m_show_terminal_name? "true" : "false");
 	QString display = m_display == Cross? "cross" : "contacts";
 	xml_element.setAttribute("displayhas", display);
 	QString snap = m_snap_to == Bottom? "bottom" : "label";
@@ -137,6 +141,7 @@ QDomElement XRefProperties::toXml(QDomDocument &xml_document) const
 */
 bool XRefProperties::fromXml(const QDomElement &xml_element) {
 	m_show_power_ctc = xml_element.attribute("showpowerctc")  == "true";
+	m_show_terminal_name = xml_element.attribute("showterminalname", "true") == "true";
 	QString display = xml_element.attribute("displayhas", "cross");
 	display == "cross"? m_display = Cross : m_display = Contacts;
 	QString snap = xml_element.attribute("snapto", "label");
@@ -188,6 +193,7 @@ QHash<QString, XRefProperties> XRefProperties::defaultProperties()
 
 bool XRefProperties::operator ==(const XRefProperties &xrp) const{
 	return (m_show_power_ctc == xrp.m_show_power_ctc
+			&& m_show_terminal_name == xrp.m_show_terminal_name
 			&& m_display     == xrp.m_display
 			&& m_snap_to     == xrp.m_snap_to
 			&& m_prefix      == xrp.m_prefix

sources/properties/xrefproperties.h

@@ -57,6 +57,9 @@ class XRefProperties : public PropertiesInterface
 	void setShowPowerContac (const bool a) {m_show_power_ctc = a;}
 	bool showPowerContact	() const	   {return m_show_power_ctc;}
 
+	void setShowTerminalName (const bool a) {m_show_terminal_name = a;}
+	bool showTerminalName	 () const		{return m_show_terminal_name;}
+
 	void setDisplayHas	  (const DisplayHas dh) {m_display = dh;}
 	DisplayHas displayHas () const				{return m_display;}
 
@@ -81,6 +84,7 @@ class XRefProperties : public PropertiesInterface
 
 	private:
 	bool m_show_power_ctc;
+	bool m_show_terminal_name;
 	DisplayHas m_display;
 	SnapTo m_snap_to;
 	Qt::AlignmentFlag m_xref_pos;

sources/qet.cpp

@@ -183,16 +183,7 @@ bool QET::orthogonalProjection(
 
 	// determine le point d'intersection des deux droites = le projete orthogonal
 	QPointF intersection_point;
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
-	QLineF::IntersectType it = line.
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-			intersect // ### Qt 6: remove
-#else
-			intersects
-#endif
-			(perpendicular_line, &intersection_point);
+	QLineF::IntersectType it = line.intersects(perpendicular_line, &intersection_point);
 
 	// ne devrait pas arriver (mais bon...)
 	if (it == QLineF::NoIntersection) return(false);
@@ -545,16 +536,8 @@ QString QET::joinWithSpaces(const QStringList &string_list) {
 QStringList QET::splitWithSpaces(const QString &string) {
 	// les chaines sont separees par des espaces non echappes
 	// = avec un nombre nul ou pair de backslashes devant
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 	QStringList escaped_strings = string.split(QRegularExpression("[^\\]?(?:\\\\)* "),
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-						   QString
-#else
-						   Qt
-#endif
-						   ::SkipEmptyParts);
+											   Qt::SkipEmptyParts);
 
 	QStringList returned_list;
 	foreach(QString escaped_string, escaped_strings) {
@@ -684,14 +667,7 @@ bool QET::writeXmlFile(QDomDocument &xml_doc, const QString &filepath, QString *
 	}
 
 	QTextStream out(&file);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	out.setCodec("UTF-8");
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	out.setEncoding(QStringConverter::Utf8);
-#endif
 	out.setGenerateByteOrderMark(false);
 	out << xml_doc.toString(4);
 	if  (!file.commit())
@@ -822,14 +798,7 @@ bool QET::writeToFile(QDomDocument &xml_doc, QFile *file, QString *error_message
 
 	QTextStream out(file);
 	out.seek(0);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	out.setCodec("UTF-8");
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	out.setEncoding(QStringConverter::Utf8);
-#endif
 	out.setGenerateByteOrderMark(false);
 	out << xml_doc.toString(4);
 	if (opened_here) {

sources/qetapp.cpp

@@ -204,14 +204,7 @@ void QETApp::setLanguage(const QString &desired_language) {
 	QString languages_path = languagesPath();
 
 	// load Qt library translations
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	QString qt_l10n_path = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	QString qt_l10n_path = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
-#endif
 	if (!qtTranslator.load("qt_" + desired_language, qt_l10n_path))
 	{
 		qWarning() << "failed to load"

sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp

@@ -451,16 +451,8 @@ void GraphicsTablePropertiesEditor::setUpEditConnection()
 		m_edit_connection << connect(ui->m_table_left_margin,    QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_table_right_margin,   QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_table_bottom_margin,  QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)	// ### Qt 6: remove
-		m_edit_connection << connect(m_table_button_group,       QOverload<int>::of(&QButtonGroup::buttonClicked), this, &GraphicsTablePropertiesEditor::apply);
-		m_edit_connection << connect(m_header_button_group,      QOverload<int>::of(&QButtonGroup::buttonClicked), this, &GraphicsTablePropertiesEditor::apply);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.15 or later")
-#endif
-		m_edit_connection << connect(m_table_button_group,       QOverload<int>::of(&QButtonGroup::idClicked), this, &GraphicsTablePropertiesEditor::apply);
-		m_edit_connection << connect(m_header_button_group,      QOverload<int>::of(&QButtonGroup::idClicked), this, &GraphicsTablePropertiesEditor::apply);
-#endif
+		m_edit_connection << connect(m_table_button_group,       QOverload<int>::of(&QButtonGroup::idClicked),     this, &GraphicsTablePropertiesEditor::apply);
+		m_edit_connection << connect(m_header_button_group,      QOverload<int>::of(&QButtonGroup::idClicked),     this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_display_n_row_sb,     QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_display_n_row_sb,     QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::updateInfoLabel);
 	}

sources/qetgraphicsitem/conductor.cpp

@@ -1725,14 +1725,7 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
 			for (Conductor *c : other_conductors_list_t) {
 				other_conductors += c->relatedPotentialConductors(all_diagram, t_list);
 			}
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-			other_conductors += other_conductors_list_t.toSet();
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 			other_conductors += QSet<Conductor*>(other_conductors_list_t.begin(),other_conductors_list_t.end());
-#endif
 		}
 	}
 

sources/qetgraphicsitem/crossrefitem.cpp

@@ -17,6 +17,8 @@
 */
 #include "crossrefitem.h"
 
+#include <QTimer>
+
 #include "../autoNum/assignvariables.h"
 #include "../diagram.h"
 #include "../diagramposition.h"
@@ -222,9 +224,12 @@ void CrossRefItem::updateLabel()
 	prepareGeometryChange();
 	m_bounding_rect = QRectF();
 
-		//init the painter
-	QPainter qp;
-	qp.begin(&m_drawing);
+	// Build geometry and m_hovered_contacts_map using a QImage-backed
+	// painter so font metrics match the screen painter in paint().
+	// m_update_map=true allows the draw functions to populate the map;
+	// paint() calls them with m_update_map=false so the map is stable.
+	QImage dummy(1, 1, QImage::Format_ARGB32_Premultiplied);
+	QPainter qp(&dummy);
 	QPen pen_;
 	pen_.setWidthF(0.5);
 	qp.setPen(pen_);
@@ -233,17 +238,21 @@ void CrossRefItem::updateLabel()
 		//Draw cross or contact, only if master element is linked.
 	if (! m_element->linkedElements().isEmpty())
 	{
+		m_update_map = true;
 		XRefProperties::DisplayHas dh = m_properties.displayHas();
 
 		if (dh == XRefProperties::Cross)
 			drawAsCross(qp);
 		else if (dh == XRefProperties::Contacts)
 			drawAsContacts(qp);
+		m_update_map = false;
 	}
-	qp.end();
 
 	autoPos();
 	update();
+	// Schedule a second update after the scene has finished laying out,
+	// so the initial render uses the correct bounding rect.
+	QTimer::singleShot(0, this, [this]{ update(); });
 }
 
 /**
@@ -311,7 +320,26 @@ void CrossRefItem::paint(
 {
 	Q_UNUSED(option)
 	Q_UNUSED(widget)
-	m_drawing.play(painter);
+	// Draw directly — no QPicture involved anywhere.
+	// QPicture::play() + nested drawPicture() (m_hdr_no_ctc/m_hdr_nc_ctc)
+	// caused a use-after-free crash (QRegion::begin, Qt5Gui+0x49af60)
+	// confirmed by analysis of 19+ coredumps.
+	// m_update_map=false: draw functions do not overwrite m_hovered_contacts_map.
+	if (m_element->linkedElements().isEmpty()) return;
+
+	QPen pen_;
+	pen_.setWidthF(0.5);
+	painter->save();
+	painter->setPen(pen_);
+	painter->setFont(QETApp::diagramTextsFont(5));
+
+	m_update_map = false;
+	XRefProperties::DisplayHas dh = m_properties.displayHas();
+	if (dh == XRefProperties::Cross)
+		drawAsCross(*painter);
+	else if (dh == XRefProperties::Contacts)
+		drawAsContacts(*painter);
+	painter->restore();
 }
 
 /**
@@ -321,7 +349,24 @@ void CrossRefItem::paint(
 void CrossRefItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
 	event->accept();
-	QetGraphicsItem::showItem(m_hovered_contact);
+
+	// Find the element under the click position directly from the map,
+	// rather than relying on m_hovered_contact which may have been reset
+	// by hoverMoveEvent between the two clicks of the double-click.
+	QPointF pos = event->pos();
+	Element *target = m_hovered_contact;
+
+	if (!target) {
+		for (auto it = m_hovered_contacts_map.begin();
+		     it != m_hovered_contacts_map.end(); ++it) {
+			if (it.value().contains(pos)) {
+				target = it.key();
+				break;
+			}
+		}
+	}
+
+	QetGraphicsItem::showItem(target);
 }
 
 /**
@@ -433,49 +478,41 @@ void CrossRefItem::linkedChanged()
 
 /**
 	@brief CrossRefItem::buildHeaderContact
-	Draw the QPicture of m_hdr_no_ctc and m_hdr_nc_ctc
+	Draw NO and NC contact symbols directly onto painter.
+	Previously used QPicture (m_hdr_no_ctc/m_hdr_nc_ctc) which caused
+	use-after-free crashes via nested QPicture::play() calls.
 */
-void CrossRefItem::buildHeaderContact()
+void CrossRefItem::buildHeaderContact(QPainter &painter, QPointF no_pos, QPointF nc_pos)
 {
-	if (!m_hdr_no_ctc.isNull() && !m_hdr_nc_ctc.isNull()) return;
-
-	//init the painter
-	QPainter qp;
 	QPen pen_;
 	pen_.setWidthF(0.2);
+	painter.save();
+	painter.setPen(pen_);
 
-	//draw the NO contact
-	if (m_hdr_no_ctc.isNull()) {
-		qp.begin(&m_hdr_no_ctc);
-		qp.setPen(pen_);
-		qp.drawLine(0, 3, 5, 3);
-		QPointF p1[3] = {
-			QPointF(5, 0),
-			QPointF(10, 3),
-			QPointF(15, 3),
-		};
-		qp.drawPolyline(p1,3);
-		qp.end();
-	}
+	//draw the NO contact header symbol
+	painter.drawLine(no_pos.x()+0, no_pos.y()+3, no_pos.x()+5, no_pos.y()+3);
+	QPointF p1[3] = {
+		QPointF(no_pos.x()+5,  no_pos.y()+0),
+		QPointF(no_pos.x()+10, no_pos.y()+3),
+		QPointF(no_pos.x()+15, no_pos.y()+3),
+	};
+	painter.drawPolyline(p1, 3);
 
-	//draw the NC contact
-	if (m_hdr_nc_ctc.isNull()) {
-		qp.begin(&m_hdr_nc_ctc);
-		qp.setPen(pen_);
-		QPointF p2[3] = {
-			QPointF(0, 3),
-			QPointF(5, 3),
-			QPointF(5, 0)
-		};
-		qp.drawPolyline(p2,3);
-		QPointF p3[3] = {
-			QPointF(4, 0),
-			QPointF(10, 3),
-			QPointF(15, 3),
-		};
-		qp.drawPolyline(p3,3);
-		qp.end();
-	}
+	//draw the NC contact header symbol
+	QPointF p2[3] = {
+		QPointF(nc_pos.x()+0, nc_pos.y()+3),
+		QPointF(nc_pos.x()+5, nc_pos.y()+3),
+		QPointF(nc_pos.x()+5, nc_pos.y()+0)
+	};
+	painter.drawPolyline(p2, 3);
+	QPointF p3[3] = {
+		QPointF(nc_pos.x()+4,  nc_pos.y()+0),
+		QPointF(nc_pos.x()+10, nc_pos.y()+3),
+		QPointF(nc_pos.x()+15, nc_pos.y()+3),
+	};
+	painter.drawPolyline(p3, 3);
+
+	painter.restore();
 }
 
 /**
@@ -493,11 +530,95 @@ void CrossRefItem::setUpCrossBoundingRect(QPainter &painter)
 
 	QStringList no_str, nc_str;
 
+	// Helper lambda: build "[13-14] pos" string for an element.
+	// For power contacts (e.g. 3-pole contactor), all named terminals
+	// are collected (e.g. "[1-2-3-4-5-6] pos").
+	// For other contacts (NO/NC/SW), only the first 2 named terminals
+	// are used — users are expected to name and order their terminals
+	// in the element editor.
+	// Helper lambda: build "[13-14] pos" for an element.
+	// - Power: all terminals sorted numerically → "[1-2-3-4-5-6] pos"
+	// - SW with typed terminals: show relevant pair per column (handled below)
+	// - Others: first 2 named terminals
+	auto buildLabel = [this](Element *elmt, bool is_no_col) -> QString {
+		const bool is_power =
+			elmt->kindInformations()["type"].toString() == "power";
+		const bool is_sw =
+			elmt->kindInformations()["state"].toString() == "SW";
+
+		QStringList tnames;
+
+		if (is_sw) {
+			// Check if terminals have explicit No/Nc/Common types
+			bool has_typed = false;
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				if (t->terminalType() == TerminalData::No ||
+					t->terminalType() == TerminalData::Nc ||
+					t->terminalType() == TerminalData::Common) {
+					has_typed = true; break;
+				}
+			}
+			if (has_typed) {
+				QString no_name, nc_name, common_name;
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					if (!t->name().isEmpty()) {
+						if      (t->terminalType() == TerminalData::No)     no_name     = t->name();
+						else if (t->terminalType() == TerminalData::Nc)     nc_name     = t->name();
+						else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+					}
+				}
+				// NO column: show NO+Common pair; NC column: show NC+Common pair
+				if (is_no_col)
+					tnames << no_name << common_name;
+				else
+					tnames << nc_name << common_name;
+			} else {
+				// Fallback: first 2 named terminals
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					const QString tn = t->name();
+					if (!tn.isEmpty()) { tnames << tn; if (tnames.size() >= 2) break; }
+				}
+			}
+		} else {
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				const QString tn = t->name();
+				if (!tn.isEmpty()) {
+					tnames << tn;
+					if (!is_power && tnames.size() >= 2) break;
+				}
+			}
+			if (is_power) {
+				std::sort(tnames.begin(), tnames.end(),
+					[](const QString &a, const QString &b){
+						int i_a = a.size();
+						while (i_a > 0 && a[i_a-1].isDigit()) --i_a;
+						int i_b = b.size();
+						while (i_b > 0 && b[i_b-1].isDigit()) --i_b;
+						bool a_ok = false, b_ok = false;
+						int ai = a.mid(i_a).toInt(&a_ok);
+						int bi = b.mid(i_b).toInt(&b_ok);
+						if (a_ok && b_ok && a.left(i_a) == b.left(i_b))
+							return ai < bi;
+						return a < b;
+					});
+			}
+		}
+
+		QString pos = elementPositionText(elmt, true);
+		if (!tnames.isEmpty() && m_properties.showTerminalName())
+			return QStringLiteral("[") + tnames.join("-") + QStringLiteral("] ") + pos;
+		return pos;
+	};
+
 	for (auto elmt : NOElements()) {
-		no_str.append(elementPositionText(elmt, true));
+		no_str.append(buildLabel(elmt, true));
 	}
 	for (auto elmt : NCElements()) {
-		nc_str.append(elementPositionText(elmt, true));
+		nc_str.append(buildLabel(elmt, false));
 	}
 
 	//There is no string to display, we return now
@@ -510,9 +631,10 @@ void CrossRefItem::setUpCrossBoundingRect(QPainter &painter)
 	QRectF no_bounding;
 	for (auto str : no_str)
 	{
-		QRectF bounding = painter.boundingRect(QRectF (), Qt::AlignCenter, str);
-		no_bounding = no_bounding.united(bounding);
+		QRectF bounding = painter.boundingRect(QRectF(0, 0, 500, 20), Qt::AlignLeft, str);
 		no_bounding.setHeight(no_bounding.height() + bounding.height());
+		if (bounding.width() > no_bounding.width())
+			no_bounding.setWidth(bounding.width());
 	}
 	//Adjust according to the NO
 	if (no_bounding.height() > default_bounding.height() - header)
@@ -524,9 +646,10 @@ void CrossRefItem::setUpCrossBoundingRect(QPainter &painter)
 	QRectF nc_bounding;
 	for (auto str : nc_str)
 	{
-		QRectF bounding = painter.boundingRect(QRectF (), Qt::AlignCenter, str);
-		nc_bounding = nc_bounding.united(bounding);
+		QRectF bounding = painter.boundingRect(QRectF(0, 0, 500, 20), Qt::AlignLeft, str);
 		nc_bounding.setHeight(nc_bounding.height() + bounding.height());
+		if (bounding.width() > nc_bounding.width())
+			nc_bounding.setWidth(bounding.width());
 	}
 	//Adjust according to the NC
 	if (nc_bounding.height() > default_bounding.height() - header)
@@ -550,7 +673,8 @@ void CrossRefItem::drawAsCross(QPainter &painter)
 {
 	//calculate the size of the cross
 	setUpCrossBoundingRect(painter);
-	m_hovered_contacts_map.clear();
+	m_drawed_contacts = 0;
+	if (m_update_map) m_hovered_contacts_map.clear();
 
 	//Bounding rect is empty that mean there's no contact to draw
 	if (boundingRect().isEmpty()) return;
@@ -560,12 +684,11 @@ void CrossRefItem::drawAsCross(QPainter &painter)
 	painter.drawLine(br.width()/2, 0, br.width()/2, br.height());	//vertical line
 	painter.drawLine(0, header, br.width(), header);	//horizontal line
 
-	//Add the symbolic contacts
-	buildHeaderContact();
-	QPointF p((m_bounding_rect.width()/4) - (m_hdr_no_ctc.width()/2), 0);
-	painter.drawPicture (p, m_hdr_no_ctc);
-	p.setX((m_bounding_rect.width() * 3/4) - (m_hdr_nc_ctc.width()/2));
-	painter.drawPicture (p, m_hdr_nc_ctc);
+	//Add the symbolic contacts (drawn directly, no QPicture)
+	static const qreal hdr_symbol_width = 15.0;
+	QPointF no_pos((m_bounding_rect.width()/4) - (hdr_symbol_width/2), 0);
+	QPointF nc_pos((m_bounding_rect.width() * 3/4) - (hdr_symbol_width/2), 0);
+	buildHeaderContact(painter, no_pos, nc_pos);
 
 	//and fill it
 	fillCrossRef(painter);
@@ -582,7 +705,7 @@ void CrossRefItem::drawAsContacts(QPainter &painter)
 		return;
 
 	m_drawed_contacts = 0;
-	m_hovered_contacts_map.clear();
+	if (m_update_map) m_hovered_contacts_map.clear();
 	QRectF bounding_rect;
 
 	//Draw each linked contact
@@ -606,7 +729,7 @@ void CrossRefItem::drawAsContacts(QPainter &painter)
 			else if (type == "delayOff") option += DelayOff;
 			else if (type == "delayOnOff") option += DelayOnOff;
 
-			QRectF br = drawContact(painter, option, elmt);
+			QRectF br = drawContact(painter, option, elmt, i);
 			bounding_rect = bounding_rect.united(br);
 		}
 	}
@@ -625,19 +748,81 @@ void CrossRefItem::drawAsContacts(QPainter &painter)
 	@param elmt : the element to display text (the position of the contact)
 	@return The bounding rect of the draw (contact + text)
 */
-QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
+QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt, int pole_index)
 {
 	QString str = elementPositionText(elmt);
 
 	// Collect terminal names from the element definition (.elmt)
 	// e.g. name="13" and name="14" on each terminal
+	// For power contacts, sort numerically and pick the pair for pole_index.
+	// For SW contacts with typed terminals (No/Nc/Common), filter by role.
 	QStringList terminal_names;
+	const bool is_power_ctc =
+		elmt->kindInformations()["type"].toString() == "power";
+	const bool is_sw = (flags & SW) && !(flags & NOC);
+
+	// Check if SW terminals have explicit No/Nc/Common types
+	bool sw_has_typed_terminals = false;
+	if (is_sw) {
+		for (Terminal *t : elmt->terminals()) {
+			if (!t) continue;
+			if (t->terminalType() == TerminalData::No ||
+				t->terminalType() == TerminalData::Nc ||
+				t->terminalType() == TerminalData::Common) {
+				sw_has_typed_terminals = true;
+				break;
+			}
+		}
+	}
+
 	for (Terminal *t : elmt->terminals()) {
+		if (!t) continue;
 		const QString tname = t->name();
 		if (!tname.isEmpty())
 			terminal_names << tname;
 	}
 
+	if (is_power_ctc) {
+		// Sort terminals alphanumerically so names like "R1","R2"... or "1","2"...
+		// are ordered correctly. Extract trailing digits for numeric comparison;
+		// fall back to full string comparison when no digits are found.
+		std::sort(terminal_names.begin(), terminal_names.end(),
+			[](const QString &a, const QString &b){
+				// Extract trailing numeric part
+				int i_a = a.size();
+				while (i_a > 0 && a[i_a-1].isDigit()) --i_a;
+				int i_b = b.size();
+				while (i_b > 0 && b[i_b-1].isDigit()) --i_b;
+				bool a_ok = false, b_ok = false;
+				int ai = a.mid(i_a).toInt(&a_ok);
+				int bi = b.mid(i_b).toInt(&b_ok);
+				if (a_ok && b_ok && a.left(i_a) == b.left(i_b))
+					return ai < bi;
+				return a < b;
+			});
+		// Pick the pair for this pole: pole 0 → [0,1], pole 1 → [2,3], etc.
+		int idx = pole_index * 2;
+		if (idx + 1 < terminal_names.size())
+			terminal_names = QStringList() << terminal_names[idx] << terminal_names[idx+1];
+		else
+			terminal_names.clear();
+	} else if (is_sw && sw_has_typed_terminals) {
+		// Build [NO_name, Common_name, NC_name] from typed terminals
+		QString no_name, nc_name, common_name;
+		for (Terminal *t : elmt->terminals()) {
+			if (!t) continue;
+			if (!t->name().isEmpty()) {
+				if      (t->terminalType() == TerminalData::No)     no_name     = t->name();
+				else if (t->terminalType() == TerminalData::Nc)     nc_name     = t->name();
+				else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+			}
+		}
+		// drawText expects: [0]=NC, [1]=NO, [2]=Common
+		// (drawText uses [1] for NO top-left, [0] for NC bottom-left, [2] for Common right)
+		terminal_names.clear();
+		terminal_names << nc_name << no_name << common_name;
+	}
+
 	int offset = m_drawed_contacts*10;
 	QRectF bounding_rect = QRectF(0, offset, 24, 10);
 	
@@ -656,10 +841,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 
 		// Draw terminal names on each side of the contact symbol
 		// terminal_names[0] on the left, terminal_names[1] on the right
-		if (!terminal_names.isEmpty()) {
-			QFont font = QETApp::diagramTextsFont(4);
-			font.setBold(true);
-			painter.setFont(font);
+		if (!terminal_names.isEmpty() && m_properties.showTerminalName()) {
+			painter.setFont(QETApp::diagramTextsFont(4));
 			QRectF bt(0, offset, 24, 10);
 			if (terminal_names.size() >= 1)
 				painter.drawText(bt, Qt::AlignLeft|Qt::AlignTop, terminal_names[0]);
@@ -744,14 +927,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 		painter.drawText(text_rect, Qt::AlignLeft | Qt::AlignVCenter, str);
 		bounding_rect = bounding_rect.united(text_rect);
 
-		if (m_hovered_contacts_map.contains(elmt))
-		{
+		if (m_update_map)
 			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
-		else
-		{
-			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
 
 		++m_drawed_contacts;
 	}
@@ -787,21 +964,19 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 		// terminal_names[0] = NO side (top left)
 		// terminal_names[1] = NC side (bottom left)
 		// terminal_names[2] = common side (right)
-		if (!terminal_names.isEmpty()) {
-			QFont font = QETApp::diagramTextsFont(4);
-			font.setBold(true);
-			painter.setFont(font);
+		if (!terminal_names.isEmpty() && m_properties.showTerminalName()) {
+			painter.setFont(QETApp::diagramTextsFont(4));
 			// Sort order from parseTerminal (top->bottom, left->right):
 			// [0]=12 (NO, top-left), [1]=14 (common, top-center), [2]=13 (NC, bottom-center)
 			if (terminal_names.size() >= 1)
 				painter.drawText(QRectF(0, offset, 8, 8),
-						Qt::AlignLeft|Qt::AlignTop, terminal_names[0]);   // 12 NO left
+						Qt::AlignLeft|Qt::AlignTop, terminal_names[1]);   // 12 NO left
 			if (terminal_names.size() >= 2)
 				painter.drawText(QRectF(16, offset+4, 8, 6),
-						Qt::AlignRight|Qt::AlignTop, terminal_names[1]); // 14 common right
+						Qt::AlignRight|Qt::AlignTop, terminal_names[2]); // 14 common right
 			if (terminal_names.size() >= 3)
 				painter.drawText(QRectF(0, offset+9, 8, 6),
-						Qt::AlignLeft|Qt::AlignTop, terminal_names[2]); // 13 NC left-bottom
+						Qt::AlignLeft|Qt::AlignTop, terminal_names[0]); // 13 NC left-bottom
 			painter.setFont(QETApp::diagramTextsFont(5));
 		}
 
@@ -836,12 +1011,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 				 str);
 		bounding_rect = bounding_rect.united(text_rect);
 
-		if (m_hovered_contacts_map.contains(elmt)) {
+		if (m_update_map)
 			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
-		else {
-			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
 
 			//a switch contact take place of two normal contact
 		m_drawed_contacts += 2;
@@ -872,12 +1043,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 					str);
 		bounding_rect = bounding_rect.united(text_rect);
 
-		if (m_hovered_contacts_map.contains(elmt)) {
+		if (m_update_map)
 			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
-		else {
-			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
 		++m_drawed_contacts;
 	}
 		return bounding_rect;
@@ -903,7 +1070,60 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 		m_hovered_contact == elmt ? pen.setColor(Qt::blue) :pen.setColor(Qt::black);
 		painter.setPen(pen);
 
+		// Collect terminal names for NO column.
+		// Power: all terminals sorted numerically.
+		// SW with typed terminals: NO+Common pair.
+		// Others: first 2 named terminals.
+		const bool is_power_no =
+			elmt->kindInformations()["type"].toString() == "power";
+		const bool is_sw_no =
+			elmt->kindInformations()["state"].toString() == "SW";
+		QStringList tnames;
+		if (is_sw_no) {
+			bool has_typed = false;
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				if (t->terminalType() == TerminalData::No ||
+					t->terminalType() == TerminalData::Nc ||
+					t->terminalType() == TerminalData::Common) {
+					has_typed = true; break;
+				}
+			}
+			if (has_typed) {
+				QString no_name, common_name;
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					if (!t->name().isEmpty()) {
+						if      (t->terminalType() == TerminalData::No)     no_name     = t->name();
+						else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+					}
+				}
+				tnames << no_name << common_name;
+			} else {
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					const QString tn = t->name();
+					if (!tn.isEmpty()) { tnames << tn; if (tnames.size() >= 2) break; }
+				}
+			}
+		} else {
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				const QString tn = t->name();
+				if (!tn.isEmpty()) {
+					tnames << tn;
+					if (!is_power_no && tnames.size() >= 2) break;
+				}
+			}
+		}
+		QString terminal_label;
+		if (!tnames.isEmpty() && m_properties.showTerminalName())
+			terminal_label = QStringLiteral("[") + tnames.join("-") + QStringLiteral("]");
+
 		QString str = elementPositionText(elmt, true);
+		if (!terminal_label.isEmpty())
+			str = terminal_label + QStringLiteral(" ") + str;
+
 		QRectF bounding = painter.boundingRect(
 					QRectF(no_top_left,
 					       QSize(middle_cross, 1)),
@@ -911,13 +1131,11 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 					str);
 		painter.drawText(bounding, Qt::AlignLeft, str);
 
-		if (m_hovered_contacts_map.contains(elmt))
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
-		}
-		else
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
+		if (m_update_map) {
+			QString pos_str = elementPositionText(elmt, true);
+			QRectF pos_rect = painter.boundingRect(bounding, Qt::AlignRight, pos_str);
+			pos_rect.adjust(-2, -1, 2, 1); // extend hit area slightly
+			m_hovered_contacts_map.insert(elmt, pos_rect);
 		}
 
 		no_top_left.ry() += bounding.height();
@@ -932,7 +1150,60 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 					  :pen.setColor(Qt::black);
 		painter.setPen(pen);
 
+		// Collect terminal names for NC column.
+		// Power: all terminals sorted numerically.
+		// SW with typed terminals: NC+Common pair.
+		// Others: first 2 named terminals.
+		const bool is_power_nc =
+			elmt->kindInformations()["type"].toString() == "power";
+		const bool is_sw_nc =
+			elmt->kindInformations()["state"].toString() == "SW";
+		QStringList tnames_nc;
+		if (is_sw_nc) {
+			bool has_typed = false;
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				if (t->terminalType() == TerminalData::No ||
+					t->terminalType() == TerminalData::Nc ||
+					t->terminalType() == TerminalData::Common) {
+					has_typed = true; break;
+				}
+			}
+			if (has_typed) {
+				QString nc_name, common_name;
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					if (!t->name().isEmpty()) {
+						if      (t->terminalType() == TerminalData::Nc)     nc_name     = t->name();
+						else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+					}
+				}
+				tnames_nc << nc_name << common_name;
+			} else {
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					const QString tn = t->name();
+					if (!tn.isEmpty()) { tnames_nc << tn; if (tnames_nc.size() >= 2) break; }
+				}
+			}
+		} else {
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				const QString tn = t->name();
+				if (!tn.isEmpty()) {
+					tnames_nc << tn;
+					if (!is_power_nc && tnames_nc.size() >= 2) break;
+				}
+			}
+		}
+		QString terminal_label;
+		if (!tnames_nc.isEmpty() && m_properties.showTerminalName())
+			terminal_label = QStringLiteral("[") + tnames_nc.join("-") + QStringLiteral("]");
+
 		QString str = elementPositionText(elmt, true);
+		if (!terminal_label.isEmpty())
+			str = terminal_label + QStringLiteral(" ") + str;
+
 		QRectF bounding = painter.boundingRect(
 					QRectF(nc_top_left,
 					       QSize(middle_cross, 1)),
@@ -940,13 +1211,11 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 					str);
 		painter.drawText(bounding, Qt::AlignRight, str);
 
-		if (m_hovered_contacts_map.contains(elmt))
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
-		}
-		else
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
+		if (m_update_map) {
+			QString pos_str = elementPositionText(elmt, true);
+			QRectF pos_rect = painter.boundingRect(bounding, Qt::AlignRight, pos_str);
+			pos_rect.adjust(-2, -1, 2, 1); // extend hit area slightly
+			m_hovered_contacts_map.insert(elmt, pos_rect);
 		}
 
 		nc_top_left.ry() += bounding.height();

sources/qetgraphicsitem/crossrefitem.h

@@ -22,7 +22,6 @@
 
 #include <QGraphicsObject>
 #include <QMultiMap>
-#include <QPicture>
 
 class Element;
 class DynamicElementTextItem;
@@ -103,11 +102,11 @@ class CrossRefItem : public QGraphicsObject
 
 	private:
 		void linkedChanged();
-		void buildHeaderContact();
+		void buildHeaderContact(QPainter &painter, QPointF no_pos, QPointF nc_pos);
 		void setUpCrossBoundingRect(QPainter &painter);
 		void drawAsCross(QPainter &painter);
 		void drawAsContacts(QPainter &painter);
-		QRectF drawContact(QPainter &painter, int flags, Element *elmt);
+		QRectF drawContact(QPainter &painter, int flags, Element *elmt, int pole_index = 0);
 		void fillCrossRef(QPainter &painter);
 		void AddExtraInfo(QPainter &painter, const QString&);
 		QList<Element *> NOElements() const;
@@ -117,10 +116,10 @@ class CrossRefItem : public QGraphicsObject
 	private:
 		Element *m_element; //element to display the cross reference
 		QRectF m_bounding_rect;
-		QPicture m_drawing, m_hdr_no_ctc, m_hdr_nc_ctc;
 		QPainterPath m_shape_path;
 		XRefProperties m_properties;
 		int m_drawed_contacts;
+		bool m_update_map = false;
 		QMultiMap <Element *, QRectF> m_hovered_contacts_map;
 		Element *m_hovered_contact = nullptr;
 		DynamicElementTextItem *m_text = nullptr;

sources/qetgraphicsitem/dynamicelementtextitem.cpp

@@ -26,7 +26,7 @@
 #include "crossrefitem.h"
 #include "element.h"
 #include "elementtextitemgroup.h"
-
+#include <QTimer>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QGraphicsSceneMouseEvent>
@@ -302,7 +302,8 @@ void DynamicElementTextItem::refreshLabelConnection()
 	if ((m_text_from == ElementInfo && m_info_name == "label") ||
 		(m_text_from == CompositeText && m_composite_text.contains("%{label}")))
 	{
-		if(m_parent_element.data()->linkType() & Element::AllReport)
+		if((m_parent_element.data()->linkType() & Element::AllReport) ||
+			m_parent_element.data()->linkType() == Element::ConductorDefinition)
 		{
 			updateReportFormulaConnection();
 			updateReportText();
@@ -418,7 +419,8 @@ void DynamicElementTextItem::setInfoName(const QString &info_name)
 		updateXref();
 	}
 
-	if (m_parent_element && (m_parent_element.data()->linkType() & Element::AllReport)) //special treatment for report
+	if (m_parent_element && ((m_parent_element.data()->linkType() & Element::AllReport) ||
+		m_parent_element.data()->linkType() == Element::ConductorDefinition)) //special treatment for report
 	{
 		if(old_info_name != info_name)
 		{
@@ -472,7 +474,8 @@ void DynamicElementTextItem::setCompositeText(const QString &text)
 		updateXref();
 	}
 
-	if (m_parent_element && (m_parent_element.data()->linkType() & Element::AllReport)) //special treatment for report
+	if (m_parent_element && ((m_parent_element.data()->linkType() & Element::AllReport) ||
+		m_parent_element.data()->linkType() == Element::ConductorDefinition)) //special treatment for report
 	{
 			/*
 			 * May be in some case the old and new composite text both have the var %{label},
@@ -726,28 +729,29 @@ QVariant DynamicElementTextItem::itemChange(QGraphicsItem::GraphicsItemChange ch
 			if(!m_parent_element.data()->linkedElements().isEmpty())
 				masterChanged();
 		}
-		else if(m_parent_element.data()->linkType() & Element::AllReport)
+		else if((m_parent_element.data()->linkType() & Element::AllReport) ||
+			m_parent_element.data()->linkType() == Element::ConductorDefinition)
 		{
-				//Get the report formula, and add connection to keep up to date the formula.
+			//Get the report formula, and add connection to keep up to date the formula.
 			if (m_parent_element.data()->diagram() && m_parent_element.data()->diagram()->project())
 			{
 				m_report_formula = m_parent_element.data()->diagram()->project()->defaultReportProperties();
 				m_report_formula_con = connect(m_parent_element.data()->diagram()->project(), &QETProject::reportPropertiesChanged, this, &DynamicElementTextItem::reportFormulaChanged);
 			}
 
-				//Add connection to keep up to date the status of the element linked to the parent folio report of this text.
+			//Add connection to keep up to date the status of the element linked to the parent folio report of this text.
 			connect(m_parent_element.data(), &Element::linkedElementChanged, this, &DynamicElementTextItem::reportChanged);
-				//The parent is already linked, we call reportChanged for init the connection
+			//The parent is already linked, we call reportChanged for init the connection
 			if(!m_parent_element.data()->linkedElements().isEmpty())
 				reportChanged();
 
 			if(m_parent_element.data()->terminals().size())
 			{
-					//Add connection to keep up date the conductors added or removed to the parent folio report element
+				//Add connection to keep up date the conductors added or removed to the parent folio report element
 				connect(m_parent_element.data()->terminals().first(), &Terminal::conductorWasAdded, this, &DynamicElementTextItem::conductorWasAdded);
 				connect(m_parent_element.data()->terminals().first(), &Terminal::conductorWasRemoved, this, &DynamicElementTextItem::conductorWasRemoved);
 			}
-				//Get a conductor in the potential
+			//Get a conductor in the potential
 			setPotentialConductor();
 		}
 		else if(m_parent_element.data()->linkType() == Element::Master)
@@ -1027,7 +1031,8 @@ void DynamicElementTextItem::clearFormulaConnection()
 
 void DynamicElementTextItem::updateReportFormulaConnection()
 {
-	if(!(m_parent_element.data()->linkType() & Element::AllReport))
+	if(!(m_parent_element.data()->linkType() & Element::AllReport) &&
+		m_parent_element.data()->linkType() != Element::ConductorDefinition)
 		return;
 	
 	removeConnectionForReportFormula(m_report_formula);
@@ -1041,7 +1046,8 @@ void DynamicElementTextItem::updateReportFormulaConnection()
 */
 void DynamicElementTextItem::updateReportText()
 {
-	if(!(m_parent_element.data()->linkType() & Element::AllReport))
+	if(!(m_parent_element.data()->linkType() & Element::AllReport) &&
+		m_parent_element.data()->linkType() != Element::ConductorDefinition)
 		return;
 	
 	if (m_text_from == ElementInfo && m_info_name == "label")
@@ -1098,7 +1104,10 @@ void DynamicElementTextItem::updateLabel()
 void DynamicElementTextItem::conductorWasAdded(Conductor *conductor)
 {
 	Q_UNUSED(conductor)
-	setPotentialConductor();
+	QTimer::singleShot(100, this, [this]() {
+		setPotentialConductor();
+		conductorPropertiesChanged();
+	});
 }
 
 /**
@@ -1123,7 +1132,8 @@ void DynamicElementTextItem::conductorWasRemoved(Conductor *conductor)
 */
 void DynamicElementTextItem::setPotentialConductor()
 {
-	if(parentElement() && (parentElement()->linkType() & Element::AllReport))
+	if(parentElement() && ((parentElement()->linkType() & Element::AllReport) || (parentElement()->linkType() == Element::ConductorDefinition) ||
+		parentElement()->linkType() == Element::ConductorDefinition))
 	{
 		if(parentElement()->terminals().isEmpty())
 			return;
@@ -1156,6 +1166,7 @@ void DynamicElementTextItem::setPotentialConductor()
 				connect(m_watched_conductor.data(), &Conductor::propertiesChange, this, &DynamicElementTextItem::conductorPropertiesChanged);
 			}
 		}
+		conductorPropertiesChanged();
 	}
 	else //This text haven't got a parent element, then ther isn't a conductor in the potential
 	{
@@ -1172,7 +1183,8 @@ void DynamicElementTextItem::setPotentialConductor()
 */
 void DynamicElementTextItem::conductorPropertiesChanged()
 {
-	if(m_parent_element && (m_parent_element.data()->linkType() & Element::AllReport))
+	if(m_parent_element && ((m_parent_element.data()->linkType() & Element::AllReport) || (m_parent_element.data()->linkType() == Element::ConductorDefinition) ||
+		m_parent_element.data()->linkType() == Element::ConductorDefinition))
 	{
 		if(m_text_from == ElementInfo)
 		{
@@ -1201,7 +1213,8 @@ QString DynamicElementTextItem::reportReplacedCompositeText() const
 {
 	QString string;
 
-	if(m_parent_element.data()->linkType() & Element::AllReport)
+	if((m_parent_element.data()->linkType() & Element::AllReport) || (m_parent_element.data()->linkType() == Element::ConductorDefinition) ||
+		m_parent_element.data()->linkType() == Element::ConductorDefinition)
 	{
 		string = m_composite_text;
 		

sources/qetgraphicsitem/element.cpp

@@ -36,6 +36,7 @@
 #include "../qetxml.h"
 #include "../qetversion.h"
 #include "qgraphicsitemutility.h"
+#include <QDebug>
 
 #include <QDomElement>
 #include <utility>
@@ -431,6 +432,11 @@ bool Element::buildFromXml(const QDomElement &xml_def_elmt, int *state)
 	m_data.fromXml(xml_def_elmt);
 	setToolTip(name());
 
+	QString my_type_str = xml_def_elmt.attribute(QStringLiteral("link_type"), QStringLiteral("simple"));
+	if (my_type_str == QLatin1String("conductor_definition")) {
+		m_link_type = Element::ConductorDefinition;
+	}
+
 		//load kind informations
 	m_kind_informations.fromXml(
 				xml_def_elmt.firstChildElement(QStringLiteral("kindInformations")),
@@ -627,6 +633,9 @@ Terminal *Element::parseTerminal(const QDomElement &dom_element)
 	Terminal *new_terminal = new Terminal(data, this);
 	m_terminals << new_terminal;
 
+	connect(new_terminal, &Terminal::conductorWasAdded,   this, &Element::updateConductorTexts);
+	connect(new_terminal, &Terminal::conductorWasRemoved, this, &Element::updateConductorTexts);
+
 		//Sort from top to bottom and left to right
 	std::sort(m_terminals.begin(),
 		  m_terminals.end(),
@@ -1288,6 +1297,8 @@ QString Element::linkTypeToString() const
 			return QStringLiteral("Terminale");
 		case Thumbnail:
 			return QStringLiteral("Thumbnail");
+		case ConductorDefinition:
+			return QStringLiteral("ConductorDefinition");
 		default:
 			return QStringLiteral("Unknown");
 	}
@@ -1555,3 +1566,25 @@ ElementsLocation Element::location() const
 {
 	return m_location;
 }
+
+/**
+ * @brief Element::updateConductorTexts
+ *Slot that is triggered when a cable is                           *
+ *connected to or disconnected from a terminal on this component.
+ */
+/**
+ * @brief Element::updateConductorTexts
+ */
+void Element::updateConductorTexts()
+{
+	if (m_link_type != Element::ConductorDefinition) {
+		return;
+	}
+
+	for (DynamicElementTextItem *deti : m_dynamic_text_list) {
+		if (deti) {
+			deti->setPotentialConductor();
+			deti->updateLabel();
+		}
+	}
+}

sources/qetgraphicsitem/element.h

@@ -52,14 +52,15 @@ class Element : public QetGraphicsItem
 				(master, slave, report ect...)
 			*/
 		enum kind {
-			Simple = 1,
-			NextReport = 2,
-			PreviousReport = 4,
-			AllReport = 6,
-			Master = 8,
-			Slave = 16,
-			Terminale = 32,
-			Thumbnail = 64};
+            Simple = 1,
+            NextReport = 2,
+            PreviousReport = 4,
+            AllReport = 6,
+            Master = 8,
+            Slave = 16,
+            Terminale = 32,
+            Thumbnail = 64,
+            ConductorDefinition = 128};
 
 		Element(const ElementsLocation &location,
 			QGraphicsItem * = nullptr,
@@ -95,6 +96,8 @@ class Element : public QetGraphicsItem
 				DynamicElementTextItem *text,
 				ElementTextItemGroup *group);
 
+	public slots:
+		void updateConductorTexts();
 
 	public:
 		QList<Terminal *> terminals() const;

sources/qetgraphicsitem/terminal.cpp

@@ -753,6 +753,15 @@ QString Terminal::name() const
 	return d->m_name;
 }
 
+/**
+	@brief Terminal::terminalType
+	@return the type of this terminal (Generic, Inner, Outer, No, Nc, Common)
+*/
+TerminalData::Type Terminal::terminalType() const
+{
+	return d->m_type;
+}
+
 /**
 	@brief Conductor::relatedPotentialTerminal
 	Return terminal at the same potential from the same