Merge 3cadc9275e into 22e6188bb6

2026-06-21 22:44:14 +02:00 · 2025-01-30 06:26:09 +00:00
203 changed files with 16283 additions and 26479 deletions
@@ -16,7 +16,7 @@
 include(cmake/hoto_update_cmake_message.cmake)
-cmake_minimum_required(VERSION 3.21.1 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
 project(qelectrotech
  VERSION 0.9.0
@@ -27,13 +27,6 @@ project(qelectrotech
 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)
@@ -50,17 +43,42 @@ include(cmake/git_last_commit_sha.cmake)
 include(cmake/fetch_kdeaddons.cmake)
 include(cmake/fetch_singleapplication.cmake)
 include(cmake/fetch_pugixml.cmake)
 include(cmake/qet_compilation_vars.cmake)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 SET(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(
  QT
 NAMES
  Qt6
  Qt5
 COMPONENTS
  ${QET_COMPONENTS}
 REQUIRED
 )
 find_package(
  Qt${QT_VERSION_MAJOR}
 COMPONENTS
 ${QET_COMPONENTS}
 REQUIRED)
 set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
 qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
 qt5_add_translation(QM_FILES ${TS_FILES})
 # als laatse
 include(cmake/define_definitions.cmake)
-qt_add_executable(
+add_executable(
  ${PROJECT_NAME}
  ${QET_RES_FILES}
  ${QET_SRC_FILES}
@@ -68,24 +86,13 @@ qt_add_executable(
  ${QET_DIR}/qelectrotech.qrc
  )
 if(QMFILES_AS_RESOURCE)
  qt_add_translations(${PROJECT_NAME} TS_FILES ${TS_FILES} RESOURCE_PREFIX "/lang")
 else()
  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}
  ${KF6_PRIVATE_LIBRARIES}
  ${QET_PRIVATE_LIBRARIES}
  )
@@ -142,7 +149,6 @@ install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share
 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})
-  install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+
 endif()
 endif()
@@ -29,7 +29,7 @@
        {
          "type": "git",
          "url": "https://github.com/iwalton3/tkinter-standalone",
-          "commit": "23c793bad2429f4a81eee9f50e2d07ae845b7785"
+          "commit": "2301112d142ebaf7532b25600c77d1a2edc9ef04"
        }
            ],
      "modules": [
@@ -125,7 +125,6 @@
        !insertmacro MUI_LANGUAGE "Dutch"
        !insertmacro MUI_LANGUAGE "Dutch_Belgium"
        !insertmacro MUI_LANGUAGE "Danish"
        !insertmacro MUI_LANGUAGE "Swedish"
 	!insertmacro MUI_RESERVEFILE_LANGDLL
 	!include lang_extra.nsh
@@ -62,15 +62,10 @@ message("PROJECT_SOURCE_DIR        :" ${PROJECT_SOURCE_DIR})
 message("QET_DIR                   :" ${QET_DIR})
 message("GIT_COMMIT_SHA            :" ${GIT_COMMIT_SHA})
-if(BUILD_WITH_KF6 AND BUILD_KF6)
+if(BUILD_WITH_KF5)
-  message("KF6_GIT_TAG               :" ${KF6_GIT_TAG})
+  message("KF5_GIT_TAG               :" ${KF5_GIT_TAG})
-endif()
+else()
-if(NOT BUILD_WITH_KF6)
+  add_definitions(-DBUILD_WITHOUT_KF5)
  add_definitions(-DBUILD_WITHOUT_KF6)
 endif()
 message("QET_COMPONENTS            :" ${QET_COMPONENTS})
-message("Qt version                :" ${Qt6_VERSION})
+message("QT_VERSION_MAJOR          :" ${QT_VERSION_MAJOR})
 if(QMFILES_AS_RESOURCE)
  add_definitions(-DQMFILES_AS_RESOURCE)
 endif()
@@ -31,8 +31,5 @@ add_definitions(-DQT_MESSAGELOGCONTEXT)
 # In order to do so, uncomment the following line.
 #add_definitions(-DTODO_LIST)
-# Build with KF6
+# Build with KF5
-option(BUILD_WITH_KF6 "Build with KF6" ON)
+option(BUILD_WITH_KF5 "Build with KF5" ON)
 # Use translations as a Qt resource
 option(QMFILES_AS_RESOURCE "Use .qm files as Qt resource" ON)
@@ -14,47 +14,54 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-message(STATUS "fetch_kdeaddons")
+message(" - fetch_kdeaddons")
-if(BUILD_WITH_KF6)
+if(DEFINED BUILD_WITH_KF5)
-  option(BUILD_KF6 "Build KF6 libraries, use system ones otherwise" OFF)
+  Include(FetchContent)
  block(PROPAGATE KF6_GIT_TAG)
  set(BUILD_TESTING OFF)
  set(KDE_SKIP_TEST_SETTINGS ON)
  set(BUILD_DESIGNERPLUGIN OFF)
  set(KCOREADDONS_USE_QML OFF)
  set(BUILD_QCH OFF)
  set(BUILD_SHARED_LIBS OFF)
  find_package(ECM 6.8.0 REQUIRED NO_MODULE)
  list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-  if(BUILD_KF6)
+  option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES)
    Include(FetchContent)
-    if(NOT DEFINED KF6_GIT_TAG)
+  if(BUILD_KF5)
-      set(KF6_GIT_TAG v6.8.0)
+
    if(NOT DEFINED KF5_GIT_TAG)
      #https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
      set(KF5_GIT_TAG v5.77.0)
    endif()
    # Fix stop the run autotests of kcoreaddons
    # see
    # https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98
    # issue:
    # CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
    # Cannot find source file:
    # see
    # https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
    set(KDE_SKIP_TEST_SETTINGS "TRUE")
    set(BUILD_TESTING "0")
    FetchContent_Declare(
      ecm
      GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
      GIT_TAG        ${KF5_GIT_TAG})
    FetchContent_MakeAvailable(ecm)
    FetchContent_Declare(
      kcoreaddons
      GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
-      GIT_TAG        ${KF6_GIT_TAG})
+      GIT_TAG        ${KF5_GIT_TAG})
    FetchContent_MakeAvailable(kcoreaddons)
    get_target_property(kca_version KF6::CoreAddons VERSION)
    FetchContent_Declare(
      kwidgetsaddons
      GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
      GIT_TAG        ${KF5_GIT_TAG})
    FetchContent_MakeAvailable(kwidgetsaddons)
  else()
-    find_package(KF6CoreAddons REQUIRED)
+    find_package(KF5CoreAddons REQUIRED)
-    set(kca_version ${KF6CoreAddons_VERSION})
+    find_package(KF5WidgetsAddons REQUIRED)
  endif()
-  get_target_property(kwa_type KF6::CoreAddons TYPE)
+  set(KF5_PRIVATE_LIBRARIES
-
+    KF5::WidgetsAddons
-  message(NOTICE "ecm version            : " ${ECM_VERSION})
+    KF5::CoreAddons
  message(NOTICE "kcoreaddons library    : " ${kca_type})
  message(NOTICE "kcoreaddons version    : " ${kca_version})
  endblock()
  set(KF6_PRIVATE_LIBRARIES
    KF6::CoreAddons
    )
 endif()
@@ -25,7 +25,7 @@ if(BUILD_PUGIXML)
  FetchContent_Declare(
    pugixml
    GIT_REPOSITORY https://github.com/zeux/pugixml.git
-    GIT_TAG        v1.14)
+    GIT_TAG        v1.11.4)
  FetchContent_MakeAvailable(pugixml)
 else()
