Merge pull request #375 from plc-user/master

bordertitleblock: use same code for Qt5 & Qt6 for "numbering" rows
2026-06-06 18:13:14 +02:00 · 2025-03-02 09:53:11 +01:00 · 2025-03-02 08:48:19 +01:00 · 2025-03-01 07:19:28 +01:00 · 2025-02-28 21:08:12 +01:00 · 2025-02-28 20:36:38 +01:00
621 changed files with 29009 additions and 18165 deletions
@@ -77,12 +77,12 @@ Take advantage of the modern GUI
 Toolbars and panels can be enabled/disabled, moved and displayed the way you want to work.  
 Panels can be stacked on each other (as tabs) or docked on the sides (as docks) or completely separated from the main window (as windows).  
 The GUI can fit to small or big screens, and even to multi-display configurations.
-![](https://download.tuxfamily.org/qet/images-features/0030.png "GUI overview")
+![](https://download.qelectrotech.org/qet/images-features/0030.png "GUI overview")


 The GUI of QElectroTech is translated in 25 languages.
 You only need to restart the application for the new selected language to take effect.
-![](https://download.tuxfamily.org/qet/images-features/0040.png "Lang menu")
+![](https://download.qelectrotech.org/qet/images-features/0040.png "Lang menu")

 Create technical documentation in professional quality

@@ -91,56 +91,56 @@ You can set vertical and horizontal headers (printed rulers) individually on and

 Titlebocks can be created and edited with the embedded titleblock editor to perfectly suit your needs.  
 Custom variables can be defined to display the informations you wish in the titleblock.
-![](https://download.tuxfamily.org/qet/images-features/0055.png "Titleblock editor")
+![](https://download.qelectrotech.org/qet/images-features/0055.png "Titleblock editor")

 With only 2 mouse clicks you can add a full automatic generated table of content.  
 Changes in the documentation are updated on the fly.
-![](https://download.tuxfamily.org/qet/images-features/0060.png "Table of content")
+![](https://download.qelectrotech.org/qet/images-features/0060.png "Table of content")

 Choose from more than 8.200 symbols...
 The embedded QET collection contains a rich library of electric, logic, pneumatic, hydraulic and fluid symbols.  
 The library grows at every new release thanks to an active user community.
-![](https://download.tuxfamily.org/qet/images-features/0070.png "Collections")
+![](https://download.qelectrotech.org/qet/images-features/0070.png "Collections")

 ...or create your own collection

 The embedded element editor is a nice tool to create your own elements (symbols or anything else).  
 Your own elements are stored in the user collection.
-![](https://download.tuxfamily.org/qet/images-features/0080.png "Element editor")
+![](https://download.qelectrotech.org/qet/images-features/0080.png "Element editor")

 Quickly find what you need

 All collections can quickly be searched with the integrated search engine.  
 Furthermore, the search request can be restricted to the folder of your choice.
-![](https://download.tuxfamily.org/qet/images-features/0090.png "Search engine")
+![](https://download.qelectrotech.org/qet/images-features/0090.png "Search engine")

 Easily draw complex schematics

 To add an element on the drawing area, it only needs a drag & drop from the collection panel.
-![](https://download.tuxfamily.org/qet/images-features/0102.png "Drag and drop")
+![](https://download.qelectrotech.org/qet/images-features/0102.png "Drag and drop")

 Elements are automatically connected if they are aligned, or connected from point to point by pulling a conductor with the mouse.
-![](https://download.tuxfamily.org/qet/images-features/0105.png "Conductor connections")
+![](https://download.qelectrotech.org/qet/images-features/0105.png "Conductor connections")

 The path of every conductor can be modified by moving its handles with the mouse.
-![](https://download.tuxfamily.org/qet/images-features/0107.png "Conductor handles")
+![](https://download.qelectrotech.org/qet/images-features/0107.png "Conductor handles")
 And of course, you can accurately zoom with the mouse wheel over the drawing area to catch the smallest details.

 Link elements together to create cross references

 Several types of element can be linked together to display a cross reference text.  
 All types of cross references are automatically updated on the fly, you don't need to think about them if you make changes.
-![](https://download.tuxfamily.org/qet/images-features/0112.png "Cross ref elements")
+![](https://download.qelectrotech.org/qet/images-features/0112.png "Cross ref elements")
 To speed up your work, linkable elements are easily searched and shown.
-![](https://download.tuxfamily.org/qet/images-features/0115.png  "Cross ref search")
+![](https://download.qelectrotech.org/qet/images-features/0115.png  "Cross ref search")


 Export informations to a parts list
 Informations of all elements in the project can be exported to a .csv file that can be read and edited by any spreadsheet application.
-![](https://download.tuxfamily.org/qet/images-features/0122.png "Element informations")
+![](https://download.qelectrotech.org/qet/images-features/0122.png "Element informations")

 This way, you can make your own parts list or bill of material using the full power of a spreadsheet program.
-![](https://download.tuxfamily.org/qet/images-features/0125.png "Spreadsheet")
+![](https://download.qelectrotech.org/qet/images-features/0125.png "Spreadsheet")
 Print to pdf and/or export your work to images

 Your whole documentation or only selected parts of it can be printed to a real printer or to a pdf file.  
@@ -165,7 +165,7 @@ The nomenclature is presented in the form of a configurable table separated into
 - Display: the size and position of the table, the margins between text and the table cell, the alignment of the text in the cells and the font. The configuration of the table headers and the table itself are separate.  
 - Content: the information to display in the table and the order in which it should be displayed.  

-![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
+![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")

 In order to speed up the establishment of a nomenclature, it is possible to export / import the display and content configurations separately. This is the "Configuration" part that can be seen in the photos above.  

@@ -184,7 +184,7 @@ Finally two buttons are available in the property panel:
 - "Apply geometry to all tables linked to this one": applies the three properties mentioned above to all linked tables in order to save time and maintain aesthetic consistency.  

 And to finish a table   
-![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/tableau.png "table")
+![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/tableau.png "table")


 Summary
@@ -29,7 +29,7 @@
        {
          "type": "git",
          "url": "https://github.com/iwalton3/tkinter-standalone",
-          "commit": "2301112d142ebaf7532b25600c77d1a2edc9ef04"
+          "commit": "23c793bad2429f4a81eee9f50e2d07ae845b7785"
        }
            ],
      "modules": [
@@ -33,7 +33,7 @@ apps:
    environment: &env
      TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
      HOME: $SNAP_USER_COMMON
-      PYTHONPATH: $SNAP:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3.8:$SNAP/usr/lib/python3.8/lib-dynload
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.10/site-packages:$SNAP/usr/lib/python3.10:$SNAP/usr/lib/python3.10/lib-dynload

  qet-tb-generator:
    command: bin/qet_tb_generator
@@ -5,7 +5,10 @@ set current_dir=%~dp0
 cd /d %current_dir%

 rem lance QElectroTech
-rem Sans option --config-dir, la configuration de QElectroTech ainsi que la
-rem collection d'elements perso seront dans "%APPDATA%\qet"
+rem Sans option --config-dir, la configuration de QElectroTech seront dans
+rem "C:/Users/<USER>/AppData/Local/QElectroTech/QElectroTech"
+rem Sans l'option --data-dir, les données utilisateur (elements, titleblocks,
+rem log, ...) de QElectroTech sont stockées dans
+rem "C:/Users/<USER>/AppData/Roaming/QElectroTech/QElectroTech"
 set command=bin\qelectrotech.exe --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ -style windowsvista %*
@start %command%
@@ -125,6 +125,7 @@
        !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
@@ -736,6 +736,7 @@ 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
  )
@@ -25,5 +25,8 @@ add_definitions(-DQET_ALLOW_OVERRIDE_CTBTD_OPTION)
 # Comment the line below to deactivate the --config-dir option
 add_definitions(-DQET_ALLOW_OVERRIDE_CD_OPTION)

+# Comment the line below to deactivate the --data-dir option
+add_definitions(-DQET_ALLOW_OVERRIDE_DD_OPTION)
+
 #comment the line below to disable the project database export
 #add_definitions(-DQET_EXPORT_PROJECT_DB) #error Todo
@@ -0,0 +1,326 @@
+<!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>
@@ -8,5 +8,5 @@ rem Met la collection QET en lecture seule
 attrib +r elements/* /S /D

 rem lance QElectroTech
-set command=bin\qelectrotech.exe -platform windows:fontengine=freetype --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ --config-dir=conf/ -style plastique %*
+set command=bin\qelectrotech.exe -platform windows:fontengine=freetype --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ --config-dir=conf/ --data-dir=conf/ -style plastique %*
@start %command%
@@ -7,6 +7,7 @@ QET_EXE=$(readlink -f "${current_dir}/../qelectrotech")
 QET_ELEMENTS_DIR=$(readlink -f "${current_dir}/../elements/")
 QET_TBT_DIR=$(readlink -f "${current_dir}/../titleblocks/")
 QET_CONFIG_DIR=""
+QET_DATA_DIR=""
 QET_LANG_DIR=$(readlink -f "${current_dir}/../lang/")
 # REDEFINE_LANG="es"

@@ -31,6 +32,10 @@ if [ -d "${QET_CONFIG_DIR}" ]; then
 	OPTIONS="${OPTIONS} --config-dir=${QET_CONFIG_DIR}"
 fi

+if [ -d "${QET_DATA_DIR}" ]; then
+	OPTIONS="${OPTIONS} --data-dir=${QET_DATA_DIR}"
+fi
+
 if [ -d "${QET_LANG_DIR}" ]; then
 	OPTIONS="${OPTIONS} --lang-dir=${QET_LANG_DIR}"
 fi
@@ -10,35 +10,37 @@ 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]=Schaltpläne erstellen und bearbeiten.
-Comment[fr]=Éditer des schémas électriques.
 Comment[ar]=تحرير مخططات كهربائية
-Comment[es]=Editar esquemas eléctricos
-Comment[ru]=Создание и редактирование электрических схем.
-Comment[ca]=Editar esquemes elèctrics.
-Comment[pt]=Criar esquemas eléctricos.
-Comment[cs]=Editor výkresů elektrických obvodů
-Comment[pl]=Edycja schematów elektrycznych
-Comment[it]=Disegnare schemi elettrici
-Comment[hr]=Uredi elektro sheme
-Comment[el]=Επεξεργασία ηλεκτρικών διαγραμμάτων
-Comment[nl]=Bewerken bedradingsdiagrammen.
 Comment[be]=Bewerken elektrisch schema.
+Comment[ca]=Editar esquemes elèctrics.
+Comment[cs]=Editor výkresů elektrických obvodů
 Comment[da]=Rediger elektriske diagrammer.
+Comment[de]=Elektroschaltpläne erstellen und bearbeiten.
+Comment[el]=Επεξεργασία ηλεκτρικών διαγραμμάτων
+Comment[es]=Editar esquemas eléctricos
+Comment[fr]=Éditer des schémas électriques.
+Comment[hr]=Uredi elektro sheme
+Comment[it]=Disegnare schemi elettrici
 Comment[ja]=電気回路図の編集。
+Comment[nl]=Bewerken bedradingsdiagrammen.
+Comment[pl]=Edycja schematów elektrycznych
+Comment[pt]=Criar esquemas eléctricos.
+Comment[ru]=Создание и редактирование электрических схем.
+Comment[sk]=Úprava elektrických schém.
 GenericName=Electrical diagram editor
-GenericName[de]=Schaltplaneditor
-GenericName[fr]=Éditeur de schémas électriques
 GenericName[ar]=مُحرّر مخططات كهربائية
-GenericName[es]=Editor de esquemas eléctricos
-GenericName[ru]=Редактор электрических схем
-GenericName[pt]=Editor de esquemas eléctricos.
-GenericName[cs]=Editor výkresů elektrických obvodů
-GenericName[pl]=Edytor schematów elektrycznych
-GenericName[it]=Programma per disegnare schemi elettrici
-GenericName[hr]=Editor elektro sheme
-GenericName[el]=Επεξεργαστής ηλεκτρικών διαγραμμάτων
-GenericName[nl]=Elektrische schema editor
 GenericName[be]=Elektrische schema editor
+GenericName[cs]=Editor výkresů elektrických obvodů
 GenericName[da]=Elektrisk diagram redigering
+GenericName[de]=Schaltplaneditor
+GenericName[el]=Επεξεργαστής ηλεκτρικών διαγραμμάτων
+GenericName[es]=Editor de esquemas eléctricos
+GenericName[fr]=Éditeur de schémas électriques
+GenericName[hr]=Editor elektro sheme
+GenericName[it]=Programma per disegnare schemi elettrici
 GenericName[ja]=電気回路図エディタ
+GenericName[nl]=Elektrische schema editor
+GenericName[pl]=Edytor schematów elektrycznych
+GenericName[pt]=Editor de esquemas eléctricos.
+GenericName[ru]=Редактор электрических схем
+GenericName[sk]=Editor elektrických schém
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2006-2024 The QElectroTech Team -->
+<!-- Copyright 2006-2025 The QElectroTech Team -->
 <application>
 <id type="desktop">qelectrotech.desktop</id>
 <metadata_license>MIT</metadata_license>
@@ -57,6 +57,9 @@ DEFINES += QET_ALLOW_OVERRIDE_CTBTD_OPTION
 # Commenter la ligne ci-dessous pour desactiver l'option --config-dir
 DEFINES += QET_ALLOW_OVERRIDE_CD_OPTION

+# Commenter la ligne ci-dessous pour desactiver l'option --data-dir
+DEFINES += QET_ALLOW_OVERRIDE_DD_OPTION
+
 #comment the line below to disable the project database export
 DEFINES += QET_EXPORT_PROJECT_DB

@@ -49,6 +49,7 @@
        <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>
@@ -60,6 +61,7 @@
        <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>
@@ -210,7 +212,7 @@
        <file>ico/48x48/view-pim-journal.png</file>
        <file>ico/24x16/nl.png</file>
        <file>ico/32x32/simplifyrichtext.png</file>
-        <file>ico/24x16/be.png</file>
+        <file>ico/24x16/nl_BE.png</file>
        <file>ico/128x128/plasmagik.png</file>
        <file>ico/22x22/autoconnect.png</file>
        <file>ico/128x128/project.png</file>
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -26,7 +26,11 @@
 #include "xmlprojectelementcollectionitem.h"

 #include <QFutureWatcher>
-#include <QtConcurrent>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
+#include <QtConcurrentMap>
+#else
+#include <QtConcurrentRun>
+#endif

 /**
 	@brief ElementsCollectionModel::ElementsCollectionModel
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -870,7 +870,7 @@ QIcon ElementsLocation::icon() const

 /**
 	@brief ElementLocation::name
-	@return The name of the represented element in the current local
+	@return The name of the represented element in the current locale
 */
 QString ElementsLocation::name() const
 {
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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.
-	She encapsulates a virtual path.
+	It 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.
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-		Copyright 2006-2024 The QElectroTech Team
+		Copyright 2006-2025 The QElectroTech Team
 		This file is part of QElectroTech.

 		QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-		Copyright 2006-2024 The QElectroTech Team
+		Copyright 2006-2025 The QElectroTech Team
 		This file is part of QElectroTech.

 		QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -117,44 +117,52 @@ XmlElementCollection::XmlElementCollection(QETProject *project) :
 		0x8981,
 		0x7D20};

-	names.addName("fr", "Éléments importés");
-	names.addName("en", "Imported elements");
-	names.addName("de", "Importierte elemente");
-	names.addName("es", "Elementos importados");
-	names.addName("ru", QString(russian_data, 24));
-	names.addName("cs", "Zavedené prvky");
-	names.addName("pl", "Elementy importowane");
-	names.addName("pt", "elementos importados");
-	names.addName("it", "Elementi importati");
-	names.addName("el", QString(greek_data, 18));
-	names.addName("nl", "Elementen geïmporteerd");
-	names.addName("hr", "Uvezeni elementi");
 	names.addName("ca",    "Elements importats");
-	names.addName("ro", "Elemente importate");
-	names.addName("tr", QString(turkish_data, 12));
+	names.addName("cs",    "Zavedené prvky");
 	names.addName("da",    "Importerede elementer");
-	names.addName("sl", "Uvoženi elementi");
+	names.addName("de",    "Importierte elemente");
+	names.addName("el",    QString(greek_data, 18));
+	names.addName("en",    "Imported elements");
+	names.addName("es",    "Elementos importados");
+	names.addName("fr",    "Éléments importés");
+	names.addName("hr",    "Uvezeni elementi");
+	names.addName("it",    "Elementi importati");
 	names.addName("ja",    QString(japanese_data, 10));
+	names.addName("nl_BE", "Elementen geïmporteerd");
+	names.addName("nl",    "Elementen geïmporteerd");
+	names.addName("pl",    "Elementy importowane");
+	names.addName("pt_BR", "elementos importados");
+	names.addName("pt",    "elementos importados");
+	names.addName("ro",    "Elemente importate");
+	names.addName("ru",    QString(russian_data, 24));
+	names.addName("sl",    "Uvoženi elementi");
+	names.addName("tr",    QString(turkish_data, 12));
 	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("fr", "Éléments importés");
-	names.addName("en", "Imported elements");
-	names.addName("de", "Importierte elemente");
-	names.addName("es", "Elementos importados");
-	names.addName("cs", "Zavedené prvky");
-	names.addName("pl", "Elementy importowane");
-	names.addName("pt", "elementos importados");
-	names.addName("it", "Elementi importati");
-	names.addName("nl", "Elementen geïmporteerd");
-	names.addName("hr", "Uvezeni elementi");
 	names.addName("ca",    "Elements importats");
-	names.addName("ro", "Elemente importate");
+	names.addName("cs",    "Zavedené prvky");
 	names.addName("da",    "Importerede elementer");
+	names.addName("de",    "Importierte elemente");
+	names.addName("el",    "Εισηγμένα στοιχεία");
+	names.addName("en",    "Imported elements");
+	names.addName("es",    "Elementos importados");
+	names.addName("fr",    "Éléments importés");
+	names.addName("hr",    "Uvezeni elementi");
+	names.addName("it",    "Elementi importati");
+	names.addName("ja",    "インバートされた要素");
+	names.addName("nl_BE", "Elementen geïmporteerd");
+	names.addName("nl",    "Elementen geïmporteerd");
+	names.addName("pl",    "Elementy importowane");
+	names.addName("pt_BR", "elementos importados");
+	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

@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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;
-	hash_names.insert(lang, name);
+	map_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) {
-	hash_names.remove(lang);
+	map_names.remove(lang);
 }

 /**
@@ -62,7 +62,7 @@ void NamesList::removeName(const QString &lang) {
 */
 void NamesList::clearNames()
 {
-	hash_names.clear();
+	map_names.clear();
 }

 /**
@@ -70,7 +70,7 @@ void NamesList::clearNames()
 */
 QList<QString> NamesList::langs() const
 {
-	return(hash_names.keys());
+	return(map_names.keys());
 }

 /**
@@ -78,7 +78,7 @@ QList<QString> NamesList::langs() const
 */
 bool NamesList::isEmpty() const
 {
-	return(hash_names.isEmpty());
+	return(map_names.isEmpty());
 }

 /**
@@ -86,7 +86,7 @@ bool NamesList::isEmpty() const
 */
 int NamesList::count() const
 {
-	return(hash_names.count());
+	return(map_names.count());
 }

 /**
@@ -95,7 +95,7 @@ int NamesList::count() const
 	defini
 */
 QString &NamesList::operator[](const QString &lang) {
-	return(hash_names[lang]);
+	return(map_names[lang]);
 }

 /**
@@ -105,17 +105,21 @@ QString &NamesList::operator[](const QString &lang) {
 */
 const QString NamesList::operator[](const QString &lang) const
 {
-	return(hash_names.value(lang));
+	return(map_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
+	@param xml_element L'element XML a analyser / The XML element to be parsed
 	@param xml_options A set of options related to XML parsing.
 	@see getXmlOptions()
 */
@@ -168,8 +172,13 @@ 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"
@@ -179,14 +188,22 @@ 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"]);
-	QHashIterator<QString, QString> names_iterator(hash_names);
+	if (map_names.isEmpty()) {
+		qInfo() << " NamesList of element is empty - add default: [" << "en" << "] = " << "NoName" << "";
+		QDomElement name_elmt = xml_document.createElement(xml_opt["TagName"]);
+		name_elmt.setAttribute(xml_opt["LanguageAttribute"], "en");
+		name_elmt.appendChild(xml_document.createTextNode("NoName"));
+		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()));
+			name_elmt.appendChild(xml_document.createTextNode(names_iterator.value().trimmed()));
 			names_elmt.appendChild(name_elmt);
 		}
+	}
 	return(names_elmt);
 }

@@ -218,7 +235,7 @@ QHash<QString, QString> NamesList::getXmlOptions(const QHash<QString, QString> &
 */
 bool NamesList::operator!=(const NamesList &nl) const
 {
-	return(hash_names != nl.hash_names);
+	return(map_names != nl.map_names);
 }

 /**
@@ -227,7 +244,7 @@ bool NamesList::operator!=(const NamesList &nl) const
 */
 bool NamesList::operator==(const NamesList &nl) const
 {
-	return(hash_names == nl.hash_names);
+	return(map_names == nl.map_names);
 }

 /**
@@ -246,10 +263,10 @@ bool NamesList::operator==(const NamesList &nl) const
 QString NamesList::name(const QString &fallback_name) const
 {
 	QString system_language = QETApp::langFromSetting();
-	if (! hash_names[system_language].isEmpty())
-		return (hash_names[system_language]);
-	if (! hash_names["en"].isEmpty()) return (hash_names["en"]);
+	if (! map_names[system_language].isEmpty())
+		return (map_names[system_language]);
+	if (! map_names["en"].isEmpty()) return (map_names["en"]);
 	if (! fallback_name.isEmpty()) return (fallback_name);
-	if (hash_names.count()) return (hash_names.begin().value());
+	if (map_names.count()) return (map_names.begin().value());
 	return (QString(""));
 }
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -21,6 +21,12 @@

 #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.
@@ -36,7 +42,7 @@ class NamesList {
 	
 	// attributes
 	private:
-	QHash<QString, QString> hash_names;
+	QMap<QString, QString> map_names;
 	
 	public:
 	static int MetaTypeId;
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2024 The QElectroTech Team
+	Copyright 2006-2025 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
--- a/Show More
+++ b/Show More