@@ -26,6 +26,6 @@ Include(FetchContent)
 FetchContent_Declare(
  SingleApplication
  GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
-  GIT_TAG        v3.5.1)
+  GIT_TAG        v3.2.0)
 FetchContent_MakeAvailable(SingleApplication)
@@ -17,8 +17,6 @@
 message(" - qet_compilation_vars")
 set(QET_COMPONENTS
  Core
  Gui
  LinguistTools
  PrintSupport
  Xml
@@ -111,12 +109,6 @@ 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
@@ -718,6 +710,7 @@ set(QET_SRC_FILES
 set(TS_FILES
  ${QET_DIR}/lang/qet_ar.ts
  ${QET_DIR}/lang/qet_be.ts
  ${QET_DIR}/lang/qet_ca.ts
  ${QET_DIR}/lang/qet_cs.ts
  ${QET_DIR}/lang/qet_da.ts
@@ -734,7 +727,6 @@ set(TS_FILES
  ${QET_DIR}/lang/qet_mn.ts
  ${QET_DIR}/lang/qet_nb.ts
  ${QET_DIR}/lang/qet_nl.ts
  ${QET_DIR}/lang/qet_nl_BE.ts
  ${QET_DIR}/lang/qet_no.ts
  ${QET_DIR}/lang/qet_pl.ts
  ${QET_DIR}/lang/qet_pt.ts
@@ -744,7 +736,6 @@ set(TS_FILES
  ${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_zh.ts
  )
@@ -29,4 +29,4 @@ add_definitions(-DQET_ALLOW_OVERRIDE_CD_OPTION)
 add_definitions(-DQET_ALLOW_OVERRIDE_DD_OPTION)
 #comment the line below to disable the project database export
-add_definitions(-DQET_EXPORT_PROJECT_DB)
+#add_definitions(-DQET_EXPORT_PROJECT_DB) #error Todo
@@ -1,326 +0,0 @@
 <!DOCTYPE QPH>
 <QPH sourcelanguage="fr" language="sv">
 <phrase>
    <source>Texte composé</source>
    <target>Sammansatt text</target>
 </phrase>
 <phrase>
    <source>Texte utilisateur</source>
    <target>Egen text</target>
 </phrase>
 <phrase>
    <source>Gauche</source>
    <target>Vänster</target>
 </phrase>
 <phrase>
    <source>Droite</source>
    <target>Höger</target>
 </phrase>
 <phrase>
    <source>Centre</source>
    <target>Centrum</target>
 </phrase>
 <phrase>
    <source>Élément</source>
    <target>Objekt</target>
    <definition>Vid referens av olika typer</definition>
 </phrase>
 <phrase>
    <source>Folio</source>
    <target>Blad</target>
 </phrase>
 <phrase>
    <source>Conducteur</source>
    <target>Förbindning</target>
 </phrase>
 <phrase>
    <source>Sans nom</source>
    <target>Namnlös</target>
 </phrase>
 <phrase>
    <source>Recharger</source>
    <target>Ladda om</target>
 </phrase>
 <phrase>
    <source>Projet sans titre</source>
    <target>Namnlöst projekt</target>
 </phrase>
 <phrase>
    <source>Folio sans titre</source>
    <target>Namnlöst blad</target>
 </phrase>
 <phrase>
    <source>Nom</source>
    <target>Namn</target>
 </phrase>
 <phrase>
    <source>Sélection</source>
    <target>Urval</target>
 </phrase>
 <phrase>
    <source>Désélectionner tout</source>
    <target>Avmarkera allt</target>
 </phrase>
 <phrase>
    <source>Sélectionner tout</source>
    <target>Välj allt</target>
 </phrase>
 <phrase>
    <source>Installation</source>
    <target>Anläggning</target>
 </phrase>
 <phrase>
    <source>Localisation</source>
    <target>Placering</target>
 </phrase>
 <phrase>
    <source>Reports de folio</source>
    <target>Bladhänvisningar</target>
 </phrase>
 <phrase>
    <source>Report de folio</source>
    <target>Bladhänvisning</target>
 </phrase>
 <phrase>
    <source>Centre</source>
    <target>Mitten</target>
    <definition>Vid textjustering</definition>
 </phrase>
 <phrase>
    <source>Collage multiple</source>
    <target>Klistra in flera</target>
 </phrase>
 <phrase>
    <source>Remplacer</source>
    <target>Ersätt</target>
 </phrase>
 <phrase>
    <source>Élément</source>
    <target>Symbol</target>
    <definition>Vid referens av symbol</definition>
 </phrase>
 <phrase>
    <source>À</source>
    <target>Till</target>
 </phrase>
 <phrase>
    <source>De</source>
    <target>Från</target>
 </phrase>
 <phrase>
    <source>Nomenclature</source>
    <target>Förteckning</target>
 </phrase>
 <phrase>
    <source>Position du folio</source>
    <target>Bladposition</target>
 </phrase>
 <phrase>
    <source>Polygone fermé</source>
    <target>Sluten polygon</target>
 </phrase>
 <phrase>
    <source>Dossier</source>
    <target>Mapp</target>
 </phrase>
 <phrase>
    <source>Que souhaitez-vous faire</source>
    <target>Vad vill du göra</target>
 </phrase>
 <phrase>
    <source>Collection</source>
    <target>Bibliotek</target>
 </phrase>
 <phrase>
    <source>Collection de cartouches</source>
    <target>Titelblockbibliotek</target>
 </phrase>
 <phrase>
    <source>Collection company de cartouches</source>
    <target>Organisationens titelblockbibliotek</target>
 </phrase>
 <phrase>
    <source>Champ texte</source>
    <target>Textfält</target>
 </phrase>
 <phrase>
    <source>Longueur</source>
    <target>Längd</target>
 </phrase>
 <phrase>
    <source>Suivant</source>
    <target>Nästa</target>
 </phrase>
 <phrase>
    <source>Suivant</source>
    <target>Följande</target>
 </phrase>
 <phrase>
    <source>Chiffre</source>
    <target>Siffra</target>
 </phrase>
 <phrase>
    <source>Tout cocher</source>
    <target>Markera allt</target>
 </phrase>
 <phrase>
    <source>Tout décocher</source>
    <target>Avmarkera allt</target>
 </phrase>
 <phrase>
    <source>Titre</source>
    <target>Titel</target>
 </phrase>
 <phrase>
    <source>Dimensions</source>
    <target>Dimensioner</target>
 </phrase>
 <phrase>
    <source>Dimensions</source>
    <target>Mått</target>
 </phrase>
 <phrase>
    <source>Aperçu</source>
    <target>Översikt</target>
 </phrase>
 <phrase>
    <source>Générique</source>
    <target>Generisk</target>
 </phrase>
 <phrase>
    <source>Sans</source>
    <target>Utan</target>
 </phrase>
 <phrase>
    <source>Avec</source>
    <target>Med</target>
 </phrase>
 <phrase>
    <source>Normal</source>
    <target>Normal</target>
 </phrase>
 <phrase>
    <source>Tiret</source>
    <target>Streckad</target>
 </phrase>
 <phrase>
    <source>Pointillé</source>
    <target>Punktad</target>
 </phrase>
 <phrase>
    <source>Remplissage</source>
    <target>Fyllning</target>
 </phrase>
 <phrase>
    <source>Apparence</source>
    <target>Utseende</target>
 </phrase>
 <phrase>
    <source>Contour</source>
    <target>Kontur</target>
 </phrase>
 <phrase>
    <source>Épaisseur</source>
    <target>Tjocklek</target>
 </phrase>
 <phrase>
    <source>Géométrie</source>
    <target>Geometri</target>
 </phrase>
 <phrase>
    <source>Par defaut</source>
    <target>Förinställt</target>
 </phrase>
 <phrase>
    <source>Parcourir</source>
    <target>Bläddra</target>
 </phrase>
 <phrase>
    <source>Général</source>
    <target>Allmänt</target>
 </phrase>
 <phrase>
    <source>Borne</source>
    <target>Plint</target>
 </phrase>
 <phrase>
    <source>Coller</source>
    <target>Klistra in</target>
 </phrase>
 <phrase>
    <source>Ouvrir</source>
    <target>Öppna</target>
 </phrase>
 <phrase>
    <source>Arc</source>
    <target>Båge</target>
 </phrase>
 <phrase>
    <source>Ellipse</source>
    <target>Ellips</target>
 </phrase>
 <phrase>
    <source>Ligne</source>
    <target>Linje</target>
 </phrase>
 <phrase>
    <source>Rectangle</source>
    <target>Rektangel</target>
 </phrase>
 <phrase>
    <source>Orientation</source>
    <target>Orientering</target>
 </phrase>
 <phrase>
    <source>Nord</source>
    <target>Nord</target>
 </phrase>
 <phrase>
    <source>Est</source>
    <target>Öst</target>
 </phrase>
 <phrase>
    <source>Sud</source>
    <target>Syd</target>
 </phrase>
 <phrase>
    <source>Ouest</source>
    <target>Väst</target>
 </phrase>
 <phrase>
    <source>Police</source>
    <target>Typsnitt</target>
 </phrase>
 <phrase>
    <source>Dimensions</source>
    <target>Storlek</target>
 </phrase>
 <phrase>
    <source>Sans titre</source>
    <target>Namnlös</target>
 </phrase>
 <phrase>
    <source>Borne</source>
    <target>Anslutning</target>
 </phrase>
 <phrase>
    <source>Sans titre</source>
    <target>Namnlöst</target>
 </phrase>
 <phrase>
    <source>Sans nom</source>
    <target>Namnlöst</target>
 </phrase>
 <phrase>
    <source>Décalage</source>
    <target>Förkjutning</target>
 </phrase>
 <phrase>
    <source>Afficher</source>
    <target>Visa</target>
 </phrase>
 <phrase>
    <source>Affichage</source>
    <target>Visning</target>
 </phrase>
 </QPH>
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=QElectroTech
+Name=QElectroTech 
 TryExec=qelectrotech
 Exec=qelectrotech %F
 Icon=qelectrotech
@@ -10,7 +10,7 @@ MimeType=application/x-qet-project;application/x-qet-element;application/x-qet-t
 Categories=Graphics;Qt;VectorGraphics;Science;Electricity;Engineering;
 Keywords=Graphics;Science;Electricity;Engineering;
 Comment=Edit electrical diagrams.
-Comment[de]=Elektroschaltpläne erstellen und bearbeiten.
+Comment[de]=Schaltpläne erstellen und bearbeiten.
 Comment[fr]=Éditer des schémas électriques.
 Comment[ar]=تحرير مخططات كهربائية
 Comment[es]=Editar esquemas eléctricos
@@ -26,7 +26,6 @@ Comment[nl]=Bewerken bedradingsdiagrammen.
 Comment[be]=Bewerken elektrisch schema.
 Comment[da]=Rediger elektriske diagrammer.
 Comment[ja]=電気回路図の編集。
 Comment[sk]=Úprava elektrických schém.
 GenericName=Electrical diagram editor
 GenericName[de]=Schaltplaneditor
 GenericName[fr]=Éditeur de schémas électriques
@@ -43,4 +42,3 @@ GenericName[nl]=Elektrische schema editor
 GenericName[be]=Elektrische schema editor
 GenericName[da]=Elektrisk diagram redigering
 GenericName[ja]=電気回路図エディタ
 GenericName[sk]=Editor elektrických schém
@@ -49,7 +49,6 @@
        <file>ico/16x16/endline-none.png</file>
        <file>ico/16x16/endline-simple.png</file>
        <file>ico/16x16/endline-triangle.png</file>
        <file>ico/16x16/flip.png</file>
        <file>ico/16x16/folder-new.png</file>
        <file>ico/16x16/folder.png</file>
        <file>ico/16x16/go-company.png</file>
@@ -61,7 +60,6 @@
        <file>ico/16x16/list-add.png</file>
        <file>ico/16x16/list-remove.png</file>
        <file>ico/16x16/masquer.png</file>
        <file>ico/16x16/mirror.png</file>
        <file>ico/16x16/neutral.png</file>
        <file>ico/16x16/north.png</file>
        <file>ico/16x16/orientations.png</file>
@@ -26,8 +26,7 @@
 #include "xmlprojectelementcollectionitem.h"
 #include <QFutureWatcher>
-#include <QtConcurrentMap>
+#include <QtConcurrent>
 /**
 	@brief ElementsCollectionModel::ElementsCollectionModel
@@ -293,9 +292,15 @@ void ElementsCollectionModel::loadCollections(bool common_collection,
 		&QFutureWatcher<void>::finished,
 		watcher,
 		&QFutureWatcher<void>::deleteLater);
-
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
 	m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData);
-
+#else
 #	if TODO_LIST
 #		pragma message("@TODO remove code for QT 6 or later")
 #	endif
 	qDebug() << "Help code for QT 6 or later"
 			 << "QtConcurrent::run its backwards now...function, object, args";
 #endif
 	watcher->setFuture(m_future);
 }
@@ -765,7 +765,7 @@ void ElementsCollectionWidget::search()
 	}
 		//start the search when text have at least 3 letters.
-	if (text.length() < 3) {
+	if (text.count() < 3) {
 		return;
 	}
@@ -805,15 +805,15 @@ bool ElementsLocation::setXml(const QDomDocument &xml_document) const
 			qDebug() << "Help code for QT 6 or later";
 			QString			   path_ = collectionPath(false);
-			QRegularExpression rx(QRegularExpression::anchoredPattern("(.*)/(.*\\.elmt)"));
+			QRegularExpression rx("^(.*)/(.*\\.elmt)$");
-			QRegularExpressionMatch match = rx.match(path_);
+
-			if (match.hasMatch())
+			if (rx.exactMatch(path_))
 			{
 				return project()
 					->embeddedElementCollection()
 					->addElementDefinition(
-						match.captured(1),
+						rx.cap(1),
-						match.captured(2),
+						rx.cap(2),
 						xml_document.documentElement());
 			}
 			else
@@ -870,7 +870,7 @@ QIcon ElementsLocation::icon() const
 /**
 	@brief ElementLocation::name
-	@return The name of the represented element in the current locale
+	@return The name of the represented element in the current local
 */
 QString ElementsLocation::name() const
 {
@@ -37,7 +37,7 @@ class XmlElementCollection;
 	This class represents the location,
 	the location of an element or of a category,
 	even of a collection ... in a collection.
-	It encapsulates a virtual path.
+	She encapsulates a virtual path.
 	\~French
 	Cette classe represente la localisation, l'emplacement d'un element ou
 	d'une categorie, voire d'une collection... dans une collection.
@@ -117,53 +117,46 @@ XmlElementCollection::XmlElementCollection(QETProject *project) :
 		0x8981,
 		0x7D20};
-	names.addName("ca",    "Elements importats");
+	names.addName("fr", "Éléments importés");
-	names.addName("cs",    "Zavedené prvky");
+	names.addName("en", "Imported elements");
-	names.addName("da",    "Importerede elementer");
+	names.addName("nl_BE","Elementen geïmporteerd");
-	names.addName("de",    "Importierte elemente");
+	names.addName("de", "Importierte elemente");
-	names.addName("el",    QString(greek_data, 18));
+	names.addName("es", "Elementos importados");
-	names.addName("en",    "Imported elements");
+	names.addName("ru", QString(russian_data, 24));
-	names.addName("es",    "Elementos importados");
+	names.addName("cs", "Zavedené prvky");
-	names.addName("fr",    "Éléments importés");
+	names.addName("pl", "Elementy importowane");
-	names.addName("hr",    "Uvezeni elementi");
+	names.addName("pt", "elementos importados");
-	names.addName("it",    "Elementi importati");
+	names.addName("it", "Elementi importati");
-	names.addName("ja",    QString(japanese_data, 10));
+	names.addName("el", QString(greek_data, 18));
-	names.addName("nl_BE", "Elementen geïmporteerd");
+	names.addName("nl", "Elementen geïmporteerd");
-	names.addName("nl",    "Elementen geïmporteerd");
+	names.addName("hr", "Uvezeni elementi");
-	names.addName("pl",    "Elementy importowane");
+	names.addName("ca", "Elements importats");
-	names.addName("pt_BR", "elementos importados");
+	names.addName("ro", "Elemente importate");
-	names.addName("pt",    "elementos importados");
+	names.addName("tr", QString(turkish_data, 12));
-	names.addName("ro",    "Elemente importate");
+	names.addName("da", "Importerede elementer");
-	names.addName("ru",    QString(russian_data, 24));
+	names.addName("sl", "Uvoženi elementi");
-	names.addName("sl",    "Uvoženi elementi");
+	names.addName("ja", QString(japanese_data, 10));
-	names.addName("tr",    QString(turkish_data, 12));
+	names.addName("uk", QString(ukrainian_data, 20));
 	names.addName("uk",    QString(ukrainian_data, 20));
 #else
 #	if TODO_LIST
 #		pragma message("@TODO remove code for QT 6 or later")
 #	endif
 	qDebug() << "Help code for QT 6 or later";
-	names.addName("ca",    "Elements importats");
+	names.addName("fr", "Éléments importés");
-	names.addName("cs",    "Zavedené prvky");
+	names.addName("en", "Imported elements");
-	names.addName("da",    "Importerede elementer");
+	names.addName("de", "Importierte elemente");
-	names.addName("de",    "Importierte elemente");
+	names.addName("es", "Elementos importados");
-	names.addName("el",    "Εισηγμένα στοιχεία");
+	names.addName("cs", "Zavedené prvky");
-	names.addName("en",    "Imported elements");
+	names.addName("pl", "Elementy importowane");
-	names.addName("es",    "Elementos importados");
+	names.addName("pt", "elementos importados");
-	names.addName("fr",    "Éléments importés");
+	names.addName("it", "Elementi importati");
-	names.addName("hr",    "Uvezeni elementi");
+	names.addName("nl", "Elementen geïmporteerd");
-	names.addName("it",    "Elementi importati");
+	names.addName("hr", "Uvezeni elementi");
-	names.addName("ja",    "インバートされた要素");
+	names.addName("ca", "Elements importats");
-	names.addName("nl_BE", "Elementen geïmporteerd");
+	names.addName("ro", "Elemente importate");
-	names.addName("nl",    "Elementen geïmporteerd");
+	names.addName("da", "Importerede elementer");
-	names.addName("pl",    "Elementy importowane");
+	names.addName("sl", "Uvoženi elementi");
-	names.addName("pt_BR", "elementos importados");
+	names.addName("uk", "Імпортовані елементи");
 	names.addName("pt",    "elementos importados");
 	names.addName("ro",    "Elemente importate");
 	names.addName("ru",    "Импортированные элементы");
 	names.addName("sl",    "Uvoženi elementi");
 	names.addName("tr",    "İthal öğeler");
 	names.addName("uk",    "Імпортовані елементи");
 #endif
 	import.appendChild(names.toXml(m_dom_document));
@@ -46,7 +46,7 @@ NamesList::~NamesList()
 void NamesList::addName(const QString &lang, const QString &name) {
 	if ((lang.length() != 2) && (lang.length() != 5)) return;
 	if ((lang.length() == 5) && (lang[2] != '_')) return;
-	map_names.insert(lang, name);
+	hash_names.insert(lang, name);
 }
 /**
@@ -54,7 +54,7 @@ void NamesList::addName(const QString &lang, const QString &name) {
 	@param lang la langue pour laquelle il faut supprimer le nom
 */
 void NamesList::removeName(const QString &lang) {
-	map_names.remove(lang);
+	hash_names.remove(lang);
 }
 /**
@@ -62,7 +62,7 @@ void NamesList::removeName(const QString &lang) {
 */
 void NamesList::clearNames()
 {
-	map_names.clear();
+	hash_names.clear();
 }
 /**
@@ -70,7 +70,7 @@ void NamesList::clearNames()
 */
 QList<QString> NamesList::langs() const
 {
-	return(map_names.keys());
+	return(hash_names.keys());
 }
 /**
@@ -78,7 +78,7 @@ QList<QString> NamesList::langs() const
 */
 bool NamesList::isEmpty() const
 {
-	return(map_names.isEmpty());
+	return(hash_names.isEmpty());
 }
 /**
@@ -86,7 +86,7 @@ bool NamesList::isEmpty() const
 */
 int NamesList::count() const
 {
-	return(map_names.count());
+	return(hash_names.count());
 }
 /**
@@ -95,7 +95,7 @@ int NamesList::count() const
 	defini
 */
 QString &NamesList::operator[](const QString &lang) {
-	return(map_names[lang]);
+	return(hash_names[lang]);
 }
 /**
@@ -105,21 +105,17 @@ QString &NamesList::operator[](const QString &lang) {
 */
 const QString NamesList::operator[](const QString &lang) const
 {
-	return(map_names.value(lang));
+	return(hash_names.value(lang));
 }
 /**
 	Loads the list of names from an XML element. This element is assumed to be
 	the parent of a ‘names’ element, which itself contains the ‘names’. The
 	names previously contained in the list are not deleted, but can be overwritten.
 	French:
 	Charge la liste de noms depuis un element XML. Cet element est sense etre
 	le parent d'un element "names", qui contient lui meme les "name".
 	Les noms precedemment contenus dans la liste ne sont pas effaces mais
 	peuvent etre ecrases.
-	@param xml_element L'element XML a analyser / The XML element to be parsed
+	@param xml_element L'element XML a analyser
 	@param xml_options A set of options related to XML parsing.
 	@see getXmlOptions()
 */
@@ -172,13 +168,8 @@ void NamesList::fromXml(const pugi::xml_node &xml_element, const QHash<QString,
 }
 /**
 	Exports the list of names to an XML element.
 	Make sure that the list of names is not empty before exporting.
 	If list is empty, set name to "en" / "NoName"
 	French:
 	Exporte la liste des noms vers un element XML. Veillez a verifier que la
 	liste de noms n'est pas vide avant de l'exporter.
 	Si la liste est vide, le nom sera "en" / "NoName".
 	@param xml_document Le document XML dans lequel l'element XML sera insere
 	@param xml_options A set of options related to XML parsing.
 	@return L'element XML correspondant a la section "names"
@@ -188,21 +179,13 @@ QDomElement NamesList::toXml(QDomDocument &xml_document, const QHash<QString, QS
 {
 	QHash<QString, QString> xml_opt = getXmlOptions(xml_options);
 	QDomElement names_elmt = xml_document.createElement(xml_opt["ParentTagName"]);
-	if (map_names.isEmpty()) {
+	QHashIterator<QString, QString> names_iterator(hash_names);
-		qInfo() << " NamesList of element is empty - add default: [" << "en" << "] = " << "NoName" << "";
+	while (names_iterator.hasNext()) {
 		names_iterator.next();
 		QDomElement name_elmt = xml_document.createElement(xml_opt["TagName"]);
-		name_elmt.setAttribute(xml_opt["LanguageAttribute"], "en");
+		name_elmt.setAttribute(xml_opt["LanguageAttribute"], names_iterator.key());
-		name_elmt.appendChild(xml_document.createTextNode("NoName"));
+		name_elmt.appendChild(xml_document.createTextNode(names_iterator.value()));
 		names_elmt.appendChild(name_elmt);
 	} else {
 		QMapIterator<QString, QString> names_iterator(map_names);
 		while (names_iterator.hasNext()) {
 			names_iterator.next();
 			QDomElement name_elmt = xml_document.createElement(xml_opt["TagName"]);
 			name_elmt.setAttribute(xml_opt["LanguageAttribute"], names_iterator.key());
 			name_elmt.appendChild(xml_document.createTextNode(names_iterator.value().trimmed()));
 			names_elmt.appendChild(name_elmt);
 		}
 	}
 	return(names_elmt);
 }
@@ -235,7 +218,7 @@ QHash<QString, QString> NamesList::getXmlOptions(const QHash<QString, QString> &
 */
 bool NamesList::operator!=(const NamesList &nl) const
 {
-	return(map_names != nl.map_names);
+	return(hash_names != nl.hash_names);
 }
 /**
@@ -244,7 +227,7 @@ bool NamesList::operator!=(const NamesList &nl) const
 */
 bool NamesList::operator==(const NamesList &nl) const
 {
-	return(map_names == nl.map_names);
+	return(hash_names == nl.hash_names);
 }
 /**
@@ -263,10 +246,10 @@ bool NamesList::operator==(const NamesList &nl) const
 QString NamesList::name(const QString &fallback_name) const
 {
 	QString system_language = QETApp::langFromSetting();
-	if (! map_names[system_language].isEmpty())
+	if (! hash_names[system_language].isEmpty())
-		return (map_names[system_language]);
+		return (hash_names[system_language]);
-	if (! map_names["en"].isEmpty()) return (map_names["en"]);
+	if (! hash_names["en"].isEmpty()) return (hash_names["en"]);
 	if (! fallback_name.isEmpty()) return (fallback_name);
-	if (map_names.count()) return (map_names.begin().value());
+	if (hash_names.count()) return (hash_names.begin().value());
 	return (QString(""));
 }
@@ -21,12 +21,6 @@
 #include <QtXml>
 /**
 	This class represents a list of names, used by elements and categories
 	to embed the same name in several languages.
 	Languages are represented by two or five letters (typically the first
 	two of the system locale); examples: en for English, fr for French,
 	pt_BR for Brazilian Portuguese.
 	French:
 	Cette classe represente une liste de noms, utilisee
 	par les elements et categories pour embarquer un meme nom en plusieurs
 	langues.
@@ -42,7 +36,7 @@ class NamesList {
 	// attributes
 	private:
-	QMap<QString, QString> map_names;
+	QHash<QString, QString> hash_names;
 	public:
 	static int MetaTypeId;
@@ -17,7 +17,6 @@
 */
 #include "terminalstripdrawer.h"
 #include <QPainter>
 #include <QHash>
 namespace TerminalStripDrawer {
@@ -203,7 +202,7 @@ void TerminalStripDrawer::paint(QPainter *painter)
 		painter->restore();
 			//Draw the bridges
-		for (const auto &points_ : std::as_const(bridges_anchor_points))
+		for (const auto &points_ : qAsConst(bridges_anchor_points))
 		{
 			painter->save();
 			auto pen_{painter->pen()};
@@ -126,7 +126,7 @@ void RemoveTerminalFromStripCommand::redo()
 	if (m_strip)
 	{
 		QVector<QSharedPointer<RealTerminal>> real_t;
-		for (const auto &real_t_vector : std::as_const(m_terminals)) {
+		for (const auto &real_t_vector : qAsConst(m_terminals)) {
 			real_t.append(real_t_vector);
 		}
@@ -68,7 +68,7 @@ void UnGroupTerminalsCommand::undo()
 			m_terminal_strip->groupTerminals(key, m_physical_real_H.value(key));
 		}
 			//Second, set level.
-		for (const auto &pair : std::as_const(m_real_t_level)) {
+		for (const auto &pair : qAsConst(m_real_t_level)) {
 			m_terminal_strip->setLevel(pair.first, pair.second);
 		}
 	}
@@ -78,7 +78,7 @@ void UnGroupTerminalsCommand::redo()
 {
 	if (m_terminal_strip)
 	{
-		for (const auto &value : std::as_const(m_physical_real_H)) {
+		for (const auto &value : qAsConst(m_physical_real_H)) {
 			m_terminal_strip->unGroupTerminals(value);
 		}
 	}
@@ -131,7 +131,7 @@ bool PhysicalTerminal::setLevelOf(const QSharedPointer<RealTerminal> &terminal,
 	if (i >= 0)
 	{
 #if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
-		m_real_terminal.swapItemsAt(i, std::min((qsizetype)level, m_real_terminal.size()-1));
+		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]);
@@ -250,7 +250,7 @@ bool TerminalStrip::addTerminal(Element *terminal)
 		}
 	}
-	if (terminal->elementData().m_type != ElementData::Terminal) {
+	if (terminal->elementData().m_type != ElementData::Terminale) {
 		return false;
 	}
@@ -466,7 +466,7 @@ QSharedPointer<RealTerminal> TerminalStrip::realTerminalForUuid(const QUuid &uui
 QVector<QSharedPointer<RealTerminal>> TerminalStrip::realTerminals() const
 {
 	QVector<QSharedPointer<RealTerminal>> vector_;
-	for (const auto &phy : std::as_const(m_physical_terminals)) {
+	for (const auto &phy : qAsConst(m_physical_terminals)) {
 		vector_.append(phy->realTerminals());
 	}
 	return vector_;
@@ -639,7 +639,7 @@ bool TerminalStrip::isBridgeable(const QVector<QSharedPointer<RealTerminal>> &re
 		// Get the physical terminal and pos
 	auto first_physical_terminal = first_real_terminal->physicalTerminal();
 	QVector<shared_physical_terminal> physical_vector{first_physical_terminal};
-	QVector<qsizetype> pos_vector{m_physical_terminals.indexOf(first_physical_terminal)};
+	QVector<int> pos_vector{m_physical_terminals.indexOf(first_physical_terminal)};
 	auto bridge_ = isBridged(first_real_terminal);
 		//bool to know at the end of this function if at least one terminal is not bridged
@@ -856,7 +856,7 @@ QSharedPointer<TerminalStripBridge> TerminalStrip::isBridged(const QSharedPointe
 {
 	if (real_terminal)
 	{
-		for (const auto &bridge_ : std::as_const(m_bridge)) {
+		for (const auto &bridge_ : qAsConst(m_bridge)) {
 			if (bridge_->realTerminals().contains(real_terminal))
 				return bridge_;
 		}
@@ -983,7 +983,7 @@ QDomElement TerminalStrip::toXml(QDomDocument &parent_document)
 	}
 	root_elmt.appendChild(xml_layout);
-	for (const auto &bridge_ : std::as_const(m_bridge)) {
+	for (const auto &bridge_ : qAsConst(m_bridge)) {
 		root_elmt.appendChild(bridge_->toXml(parent_document));
 	}
@@ -1024,7 +1024,7 @@ bool TerminalStrip::fromXml(QDomElement &xml_element)
 			for (auto &xml_real : QETXML::findInDomElement(xml_physical, RealTerminal::xmlTagName()))
 			{
 				const auto uuid_ = QUuid(xml_real.attribute(QStringLiteral("element_uuid")));
-				for (auto terminal_elmt : std::as_const(free_terminals))
+				for (auto terminal_elmt : qAsConst(free_terminals))
 				{
 					if (terminal_elmt->uuid() == uuid_)
 					{
@@ -85,7 +85,7 @@ QDomElement TerminalStripBridge::toXml(QDomDocument &parent_document) const
 	root_elmt.setAttribute(QStringLiteral("color"), m_color.name());
 	auto terminals_elmt = parent_document.createElement(QStringLiteral("real_terminals"));
-	for (const auto &real_t : std::as_const(m_real_terminals))
+	for (const auto &real_t : qAsConst(m_real_terminals))
 	{
 		if (real_t)
 		{
@@ -106,7 +106,7 @@ void TerminalStripBridge::fromXml(const QDomElement &dom_element)
 	}
 	m_uuid = QUuid(dom_element.attribute(QStringLiteral("uuid"), m_uuid.toString()));
-	m_color = QColor::fromString(dom_element.attribute(QStringLiteral("color")));
+	m_color.setNamedColor(dom_element.attribute(QStringLiteral("color")));
 	const auto real_t_vector = QETXML::subChild(dom_element,
 										 QStringLiteral("real_terminals"),
@@ -69,7 +69,7 @@
           </widget>
          </item>
          <item row="12" column="1" colspan="2">
-           <widget class="ColorComboBox" name="m_bridge_color_cb"/>
+           <widget class="KColorCombo" name="m_bridge_color_cb"/>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_6">
@@ -323,9 +323,9 @@
 </widget>
 <customwidgets>
  <customwidget>
-   <class>ColorComboBox</class>
+   <class>KColorCombo</class>
   <extends>QComboBox</extends>
-   <header>../../colorcombobox.h</header>
+   <header>kcolorcombo.h</header>
  </customwidget>
 </customwidgets>
 <resources>
@@ -535,7 +535,7 @@ modelRealTerminalData TerminalStripModel::dataAtRow(int row) const
 	else
 	{
 		auto current_row = 0;
-		for (const auto &physical_data : std::as_const(m_physical_data))
+		for (const auto &physical_data : qAsConst(m_physical_data))
 		{
 			for (const auto &real_data : physical_data.real_data)
 			{
@@ -567,7 +567,7 @@ void TerminalStripModel::replaceDataAtRow(modelRealTerminalData data, int row)
 		auto current_row = 0;
 		auto current_physical = 0;
-		for (const auto &physical_data : std::as_const(m_physical_data))
+		for (const auto &physical_data : qAsConst(m_physical_data))
 		{
 			auto current_real = 0;
 			for (int i=0 ; i<physical_data.real_data.count() ; ++i)
@@ -606,7 +606,7 @@ modelPhysicalTerminalData TerminalStripModel::physicalDataAtIndex(int index) con
 	int current_phy = -1;
 	bool match_ = false;
-	for (const auto &ptd_ : std::as_const(m_physical_data))
+	for (const auto &ptd_ : qAsConst(m_physical_data))
 	{
 		current_checked_index += ptd_.real_data.size();
 		++current_phy;
@@ -637,9 +637,9 @@ modelRealTerminalData TerminalStripModel::realDataAtIndex(int index) const
 	int current_checked_index = -1;
-	for (const auto & ptd_ : std::as_const(m_physical_data))
+	for (const auto & ptd_ : qAsConst(m_physical_data))
 	{
-		for (const auto & rtd_ : std::as_const(ptd_.real_data)) {
+		for (const auto & rtd_ : qAsConst(ptd_.real_data)) {
 			++current_checked_index;
 			if (current_checked_index == index) {
 				return rtd_;
@@ -29,12 +29,12 @@
 #include "modelTerminalData.h"
 //Code to use QColor as key for QHash
-inline size_t qHash(const QColor &key, size_t seed) {
+inline uint qHash(const QColor &key, uint seed) {
 	return qHash(key.name(), seed);
 }
 //needed to use QPointer<Element> as key of QHash
-inline size_t qHash(const QPointer<Element> &key, size_t seed) {
+inline uint qHash(const QPointer<Element> &key, uint seed) {
 	if (key)
 		return qHash(key->uuid(), seed);
 	else
@@ -60,7 +60,7 @@ void TerminalStripTreeDockWidget::reload()
 	m_uuid_terminal_H.clear();
 	m_uuid_strip_H.clear();
-	for (const auto &connection_ : std::as_const(m_strip_changed_connection)) {
+	for (const auto &connection_ : qAsConst(m_strip_changed_connection)) {
 		disconnect(connection_);
 	}
 	m_strip_changed_connection.clear();
@@ -222,7 +222,7 @@ void TerminalStripTreeDockWidget::buildTree()
 		return a->name() < b->name();
 	});
-	for (const auto &ts : std::as_const(ts_vector)) {
+	for (const auto &ts : qAsConst(ts_vector)) {
 		addTerminalStrip(ts);
 	}
 	addFreeTerminal();
@@ -324,7 +324,7 @@ void TerminalStripTreeDockWidget::addFreeTerminal()
 	auto free_terminal_item = ui->m_tree_view->topLevelItem(1);
-	for (const auto terminal : std::as_const(vector_))
+	for (const auto terminal : qAsConst(vector_))
 	{
 		QUuid uuid_ = terminal->uuid();
 		QStringList strl{terminal->actualLabel()};
@@ -20,7 +20,6 @@
 #include "../diagram.h"
 #include "../diagramposition.h"
 #include "../qetapp.h"
 #include "../qetgraphicsitem/conductor.h"
 #include "../qetgraphicsitem/element.h"
 #include "../qetxml.h"
@@ -190,14 +189,12 @@ namespace autonum
 	QString AssignVariables::formulaToLabel(QString formula,
 						sequentialNumbers &seqStruct,
 						Diagram *diagram,
-						const Element *elmt,
+						const Element *elmt)
 						const Conductor *cndr)
 	{
 		AssignVariables av(std::move(formula),
 				   seqStruct,
 				   diagram,
-				   elmt,
+				   elmt);
 				   cndr);
 		seqStruct = av.m_seq_struct;
 		return av.m_assigned_label;
 	}
@@ -304,14 +301,13 @@ namespace autonum
 	AssignVariables::AssignVariables(const QString& formula,
 					 const sequentialNumbers& seqStruct,
 					 Diagram *diagram,
-					 const Element *elmt,
+					 const Element *elmt):
 					 const Conductor *cndr):
 	m_diagram(diagram),
 	m_arg_formula(formula),
 	m_assigned_label(formula),
 	m_seq_struct(seqStruct),
-	m_element(elmt),
+	m_element(elmt)
-	m_conductor(cndr)
+	
 	{
 		if (m_diagram)
 		{
@@ -353,14 +349,6 @@ namespace autonum
 				m_assigned_label.replace("%prefix", m_element->getPrefix());
 			}
 			if (m_conductor)
 			{
 				m_assigned_label.replace("%wf", cndr->properties().m_function);
 				m_assigned_label.replace("%wv", cndr->properties().m_tension_protocol);
 				m_assigned_label.replace("%wc", cndr->properties().m_wire_color);
 				m_assigned_label.replace("%ws", cndr->properties().m_wire_section);
 			}
 			assignTitleBlockVar();
 			assignProjectVar();
 			assignSequence();
@@ -24,7 +24,6 @@
 #include <QString>
 #include <QStringList>
 class Conductor;
 class Diagram;
 class Element;
 class ElementsLocation;
@@ -62,12 +61,12 @@ namespace autonum
 	class AssignVariables
 	{
 		public:
-			static QString formulaToLabel (QString formula, sequentialNumbers &seqStruct, Diagram *diagram, const Element *elmt = nullptr, const Conductor *cndr = nullptr);
+			static QString formulaToLabel (QString formula, sequentialNumbers &seqStruct, Diagram *diagram, const Element *elmt = nullptr);
 			static QString replaceVariable (const QString &formula, const DiagramContext &dc);
 			static QString genericXref (const Element *element);
 		private:
-			AssignVariables(const QString& formula, const sequentialNumbers& seqStruct , Diagram *diagram, const Element *elmt = nullptr, const Conductor *cndr = nullptr);
+			AssignVariables(const QString& formula, const sequentialNumbers& seqStruct , Diagram *diagram, const Element *elmt = nullptr);
 			void assignTitleBlockVar();
 			void assignProjectVar();
 			void assignSequence();
@@ -77,7 +76,6 @@ namespace autonum
 			QString m_assigned_label;
 			sequentialNumbers m_seq_struct;
 			const Element *m_element = nullptr;
 			const Conductor *m_conductor = nullptr;
 	};
 	void setSequentialToList(QStringList &list, NumerotationContext &nc, const QString& type);
@@ -57,9 +57,9 @@ bool NumerotationContext::addValue(const QString &type,
 				   const QVariant &value,
 				   const int increase,
 				   const int initialvalue) {
-	if (!keyIsAcceptable(type) && !value.canConvert<QString>())
+	if (!keyIsAcceptable(type) && !value.canConvert(QVariant::String))
 		return false;
-	if (keyIsNumber(type) && !value.canConvert<int>())
+	if (keyIsNumber(type) && !value.canConvert(QVariant::Int))
 		return false;
 	QString valuestr = value.toString();
@@ -151,7 +151,7 @@ void AutoNumberingDockWidget::setProject(QETProject *project,
 		//Set Combobox Context
 	setContext();
-	ui->m_configure_pb->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_P);
+	ui->m_configure_pb->setShortcut(QKeySequence( tr("Ctrl+Shift+P")));
 }
 /**
@@ -55,8 +55,11 @@ BorderTitleBlock::BorderTitleBlock(QObject *parent) :
 	m_titleblock_template_renderer = new TitleBlockTemplateRenderer(this);
 	m_titleblock_template_renderer -> setTitleBlockTemplate(QETApp::defaultTitleBlockTemplate());
-	// disable the QPicture-based cache to avoid rendering errors and crashes
+	// 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());
@@ -236,8 +239,7 @@ void BorderTitleBlock::borderToXml(QDomElement &xml_elmt) {
 	xml_elmt.setAttribute("displayrows", rowsAreDisplayed() ? "true" : "false");
 	// attribut datant de la version 0.1 - laisse pour retrocompatibilite
-	// attribute from version 0.1 - leave for backwards-compatibility
+	xml_elmt.setAttribute("height", QString("%1").arg(diagramHeight()));
 	xml_elmt.setAttribute("height",      QString("%1").arg(diagramHeight()));
 }
 /**
@@ -939,15 +941,22 @@ QString BorderTitleBlock::incrementLetters(const QString &string) {
 	} else {
 		// separate previous digits from last digit
 		// separe les digits precedents du dernier digit
-		QString first_digits(string.left(string.length() - 1));
+		QString first_digits(string.left(string.count() - 1));
-		char last_digit(string.at(string.length() - 1).unicode());
+		QChar last_digit(string.at(string.count() - 1));
 		if (last_digit != 'Z') {
 			// increments the last digit
 			// incremente le dernier digit
-			last_digit = (char)(string[string.length()-1].unicode()) + 1;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
 			last_digit = last_digit.toLatin1() + 1;
 #else
 #	if TODO_LIST
 #		pragma message("@TODO remove code for QT 6 or later")
 #	endif
 			qDebug() << "Help code for QT 6 or later";
 #endif
 			return(first_digits + QString(last_digit));
 		} else {
-			return(incrementLetters(first_digits) % "A");
+			return(incrementLetters(first_digits) + "A");
 		}
 	}
 }
@@ -1,90 +0,0 @@
 /*
 	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	QElectroTech is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
 	QElectroTech is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "colorbutton.h"
 #include <QColorDialog>
 #include <QPainter>
 /**
 	@brief ColorButton::ColorButton
 	Simple constructor
 	@param parent QObject parent of the ColorButton
 */
 ColorButton::ColorButton(QWidget *parent) : QPushButton(parent)
 {
 	connect(this, &QPushButton::clicked, this, &ColorButton::clicked);
 }
 /**
 	@brief Getter for current color
 	@return The current selected color
 */
 const QColor ColorButton::color()
 {
 	return m_color;
 }
 /**
 	@brief Setter for current color
 */
 void ColorButton::setColor(const QColor &color)
 {
    m_color = color;
 	update();
 }
 /**
 	@brief ColorButton::clicked
 	Opens a color selection dialog and lets the user select a color.
 	@param checked Not used
 */
 void ColorButton::clicked(bool checked)
 {
 	// Open color selection dialog
 	auto new_color = QColorDialog::getColor(m_color, this, tr("Select color"), QColorDialog::DontUseNativeDialog);
 	// Validate user input
 	if (new_color.isValid()) {
 		m_color = new_color;
 		emit changed(new_color);
 		update();
 	}
 }
 /**
 	@brief ColorButton::paintEvent
 	Paints a filled rectangle with the current selected color on the button surface.
 	@param e Paint event context
 */
 void ColorButton::paintEvent(QPaintEvent *e) {
 	QPushButton::paintEvent(e);
 	// Padding for the color indicator
 	const int padding_x = 5;
 	const int padding_y = 5;
 	QPainter painter(this);
 	// Get dimensions of the button paint surface
 	auto r_width = painter.device()->width();
 	auto r_height = painter.device()->height();
 	// Paint a rectangle with a margin of 5
 	auto color_indicator = QRect(padding_x, padding_y, r_width - padding_x * 2, r_height - padding_y * 2);
 	painter.fillRect(color_indicator, m_color);
 }
@@ -1,53 +0,0 @@
 /*
 	Copyright 2006-2025 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/>.
 */
 #ifndef COLORBUTTON_H
 #define COLORBUTTON_H
 #include <QColor>
 #include <QObject>
 #include <QPushButton>
 #include <Qt>
 /**
 	@brief The ColorButton class
 */
 class ColorButton : public QPushButton
 {
 	    Q_OBJECT
 	public:
    	ColorButton(QWidget * = nullptr);
 		const QColor color();
 		void setColor(const QColor &);
 	public slots:
 		void clicked(bool = false);
 	protected:
 		void paintEvent(QPaintEvent *) override;
 	signals:
 		void changed(const QColor &);
 	private:
    	/// @brief Current selected color
    	QColor m_color = Qt::black;
 };
 #endif
@@ -1,98 +0,0 @@
 /*
 	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	QElectroTech is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
 	QElectroTech is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "colorcombobox.h"
 #include "colorcomboboxdelegate.h"
 #include <QColorDialog>
 #include <QPainter>
 #include <QStylePainter>
 #include <Qt>
 /**
 	@brief ColorComboBox::ColorComboBox
 	Simple constructor
 	@param parent QObject parent of the ColorComboBox
 */
 ColorComboBox::ColorComboBox(QWidget *parent) : QComboBox(parent)
 {
 	connect(this, &QComboBox::activated, this, &ColorComboBox::colorSelected);
 	setItemDelegate(new ColorComboBoxDelegate());
 }
 /**
 	@brief ColorComboBox::setColors
 	Sets the colors of the combo box. An item at the top will be added to allow selection
 	of a custom color.
 	@param colors Vector of colors to add to the combo box
 */
 void ColorComboBox::setColors(const QVector<QColor> &colors)
 {
 	addItem(tr("[Custom color...]"), QColor(Qt::black));
 	for(auto &color : colors) {
 		addItem(color.name(), color);
 	}
 }
 /**
 	@brief ColorComboBox::colorSelected
 	Opens a color selection dialog and lets the user select a color.
 	@param checked Not used
 */
 void ColorComboBox::colorSelected(int index)
 {
 	if (index == 0) {
 		// Open color selection dialog if custom color is selected
 		auto new_color = QColorDialog::getColor(itemData(index).value<QColor>(), this, tr("Select color"), QColorDialog::DontUseNativeDialog);
 		// Validate and emit user input color
 		if (new_color.isValid()) {
 			setItemData(index, new_color);
 			emit activated(new_color);
 		}
 	} else {
 		// Emit color from selected combo box row
 		emit activated(itemData(index).value<QColor>());
 	}
 }
 /**
 	@brief ColorComboBox::paintEvent
 	Paints a filled rectangle with the current selected color on the combo box surface.
 	@param e Paint event context
 */
 void ColorComboBox::paintEvent(QPaintEvent *e) {
 	// Padding for the color indicator
 	const int padding_x = 5;
 	const int padding_y = 5;
 	// Create painter and draw a vanilla combobox
 	QStylePainter painter(this);
 	QStyleOptionComboBox opt;
    initStyleOption(&opt);
 	painter.drawComplexControl(QStyle::CC_ComboBox, opt);
 	// Get dimensions of the combo box paint surface
 	auto r_width = painter.device()->width();
 	auto r_height = painter.device()->height();
 	// Paint a rectangle with a margin
 	auto color_indicator = QRect(padding_x, padding_y, r_width - padding_x * 2, r_height - padding_y * 2);
 	painter.fillRect(color_indicator, itemData(currentIndex()).value<QColor>());
 }
@@ -1,49 +0,0 @@
 /*
 	Copyright 2006-2025 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/>.
 */
 #ifndef COLORCOMBOBOX_H
 #define COLORCOMBOBOX_H
 #include <QColor>
 #include <QObject>
 #include <QComboBox>
 #include <QVector>
 #include <Qt>
 /**
 	@brief The ColorComboBox class
 */
 class ColorComboBox : public QComboBox
 {
 	    Q_OBJECT
 	public:
    	ColorComboBox(QWidget * = nullptr);
 		void setColors(const QVector<QColor> &);
 	public slots:
 		void colorSelected(int);
 	protected:
 		void paintEvent(QPaintEvent *) override;
 	signals:
 		void activated(const QColor &);
 };
 #endif
@@ -1,62 +0,0 @@
 /*
 	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	QElectroTech is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
 	QElectroTech is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "colorcomboboxdelegate.h"
 #include <QColor>
 #include <QPainter>
 #include <QPalette>
 #include <QtDebug>
 /**
 	@brief ColorComboBoxDelegate::paint
 	Paints a filled rectangle on the drop down item with the items color.
 	@param painter Painter context
 	@param option Style options
 	@param index Index of the item to paint
 */
 void ColorComboBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
 	// Padding for the color indicator
 	const int padding_x = 5;
 	const int padding_y = 2;
 	painter->save();
 	if (index.row() > 0)
 	{
 		auto rect = option.rect;
 		// Draw mouseover background
 		if (option.state & QStyle::State_MouseOver)
 		{
 			auto pal = option.widget->palette();
 			painter->fillRect(rect, pal.color(QPalette::Highlight));
 		}
 		// Draw color indicator rectangle
 		auto color = qvariant_cast<QColor>(index.data());
 		rect.adjust(padding_x, padding_y, -padding_x, -padding_y);
 		painter->fillRect(rect, color);
 	} else {
 		// Draw a normal drop down item for custom color
 		QStyledItemDelegate::paint(painter, option, index);
 	}
 	painter->restore();
 }
@@ -1,35 +0,0 @@
 /*
 	Copyright 2006-2025 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/>.
 */
 #ifndef COLORCOMBOBOXDELEGATE_H
 #define COLORCOMBOBOXDELEGATE_H
 #include <QStyledItemDelegate>
 /**
 	@brief The ColorComboBoxDelegate class
 	Handles drawing of items in the drop down list of ColorComboBox.
 */
 class ColorComboBoxDelegate : public QStyledItemDelegate
 {
 		Q_OBJECT
 	public:
 		void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
 };
 #endif
@@ -72,7 +72,14 @@ 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;
--- a/Show More
+++ b/Show More