NSIS: remove LANG_DUTCH_BELGIAN

The contents of svg export is not correctly centered within the exported
area, thanks Tom
https://qelectrotech.org/forum/viewtopic.php?pid=22781#p22781

README.md

@@ -15,10 +15,10 @@ The main goal of the developers is to provide a libre, easy to use and effective
 
 ### Version
 
-The current stable version is 0.90 and was released on 2023.01.06.
+The current stable version is 0.100 and was released on 2026.01.25.
 Once it has been officially released, the stable version is always frozen and is no longer developed.
 
-New functionalities, bug and issue fixings are further made in the development version (currently 0.100), which can also be [downloaded](https://qelectrotech.org/download.php).
+New functionalities, bug and issue fixings are further made in the development version (currently 0.100.1 or 0.200.0 if based on new Qt6 port), which can also be [downloaded](https://qelectrotech.org/download.php).
 
 Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partially implemented until they are done!
 

build-aux/flatpak/org.qelectrotech.QElectroTech.json

@@ -1,8 +1,7 @@
 {
   "id": "org.qelectrotech.QElectroTech",
-  "base-version": "5.15-23.08",
   "runtime": "org.kde.Platform",
-  "runtime-version": "5.15-23.08",
+  "runtime-version": "5.15-25.08",
   "sdk": "org.kde.Sdk",
   "command": "qelectrotech",
   "rename-desktop-file": "org.qelectrotech.qelectrotech.desktop",
@@ -18,51 +17,17 @@
     "--socket=cups",
     "--filesystem=host"
   ],
+  "cleanup": [
+      "/include",
+      "/man",
+      "/share/doc",
+      "/share/man",
+      "*.la",
+      "*.a"
+  ],
   "modules": [
-    {
+    "tkinter.json",
-      "name": "tkinter",
+    "pypi-dependencies.json",
-      "buildsystem": "simple",
-      "build-commands": [
-         "pip3 install --prefix=${FLATPAK_DEST} ."
-            ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/iwalton3/tkinter-standalone",
-          "commit": "23c793bad2429f4a81eee9f50e2d07ae845b7785"
-        }
-            ],
-      "modules": [
-                {
-          "name": "tcl",
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tcl8.6.11-src.tar.gz",
-              "sha256": "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258"
-            }
-          ],
-          "subdir": "unix",
-          "post-install": [
-              "chmod +w ${FLATPAK_DEST}/lib/libtcl8.6.so"
-          ]
-                },
-                {
-          "name": "tk",
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tk8.6.11-src.tar.gz",
-              "sha256": "5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282"
-            }
-          ],
-          "subdir": "unix",
-          "post-install": [
-              "chmod +w ${FLATPAK_DEST}/lib/libtk8.6.so"
-          ]
-                }
-      ]
-    },
     {
       "name": "qelectrotech",
       "buildsystem": "qmake",
@@ -76,37 +41,11 @@
         },
         {
           "type": "patch",
-          "path": "patches/0001-build-Fix-the-installation-paths.patch"
+          "paths": [
+            "patches/fix-the-installation-paths.patch"
+          ]
         }
       ]
-    },
+    }
-    {
-    "name": "python3-PySimpleGUI",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
-            "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
-        }
-    ]
-},
-    {
-    "name": "python3-qet-tb-generator",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} qet-tb-generator"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/70/aa/ebde0dddfbde799a4e8cf0564e52f95089105a7f562739ee1d16ff5a495a/qet_tb_generator-1.3.1.tar.gz",
-            "sha256": "52c9836387d54bc30ea29272068ec156fc65c3905e0cb863afd9418abc3c0907"
-        }
-    ]
-}
   ]
 }

build-aux/flatpak/patches/fix-appdata.patch

@@ -0,0 +1,54 @@
+From 5cb80674cec7363ed00bab5248b3674ca5241c2f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <yakushabb@gmail.com>
+Date: Fri, 20 Feb 2026 22:56:52 +0300
+Subject: [PATCH] Fix appdata paper cuts
+
+---
+ misc/qelectrotech.appdata.xml | 26 ++++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/misc/qelectrotech.appdata.xml b/misc/qelectrotech.appdata.xml
+index dd06ab7..eb02119 100644
+--- a/misc/qelectrotech.appdata.xml
++++ b/misc/qelectrotech.appdata.xml
+@@ -1,7 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2006-2023 The QElectroTech Team -->
+-<application>
+- <id type="desktop">qelectrotech.desktop</id>
++<component type="desktop-application">
++ <id>org.qelectrotech.QElectroTech</id>
++ <launchable type="desktop-id">qelectrotech.desktop</launchable>
+  <metadata_license>MIT</metadata_license>
+  <project_license>GPL-2.0-or-later</project_license>
+  <name>QElectroTech</name>
+@@ -83,9 +84,22 @@
+    QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。
+    </p>
+  </description>
+- <url type="homepage">http://qelectrotech.org</url>
++ <url type="homepage">https://qelectrotech.org</url>
++ <url type="bugtracker">https://qelectrotech.org/bugtracker</url>
++ <url type="vcs-browser">https://github.com/qelectrotech/qelectrotech-source-mirror</url>
++ <developer id="org.qelectrotech">
++   <name>QElectroTech</name>
++ </developer>
+  <screenshots>
+-  <screenshot type="default">http://download.tuxfamily.org/qet/screens/qelectrotech5.png</screenshot>
++  <screenshot type="default">
++    <image>https://qelectrotech.org/screenshots/qet_overview04.png</image>
++ </screenshot>
++  <screenshot>
++    <image>https://qelectrotech.org/screenshots/qet_overview06.png</image>
++ </screenshot>
++  <screenshot>
++    <image>https://qelectrotech.org/screenshots/qet_overview09.png</image>
++ </screenshot>
+  </screenshots>
+- <updatecontact>qet@lists.tuxfamily.org</updatecontact>
+-</application>
++ <update_contact>qet@lists.tuxfamily.org</update_contact>
++</component>
+-- 
+2.53.0
+

build-aux/flatpak/patches/fix-the-installation-paths.patch

@@ -1,16 +1,6 @@
-From 14f0685ddcf3a7d64bb85a3e9a9ac97c369bb508 Mon Sep 17 00:00:00 2001
+diff -ruN a/qelectrotech.pro b/qelectrotech.pro
-From: Laurent Trinques <scorpio@qelectrotech.org>
+--- a/qelectrotech.pro	2023-04-20 11:47:07.695847458 +0200
-Date: Sat, 26 Sep 2020 22:52:52 +0200
++++ b/qelectrotech.pro	2023-04-20 11:51:14.843611898 +0200
-Subject: [PATCH] build: Fix the installation paths
-
----
- qelectrotech.pro | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/qelectrotech.pro b/qelectrotech.pro
-index 7baddbb08..5dcda04b6 100644
---- a/qelectrotech.pro
-+++ b/qelectrotech.pro
 @@ -5,18 +5,18 @@
  # Chemins utilises pour la compilation et l'installation de QET
  unix {
@@ -35,6 +25,3 @@ index 7baddbb08..5dcda04b6 100644
          QET_APPDATA_PATH           = 'share/appdata'
  }
  win32 {
--- 
-2.35.1
-

build-aux/flatpak/patches/tkinter-build.patch

@@ -0,0 +1,184 @@
+commit 3bbb09a0598fc976d2bf8dac932b27740086c1bd
+Author: Hubert Figuière <hub@figuiere.net>
+Date:   Sun Dec 21 17:49:43 2025 -0500
+
+    Port to Python 3.13
+    
+    Signed-off-by: Hubert Figuière <hub@figuiere.net>
+
+diff --git a/_tkinter.c b/_tkinter.c
+index e537707..dfc5789 100644
+--- a/_tkinter.c
++++ b/_tkinter.c
+@@ -21,7 +21,6 @@ Copyright (C) 1994 Steen Lumholt.
+ 
+ */
+ 
+-#define PY_SSIZE_T_CLEAN
+ #ifndef Py_BUILD_CORE_BUILTIN
+ #  define Py_BUILD_CORE_MODULE 1
+ #endif
+@@ -32,6 +31,9 @@ Copyright (C) 1994 Steen Lumholt.
+ #  include "pycore_fileutils.h"   // _Py_stat()
+ #endif
+ 
++#include "pycore_long.h"          // _PyLong_IsNegative()
++#include "pycore_sysmodule.h"     // _PySys_GetOptionalAttrString()
++
+ #ifdef MS_WINDOWS
+ #include <windows.h>
+ #endif
+@@ -135,7 +137,7 @@ _get_tcl_lib_path()
+         struct stat stat_buf;
+         int stat_return_value;
+ 
+-        prefix = PyUnicode_FromWideChar(Py_GetPrefix(), -1);
++        (void) _PySys_GetOptionalAttrString("base_prefix", &prefix);
+         if (prefix == NULL) {
+             return NULL;
+         }
+@@ -143,9 +145,11 @@ _get_tcl_lib_path()
+         /* Check expected location for an installed Python first */
+         tcl_library_path = PyUnicode_FromString("\\tcl\\tcl" TCL_VERSION);
+         if (tcl_library_path == NULL) {
++            Py_DECREF(prefix);
+             return NULL;
+         }
+         tcl_library_path = PyUnicode_Concat(prefix, tcl_library_path);
++        Py_DECREF(prefix);
+         if (tcl_library_path == NULL) {
+             return NULL;
+         }
+@@ -959,7 +963,8 @@ AsObj(PyObject *value)
+                                 (unsigned char *)(void *)&wideValue,
+                                 sizeof(wideValue),
+                                 PY_LITTLE_ENDIAN,
+-                                /* signed */ 1) == 0) {
++                                /* signed */ 1,
++                                /* with_exceptions */ 1) == 0) {
+             return Tcl_NewWideIntObj(wideValue);
+         }
+         PyErr_Clear();
+@@ -1988,7 +1993,7 @@ _tkinter_tkapp_getboolean(TkappObject *self, PyObject *arg)
+     int v;
+ 
+     if (PyLong_Check(arg)) { /* int or bool */
+-        return PyBool_FromLong(Py_SIZE(arg) != 0);
++        return PyBool_FromLong(!_PyLong_IsZero((PyLongObject *)arg));
+     }
+ 
+     if (PyTclObject_Check(arg)) {
+diff --git a/clinic/_tkinter.c.h b/clinic/_tkinter.c.h
+index 9103565..f43510d 100644
+--- a/clinic/_tkinter.c.h
++++ b/clinic/_tkinter.c.h
+@@ -2,6 +2,8 @@
+ preserve
+ [clinic start generated code]*/
+ 
++#include "pycore_modsupport.h"    // _PyArg_BadArgument()
++
+ PyDoc_STRVAR(_tkinter_tkapp_eval__doc__,
+ "eval($self, script, /)\n"
+ "--\n"
+@@ -426,7 +428,7 @@ _tkinter_tkapp_createfilehandler(TkappObject *self, PyObject *const *args, Py_ss
+         goto exit;
+     }
+     file = args[0];
+-    mask = _PyLong_AsInt(args[1]);
++    mask = PyLong_AsInt(args[1]);
+     if (mask == -1 && PyErr_Occurred()) {
+         goto exit;
+     }
+@@ -490,7 +492,7 @@ _tkinter_tkapp_createtimerhandler(TkappObject *self, PyObject *const *args, Py_s
+     if (!_PyArg_CheckPositional("createtimerhandler", nargs, 2, 2)) {
+         goto exit;
+     }
+-    milliseconds = _PyLong_AsInt(args[0]);
++    milliseconds = PyLong_AsInt(args[0]);
+     if (milliseconds == -1 && PyErr_Occurred()) {
+         goto exit;
+     }
+@@ -524,7 +526,7 @@ _tkinter_tkapp_mainloop(TkappObject *self, PyObject *const *args, Py_ssize_t nar
+     if (nargs < 1) {
+         goto skip_optional;
+     }
+-    threshold = _PyLong_AsInt(args[0]);
++    threshold = PyLong_AsInt(args[0]);
+     if (threshold == -1 && PyErr_Occurred()) {
+         goto exit;
+     }
+@@ -558,7 +560,7 @@ _tkinter_tkapp_dooneevent(TkappObject *self, PyObject *const *args, Py_ssize_t n
+     if (nargs < 1) {
+         goto skip_optional;
+     }
+-    flags = _PyLong_AsInt(args[0]);
++    flags = PyLong_AsInt(args[0]);
+     if (flags == -1 && PyErr_Occurred()) {
+         goto exit;
+     }
+@@ -741,29 +743,29 @@ _tkinter_create(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
+     if (nargs < 4) {
+         goto skip_optional;
+     }
+-    interactive = _PyLong_AsInt(args[3]);
+-    if (interactive == -1 && PyErr_Occurred()) {
++    interactive = PyObject_IsTrue(args[3]);
++    if (interactive < 0) {
+         goto exit;
+     }
+     if (nargs < 5) {
+         goto skip_optional;
+     }
+-    wantobjects = _PyLong_AsInt(args[4]);
+-    if (wantobjects == -1 && PyErr_Occurred()) {
++    wantobjects = PyObject_IsTrue(args[4]);
++    if (wantobjects < 0) {
+         goto exit;
+     }
+     if (nargs < 6) {
+         goto skip_optional;
+     }
+-    wantTk = _PyLong_AsInt(args[5]);
+-    if (wantTk == -1 && PyErr_Occurred()) {
++    wantTk = PyObject_IsTrue(args[5]);
++    if (wantTk < 0) {
+         goto exit;
+     }
+     if (nargs < 7) {
+         goto skip_optional;
+     }
+-    sync = _PyLong_AsInt(args[6]);
+-    if (sync == -1 && PyErr_Occurred()) {
++    sync = PyObject_IsTrue(args[6]);
++    if (sync < 0) {
+         goto exit;
+     }
+     if (nargs < 8) {
+@@ -814,7 +816,7 @@ _tkinter_setbusywaitinterval(PyObject *module, PyObject *arg)
+     PyObject *return_value = NULL;
+     int new_val;
+ 
+-    new_val = _PyLong_AsInt(arg);
++    new_val = PyLong_AsInt(arg);
+     if (new_val == -1 && PyErr_Occurred()) {
+         goto exit;
+     }
+diff --git a/setup.py b/setup.py
+index f379305..cf7b6ad 100644
+--- a/setup.py
++++ b/setup.py
+@@ -3,11 +3,11 @@ from distutils.core import setup, Extension
+ module1 = Extension('_tkinter',
+                     libraries=['tcl8.6', 'tk8.6'],
+                     sources=['_tkinter.c'],
+-                    include_dirs=['/app/include/'])
++                    include_dirs=['/app/include/', '/usr/include/python3.13/internal/'])
+ 
+ setup(
+     name='tkinter-standalone',
+-    version='3.11',
++    version='3.13',
+     description='Tkinter packaged as an external package for flatpak.',
+     ext_modules=[module1],
+     packages=["tkinter"]

build-aux/flatpak/pypi-dependencies.json

@@ -0,0 +1,40 @@
+{
+    "name": "pypi-dependencies",
+    "buildsystem": "simple",
+    "build-commands": [],
+    "modules": [
+        {
+            "name": "python3-PySimpleGUI",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"PySimpleGUI\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/4d/d9/3de4b7ca71a7779e4f4a160088621b072a29d9b814a7fa9b5411571f4849/pysimplegui-5.0.8.3-py3-none-any.whl",
+                    "sha256": "67e35ad6dd76e9369051261114f4711308e87815a0488f7fa28b37c29a546f8b"
+                }
+            ]
+        },
+        {
+            "name": "python3-qet-tb-generator",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"qet-tb-generator\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/4d/d9/3de4b7ca71a7779e4f4a160088621b072a29d9b814a7fa9b5411571f4849/pysimplegui-5.0.8.3-py3-none-any.whl",
+                    "sha256": "67e35ad6dd76e9369051261114f4711308e87815a0488f7fa28b37c29a546f8b"
+                },
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/63/d6/81de49a3ccec259583241fec4d79c668eff4acf9eb4d0226db36e1399f2d/qet_tb_generator-1.3.1-py3-none-any.whl",
+                    "sha256": "80fb4af229edfd5774e61f96fa387ff394d5060abd0ca45c3c74d29de1ce9b53"
+                }
+            ]
+        }
+    ]
+}

build-aux/flatpak/tkinter.json

@@ -0,0 +1,58 @@
+{
+    "//note": "The `tkinter` module is missing from the Freedesktop Sdk's Python installation",
+    "name": "tkinter",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --prefix=${FLATPAK_DEST} --no-build-isolation ."
+    ],
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://github.com/iwalton3/tkinter-standalone",
+            "commit": "88aa05075d90d393a29a484bce676e237d311082"
+        },
+        {
+            "type": "patch",
+            "path": "patches/tkinter-build.patch"
+        }
+    ],
+    "modules": [
+        {
+            "name": "tcl",
+            "buildsystem": "autotools",
+            "subdir": "unix",
+            "post-install": [
+                "chmod 755 /app/lib/libtcl*.so"
+            ],
+            "cleanup": [
+                "/bin"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://prdownloads.sourceforge.net/tcl/tcl8.6.17-src.tar.gz",
+                    "sha256": "a3903371efcce8a405c5c245d029e9f6850258a60fa3761c4d58995610949b31"
+                }
+            ]
+        },
+        {
+            "name": "tk",
+            "buildsystem": "autotools",
+            "subdir": "unix",
+            "post-install": [
+                "chmod 755 /app/lib/libtk*.so"
+            ],
+            "cleanup": [
+                "/bin",
+                "/lib/tk*/demos"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://prdownloads.sourceforge.net/tcl/tk8.6.17-src.tar.gz",
+                    "sha256": "e4982df6f969c08bf9dd858a6891059b4a3f50dc6c87c10abadbbe2fc4838946"
+                }
+            ]
+        }
+    ]
+}

build-aux/windows/Contrib/Dutch_Belgium.nlf

@@ -1,191 +0,0 @@
-# Header, don't edit
-NLF v6
-# Start editing here
-# Language ID
-2067
-# Font and size - dash (-) means default
--
--
-# Codepage - dash (-) means ANSI code page
-1252
-# RTL - anything else than RTL means LTR
--
-# Translation by Ronny Desmedt (any credits should go here)
-# ^Branding
-Nullsoft Install System %s
-# ^SetupCaption
-$(^Name) Installatie
-# ^UninstallCaption
-$(^Name) Deïnstallatie
-# ^LicenseSubCaption
-: Licentie overeenkomst
-# ^ComponentsSubCaption
-: Installatie Opties
-# ^DirSubCaption
-: Installatie Map
-# ^InstallingSubCaption
-: Installeren
-# ^CompletedSubCaption
-: Voltooid
-# ^UnComponentsSubCaption
-: Deïnstallatie Opties
-# ^UnDirSubCaption
-: Deïnstallatie Map
-# ^ConfirmSubCaption
-: Bevestigen
-# ^UninstallingSubCaption
-: Deïnstalleren
-# ^UnCompletedSubCaption
-: Voltooid
-# ^BackBtn
-< &Terug
-# ^NextBtn
-&Volgende >
-# ^AgreeBtn
-Ik ben &Akkoord
-# ^AcceptBtn
-Ik &Accepteer de licentie overeenkomst
-# ^DontAcceptBtn
-Ik &Accepteer de licentie overeenkomst niet
-# ^InstallBtn
-&Installeer
-# ^UninstallBtn
-&Deïnstalleer
-# ^CancelBtn
-Afbreken
-# ^CloseBtn
-&Sluiten
-# ^BrowseBtn
-B&laderen...
-# ^ShowDetailsBtn
-Toon &details
-# ^ClickNext
-Klik op volgende om verder te gaan.
-# ^ClickInstall
-Klik op installeren om de installatie te starten.
-# ^ClickUninstall
-Klik op deïnstalleren om de installatie te verwijderen.
-# ^Name
-Naam
-# ^Completed
-Voltooid
-# ^LicenseText
-Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te installeren. Als u akkord bent met de licentie overeenkomst, klik op akkoord.
-# ^LicenseTextCB
-Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te installeren. Als u akkord bent met de licentie overeenkomst, klik op onderstaande selectievakje. $_CLICK
-# ^LicenseTextRB
-Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te installeren. Als u akkord bent met de licentie overeenkomst, selecteer de eerste onderstaande optie. $_CLICK
-# ^UnLicenseText
-Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te deïnstalleren. Als u akkord bent met de licentie overeenkomst, klik op akkoord.
-# ^UnLicenseTextCB
-Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te deïnstalleren. Als u akkord bent met de licentie overeenkomst, klik op onderstaande selectievakje. $_CLICK
-# ^UnLicenseTextRB
-Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te deïnstalleren. Als u akkord bent met de licentie overeenkomst, selecteer de eerste onderstaande optie. $_CLICK
-# ^Custom
-Aangepast
-# ^ComponentsText
-Selecteer de onderdelen die u wilt installeren en deselecteer de onderdelen die u niet wilt installeren. $_CLICK
-# ^ComponentsSubText1
-Selecteer een installatie type:
-# ^ComponentsSubText2_NoInstTypes
-Selecteer de onderdelen om te installeren:
-# ^ComponentsSubText2
-Of, selecteer optionelen onderdelen die u wilt installeren:
-# ^UnComponentsText
-Selecteer de onderdelen die u wilt deïnstalleren en deselecteer de onderdelen die u niet wilt deïinstalleren. $_CLICK
-# ^UnComponentsSubText1
-Selecteer een deïnstallatie type:
-# ^UnComponentsSubText2_NoInstTypes
-Selecteer de onderdelen om te deïnstalleren:
-# ^UnComponentsSubText2
-Of, selecteer optionelen onderdelen die u wilt deïnstalleren:
-# ^DirText
-De installatie van $(^NameDA) wordt in volgende map uitgevoerd. Om in een andere map te installeren, klik op bladeren om een andere map te selecteren. $_CLICK
-# ^DirSubText
-Installatie map
-# ^DirBrowseText
-Selecteerd de map om $(^NameDA) in te installeren:
-# ^UnDirText
-De deïnstallatie van $(^NameDA) in de volgende map. Om een andere map te deïnstalleren, klik op bladren om een andere map te selecteren. $_CLICK
-# ^UnDirSubText
-""
-# ^UnDirBrowseText
-Selecteer en map om $(^NameDA) van te deînstalleren:
-# ^SpaceAvailable
-"Beschikbare ruimte: "
-# ^SpaceRequired
-"Benodigde ruimte: "
-# ^UninstallingText
-$(^NameDA) wordt gedeïnstalleerd uit volgende map. $_CLICK
-# ^UninstallingSubText
-Deïnstalleren van:
-# ^FileError
-Fout bij openen van bestand om te schrijven: \r\n\r\n$0\r\n\r\nKlik op afbreken om de installatie te stoppen,\r\nOpnieuw om te proberen, of\r\nNegeren om dit bestand over te slaan.
-# ^FileError_NoIgnore
-Fout bij openen van bestand om te schrijven: \r\n\r\n$0\r\n\r\nOpnieuw om te proberen, of\r\nAfbreken om de installatie te stoppen.
-# ^CantWrite
-"Kan niet schrijven: "
-# ^CopyFailed
-Kopieren mislukt
-# ^CopyTo
-"Copier naar "
-# ^Registering
-"Registreren: "
-# ^Unregistering
-"Deregistreren: "
-# ^SymbolNotFound
-"Kan symbool niet vinden: "
-# ^CouldNotLoad
-"Kan niet laden: "
-# ^CreateFolder
-"Map maken: "
-# ^CreateShortcut
-"Snelkoppeling maken: "
-# ^CreatedUninstaller
-"Doe deïnstallatie: "
-# ^Delete
-"Verwijder bestanden: "
-# ^DeleteOnReboot
-Verwijder bij herstarten: "
-# ^ErrorCreatingShortcut
-"Fout bij maken snelkoppeling: "
-# ^ErrorCreating
-"Fout bij maken: "
-# ^ErrorDecompressing
-Fout bij uitpakken gegevens! Beschadigd bestand?
-# ^ErrorRegistering
-Fout bij registreren DLL
-# ^ExecShell
-"ExecShell: "
-# ^Exec
-"Uitvoeren: "
-# ^Extract
-"Extract: "
-# ^ErrorWriting
-Fout: fout bij schrijven naar bestand "
-# ^InvalidOpcode
-Installie beschadigd: niet toegestane opcode
-# ^NoOLE
-"Geen OLE voor: "
-# ^OutputFolder
-"Bestemmings map: "
-# ^RemoveFolder
-"Verwijder mapr: "
-# ^RenameOnReboot
-"Hernoem bij opstarten: "
-# ^Rename
-"Hernoem: "
-# ^Skipped
-Overgeslagen: "
-# ^CopyDetails
-Copier details naar klembord
-# ^LogInstall
-Log instaltie proces
-# ^Byte
-B
-# ^Kilo
-K
-# ^Mega
-M
-# ^Giga
-G

build-aux/windows/Contrib/Dutch_Belgium.nsh

@@ -1,128 +0,0 @@
-;Language:Dutch_Belgium (2067)
-;By Ronny Desmedt
-
-!insertmacro LANGFILE "Dutch_Belgium" "Dutch_Belgium"
-
-!ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welkom bij $(^NameDA) installatie Wizard"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Deze wizard zal u begeleiden bij de installatie van $(^NameDA).$\r$\n$\r$\nHet is aanbevol dat u alle andere programmas afsluit voordat u deze installatie uitvoerd. Dit geeft de mogelijkheid om relevante systeem bestanden bij te werken zonder dat uw systeem terug moet opstarten.$\r$\n$\r$\n$_CLICK"
-!endif
-
-!ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Welkom bij de $(^NameDA) deïnstallatie wizard"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Deze wizard zal u begeleiden bij de deïnstallatie van $(^NameDA).$\r$\n$\r$\nControleer of $(^NameDA) is afgesloten alvorens de deïnstallatie te starten.$\r$\n$\r$\n$_CLICK"
-!endif
-
-!ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licentie overeenkomst"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Gelieve de licentie te lezen alvorens U $(^NameDA) installeert."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Klik op akkoord om de overeenkomst te aanvaarden. U moet de overeenkomst aanvaarden om $(^NameDA) te installeren."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Als u de voorwaarden van de overeenkomst aanvaard, Klik op onderstaande selectievakje. U moet de overeenkomst aanvaarden om $(^NameDA) te installeren. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Als u de voorwaarden van de overeenkomst aanvaard, selecteer de eerste onderstaande optie. U moet de overeenkomst aanvaarden om $(^NameDA) te installeren. $_CLICK"
-!endif
-
-!ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licentie overeenkomst"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Gelieve de licentie overeenkomst te herlezen alvorens met de deïnstallatie van $(^NameDA) verder te doen."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Klik op akkoord om de overeenkomst te aanvaarden. U moet de overeenkomst aanvaarden om $(^NameDA) te deïnstalleren."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Als u de voorwaarden van de overeenkomst aanvaard, Klik op onderstaande selectievakje. U moet de overeenkomst aanvaarden om  $(^NameDA) te deïnstalleren. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Als u de voorwaarden van de overeenkomst aanvaard, selecteer de eerste onderstaande optie. U moet de overeenkomst aanvaarden om $(^NameDA) te deïnstalleren. $_CLICK"
-!endif
-
-!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Gebruik pagina neer om de rest van de overeenkomst te lezen."
-!endif
-
-!ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Kies onderdelen"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Kies de onderdelen van $(^NameDA) die u wilt installeren."
-!endif
-
-!ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Kies onderdelen"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Kies de onderdelen van $(^NameDA) die u wilt deïnstalleren."
-!endif
-
-!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschrijving"
-  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg de muisaanwijzer over de onderdelen om de beschrijving te zien."
-  !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg de muisaanwijzer over de onderdelen om de beschrijving te zien."
-  !endif
-!endif
-
-!ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Kies een installatie locatie"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Kies een map waar U $(^NameDA) wilt installeren."
-!endif
-
-!ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Kies een deïnstallatie locatie"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Kies een map waar U $(^NameDA) wilt deïnstalleren."
-!endif
-
-!ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installeren"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Even gedult terwijl $(^NameDA) wordt geinstalleerd."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installatie voltooid"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "De installatie is succesvol afgerond."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Installatie is afgebroken"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "De installatie is niet voltooid."
-!endif
-
-!ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "DeïnEven geduld terwijl $(^NameDA) wordt gedeïnstalleerd."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Deïnstallatie  voltooid"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Deïnstallatie succesvol afgerond."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Deïnstallatie onderbroken"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Deïnstallatie is niet voltooid."
-!endif
-
-!ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Voltooien van de $(^NameDA) installatie Wizard"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) is geinstalleerd op uw computer.$\r$\n$\r$\nKlik op einde om de installatie wizard af te sluiten."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Uw computer moet herstarten op de installatie van $(^NameDA) te voltooien. Wilt u nu opnieuw opstarten?"
-!endif
-
-!ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Voltooien van de $(^NameDA) deïnstallatie wizard"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) is gedeïnstalleerd op uw computer.$\r$\n$\r$\nKlik op einde om de installatie wizard af te sluiten."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Uw computer moet herstarten op de deïnstallatie van $(^NameDA)te voltooien. Wilt u nu opnieuw opstarten?"
-!endif
-
-!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Nu herstarten"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ik wil later herstarten"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Starten $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Toon leesmij"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Einde"  
-!endif
-
-!ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Kies start menu map"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Kies een map in start menu voor de snelkoppeling van $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Kies een map in start menu waar u de programma snelkoppelingen wilt aanmaken. U kan ook de naam van een nieuwe map opgeven."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Maak geen snelkoppelingen"
-!endif
-
-!ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Deïnstalleer$(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Verwijder $(^NameDA) van uw computer."
-!endif
-
-!ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Weet u zeker dat U installatie van $(^Name) wilt afbreken?"
-!endif
-
-!ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Weet u zeker dat U de deïnstallatie van $(^Name)wilt afbreken?"
-!endif
-
-!ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Kies gebruikers"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Kies voor welke gebruikers U $(^NameDA) wilt installeren."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Kies of U $(^NameDA) alleen voor u zelf of voor alle gebruikers op deze computer wilt installeren. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installeer voor iedereen die deze computer gebruikt"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installeer alleen voor mij"
-!endif

build-aux/windows/QET64.nsi

@@ -1,410 +1,485 @@
-; this file is part of installer for QElectroTech
+; this file is part of installer for QElectroTech
-; Copyright (C)2015 QElectroTech Team <scorpio@qelectrotech.org>
+; Copyright (C)2015 QElectroTech Team <scorpio@qelectrotech.org>
-;
+;
-; This program is free software; you can redistribute it and/or
+; This program is free software; you can redistribute it and/or
-; modify it under the terms of the GNU General Public License
+; modify it under the terms of the GNU General Public License
-; as published by the Free Software Foundation; either
+; as published by the Free Software Foundation; either
-; version 2 of the License, or (at your option) any later version.
+; version 2 of the License, or (at your option) any later version.
-;
+;
-; This program is distributed in the hope that it will be useful,
+; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
+; GNU General Public License for more details.
-; 
+;
-; You should have received a copy of the GNU General Public License
+; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
+; along with this program; if not, write to the Free Software
-; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
-; WebSite : http://qelectrotech.org/
+; WebSite : https://qelectrotech.org/
-
+
-;--------------------------------
+;==============================================================================
-;Include Modern UI
+; NSIS 3.x compatibility notes:
-	!include x64.nsh
+;   - Unicode is native in NSIS 3 (no need for Unicode installer plugin)
-	!include "MUI2.nsh"
+;   - XPStyle is deprecated/removed; ManifestSupportedOS replaces it
-	!include "FileFunc.nsh"
+;   - SetCompressor must appear before any Section/Function
-	!insertmacro Locate
+;   - SetRegView 64 moved to top of the hidden section (before WriteRegStr)
-	!include FileFunc.nsh
+;   - x64.nsh is still available but ${RunningX64} is now also in x64.nsh
-	!insertmacro GetParameters
+;   - MUI2.nsh is unchanged; MUI_LANGDLL_ALLLANGUAGES is still valid
-	!insertmacro GetOptions
+;   - FileFunc.nsh / Locate macro: unchanged
-	
+;   - Var /GLOBAL must be declared at global scope, not inside a Section
-	
+;==============================================================================
-!ifndef PROC
+
-	!define PROC 32 ; 
+;--------------------------------
-!endif
+; NSIS 3 requires SetCompressor BEFORE any Section or Function
-
+SetCompressor /FINAL /SOLID lzma
-
+
-	
+;--------------------------------
-; MUI Settings
+; Includes
-;--------------------------------
+!include x64.nsh
-;General
+!include "MUI2.nsh"
-	; General Product Description Definitions
+!include "FileFunc.nsh"
-	!define SOFT_NAME     "QElectroTech"
+!insertmacro Locate
-	!define SOFT_VERSION  "0.5-dev_x86_64-win64+4094"
+!insertmacro GetParameters
-	!define SOFT_WEB_SITE "http://qelectrotech.org/"
+!insertmacro GetOptions
-	!define SOFT_BUILD    "1"
+
-
+;--------------------------------
-	
+; NSIS 3: Unicode is the default. The installer binary will be Unicode.
-	SetCompressor /final /solid lzma
+; No extra plugin needed.
-	CRCCheck force
+
-	XPStyle on
+!ifndef PROC
-	BrandingText "${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}"   ; Shows in the Bottom Left of the installer
+    !define PROC 64
-	
+!endif
-	
+
-	;Name and file
+;--------------------------------
-	Name "${SOFT_NAME} ${SOFT_VERSION}"
+; General Product Description Definitions
-	OutFile "Installer_${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}.exe"
+!define SOFT_NAME     "QElectroTech"
-
+!define SOFT_VERSION  "0.5-dev_x86_64-win64+4094"
-	;Default installation folder
+!define SOFT_WEB_SITE "https://qelectrotech.org/"
-	InstallDir "$PROGRAMFILES64\${SOFT_NAME}"
+!define SOFT_BUILD    "1"
-	
+
-	;Get installation folder from registry if available
+;--------------------------------
-	InstallDirRegKey HKCU "Software\${SOFT_NAME}" ""
+; General settings
-
+CRCCheck force
-	;Request application privileges for Windows Vista
+BrandingText "${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}"
-	; we request for admin because we write stuff into the registry
+
-	RequestExecutionLevel admin
+; NSIS 3: XPStyle is removed. Use ManifestSupportedOS to declare modern OS support.
-
+; This replaces "XPStyle on" and enables proper DPI awareness + visual styles.
-;--------------------------------
+ManifestSupportedOS all
-;Interface Settings
+ManifestDPIAware true
-	!define MUI_ABORTWARNING
+
-	!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico"
+; Name and output file
-	!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico"
+Name "${SOFT_NAME} ${SOFT_VERSION}"
-	
+OutFile "Installer_${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}.exe"
-	!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp"
+
-	!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+; Default installation folder
-
+InstallDir "$PROGRAMFILES64\${SOFT_NAME}"
-	!define MUI_HEADERIMAGE
+
-	!define MUI_HEADERIMAGE_BITMAP ".\images\header.bmp" ; optional
+; Get installation folder from registry if available
-;--------------------------------
+; NSIS 3: InstallDirRegKey still works, but SetRegView 64 must be set at
-;Language Selection Dialog Settings
+; runtime (in .onInit) to read 64-bit registry hive correctly.
-
+InstallDirRegKey HKCU "Software\${SOFT_NAME}" ""
-	;Remember the installer language
+
-	!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
+; Request admin privileges (required for HKLM / file associations)
-	!define MUI_LANGDLL_REGISTRY_KEY "Software\${SOFT_NAME}" 
+RequestExecutionLevel admin
-	!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
-
+;--------------------------------
-;--------------------------------
+; Declare global variables at script scope (NSIS 3 requirement)
-;Pages
+; In NSIS 2 these could be declared inside a Section; that still compiles
-
+; in NSIS 3 but triggers a warning. Declare them here.
-	!define MUI_COMPONENTSPAGE_SMALLDESC
+Var final_qet_exe
-	!insertmacro MUI_PAGE_WELCOME
+Var final_project_ico
-	!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
+Var final_element_ico
-	!insertmacro MUI_PAGE_COMPONENTS
+Var final_titleblock_ico
-	!insertmacro MUI_PAGE_DIRECTORY
+
-	!insertmacro MUI_PAGE_INSTFILES
+;--------------------------------
-
+; MUI Interface Settings
-	!insertmacro MUI_UNPAGE_CONFIRM
+!define MUI_ABORTWARNING
-	!insertmacro MUI_UNPAGE_INSTFILES
+
-	
+; NSIS 3 ships updated icons; XPUI icons are still present for compatibility.
-; Finish page and checkbox to run QElectroTech
+; You may switch to the modern ones:
-	!define MUI_FINISHPAGE_RUN "$INSTDIR\Lancer QET.bat"
+!define MUI_ICON   "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install.ico"
-	!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico"
-	!define MUI_FINISHPAGE_RUN_TEXT "$(Check)"
+
-	!insertmacro MUI_PAGE_FINISH
+!define MUI_WELCOMEFINISHPAGE_BITMAP          ".\images\wizard.bmp"
-;--------------------------------
+!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-;Languages
+
-	;Since NSIS 2.26, the language selection dialog of Modern UI hides languages unsupported by the user's selected codepage by default.
+!define MUI_HEADERIMAGE
-	;To revert to the old behavior and display all languages, no matter what the user will see when they're selected, use MUI_LANGDLL_ALLLANGUAGES.
+!define MUI_HEADERIMAGE_BITMAP ".\images\header.bmp"
-	!define MUI_LANGDLL_ALLLANGUAGES
+
-	
+;--------------------------------
-	; For consistency, we limit the installer to languages supported by QElectroTech itself
+; Language Selection Dialog Settings (remember chosen language in registry)
-	!insertmacro MUI_LANGUAGE "English" ;first language is the default language
+!define MUI_LANGDLL_REGISTRY_ROOT      "HKCU"
-		!insertmacro MUI_LANGUAGE "Korean"
+!define MUI_LANGDLL_REGISTRY_KEY       "Software\${SOFT_NAME}"
-        !insertmacro MUI_LANGUAGE "French"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-        !insertmacro MUI_LANGUAGE "Spanish"
+
-        !insertmacro MUI_LANGUAGE "Russian"
+;--------------------------------
-        !insertmacro MUI_LANGUAGE "Portuguese"
+; Pages
-        !insertmacro MUI_LANGUAGE "Czech"
+!define MUI_COMPONENTSPAGE_SMALLDESC
-        !insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_PAGE_WELCOME
-        !insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
-        !insertmacro MUI_LANGUAGE "Arabic"
+!insertmacro MUI_PAGE_COMPONENTS
-        !insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_PAGE_DIRECTORY
-        !insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_PAGE_INSTFILES
-        !insertmacro MUI_LANGUAGE "Romanian"
+
-        !insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_UNPAGE_CONFIRM
-        !insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_UNPAGE_INSTFILES
-        !insertmacro MUI_LANGUAGE "Dutch"
+
-        !insertmacro MUI_LANGUAGE "Dutch_Belgium"
+; Finish page – checkbox to launch QElectroTech
-        !insertmacro MUI_LANGUAGE "Danish"
+!define MUI_FINISHPAGE_RUN             "$INSTDIR\Lancer QET.bat"
-    !insertmacro MUI_RESERVEFILE_LANGDLL
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
-	
+!define MUI_FINISHPAGE_RUN_TEXT        "$(Check)"
-	!include lang_extra.nsh
+!insertmacro MUI_PAGE_FINISH
-	!include lang_extra_fr.nsh
+
-	
+;--------------------------------
-
+; Languages
-	
+; NSIS 3: MUI_LANGDLL_ALLLANGUAGES is still supported and works as before.
-SetOverwrite on	
+!define MUI_LANGDLL_ALLLANGUAGES
-Section "Main Program"
+
-SectionIn RO ; Read only, always installed
+!insertmacro MUI_LANGUAGE "English"   ; first = default
-
+    !insertmacro MUI_LANGUAGE "Korean"
-Setoutpath "$INSTDIR\bin\"
+    !insertmacro MUI_LANGUAGE "French"
-File "./files/bin/${SOFT_NAME}.exe"
+    !insertmacro MUI_LANGUAGE "Spanish"
-
+    !insertmacro MUI_LANGUAGE "Russian"
-Setoutpath "$INSTDIR"
+    !insertmacro MUI_LANGUAGE "Portuguese"
-File "./files/ChangeLog"
+    !insertmacro MUI_LANGUAGE "Czech"
-File "./files/CREDIT"
+    !insertmacro MUI_LANGUAGE "Polish"
-File "./files/ELEMENTS.LICENSE"
+    !insertmacro MUI_LANGUAGE "Greek"
-File "./files/LICENSE"
+    !insertmacro MUI_LANGUAGE "Arabic"
-File "./files/qet_uninstall_file_associations.reg"
+    !insertmacro MUI_LANGUAGE "German"
-File "./files/README"
+    !insertmacro MUI_LANGUAGE "Italian"
-File "./files/register_filetypes.bat"
+    !insertmacro MUI_LANGUAGE "Romanian"
-File "Lancer QET.bat"
+    !insertmacro MUI_LANGUAGE "Catalan"
-
+    !insertmacro MUI_LANGUAGE "Croatian"
-SetOutPath "$INSTDIR"
+    !insertmacro MUI_LANGUAGE "Dutch"
-File /r "./files/ico"
+    !insertmacro MUI_LANGUAGE "Danish"
-
+!insertmacro MUI_RESERVEFILE_LANGDLL
-SectionEnd
+
-
+; Language strings for all supported locales
-;---------------------------
+!include lang_extra.nsh
-SetOverwrite on
+!include lang_extra_fr.nsh
-SubSection "$(Elements)" SEC01
+; NOTE: The string "uninstFailed" must be defined in lang_extra.nsh and
-
+; lang_extra_fr.nsh (and any other lang_extra_*.nsh) like so:
-SetOverwrite on
+;   LangString uninstFailed ${LANG_ENGLISH} "Uninstallation of the previous version failed.$\nPlease uninstall QElectroTech manually before continuing."
-Section "$(Electric)" 
+;   LangString uninstFailed ${LANG_FRENCH}  "La désinstallation de la version précédente a échoué.$\nVeuillez désinstaller QElectroTech manuellement avant de continuer."
-  SetOutPath "$INSTDIR\elements"
+
-  File /r "./files/elements/10_electric"
+;==============================================================================
-SectionEnd
+; SECTIONS
-
+;==============================================================================
-SetOverwrite on
+
-Section "$(Logic)" 
+SetOverwrite on
-  SetOutPath "$INSTDIR\elements"
+
-  File /r "./files/elements/20_logic"
+Section "Main Program"
-SectionEnd
+SectionIn RO  ; Read-only – always installed
-
+
-SetOverwrite on
+    SetOutPath "$INSTDIR\bin\"
-Section  "$(Hydraulic)" 
+    File "./files/bin/${SOFT_NAME}.exe"
-  SetOutPath "$INSTDIR\elements"
+
-  File /r "./files/elements/30_hydraulic"
+    SetOutPath "$INSTDIR"
-SectionEnd
+    File "./files/ChangeLog"
-
+    File "./files/CREDIT"
-
+    File "./files/ELEMENTS.LICENSE"
-SetOverwrite on
+    File "./files/LICENSE"
-Section "$(Pneumatic)" 
+    File "./files/qet_uninstall_file_associations.reg"
-  SetOutPath "$INSTDIR\elements"
+    File "./files/README"
-  File /r "./files/elements/50_pneumatic"
+    File "./files/register_filetypes.bat"
-SectionEnd
+    File "Lancer QET.bat"
-
+
-
+    SetOutPath "$INSTDIR"
-;---------------------------------
+    File /r "./files/ico"
-SubSection "$(Energy)" 
+
-
+SectionEnd
-SetOverwrite on
+
-Section  "$(water)" 
+;---------------------------
-  SetOutPath "$INSTDIR\elements\60_energy"
+SetOverwrite on
-  File /r "./files/elements/60_energy/11_water"
+SubSection "$(Elements)" SEC01
-  File /r "./files/elements/60_energy/"
+
-SectionEnd
+    SetOverwrite on
-
+    Section "$(Electric)"
-SetOverwrite on
+        SetOutPath "$INSTDIR\elements"
-Section  "$(Refrigeration)" 
+        File /r "./files/elements/10_electric"
-  SetOutPath "$INSTDIR\elements\60_energy"
+    SectionEnd
-  File /r "./files/elements/60_energy/21_refrigeration"
+
-  File /r "./files/elements/60_energy/"
+    SetOverwrite on
-SectionEnd
+    Section "$(Logic)"
-
+        SetOutPath "$INSTDIR\elements"
-SetOverwrite on
+        File /r "./files/elements/20_logic"
-Section  "$(Solar_thermal)" 
+    SectionEnd
-  SetOutPath "$INSTDIR\elements\60_energy"
+
-  File /r "./files/elements/60_energy/31_solar_thermal"
+    SetOverwrite on
-  File /r "./files/elements/60_energy/"
+    Section "$(Hydraulic)"
-SectionEnd
+        SetOutPath "$INSTDIR\elements"
-
+        File /r "./files/elements/30_hydraulic"
-SubSectionEnd 
+    SectionEnd
-SubSectionEnd 
+
-;-------------------------------
+    SetOverwrite on
-
+    Section "$(Pneumatic)"
-SetOverwrite on
+        SetOutPath "$INSTDIR\elements"
-Section "$(Lang)" SEC02
+        File /r "./files/elements/50_pneumatic"
-  SetOutPath "$INSTDIR\lang"
+    SectionEnd
-  File "./files/lang/*.qm"
+
-SectionEnd
+    ;---------------------------------
-
+    SubSection "$(Energy)"
-SetOverwrite on
+
-Section "$(Titleblocks)" SEC03
+        SetOverwrite on
-  SetOutPath "$INSTDIR"
+        Section "$(water)"
-  File /r "./files/titleblocks"
+            SetOutPath "$INSTDIR\elements\60_energy"
-SectionEnd
+            File /r "./files/elements/60_energy/11_water"
-
+            File /r "./files/elements/60_energy/"
-SetOverwrite on
+        SectionEnd
-Section "$(Examples)" SEC04
+
-  SetOutPath "$INSTDIR"
+        SetOverwrite on
-  File /r "./files/examples"
+        Section "$(Refrigeration)"
-SectionEnd
+            SetOutPath "$INSTDIR\elements\60_energy"
-
+            File /r "./files/elements/60_energy/21_refrigeration"
-;--------------------------------
+            File /r "./files/elements/60_energy/"
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+        SectionEnd
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $(var1)
+
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(var2)
+        SetOverwrite on
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(var3)
+        Section "$(Solar_thermal)"
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $(var4)
+            SetOutPath "$INSTDIR\elements\60_energy"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+            File /r "./files/elements/60_energy/31_solar_thermal"
-;--------------------------------
+            File /r "./files/elements/60_energy/"
-
+        SectionEnd
-;Installer Sections
+
-
+    SubSectionEnd
-Section ""
+
-	SetOutPath "$INSTDIR"  
+SubSectionEnd
-	;Store installation folder
+
-	WriteRegStr HKCU "Software\${SOFT_NAME}" "" $INSTDIR
+;-------------------------------
-	; write uninstall strings
+SetOverwrite on
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "DisplayName"     "${SOFT_NAME} (remove only)"
+Section "$(Lang)" SEC02
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+    SetOutPath "$INSTDIR\lang"
-	;Create uninstaller
+    File "./files/lang/*.qm"
-	WriteUninstaller "$INSTDIR\Uninstall.exe"
+SectionEnd
-	SetRegView 64
+
-	
+SetOverwrite on
-	; get the final path for the icons and the launch script
+Section "$(Titleblocks)" SEC03
-	Var /GLOBAL final_qet_exe
+    SetOutPath "$INSTDIR"
-	Var /GLOBAL final_project_ico
+    File /r "./files/titleblocks"
-	Var /GLOBAL final_element_ico
+SectionEnd
-	Var /GLOBAL final_titleblock_ico
+
-
+SetOverwrite on
-	StrCpy $final_qet_exe     "$INSTDIR\Lancer QET.bat"
+Section "$(Examples)" SEC04
-	StrCpy $final_project_ico "$INSTDIR\ico\application-x-qet-project.ico"
+    SetOutPath "$INSTDIR"
-	StrCpy $final_element_ico "$INSTDIR\ico\application-x-qet-element.ico"
+    File /r "./files/examples"
-	StrCpy $final_titleblock_ico "$INSTDIR\ico\application-x-qet-titleblock.ico"
+SectionEnd
-	
+
-	; write file associations registry keys
+;--------------------------------
-	WriteRegStr   HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" ""             "$\"$final_qet_exe$\" $\"%1$\""
+; Component descriptions
-	WriteRegStr   HKEY_CLASSES_ROOT ".qet"                                             ""             "qet_diagram_file"
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                 ""             "Diagram QET"
+    !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $(var1)
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "EditFlags"    0x00000000
+    !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(var2)
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "BrowserFlags" 0x00000008
+    !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(var3)
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon"                     ""             "$final_project_ico"
+    !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $(var4)
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
-	WriteRegStr   HKEY_CLASSES_ROOT ".elmt"                                            ""             "qet_element_file"
+
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                 ""             "Element QET"
+;--------------------------------
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "EditFlags"    0x00000000
+; Hidden section: registry, shortcuts, file associations
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "BrowserFlags" 0x00000008
+Section ""
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon"                     ""             "$final_element_ico"
+    SetOutPath "$INSTDIR"
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
+
-	WriteRegStr   HKEY_CLASSES_ROOT ".titleblock"                                      ""             "qet_titleblock_file"
+    ; NSIS 3 on 64-bit Windows: set 64-bit registry view BEFORE any WriteRegStr
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file"                              ""             "Titleblock QET"
+    ; so keys land in HKLM\SOFTWARE (not the Wow6432Node redirect).
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                              "EditFlags"    0x00000000
+    SetRegView 64
-	WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                              "BrowserFlags" 0x00000008
+
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\DefaultIcon"                  ""             "$final_titleblock_ico"
+    ; Store installation folder
-	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\shell\open\command"           ""             "$\"$final_qet_exe$\" $\"%1$\""
+    WriteRegStr HKCU "Software\${SOFT_NAME}" "" $INSTDIR
-	
+
-	SetShellVarContext all ; all users
+    ; Uninstall registry entries
-	; shortcuts in the start menu
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
-	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
+        "DisplayName"     "${SOFT_NAME} (remove only)"
-	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Manual"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
-	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Upgrade"
+        "UninstallString" '"$INSTDIR\Uninstall.exe"'
-	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\QElectroTech.lnk"           "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
+
-	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\Uninstall QElectroTech.lnk" "$INSTDIR\Uninstall.exe"
+    ; Create uninstaller
-	; TODO : add the QuickStart Guide (or any other documentation) when available
+    WriteUninstaller "$INSTDIR\Uninstall.exe"
-	
+
-	; shortcut on the desktop
+    ; Build paths for icons and launch script
-	CreateShortCut "$DESKTOP\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
+    StrCpy $final_qet_exe          "$INSTDIR\Lancer QET.bat"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/manual_0.7/build/index.html"
+    StrCpy $final_project_ico      "$INSTDIR\ico\application-x-qet-project.ico"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/joshua/html/QET_ru.html"
+    StrCpy $final_element_ico      "$INSTDIR\ico\application-x-qet-element.ico"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url"      "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/builds/nightly/"
+    StrCpy $final_titleblock_ico   "$INSTDIR\ico\application-x-qet-titleblock.ico"
-	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url"                "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
+
-	
+    ; File associations – .qet
-	;changing $INSTDIR\elements\ *.elmt to read-only attribute
+    WriteRegStr   HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" "" \
-	
+        '"$final_qet_exe" "%1"'
-	${Locate} "$INSTDIR\elements\" "/L=FD /M=*.elmt" "LocateCallback"
+    WriteRegStr   HKEY_CLASSES_ROOT ".qet"                                              "" "qet_diagram_file"
-	IfErrors 0 +2
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                  "" "Diagram QET"
-	;MessageBox MB_OK "Error"
+    WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                  "EditFlags"    0x00000000
-SectionEnd
+    WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                  "BrowserFlags" 0x00000008
-
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon"                      "" "$final_project_ico"
-Function LocateCallback
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command"               "" '"$final_qet_exe" "%1"'
-	SetFileAttributes $R9 FILE_ATTRIBUTE_READONLY
+
-	Push $0
+    ; File associations – .elmt
-FunctionEnd
+    WriteRegStr   HKEY_CLASSES_ROOT ".elmt"                                             "" "qet_element_file"
-
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                  "" "Element QET"
-;--------------------------------
+    WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                  "EditFlags"    0x00000000
-;Installer Functions
+    WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                  "BrowserFlags" 0x00000008
-
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon"                      "" "$final_element_ico"
-Function .onInit
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\shell\open\command"               "" '"$final_qet_exe" "%1"'
- !insertmacro MUI_LANGDLL_DISPLAY
+
-
+    ; File associations – .titleblock
-${If} ${RunningX64}
+    WriteRegStr   HKEY_CLASSES_ROOT ".titleblock"                                       "" "qet_titleblock_file"
-${Else}
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file"                               "" "Titleblock QET"
-
+    WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                               "EditFlags"    0x00000000
-    MessageBox MB_OK|MB_ICONSTOP $(wrongArch)
+    WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                               "BrowserFlags" 0x00000008
-	Abort $(wrongArch)
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\DefaultIcon"                   "" "$final_titleblock_ico"
-${EndIf}
+    WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\shell\open\command"            "" '"$final_qet_exe" "%1"'
-
+
-;Auto-uninstall old before installing new
+    SetShellVarContext all  ; apply shortcuts for all users
-  ReadRegStr $R0 HKLM \
+
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
+    ; Start Menu shortcuts
-  "UninstallString"
+    CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
-  StrCmp $R0 "" done
+    CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Manual"
-
+    CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Upgrade"
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+    CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\QElectroTech.lnk" \
-  "$(installed)" \
+        "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
-  IDOK uninst
+    CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\Uninstall QElectroTech.lnk" \
-  Abort
+        "$INSTDIR\Uninstall.exe"
-
+
-;Run the uninstaller
+    ; Desktop shortcut
-uninst:
+    CreateShortCut "$DESKTOP\QElectroTech.lnk" \
-  ClearErrors
+        "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
-  ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+
-
+    ; Internet shortcuts
-  IfErrors no_remove_uninstaller done
+    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" \
-    ;You can either use Delete /REBOOTOK in the uninstaller or add some code
+        "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/manual_0.7/build/index.html"
-    ;here to remove the uninstaller. Use a registry key to check
+    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" \
-    ;whether the user has chosen to uninstall. If you are using an uninstaller
+        "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/joshua/html/QET_ru.html"
-    ;components page, make sure all sections are uninstalled.
+    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url" \
-  no_remove_uninstaller:
+        "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/builds/nightly/"
-
+    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url" \
-done:
+        "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
-
+
-FunctionEnd
+    ; Mark installed elements as read-only
-
+    ${Locate} "$INSTDIR\elements\" "/L=FD /M=*.elmt" "LocateCallback"
-;--------------------------------
+    IfErrors 0 +2
-;Descriptions
+    ; MessageBox MB_OK "Error in Locate"  ; uncomment for debugging
-
+
-	;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
+SectionEnd
-
+
-	;Assign descriptions to sections
+;--------------------------------
-	;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+; Locate callback – sets FILE_ATTRIBUTE_READONLY on each .elmt file
-	;  !insertmacro MUI_DESCRIPTION_TEXT ${CopyFiles} "CopyFiles"
+Function LocateCallback
-	;!insertmacro MUI_FUNCTION_DESCRIPTION_END
+    SetFileAttributes $R9 FILE_ATTRIBUTE_READONLY
- 
+    Push $0
-;--------------------------------
+FunctionEnd
-;Uninstaller Section
+
-
+;==============================================================================
-Section "Uninstall"
+; INSTALLER FUNCTIONS
-	SetShellVarContext all ; all users
+;==============================================================================
-	; remove start menu shortcuts
+
-	RMDir /r "$SMPROGRAMS\${SOFT_NAME}"
+Function .onInit
-	; remove shortcut on the desktop
+    ; NSIS 3: SetRegView in .onInit ensures InstallDirRegKey reads the right hive
-	Delete "$DESKTOP\QElectroTech.lnk"
+    SetRegView 64
-	
+
-	; remove the application files
+    !insertmacro MUI_LANGDLL_DISPLAY
-	Delete "$INSTDIR\*.*"
+
-	RMDir /r "$INSTDIR"
+    ; Abort if not running on a 64-bit OS
-	
+    ${IfNot} ${RunningX64}
-	;remove installation registry keys
+        MessageBox MB_OK|MB_ICONSTOP $(wrongArch)
-	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}"
+        Abort
-	DeleteRegKey /ifempty HKCU "Software\${SOFT_NAME}"
+    ${EndIf}
-	
+
-	; remove file associations registry keys
+    ; ----------------------------------------------------------------
-	DeleteRegKey HKEY_CLASSES_ROOT "Applications\qelectrotech.exe"
+    ; Auto-uninstall previous version before installing new one
-	DeleteRegKey HKEY_CLASSES_ROOT ".qet"
+    ; ----------------------------------------------------------------
-	DeleteRegKey HKEY_CLASSES_ROOT "qet_diagram_file"
+    ReadRegStr $R0 HKLM \
-	DeleteRegKey HKEY_CLASSES_ROOT ".elmt"
+        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
-	DeleteRegKey HKEY_CLASSES_ROOT "qet_element_file"
+        "UninstallString"
-	DeleteRegKey HKEY_CLASSES_ROOT ".titleblock"
+
-	DeleteRegKey HKEY_CLASSES_ROOT "qet_titleblock_file"
+    ; No previous installation found → proceed normally
-	
+    StrCmp $R0 "" done
-	IfFileExists "$INSTDIR" 0 NoErrorMsg
+
-	;MessageBox MB_OK "Note: $INSTDIR could not be removed!" IDOK 0 ; skipped if file doesn't exist
+    ; Also read the install dir of the previous version
-	NoErrorMsg:
+    ReadRegStr $R1 HKCU "Software\${SOFT_NAME}" ""
-SectionEnd
+
-
+    ; Ask user whether to uninstall the existing version
-;--------------------------------
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(installed)" IDOK uninst
-;Uninstaller Functions
+    Abort   ; user clicked Cancel → stop the installer
-
+
-Function un.onInit
+uninst:
-
+    ; Remove surrounding quotes from the UninstallString if present
-	!insertmacro MUI_UNGETLANGUAGE
+    ; (some installers write: "C:\path\Uninstall.exe" — ExecWait needs clean path)
-
+    StrCpy $R2 $R0 1        ; first character
-FunctionEnd
+    StrCmp $R2 '"' 0 unquoted
-
+        ; Strip leading and trailing quote
-
+        StrCpy $R0 $R0 "" 1                 ; remove leading "
-
+        StrLen $R3 $R0
-
+        IntOp $R3 $R3 - 1
-
+        StrCpy $R0 $R0 $R3                  ; remove trailing "
+unquoted:
+
+    ; Run the uninstaller silently, keeping it in its own directory
+    ; _?= prevents NSIS from copying the uninstaller to a temp folder,
+    ; so it can delete itself and the whole $INSTDIR tree.
+    ClearErrors
+    ${If} $R1 != ""
+        ExecWait '"$R0" /S _?=$R1'         ; silent uninstall using saved install dir
+    ${Else}
+        ExecWait '"$R0" /S'                 ; fallback if install dir unknown
+    ${EndIf}
+
+    IfErrors uninstall_failed
+
+    ; Verify the old installation is gone before continuing
+    ${If} $R1 != ""
+        IfFileExists "$R1\${SOFT_NAME}.exe" uninstall_failed
+        IfFileExists "$R1\bin\${SOFT_NAME}.exe" uninstall_failed
+    ${EndIf}
+
+    Goto done
+
+uninstall_failed:
+    MessageBox MB_OK|MB_ICONSTOP "$(uninstFailed)"
+    Abort
+
+done:
+
+FunctionEnd
+
+;==============================================================================
+; UNINSTALLER SECTION
+;==============================================================================
+
+Section "Uninstall"
+    SetRegView 64   ; NSIS 3: required so we delete from the correct hive
+    SetShellVarContext all
+
+    ; Remove Start Menu shortcuts
+    RMDir /r "$SMPROGRAMS\${SOFT_NAME}"
+
+    ; Remove Desktop shortcut
+    Delete "$DESKTOP\QElectroTech.lnk"
+
+    ; Remove application files
+    Delete "$INSTDIR\*.*"
+    RMDir /r "$INSTDIR"
+
+    ; Remove installation registry keys
+    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}"
+    DeleteRegKey /ifempty HKCU "Software\${SOFT_NAME}"
+
+    ; Remove file associations registry keys
+    DeleteRegKey HKEY_CLASSES_ROOT "Applications\qelectrotech.exe"
+    DeleteRegKey HKEY_CLASSES_ROOT ".qet"
+    DeleteRegKey HKEY_CLASSES_ROOT "qet_diagram_file"
+    DeleteRegKey HKEY_CLASSES_ROOT ".elmt"
+    DeleteRegKey HKEY_CLASSES_ROOT "qet_element_file"
+    DeleteRegKey HKEY_CLASSES_ROOT ".titleblock"
+    DeleteRegKey HKEY_CLASSES_ROOT "qet_titleblock_file"
+
+    IfFileExists "$INSTDIR" 0 NoErrorMsg
+    ; MessageBox MB_OK "Note: $INSTDIR could not be removed!"
+    NoErrorMsg:
+
+SectionEnd
+
+;==============================================================================
+; UNINSTALLER FUNCTIONS
+;==============================================================================
+
+Function un.onInit
+    SetRegView 64   ; NSIS 3: match the view used during install
+    !insertmacro MUI_UNGETLANGUAGE
+FunctionEnd

build-aux/windows/lang_extra.nsh

@@ -17,6 +17,7 @@
         LangString var2              ${LANG_ENGLISH}  "languagues files"
         LangString var3              ${LANG_ENGLISH}  "Examples of cartridges"
         LangString var4              ${LANG_ENGLISH}  "Examples of diagrams"
+        LangString uninstFailed      ${LANG_ENGLISH}  "Uninstallation of the previous version failed.$\nPlease uninstall ${SOFT_NAME} manually before continuing."
 
         
         LangString installed         ${LANG_KOREAN} "${SOFT_NAME}이(가) 이미 설치되어 있습니다. $\n$\n이전 버전을 제거하려면 `OK`를, 업그레이드를 취소하려면 `Cancel`을 클릭하세요."
@@ -38,6 +39,7 @@
         LangString var2              ${LANG_KOREAN} "언어 파일"
         LangString var3              ${LANG_KOREAN} "표제란 예제"
         LangString var4              ${LANG_KOREAN} "도면 예제"
+        LangString uninstFailed      ${LANG_KOREAN} "이전 버전을 제거하지 못했습니다.$\n계속하기 전에 ${SOFT_NAME}을(를) 수동으로 제거해 주세요."
 
 
         LangString installed         ${LANG_POLISH}  "${SOFT_NAME} jest już zainstalowany. $\n$\nKliknij `OK` aby odinstalować poprzednią wersję lub `Anuluj` aby przerwać aktualizację."
@@ -54,11 +56,12 @@
         LangString Lang              ${LANG_POLISH}  "Język"
         LangString Titleblocks       ${LANG_POLISH}  "Tabliczki rysunkowe"
         LangString Examples          ${LANG_POLISH}  "Przykłady"
-        LangString Check             ${LANG_POLISH}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_POLISH}  "Zaznacz, aby uruchomić ${SOFT_NAME}"
-        LangString var1              ${LANG_POLISH}  "Elements of the official collection"
+        LangString var1              ${LANG_POLISH}  "Elementy oficjalnej kolekcji"
-        LangString var2              ${LANG_POLISH}  "languagues files"
+        LangString var2              ${LANG_POLISH}  "Pliki językowe"
-        LangString var3              ${LANG_POLISH}  "Examples of cartridges"
+        LangString var3              ${LANG_POLISH}  "Przykłady tabliczek rysunkowych"
-        LangString var4              ${LANG_POLISH}  "Examples of diagrams"
+        LangString var4              ${LANG_POLISH}  "Przykłady schematów"
+        LangString uninstFailed      ${LANG_POLISH}  "Odinstalowanie poprzedniej wersji nie powiodło się.$\nPrzed kontynuowaniem odinstaluj ręcznie program ${SOFT_NAME}."
         
         
         LangString installed         ${LANG_GREEK}  "${SOFT_NAME} είναι ήδη εγκατεστημένο. $\n$\nΠάτησε `OK` για αφαίρεση της προηγούμενης έκδοσης ή `Cancel` για ακύρωση της αναβάθμισης." 
@@ -78,50 +81,53 @@
         LangString Check             ${LANG_GREEK}  "Επιλέξτε για εκκίνηση ${SOFT_NAME}"
         LangString var1              ${LANG_GREEK}  "Στοιχεία της επίσημης συλλογής"
         LangString var2              ${LANG_GREEK}  "Αρχεία γλωσσών"
-        LangString var3              ${LANG_GREEK}  "Examples of cartridges"
+        LangString var3              ${LANG_GREEK}  "Παραδείγματα πινακίδων"
         LangString var4              ${LANG_GREEK}  "Παραδείγματα διαγραμμάτων"
+        LangString uninstFailed      ${LANG_GREEK}  "Η απεγκατάσταση της προηγούμενης έκδοσης απέτυχε.$\nΠαρακαλώ απεγκαταστήστε χειροκίνητα το ${SOFT_NAME} πριν συνεχίσετε."
         
         
-        LangString installed         ${LANG_CZECH} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString installed         ${LANG_CZECH} "${SOFT_NAME} je již nainstalován. $\n$\nKlikněte na `OK` pro odebrání předchozí verze nebo na `Zrušit` pro zrušení tohoto upgradu." 
-        LangString wrongArch         ${LANG_CZECH} "This distribution is for 64 bits computers only."
+        LangString wrongArch         ${LANG_CZECH} "Tato distribuce je určena pouze pro 64bitové počítače."
-        LangString Elements          ${LANG_CZECH}  "Elements"
+        LangString Elements          ${LANG_CZECH}  "Prvky"
-        LangString Electric          ${LANG_CZECH}  "Electric"
+        LangString Electric          ${LANG_CZECH}  "Elektrika"
-        LangString Logic             ${LANG_CZECH}  "Logic"
+        LangString Logic             ${LANG_CZECH}  "Logika"
-        LangString Hydraulic         ${LANG_CZECH}  "Hydraulic"
+        LangString Hydraulic         ${LANG_CZECH}  "Hydraulika"
-        LangString Pneumatic         ${LANG_CZECH}  "Pneumatic"
+        LangString Pneumatic         ${LANG_CZECH}  "Pneumatika"
-        LangString Energy            ${LANG_CZECH}  "Energy"
+        LangString Energy            ${LANG_CZECH}  "Energie"
-        LangString water             ${LANG_CZECH}  "Water"
+        LangString water             ${LANG_CZECH}  "Voda"
-        LangString Refrigeration     ${LANG_CZECH}  "Refrigeration"
+        LangString Refrigeration     ${LANG_CZECH}  "Chlazení"
-        LangString Solar_thermal     ${LANG_CZECH}  "Solar_thermal"
+        LangString Solar_thermal     ${LANG_CZECH}  "Solární_teplo"
-        LangString Lang              ${LANG_CZECH}  "Lang"
+        LangString Lang              ${LANG_CZECH}  "Jazyk"
-        LangString Titleblocks       ${LANG_CZECH}  "Titleblocks"
+        LangString Titleblocks       ${LANG_CZECH}  "Popisová pole"
-        LangString Examples          ${LANG_CZECH}  "Examples"
+        LangString Examples          ${LANG_CZECH}  "Příklady"
-        LangString Check             ${LANG_CZECH}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_CZECH}  "Zaškrtněte pro spuštění ${SOFT_NAME}"
-        LangString var1              ${LANG_CZECH}  "Elements of the official collection"
+        LangString var1              ${LANG_CZECH}  "Prvky oficiální kolekce"
-        LangString var2              ${LANG_CZECH}  "languagues files"
+        LangString var2              ${LANG_CZECH}  "Jazykové soubory"
-        LangString var3              ${LANG_CZECH}  "Examples of cartridges"
+        LangString var3              ${LANG_CZECH}  "Příklady popisových polí"
-        LangString var4              ${LANG_CZECH}  "Examples of diagrams"
+        LangString var4              ${LANG_CZECH}  "Příklady schémat"
+        LangString uninstFailed      ${LANG_CZECH}  "Odinstalování předchozí verze se nezdařilo.$\nPřed pokračováním prosím odinstalujte ${SOFT_NAME} ručně."
         
         
-        LangString installed         ${LANG_SPANISH} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString installed         ${LANG_SPANISH} "${SOFT_NAME} ya está instalado. $\n$\nHaga clic en `Aceptar` para eliminar la versión anterior o en `Cancelar` para cancelar esta actualización." 
-        LangString wrongArch         ${LANG_SPANISH} "This distribution is for 64 bits computers only."
+        LangString wrongArch         ${LANG_SPANISH} "Esta distribución es solo para ordenadores de 64 bits."
-        LangString Elements          ${LANG_SPANISH}  "Elements"
+        LangString Elements          ${LANG_SPANISH}  "Elementos"
-        LangString Electric          ${LANG_SPANISH}  "Electric"
+        LangString Electric          ${LANG_SPANISH}  "Eléctrico"
-        LangString Logic             ${LANG_SPANISH}  "Logic"
+        LangString Logic             ${LANG_SPANISH}  "Lógica"
-        LangString Hydraulic         ${LANG_SPANISH}  "Hydraulic"
+        LangString Hydraulic         ${LANG_SPANISH}  "Hidráulica"
-        LangString Pneumatic         ${LANG_SPANISH}  "Pneumatic"
+        LangString Pneumatic         ${LANG_SPANISH}  "Neumática"
-        LangString Energy            ${LANG_SPANISH}  "Energy"
+        LangString Energy            ${LANG_SPANISH}  "Energía"
-        LangString water             ${LANG_SPANISH}  "Water"
+        LangString water             ${LANG_SPANISH}  "Agua"
-        LangString Refrigeration     ${LANG_SPANISH}  "Refrigeration"
+        LangString Refrigeration     ${LANG_SPANISH}  "Refrigeración"
-        LangString Solar_thermal     ${LANG_SPANISH}  "Solar_thermal"
+        LangString Solar_thermal     ${LANG_SPANISH}  "Solar_térmico"
-        LangString Lang              ${LANG_SPANISH}  "Lang"
+        LangString Lang              ${LANG_SPANISH}  "Idioma"
-        LangString Titleblocks       ${LANG_SPANISH}  "Titleblocks"
+        LangString Titleblocks       ${LANG_SPANISH}  "Cartelas"
-        LangString Examples          ${LANG_SPANISH}  "Examples"
+        LangString Examples          ${LANG_SPANISH}  "Ejemplos"
-        LangString Check             ${LANG_SPANISH}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_SPANISH}  "Marcar para iniciar ${SOFT_NAME}"
-        LangString var1              ${LANG_SPANISH}  "Elements of the official collection"
+        LangString var1              ${LANG_SPANISH}  "Elementos de la colección oficial"
-        LangString var2              ${LANG_SPANISH}  "languagues files"
+        LangString var2              ${LANG_SPANISH}  "Archivos de idioma"
-        LangString var3              ${LANG_SPANISH}  "Examples of cartridges"
+        LangString var3              ${LANG_SPANISH}  "Ejemplos de cartelas"
-        LangString var4              ${LANG_SPANISH}  "Examples of diagrams"
+        LangString var4              ${LANG_SPANISH}  "Ejemplos de esquemas"
+        LangString uninstFailed      ${LANG_SPANISH}  "La desinstalación de la versión anterior ha fallado.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar."
         
         
         LangString installed         ${LANG_GERMAN} "${SOFT_NAME} ist bereits installiert. $\n$\nKlicken Sie auf `OK`, um die alte Version zu deinstallieren, oder auf `Abbrechen`, um das Upgrade abzubrechen." 
@@ -143,6 +149,7 @@
         LangString var2              ${LANG_GERMAN}  "Sprachdateien"
         LangString var3              ${LANG_GERMAN}  "Schriftfeld-Beispiele"
         LangString var4              ${LANG_GERMAN}  "Schaltplan-Beispiele"
+        LangString uninstFailed      ${LANG_GERMAN}  "Die Deinstallation der vorherigen Version ist fehlgeschlagen.$\nBitte deinstallieren Sie ${SOFT_NAME} manuell, bevor Sie fortfahren."
         
         
         LangString installed         ${LANG_RUSSIAN} "${SOFT_NAME} уже установлен. $\n$\nДля удаления предыдущей версии нажмите `OK` или `Cancel` для отмены обновления." 
@@ -164,48 +171,51 @@
         LangString var2              ${LANG_RUSSIAN}  "языковые файлы"
         LangString var3              ${LANG_RUSSIAN}  "Примеры штампов"
         LangString var4              ${LANG_RUSSIAN}  "Примеры схем"
+        LangString uninstFailed      ${LANG_RUSSIAN}  "Удаление предыдущей версии завершилось с ошибкой.$\nПожалуйста, удалите ${SOFT_NAME} вручную перед продолжением."
         
         
-        LangString installed         ${LANG_ARABIC} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString installed         ${LANG_ARABIC} "${SOFT_NAME} مثبَّت بالفعل. $\n$\nانقر على `موافق` لإزالة الإصدار السابق أو على `إلغاء` لإلغاء هذا التحديث." 
-        LangString wrongArch         ${LANG_ARABIC} "This distribution is for 64 bits computers only."
+        LangString wrongArch         ${LANG_ARABIC} "هذا التوزيع مخصص لأجهزة الكمبيوتر 64 بت فقط."
-        LangString Elements          ${LANG_ARABIC}  "Elements"
+        LangString Elements          ${LANG_ARABIC}  "العناصر"
-        LangString Electric          ${LANG_ARABIC}  "Electric"
+        LangString Electric          ${LANG_ARABIC}  "الكهرباء"
-        LangString Logic             ${LANG_ARABIC}  "Logic"
+        LangString Logic             ${LANG_ARABIC}  "المنطق"
-        LangString Hydraulic         ${LANG_ARABIC}  "Hydraulic"
+        LangString Hydraulic         ${LANG_ARABIC}  "الهيدروليك"
-        LangString Pneumatic         ${LANG_ARABIC}  "Pneumatic"
+        LangString Pneumatic         ${LANG_ARABIC}  "الهواء المضغوط"
-        LangString Energy            ${LANG_ARABIC}  "Energy"
+        LangString Energy            ${LANG_ARABIC}  "الطاقة"
-        LangString water             ${LANG_ARABIC}  "Water"
+        LangString water             ${LANG_ARABIC}  "الماء"
-        LangString Refrigeration     ${LANG_ARABIC}  "Refrigeration"
+        LangString Refrigeration     ${LANG_ARABIC}  "التبريد"
-        LangString Solar_thermal     ${LANG_ARABIC}  "Solar_thermal"
+        LangString Solar_thermal     ${LANG_ARABIC}  "الطاقة_الشمسية_الحرارية"
-        LangString Lang              ${LANG_ARABIC}  "Lang"
+        LangString Lang              ${LANG_ARABIC}  "اللغة"
-        LangString Titleblocks       ${LANG_ARABIC}  "Titleblocks"
+        LangString Titleblocks       ${LANG_ARABIC}  "كتل العنوان"
-        LangString Examples          ${LANG_ARABIC}  "Examples"
+        LangString Examples          ${LANG_ARABIC}  "أمثلة"
-        LangString Check             ${LANG_ARABIC}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_ARABIC}  "حدد لتشغيل ${SOFT_NAME}"
-        LangString var1              ${LANG_ARABIC}  "Elements of the official collection"
+        LangString var1              ${LANG_ARABIC}  "عناصر المجموعة الرسمية"
-        LangString var2              ${LANG_ARABIC}  "languagues files"
+        LangString var2              ${LANG_ARABIC}  "ملفات اللغة"
-        LangString var3              ${LANG_ARABIC}  "Examples of cartridges"
+        LangString var3              ${LANG_ARABIC}  "أمثلة على كتل العنوان"
-        LangString var4              ${LANG_ARABIC}  "Examples of diagrams"
+        LangString var4              ${LANG_ARABIC}  "أمثلة على المخططات"
+        LangString uninstFailed      ${LANG_ARABIC}  "فشل إلغاء تثبيت الإصدار السابق. يرجى إلغاء تثبيت ${SOFT_NAME} يدويًا قبل المتابعة."
         
         
-        LangString installed         ${LANG_CATALAN} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString installed         ${LANG_CATALAN} "${SOFT_NAME} ja està instal·lat. $\n$\nFeu clic a `D'acord` per eliminar la versió anterior o a `Cancel·la` per cancel·lar aquesta actualització." 
-        LangString wrongArch         ${LANG_CATALAN} "This distribution is for 64 bits computers only."
+        LangString wrongArch         ${LANG_CATALAN} "Aquesta distribució és només per a ordinadors de 64 bits."
         LangString Elements          ${LANG_CATALAN}  "Elements"
-        LangString Electric          ${LANG_CATALAN}  "Electric"
+        LangString Electric          ${LANG_CATALAN}  "Elèctric"
-        LangString Logic             ${LANG_CATALAN}  "Logic"
+        LangString Logic             ${LANG_CATALAN}  "Lògica"
-        LangString Hydraulic         ${LANG_CATALAN}  "Hydraulic"
+        LangString Hydraulic         ${LANG_CATALAN}  "Hidràulica"
-        LangString Pneumatic         ${LANG_CATALAN}  "Pneumatic"
+        LangString Pneumatic         ${LANG_CATALAN}  "Pneumàtica"
-        LangString Energy            ${LANG_CATALAN}  "Energy"
+        LangString Energy            ${LANG_CATALAN}  "Energia"
-        LangString water             ${LANG_CATALAN}  "Water"
+        LangString water             ${LANG_CATALAN}  "Aigua"
-        LangString Refrigeration     ${LANG_CATALAN}  "Refrigeration"
+        LangString Refrigeration     ${LANG_CATALAN}  "Refrigeració"
-        LangString Solar_thermal     ${LANG_CATALAN}  "Solar_thermal"
+        LangString Solar_thermal     ${LANG_CATALAN}  "Solar_tèrmic"
-        LangString Lang              ${LANG_CATALAN}  "Lang"
+        LangString Lang              ${LANG_CATALAN}  "Idioma"
-        LangString Titleblocks       ${LANG_CATALAN}  "Titleblocks"
+        LangString Titleblocks       ${LANG_CATALAN}  "Cartutxos"
-        LangString Examples          ${LANG_CATALAN}  "Examples"
+        LangString Examples          ${LANG_CATALAN}  "Exemples"
-        LangString Check             ${LANG_CATALAN}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_CATALAN}  "Marca per iniciar ${SOFT_NAME}"
-        LangString var1              ${LANG_CATALAN}  "Elements of the official collection"
+        LangString var1              ${LANG_CATALAN}  "Elements de la col·lecció oficial"
-        LangString var2              ${LANG_CATALAN}  "languagues files"
+        LangString var2              ${LANG_CATALAN}  "Fitxers d'idioma"
-        LangString var3              ${LANG_CATALAN}  "Examples of cartridges"
+        LangString var3              ${LANG_CATALAN}  "Exemples de cartutxos"
-        LangString var4              ${LANG_CATALAN}  "Examples of diagrams"
+        LangString var4              ${LANG_CATALAN}  "Exemples d'esquemes"
+        LangString uninstFailed      ${LANG_CATALAN}  "La desinstal·lació de la versió anterior ha fallat.$\nSi us plau, desinstal·leu ${SOFT_NAME} manualment abans de continuar."
         
         
         LangString installed         ${LANG_ITALIAN} "${SOFT_NAME} è già installato. $\n$\nFare click su `OK` per rimuovere la versione precedente o su `Annulla` per annullare questo aggiornamento." 
@@ -227,69 +237,73 @@
         LangString var2              ${LANG_ITALIAN}  "File della lingua"
         LangString var3              ${LANG_ITALIAN}  "Cartigli di esempio"
         LangString var4              ${LANG_ITALIAN}  "Schemi di esempio"
+        LangString uninstFailed      ${LANG_ITALIAN}  "La disinstallazione della versione precedente non è riuscita.$\nSi prega di disinstallare ${SOFT_NAME} manualmente prima di continuare."
         
         
-        LangString installed         ${LANG_PORTUGUESE} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString installed         ${LANG_PORTUGUESE} "${SOFT_NAME} já está instalado. $\n$\nClique em `OK` para remover a versão anterior ou em `Cancelar` para cancelar esta atualização." 
-        LangString wrongArch         ${LANG_PORTUGUESE} "This distribution is for 64 bits computers only."
+        LangString wrongArch         ${LANG_PORTUGUESE} "Esta distribuição é apenas para computadores de 64 bits."
-        LangString Elements          ${LANG_PORTUGUESE}  "Elements"
+        LangString Elements          ${LANG_PORTUGUESE}  "Elementos"
-        LangString Electric          ${LANG_PORTUGUESE}  "Electric"
+        LangString Electric          ${LANG_PORTUGUESE}  "Elétrica"
-        LangString Logic             ${LANG_PORTUGUESE}  "Logic"
+        LangString Logic             ${LANG_PORTUGUESE}  "Lógica"
-        LangString Hydraulic         ${LANG_PORTUGUESE}  "Hydraulic"
+        LangString Hydraulic         ${LANG_PORTUGUESE}  "Hidráulica"
-        LangString Pneumatic         ${LANG_PORTUGUESE}  "Pneumatic"
+        LangString Pneumatic         ${LANG_PORTUGUESE}  "Pneumática"
-        LangString Energy            ${LANG_PORTUGUESE}  "Energy"
+        LangString Energy            ${LANG_PORTUGUESE}  "Energia"
-        LangString water             ${LANG_PORTUGUESE}  "Water"
+        LangString water             ${LANG_PORTUGUESE}  "Água"
-        LangString Refrigeration     ${LANG_PORTUGUESE}  "Refrigeration"
+        LangString Refrigeration     ${LANG_PORTUGUESE}  "Refrigeração"
-        LangString Solar_thermal     ${LANG_PORTUGUESE}  "Solar_thermal"
+        LangString Solar_thermal     ${LANG_PORTUGUESE}  "Solar_térmico"
-        LangString Lang              ${LANG_PORTUGUESE}  "Lang"
+        LangString Lang              ${LANG_PORTUGUESE}  "Idioma"
-        LangString Titleblocks       ${LANG_PORTUGUESE}  "Titleblocks"
+        LangString Titleblocks       ${LANG_PORTUGUESE}  "Legendas"
-        LangString Examples          ${LANG_PORTUGUESE}  "Examples"
+        LangString Examples          ${LANG_PORTUGUESE}  "Exemplos"
-        LangString Check             ${LANG_PORTUGUESE}  "Avviare ${SOFT_NAME}"
+        LangString Check             ${LANG_PORTUGUESE}  "Marcar para iniciar ${SOFT_NAME}"
-        LangString var1              ${LANG_PORTUGUESE}  "Elements of the official collection"
+        LangString var1              ${LANG_PORTUGUESE}  "Elementos da coleção oficial"
-        LangString var2              ${LANG_PORTUGUESE}  "languagues files"
+        LangString var2              ${LANG_PORTUGUESE}  "Arquivos de idioma"
-        LangString var3              ${LANG_PORTUGUESE}  "Examples of cartridges"
+        LangString var3              ${LANG_PORTUGUESE}  "Exemplos de legendas"
-        LangString var4              ${LANG_PORTUGUESE}  "Examples of diagrams"
+        LangString var4              ${LANG_PORTUGUESE}  "Exemplos de esquemas"
+        LangString uninstFailed      ${LANG_PORTUGUESE}  "A desinstalação da versão anterior falhou.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar."
         
         
-        LangString installed         ${LANG_ROMANIAN} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString installed         ${LANG_ROMANIAN} "${SOFT_NAME} este deja instalat. $\n$\nFaceți clic pe `OK` pentru a elimina versiunea anterioară sau pe `Anulare` pentru a anula această actualizare." 
-        LangString wrongArch         ${LANG_ROMANIAN} "This distribution is for 64 bits computers only."
+        LangString wrongArch         ${LANG_ROMANIAN} "Această distribuție este destinată numai computerelor pe 64 de biți."
-        LangString Elements          ${LANG_ROMANIAN}  "Elements"
+        LangString Elements          ${LANG_ROMANIAN}  "Elemente"
         LangString Electric          ${LANG_ROMANIAN}  "Electric"
-        LangString Logic             ${LANG_ROMANIAN}  "Logic"
+        LangString Logic             ${LANG_ROMANIAN}  "Logică"
-        LangString Hydraulic         ${LANG_ROMANIAN}  "Hydraulic"
+        LangString Hydraulic         ${LANG_ROMANIAN}  "Hidraulică"
-        LangString Pneumatic         ${LANG_ROMANIAN}  "Pneumatic"
+        LangString Pneumatic         ${LANG_ROMANIAN}  "Pneumatică"
-        LangString Energy            ${LANG_ROMANIAN}  "Energy"
+        LangString Energy            ${LANG_ROMANIAN}  "Energie"
-        LangString water             ${LANG_ROMANIAN}  "Water"
+        LangString water             ${LANG_ROMANIAN}  "Apă"
-        LangString Refrigeration     ${LANG_ROMANIAN}  "Refrigeration"
+        LangString Refrigeration     ${LANG_ROMANIAN}  "Refrigerare"
-        LangString Solar_thermal     ${LANG_ROMANIAN}  "Solar_thermal"
+        LangString Solar_thermal     ${LANG_ROMANIAN}  "Solar_termic"
-        LangString Lang              ${LANG_ROMANIAN}  "Lang"
+        LangString Lang              ${LANG_ROMANIAN}  "Limbă"
-        LangString Titleblocks       ${LANG_ROMANIAN}  "Titleblocks"
+        LangString Titleblocks       ${LANG_ROMANIAN}  "Cartușe"
-        LangString Examples          ${LANG_ROMANIAN}  "Examples"
+        LangString Examples          ${LANG_ROMANIAN}  "Exemple"
-        LangString Check             ${LANG_ROMANIAN}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_ROMANIAN}  "Bifați pentru a porni ${SOFT_NAME}"
-        LangString var1              ${LANG_ROMANIAN}  "Elements of the official collection"
+        LangString var1              ${LANG_ROMANIAN}  "Elemente din colecția oficială"
-        LangString var2              ${LANG_ROMANIAN}  "languagues files"
+        LangString var2              ${LANG_ROMANIAN}  "Fișiere de limbă"
-        LangString var3              ${LANG_ROMANIAN}  "Examples of cartridges"
+        LangString var3              ${LANG_ROMANIAN}  "Exemple de cartușe"
-        LangString var4              ${LANG_ROMANIAN}  "Examples of diagrams"
+        LangString var4              ${LANG_ROMANIAN}  "Exemple de scheme"
+        LangString uninstFailed      ${LANG_ROMANIAN}  "Dezinstalarea versiunii anterioare a eșuat.$\nVă rugăm să dezinstalați ${SOFT_NAME} manual înainte de a continua."
         
         
-        LangString installed         ${LANG_CROATIAN} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString installed         ${LANG_CROATIAN} "${SOFT_NAME} je već instaliran. $\n$\nKliknite `U redu` za uklanjanje prethodne verzije ili `Odustani` za odustajanje od nadogradnje." 
-        LangString wrongArch         ${LANG_CROATIAN} "This distribution is for 64 bits computers only."
+        LangString wrongArch         ${LANG_CROATIAN} "Ova distribucija namijenjena je samo za 64-bitna računala."
-        LangString Elements          ${LANG_CROATIAN}  "Elements"
+        LangString Elements          ${LANG_CROATIAN}  "Elementi"
-        LangString Electric          ${LANG_CROATIAN}  "Electric"
+        LangString Electric          ${LANG_CROATIAN}  "Elektrika"
-        LangString Logic             ${LANG_CROATIAN}  "Logic"
+        LangString Logic             ${LANG_CROATIAN}  "Logika"
-        LangString Hydraulic         ${LANG_CROATIAN}  "Hydraulic"
+        LangString Hydraulic         ${LANG_CROATIAN}  "Hidraulika"
-        LangString Pneumatic         ${LANG_CROATIAN}  "Pneumatic"
+        LangString Pneumatic         ${LANG_CROATIAN}  "Pneumatika"
-        LangString Energy            ${LANG_CROATIAN}  "Energy"
+        LangString Energy            ${LANG_CROATIAN}  "Energija"
-        LangString water             ${LANG_CROATIAN}  "Water"
+        LangString water             ${LANG_CROATIAN}  "Voda"
-        LangString Refrigeration     ${LANG_CROATIAN}  "Refrigeration"
+        LangString Refrigeration     ${LANG_CROATIAN}  "Hlađenje"
-        LangString Solar_thermal     ${LANG_CROATIAN}  "Solar_thermal"
+        LangString Solar_thermal     ${LANG_CROATIAN}  "Solarno_toplinsko"
-        LangString Lang              ${LANG_CROATIAN}  "Lang"
+        LangString Lang              ${LANG_CROATIAN}  "Jezik"
-        LangString Titleblocks       ${LANG_CROATIAN}  "Titleblocks"
+        LangString Titleblocks       ${LANG_CROATIAN}  "Zaglavlja"
-        LangString Examples          ${LANG_CROATIAN}  "Examples"
+        LangString Examples          ${LANG_CROATIAN}  "Primjeri"
-        LangString Check             ${LANG_CROATIAN}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_CROATIAN}  "Označite za pokretanje ${SOFT_NAME}"
-        LangString var1              ${LANG_CROATIAN}  "Elements of the official collection"
+        LangString var1              ${LANG_CROATIAN}  "Elementi službene zbirke"
-        LangString var2              ${LANG_CROATIAN}  "languagues files"
+        LangString var2              ${LANG_CROATIAN}  "Jezične datoteke"
-        LangString var3              ${LANG_CROATIAN}  "Examples of cartridges"
+        LangString var3              ${LANG_CROATIAN}  "Primjeri zaglavlja"
-        LangString var4              ${LANG_CROATIAN}  "Examples of diagrams"
+        LangString var4              ${LANG_CROATIAN}  "Primjeri shema"
+        LangString uninstFailed      ${LANG_CROATIAN}  "Deinstalacija prethodne verzije nije uspjela.$\nMolimo deinstalirajte ${SOFT_NAME} ručno prije nastavka."
         
         
         LangString installed         ${LANG_DUTCH}  "${SOFT_NAME} is al geinstalleerd. $\n$\nklik `OK` om vorige versie te verwijderen of `annuleer` om deze upgrade te annuleren."
@@ -306,32 +320,12 @@
         LangString Lang              ${LANG_DUTCH}  "Taal"
         LangString Titleblocks       ${LANG_DUTCH}  "Titelblok"
         LangString Examples          ${LANG_DUTCH}  "Voorbeelden"
-        LangString Check             ${LANG_DUTCH}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_DUTCH}  "Aanvinken om ${SOFT_NAME} te starten"
-        LangString Check             ${LANG_DUTCH}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_DUTCH}  "Elementen van de officiële verzameling"
-        LangString var1              ${LANG_DUTCH}  "Elements of the official collection"
+        LangString var2              ${LANG_DUTCH}  "Taalbestanden"
-        LangString var2              ${LANG_DUTCH}  "languagues files"
+        LangString var3              ${LANG_DUTCH}  "Voorbeelden van titelblokken"
-        LangString var3              ${LANG_DUTCH}  "Examples of cartridges"
+        LangString var4              ${LANG_DUTCH}  "Voorbeelden van schema's"
-        LangString var4              ${LANG_DUTCH}  "Examples of diagrams"
+        LangString uninstFailed      ${LANG_DUTCH}  "Het verwijderen van de vorige versie is mislukt.$\nVerwijder ${SOFT_NAME} handmatig voordat u verdergaat."
-
-        LangString installed         ${LANG_DUTCH_BELGIUM} "${SOFT_NAME} is reeds geinstallerd. $\n$\nKlik`OK` om vorige versie te verwijderen of `Afbreken` om de upgrade niet uit te voeren." 
-        LangString wrongArch         ${LANG_DUTCH_BELGIUM} "Deze distributie werkt enkel op 64 bits computers."
-        LangString Elements          ${LANG_DUTCH_BELGIUM}  "Elementen"
-        LangString Electric          ${LANG_DUTCH_BELGIUM}  "Electrisch"
-        LangString Logic             ${LANG_DUTCH_BELGIUM}  "Logica"
-        LangString Hydraulic         ${LANG_DUTCH_BELGIUM}  "Hydraulisch"
-        LangString Pneumatic         ${LANG_DUTCH_BELGIUM}  "Pneumatisch"
-        LangString Energy            ${LANG_DUTCH_BELGIUM}  "Energie"
-        LangString water             ${LANG_DUTCH_BELGIUM}  "Water"
-        LangString Refrigeration     ${LANG_DUTCH_BELGIUM}  "Klimatisatie"
-        LangString Solar_thermal     ${LANG_DUTCH_BELGIUM}  "Termisch & zonlicht"
-        LangString Lang              ${LANG_DUTCH_BELGIUM}  "Taal"
-        LangString Titleblocks       ${LANG_DUTCH_BELGIUM}  "Titelhoek"
-        LangString Examples          ${LANG_DUTCH_BELGIUM}  "Voorbeelden"
-        LangString Check             ${LANG_DUTCH_BELGIUM}  "Controleer om te beginnen ${SOFT_NAME}"
-        LangString var1              ${LANG_DUTCH_BELGIUM}  "Symbolen van de officielen verzameling"
-        LangString var2              ${LANG_DUTCH_BELGIUM}  "taal bestanden"
-        LangString var3              ${LANG_DUTCH_BELGIUM}  "Voorbeel titelhoeken"
-        LangString var4              ${LANG_DUTCH_BELGIUM}  "Voorbeeld schema's"
         
         
         LangString installed         ${LANG_DANISH} "${SOFT_NAME} er allerede installeret. $\n$\nKlik `Ok` for at fjerne foregående version eller `Annuller` for at annullere opgraderingen." 
@@ -353,5 +347,7 @@
         LangString var2              ${LANG_DANISH}  "Sprog filer"
         LangString var3              ${LANG_DANISH}  "Titel blokke eksempler"
         LangString var4              ${LANG_DANISH}  "Diagram eksempler"
+        LangString uninstFailed      ${LANG_DANISH}  "Afinstallation af den tidligere version mislykkedes.$\nAfinstaller venligst ${SOFT_NAME} manuelt, inden du fortsætter."
+
         
         

build-aux/windows/lang_extra_fr.nsh

@@ -1,6 +1,6 @@
         LangString wrongArch         ${LANG_FRENCH}  "Ce programme est pour Windows 64 bits seulement."
-        LangString installed         ${LANG_FRENCH}  "${SOFT_NAME} est déja installé. $\n$\nCliquer sur `OK` pour désinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
+        LangString installed         ${LANG_FRENCH}  "${SOFT_NAME} est déja installé. $\n$\nCliquer sur `OK` pour désinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
-        LangString Elements          ${LANG_FRENCH}  "Eléments"
+        LangString Elements          ${LANG_FRENCH}  "Eléments"
         LangString Electric          ${LANG_FRENCH}  "Electrique"
         LangString Logic             ${LANG_FRENCH}  "Logique"
         LangString Hydraulic         ${LANG_FRENCH}  "Hydraulique"
@@ -13,7 +13,8 @@
         LangString Titleblocks       ${LANG_FRENCH}  "Cartouches"
         LangString Examples          ${LANG_FRENCH}  "Exemples"
         LangString Check             ${LANG_FRENCH}  "Cocher pour lancer ${SOFT_NAME}"
-        LangString var1              ${LANG_FRENCH}  "Eléments de la collection officielle"
+        LangString var1              ${LANG_FRENCH}  "Eléments de la collection officielle"
         LangString var2              ${LANG_FRENCH}  "Fichiers de langues"
         LangString var3              ${LANG_FRENCH}  "Exemples de cartouches"
-        LangString var4              ${LANG_FRENCH}  "Exemples de schémas"
+        LangString var4              ${LANG_FRENCH}  "Exemples de schémas"
+        LangString uninstFailed      ${LANG_FRENCH}  "La désinstallation de la version précédente a échoué.$\nVeuillez désinstaller ${SOFT_NAME} manuellement avant de continuer."

cmake/qet_compilation_vars.cmake

@@ -88,6 +88,7 @@ set(QET_RES_FILES
   ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.ui
   ${QET_DIR}/sources/ui/elementinfopartwidget.ui
   ${QET_DIR}/sources/ui/elementinfowidget.ui
+  ${QET_DIR}/sources/ui/terminalnumberingdialog.ui
   ${QET_DIR}/sources/ui/formulaassistantdialog.ui
   ${QET_DIR}/sources/ui/imagepropertieswidget.ui
   ${QET_DIR}/sources/ui/importelementdialog.ui
@@ -112,6 +113,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/conductorautonumerotation.cpp
   ${QET_DIR}/sources/conductorautonumerotation.h
   ${QET_DIR}/sources/conductornumexport.cpp
+  ${QET_DIR}/sources/wiringlistexport.h
+  ${QET_DIR}/sources/wiringlistexport.cpp
   ${QET_DIR}/sources/conductornumexport.h
   ${QET_DIR}/sources/conductorprofile.cpp
   ${QET_DIR}/sources/conductorprofile.h
@@ -630,6 +633,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/ui/elementinfopartwidget.h
   ${QET_DIR}/sources/ui/elementinfowidget.cpp
   ${QET_DIR}/sources/ui/elementinfowidget.h
+  ${QET_DIR}/sources/ui/terminalnumberingdialog.cpp
+  ${QET_DIR}/sources/ui/terminalnumberingdialog.h
   ${QET_DIR}/sources/ui/elementpropertieswidget.cpp
   ${QET_DIR}/sources/ui/elementpropertieswidget.h
   ${QET_DIR}/sources/ui/formulaassistantdialog.cpp

misc/org.qelectrotech.qelectrotech.desktop

@@ -7,7 +7,7 @@ Icon=qelectrotech
 Terminal=false
 Type=Application
 MimeType=application/x-qet-project;application/x-qet-element;application/x-qet-titleblock;
-Categories=Graphics;Qt;VectorGraphics;Science;Electricity;Engineering;
+Categories=Graphics;
 Keywords=Graphics;Science;Electricity;Engineering;
 Comment=Edit electrical diagrams.
 Comment[ar]=تحرير مخططات كهربائية

misc/qelectrotech.appdata.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2006-2026 The QElectroTech Team -->
-<application>
+<component type="desktop-application">
- <id type="desktop">qelectrotech.desktop</id>
+ <id>org.qelectrotech.QElectroTech</id>
+ <launchable type="desktop-id">org.qelectrotech.QElectroTech.desktop</launchable>
  <metadata_license>MIT</metadata_license>
  <project_license>GPL-2.0-or-later</project_license>
  <name>QElectroTech</name>
@@ -25,7 +26,7 @@
  <summary xml:lang="ru">Редактор электрических схем</summary>
  <content_rating type="oars-1.1"/>
  <releases>
-     <release version="0.9-dev" date="2021-02-21"/>
+     <release version="0.100.1-dev" date="2026"/>
  </releases>
  <description>
   <p>
@@ -93,9 +94,20 @@
    Приложение использует для хранения проектов и библиотек элементов файлы в XML формате. Приложение помимо редактора электричесих схем, содержит также редакторы элементов и редактор шаблонов листов.
   </p>
  </description>
- <url type="homepage">http://qelectrotech.org</url>
+ <url type="homepage">https://qelectrotech.org</url>
- <screenshots>
+ <url type="bugtracker">https://qelectrotech.org/bugtracker</url>
-  <screenshot type="default">http://download.tuxfamily.org/qet/screens/qelectrotech5.png</screenshot>
+ <url type="vcs-browser">https://github.com/qelectrotech/qelectrotech-source-mirror</url>
- </screenshots>
+ <developer id="org.qelectrotech">
- <updatecontact>qet@lists.tuxfamily.org</updatecontact>
+   <name>QElectroTech</name>
-</application>
+ </developer>
+  <screenshot type="default">
+    <image>https://qelectrotech.org/screenshots/qet_overview04.png</image>
+ </screenshot>
+  <screenshot>
+    <image>https://qelectrotech.org/screenshots/qet_overview06.png</image>
+ </screenshot>
+  <screenshot>
+    <image>https://qelectrotech.org/screenshots/qet_overview09.png</image>
+ </screenshot>
+ <update_contact>scorpio@qelectrotech.org</update_contact>
+</component>

sources/editor/ui/elementpropertieseditorwidget.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 	Copyright 2006-2026 The QElectroTech Team
 	This file is part of QElectroTech.
 
@@ -96,8 +96,18 @@ void ElementPropertiesEditorWidget::upDateInterface()
 	}
 	else if (m_data.m_type == ElementData::Master) {
 		ui->m_master_type_cb->setCurrentIndex(
-					ui->m_master_type_cb->findData (
+			ui->m_master_type_cb->findData (
-						m_data.m_master_type));
+				m_data.m_master_type));
+
+		// NEU: Checkbox und Zahlenbox für max_slaves einstellen
+		if (m_data.m_max_slaves == -1) {
+			ui->max_slaves_checkbox->setChecked(false);
+			ui->max_slaves_spinbox->setEnabled(false);
+		} else {
+			ui->max_slaves_checkbox->setChecked(true);
+			ui->max_slaves_spinbox->setEnabled(true);
+			ui->max_slaves_spinbox->setValue(m_data.m_max_slaves);
+		}
 	} else if (m_data.m_type == ElementData::Terminal) {
 		ui->m_terminal_type_cb->setCurrentIndex(
 					ui->m_terminal_type_cb->findData(
@@ -151,10 +161,13 @@ void ElementPropertiesEditorWidget::setUpInterface()
 	ui->m_terminal_func_cb->addItem(tr("Phase"),     ElementData::TFPhase);
 	ui->m_terminal_func_cb->addItem(tr("Neutre"),    ElementData::TFNeutral);
 
-		//Disable the edition of the first column of the information tree
+	//Disable the edition of the first column of the information tree
-		//by this little workaround
+	//by this little workaround
 	ui->m_tree->setItemDelegate(new EditorDelegate(this));
-	ui->m_tree->header()->resizeSection(0, 150);
+
+	// NEU: Checkbox mit der Zahlenbox verbinden (Aktivieren/Deaktivieren)
+	connect(ui->max_slaves_checkbox, SIGNAL(toggled(bool)), ui->max_slaves_spinbox, SLOT(setEnabled(bool)));
+
 	populateTree();
 }
 
@@ -226,6 +239,13 @@ void ElementPropertiesEditorWidget::on_m_buttonBox_accepted()
 	}
 	else if (m_data.m_type == ElementData::Master) {
 		m_data.m_master_type = ui->m_master_type_cb->currentData().value<ElementData::MasterType>();
+
+		//If the checkbox is checked, save the number; otherwise, -1 (infinity)
+		if (ui->max_slaves_checkbox->isChecked()) {
+			m_data.m_max_slaves = ui->max_slaves_spinbox->value();
+		} else {
+			m_data.m_max_slaves = -1;
+		}
 	}
 	else if (m_data.m_type == ElementData::Terminal)
 	{

sources/editor/ui/elementpropertieseditorwidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>527</width>
-    <height>442</height>
+    <height>492</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -104,6 +104,23 @@
           <item row="0" column="1">
            <widget class="QComboBox" name="m_master_type_cb"/>
           </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="max_slaves_checkbox">
+            <property name="text">
+             <string>Définir le nombre maximal d'esclaves</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="max_slaves_spinbox">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>

sources/elementspanel.cpp

@@ -67,7 +67,10 @@ ElementsPanel::ElementsPanel(QWidget *parent) :
 	connect(this, &ElementsPanel::itemDoubleClicked, this, &ElementsPanel::slot_doubleClick);
 	connect(this, &GenericPanel::firstActivated, [this]() {QTimer::singleShot(250, this, SLOT(reload()));});
 	connect(this, &ElementsPanel::panelContentChanged, this, &ElementsPanel::panelContentChange);
-	
+
+		// manage signal itemClicked
+	connect(this, &ElementsPanel::itemClicked, this, &ElementsPanel::slot_clicked);
+
 		//Emit a signal instead au manage is own context menu
 	setContextMenuPolicy(Qt::CustomContextMenu);
 }
@@ -139,15 +142,26 @@ QTreeWidgetItem *ElementsPanel::addProject(QETProject *project,
 	Q_UNUSED(options)
 	
 	bool first_add = (first_reload_ || !projects_to_display_.contains(project));
+	clearSelection();
 	
-	// create the QTreeWidgetItem representing the project
+		// create the QTreeWidgetItem representing the project
 	QTreeWidgetItem *qtwi_project = GenericPanel::addProject(project, nullptr, GenericPanel::All);
-	// the project will be inserted right before the common tb templates collection
+		// the project will be inserted right before the common tb templates collection
 	invisibleRootItem() -> insertChild(
 		indexOfTopLevelItem(common_tbt_collection_item_),
 		qtwi_project
 	);
-	if (first_add) qtwi_project -> setExpanded(true);
+	if (first_add){
+		qtwi_project -> setExpanded(true);
+			// on adding an project select first diagram
+		setCurrentItem(qtwi_project -> child(0));
+		qtwi_project -> child(0)->setSelected(true);
+	}
+	else {
+			// on adding an diagram to project select the last diagram
+		setCurrentItem(qtwi_project->child(qtwi_project->childCount()-2));
+		qtwi_project->child(qtwi_project->childCount()-2)->setSelected(true);
+	}
 	
 	if (TitleBlockTemplatesCollection *tbt_collection = project -> embeddedTitleBlockTemplatesCollection()) {
 		if (QTreeWidgetItem *tbt_collection_qtwi = itemForTemplatesCollection(tbt_collection)) {
@@ -258,21 +272,28 @@ void ElementsPanel::reload()
 }
 
 /**
-	Gere le double-clic sur un element.
+	@brief ElementsPanel::slot_clicked
-	Si un double-clic sur un projet est effectue, le signal requestForProject
+	handle click on qtwi
-	est emis.
+	@param qtwi item that was clickerd on
-	Si un double-clic sur un schema est effectue, le signal requestForDiagram
+*/
-	est emis.
+void ElementsPanel::slot_clicked(QTreeWidgetItem *clickedItem, int) {
+
+	requestForItem(clickedItem);
+}
+
+/**
+	@brief ElementsPanel::slot_doubleClick
+	handle double click on qtwi
 	@param qtwi
 */
 void ElementsPanel::slot_doubleClick(QTreeWidgetItem *qtwi, int) {
 	int qtwi_type = qtwi -> type();
 	if (qtwi_type == QET::Project) {
-		QETProject *project = valueForItem<QETProject *>(qtwi);
+			// open project properties
-		emit(requestForProject(project));
+		emit(requestForProjectPropertiesEdition());
 	} else if (qtwi_type == QET::Diagram) {
-		Diagram *diagram = valueForItem<Diagram *>(qtwi);
+			// open diagram properties
-		diagram->showMe();
+		emit(requestForDiagramPropertiesEdition());
 	} else if (qtwi_type == QET::TitleBlockTemplate) {
 		TitleBlockTemplateLocation tbt = valueForItem<TitleBlockTemplateLocation>(qtwi);
 		emit(requestForTitleBlockTemplate(tbt));
@@ -444,3 +465,64 @@ void ElementsPanel::ensureHierarchyIsVisible(const QList<QTreeWidgetItem *> &ite
 		if (parent_qtwi -> isHidden()) parent_qtwi -> setHidden(false);
 	}
 }
+
+/**
+ * @brief ElementsPanel::syncTabBars
+ * set the project- or diagram Tab corresponding to
+ * the selection in the treeView
+ */
+void ElementsPanel::requestForItem(QTreeWidgetItem *clickedItem)
+{
+		// activate diagram
+	if(clickedItem->type() == QET::Diagram){
+		Diagram *diagram = valueForItem<Diagram *>(clickedItem);
+			// if we click on diagramItem in annother project we need the other project
+		emit(requestForProject(projectForItem(clickedItem->parent())));
+			// required for keyPressEvent
+			// after emit the focus is on the diagram editor, we put it back to elementsPanel
+		this->setFocus();
+			// activate diagram
+		diagram->showMe();
+	}
+		// activate project
+	else if(clickedItem->type() == QET::Project) {
+		QETProject *project = projectForItem(clickedItem);
+		emit(requestForProject(project));
+		this->setFocus();
+	}
+}
+
+/**
+ *   @brief ElementsPanel::keyPressEvent
+ *   @param event
+ */
+void ElementsPanel::keyPressEvent(QKeyEvent *event)
+{
+	switch (event->key())
+	{
+	case Qt::Key_Up:{
+			// check if there is another item abbove
+		if(!itemAbove(currentItem()))
+			break;
+
+		setCurrentItem(itemAbove(currentItem()));
+		if (currentItem()->type()==QET::Diagram || currentItem()->type()==QET::Project){
+			requestForItem(currentItem());
+		}
+		break;
+	}
+	case Qt::Key_Down:{
+			// check if there is another item below
+		if(!itemBelow(currentItem()))
+			break;
+
+		setCurrentItem(itemBelow(currentItem()));
+		if (currentItem()->type()==QET::Diagram || currentItem()->type()==QET::Project){
+			requestForItem(currentItem());
+		}
+		break;
+	}
+	default:
+		QTreeView::keyPressEvent(event);
+	}
+}

sources/elementspanel.h

@@ -53,8 +53,13 @@ class ElementsPanel : public GenericPanel {
 	signals:
 	void requestForProject(QETProject *);
 	void requestForTitleBlockTemplate(const TitleBlockTemplateLocation &);
-	
+		// Signal to open the project properties
+	void requestForProjectPropertiesEdition();
+		// Signal to open the diagram properties
+	void requestForDiagramPropertiesEdition();
+
 	public slots:
+	void slot_clicked(QTreeWidgetItem *, int);
 	void slot_doubleClick(QTreeWidgetItem *, int);
 	void reload();
 	void filter(const QString &, QET::Filtering = QET::RegularFilter);
@@ -63,7 +68,9 @@ class ElementsPanel : public GenericPanel {
 	void buildFilterList();
 	void applyCurrentFilter(const QList<QTreeWidgetItem *> &);
 	void ensureHierarchyIsVisible(const QList<QTreeWidgetItem *> &);
-	
+	void requestForItem(QTreeWidgetItem *);
+	void keyPressEvent(QKeyEvent *event)override;
+
 	protected:
 	void startDrag(Qt::DropActions) override;
 	void startTitleBlockTemplateDrag(const TitleBlockTemplateLocation &);

sources/elementspanelwidget.cpp

@@ -120,6 +120,12 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) {
 		SLOT(openTitleBlockTemplate(const TitleBlockTemplateLocation &))
 	);
 
+		// manage double click on TreeWidgetItem
+	connect(elements_panel, SIGNAL(requestForProjectPropertiesEdition()), this, SLOT(editProjectProperties()) );
+	connect(elements_panel, SIGNAL(requestForDiagramPropertiesEdition()), this, SLOT(editDiagramProperties()) );
+		// manage project activation
+	connect(elements_panel, SIGNAL(requestForProject(QETProject*)), this, SIGNAL(requestForProject(QETProject*)));
+
 	// disposition verticale
 	QVBoxLayout *vlayout = new QVBoxLayout(this);
 	vlayout -> setContentsMargins(0,0,0,0);
@@ -236,6 +242,7 @@ void ElementsPanelWidget::deleteDiagram()
 {
 	if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
 		emit(requestForDiagramDeletion(selected_diagram));
+		elements_panel->reload();
 	}
 }
 
@@ -473,28 +480,33 @@ void ElementsPanelWidget::keyPressEvent   (QKeyEvent *e) {
 					break;
 					case Qt::Key_F3:
 					if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
+						elements_panel->setSelectedItem(elements_panel->getItemForDiagram(selected_diagram));
 						emit(requestForDiagramMoveUp(selected_diagram));
 					}
 					break;
 					case Qt::Key_F4:
 					if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
+						elements_panel->setSelectedItem(elements_panel->getItemForDiagram(selected_diagram));
 						emit(requestForDiagramMoveDown(selected_diagram));
 					}
 					break;
 					case Qt::Key_F5:
 					if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
+						elements_panel->setSelectedItem(elements_panel->getItemForDiagram(selected_diagram));
 						emit(requestForDiagramMoveUpTop(selected_diagram));
 					}
 					
 					break;
 					case Qt::Key_F6:
 					if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
+						elements_panel->setSelectedItem(elements_panel->getItemForDiagram(selected_diagram));
 						emit(requestForDiagramMoveDownx10(selected_diagram));
 					}
 					
 					break;
 					case Qt::Key_F7:
 					if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
+						elements_panel->setSelectedItem(elements_panel->getItemForDiagram(selected_diagram));
 						emit(requestForDiagramMoveDownx100(selected_diagram));
 					}
 					
@@ -502,12 +514,14 @@ void ElementsPanelWidget::keyPressEvent   (QKeyEvent *e) {
 					break;
 					case Qt::Key_F8:
 					if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
+						elements_panel->setSelectedItem(elements_panel->getItemForDiagram(selected_diagram));
 						emit(requestForDiagramMoveUpx10(selected_diagram));
 					}					
 					
 					break;
 					case Qt::Key_F9:
 					if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
+						elements_panel->setSelectedItem(elements_panel->getItemForDiagram(selected_diagram));
 						emit(requestForDiagramMoveUpx100(selected_diagram));
 					}
 					break;

sources/exportdialog.cpp

@@ -418,7 +418,8 @@ void ExportDialog::generateSvg(
 	
 	// "joue" la QPicture sur un QSvgGenerator
 	QSvgGenerator svg_engine;
-	svg_engine.setSize(QSize((width*9/16), (height*9/16)));
+	svg_engine.setSize(QSize(width, height));
+	svg_engine.setViewBox(QRect(0, 0, width*0.75, height*0.75));
 	svg_engine.setOutputDevice(&io_device);
 	QPainter svg_painter(&svg_engine);
 	picture.play(&svg_painter);

sources/genericpanel.cpp

@@ -766,7 +766,6 @@ void GenericPanel::projectDiagramsOrderChanged(QETProject *project,
 	if (!moved_qtwi_diagram) return;
 	
 	// remove the QTWI then insert it back at the adequate location
-	bool was_selected = moved_qtwi_diagram -> isSelected();
 	qtwi_project -> removeChild (moved_qtwi_diagram);
 	qtwi_project -> insertChild (to, moved_qtwi_diagram);
 	
@@ -781,8 +780,14 @@ void GenericPanel::projectDiagramsOrderChanged(QETProject *project,
 			updateDiagramItem(qtwi_diagram, diagram);
 	}
 	
-	if (was_selected)
+		// select the moved diagram
+	if(m_selected_item){
 		setCurrentItem(moved_qtwi_diagram);
+	}
+	else{
+		setCurrentItem(qtwi_project -> child(from));
+	}
+	m_selected_item = nullptr;
 
 	emit(panelContentChanged());
 }
@@ -1041,3 +1046,12 @@ void GenericPanel::emitFirstActivated()
 {
 	emit(firstActivated());
 }
+
+/**
+	@brief GenericPanel::setSelectedItem
+	@param selectedItem
+*/
+void GenericPanel::setSelectedItem(QTreeWidgetItem *selectedItem)
+{
+	m_selected_item = selectedItem;
+}

sources/genericpanel.h

@@ -95,8 +95,8 @@ class GenericPanel : public QTreeWidget {
 	virtual QTreeWidgetItem *addDiagram(Diagram *,
 					    QTreeWidgetItem * = nullptr,
 					    PanelOptions = AddAllChild);
-	protected:
 	virtual QTreeWidgetItem *getItemForDiagram(Diagram *, bool * = nullptr);
+	protected:
 	virtual QTreeWidgetItem *updateDiagramItem(QTreeWidgetItem *,
 						   Diagram *,
 						   PanelOptions = AddAllChild,
@@ -171,6 +171,9 @@ class GenericPanel : public QTreeWidget {
 					 const QString &);
 	
 	// various other methods
+	public:
+	void setSelectedItem(QTreeWidgetItem *selectedItem);
+
 	protected:
 	virtual QString defaultText(QET::ItemType);
 	virtual QIcon   defaultIcon(QET::ItemType);
@@ -222,5 +225,7 @@ class GenericPanel : public QTreeWidget {
 		representing a title block template
 	*/
 	QHash<TitleBlockTemplateLocation, QTreeWidgetItem *> tb_templates_;
+
+	QTreeWidgetItem *m_selected_item = nullptr;
 };
 #endif

sources/projectview.cpp

@@ -721,6 +721,14 @@ void ProjectView::initActions()
 	
 	m_end_view = new QAction(QET::Icons::ArrowRightDouble, tr("Aller à la fin du projet"),this);
 	connect(m_end_view, &QAction::triggered, [this](){this->m_tab->setCurrentWidget(lastDiagram());});
+
+		// button to scroll one page left
+	m_next_view_left = new QAction(QET::Icons::ArrowLeft, tr("go one page left"),this);
+	connect(m_next_view_left, &QAction::triggered, [this](){this->m_tab->setCurrentWidget(previousDiagram());});
+
+		// button to scroll one page right
+	m_next_view_right = new QAction(QET::Icons::ArrowRight, tr("go one page right"),this);
+	connect(m_next_view_right, &QAction::triggered, [this](){this->m_tab->setCurrentWidget(nextDiagram());});
 }
 
 /**
@@ -748,34 +756,65 @@ void ProjectView::initWidgets()
 	m_tab = new QTabWidget(this);
 #endif
 	m_tab -> setMovable(true);
+		// setting UsesScrollButton ensures that when the tab bar is full, the tabs are scrolled.
+	m_tab -> setUsesScrollButtons(true);
+		// disable the internal scroll buttons of the TabWidget, we will use our own buttons.
+	m_tab->setStyleSheet("QTabBar QToolButton {border-image: ;border-width: 0px}");
+	m_tab->setStyleSheet("QTabBar::scroller {width: 0px;}");
 
+		   // add layouts
 	QHBoxLayout *TopRightCorner_Layout = new QHBoxLayout();
 	TopRightCorner_Layout->setContentsMargins(0,0,0,0);
+	// some place left to the 'next_right_view_button' button
+	TopRightCorner_Layout->insertSpacing(1,10);
 
-	QToolButton *add_new_diagram_button = new QToolButton;
+	QHBoxLayout *TopLeftCorner_Layout = new QHBoxLayout();
-	add_new_diagram_button -> setDefaultAction(m_add_new_diagram);
+	TopLeftCorner_Layout->setContentsMargins(0,0,0,0);
-	add_new_diagram_button -> setAutoRaise(true);
+
-	TopRightCorner_Layout->addWidget(add_new_diagram_button);
+		// add buttons
+	QToolButton *m_next_right_view_button =new QToolButton;
+	m_next_right_view_button->setDefaultAction(m_next_view_right);
+	m_next_right_view_button->setAutoRaise(true);
+	TopRightCorner_Layout->addWidget(m_next_right_view_button);
 
-	connect(m_tab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
-	connect(m_tab, SIGNAL(tabBarDoubleClicked(int)), this, SLOT(tabDoubleClicked(int)));
-	connect(m_tab->tabBar(), SIGNAL(tabMoved(int, int)), this, SLOT(tabMoved(int, int)), Qt::QueuedConnection);
-	
-	//arrows button to return on first view
-	QToolButton *m_first_view_button =new QToolButton;
-	m_first_view_button->setDefaultAction(m_first_view);
-	m_first_view_button->setAutoRaise(true);
-	m_tab->setCornerWidget(m_first_view_button, Qt::TopLeftCorner);
-	
-	//arrows button to go on last view
 	QToolButton *m_end_view_button =new QToolButton;
 	m_end_view_button->setDefaultAction(m_end_view);
 	m_end_view_button->setAutoRaise(true);
 	TopRightCorner_Layout->addWidget(m_end_view_button);
 
-	QWidget *tabwidget=new QWidget(this);
+	QToolButton *add_new_diagram_button = new QToolButton;
-	tabwidget->setLayout(TopRightCorner_Layout);
+	add_new_diagram_button -> setDefaultAction(m_add_new_diagram);
-	m_tab -> setCornerWidget(tabwidget, Qt::TopRightCorner);
+	add_new_diagram_button -> setAutoRaise(true);
+	TopRightCorner_Layout->addWidget(add_new_diagram_button);
+		// some place right to the 'add_new_diagram_button' button
+	TopRightCorner_Layout->addSpacing(5);
+
+	QToolButton *m_first_view_button =new QToolButton;
+	m_first_view_button->setDefaultAction(m_first_view);
+	m_first_view_button->setAutoRaise(true);
+	TopLeftCorner_Layout->addWidget(m_first_view_button);
+
+	QToolButton *m_next_left_view_button =new QToolButton;
+	m_next_left_view_button->setDefaultAction(m_next_view_left);
+	m_next_left_view_button->setAutoRaise(true);
+	TopLeftCorner_Layout->addWidget(m_next_left_view_button);
+
+		// some place right to the 'first_view_button' button
+	TopLeftCorner_Layout->addSpacing(10);
+
+		// add widgets to tabbar
+	QWidget *tabwidgetRight=new QWidget(this);
+	tabwidgetRight->setLayout(TopRightCorner_Layout);
+	m_tab -> setCornerWidget(tabwidgetRight, Qt::TopRightCorner);
+
+	QWidget *tabwidgetLeft=new QWidget(this);
+	tabwidgetLeft->setLayout(TopLeftCorner_Layout);
+	m_tab -> setCornerWidget(tabwidgetLeft, Qt::TopLeftCorner);
+
+		// manage signals
+	connect(m_tab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
+	connect(m_tab, SIGNAL(tabBarDoubleClicked(int)), this, SLOT(tabDoubleClicked(int)));
+	connect(m_tab->tabBar(), SIGNAL(tabMoved(int,int)), this, SLOT(tabMoved(int,int)), Qt::QueuedConnection);
 
 	fallback_widget_ -> setVisible(false);
 	m_tab -> setVisible(false);

sources/projectview.h

@@ -168,8 +168,10 @@ class ProjectView : public QWidget
 		// attributes
 	private:
 		QAction *m_add_new_diagram,
-		*m_first_view,
+			*m_first_view,
-		*m_end_view;
+			*m_end_view,
+			*m_next_view_left,
+			*m_next_view_right;
 		QETProject *m_project;
 		QVBoxLayout *layout_;
 		QWidget *fallback_widget_;

sources/properties/elementdata.cpp

@@ -76,6 +76,16 @@ QDomElement ElementData::kindInfoToXml(QDomDocument &document)
 		xml_type.appendChild(type_txt);
 
 		returned_elmt.appendChild(xml_type);
+
+		// Save max_slaves only if a specific limit is set (not default -1)
+		if (m_max_slaves != -1) {
+			auto xml_max_slaves = document.createElement(QStringLiteral("kindInformation"));
+			xml_max_slaves.setAttribute(QStringLiteral("name"), QStringLiteral("max_slaves"));
+			auto max_slaves_txt = document.createTextNode(QString::number(m_max_slaves));
+			xml_max_slaves.appendChild(max_slaves_txt);
+
+			returned_elmt.appendChild(xml_max_slaves);
+		}
 	}
 	else if (m_type == ElementData::Slave)
 	{
@@ -558,9 +568,12 @@ void ElementData::kindInfoFromXml(const QDomElement &xml_element)
 			}
 			auto name = dom_elmt.attribute(QStringLiteral("name"));
 
-			if (m_type == ElementData::Master &&
+			if (m_type == ElementData::Master) {
-				name == QLatin1String("type")) {
+				if (name == QLatin1String("type")) {
-				m_master_type = masterTypeFromString(dom_elmt.text());
+					m_master_type = masterTypeFromString(dom_elmt.text());
+				} else if (name == QLatin1String("max_slaves")) {
+					m_max_slaves = dom_elmt.text().toInt();
+				}
 			}
 			else if (m_type == ElementData::Slave ) {
 				if (name == QLatin1String("type")) {

sources/properties/elementdata.h

@@ -134,6 +134,7 @@ class ElementData : public PropertiesInterface
 		ElementData::Type       m_type = ElementData::Simple;
 
 		ElementData::MasterType m_master_type = ElementData::Coil;
+		int m_max_slaves{-1};
 
 		ElementData::SlaveType  m_slave_type  = ElementData::SSimple;
 		ElementData::SlaveState m_slave_state = ElementData::NO;
@@ -141,7 +142,7 @@ class ElementData : public PropertiesInterface
 		ElementData::TerminalType     m_terminal_type     = ElementData::TTGeneric;
 		ElementData::TerminalFunction m_terminal_function = ElementData::TFGeneric;
 
-		int m_contact_count = 1;
+		int m_contact_count{1};
 		DiagramContext m_informations;
 		NamesList m_names_list;
 		QString m_drawing_information;

sources/qetdiagrameditor.cpp

@@ -45,6 +45,8 @@
 #include "TerminalStrip/ui/terminalstripeditorwindow.h"
 #include "ui/diagrameditorhandlersizewidget.h"
 #include "TerminalStrip/ui/addterminalstripitemdialog.h"
+#include "wiringlistexport.h"
+#include "ui/terminalnumberingdialog.h"
 
 #ifdef BUILD_WITHOUT_KF5
 #else
@@ -465,13 +467,27 @@ void QETDiagramEditor::setUpActions()
 			wne.toCsv();
 		}
 	});
-
+	// Export wiring list to CSV
-#ifdef QET_EXPORT_PROJECT_DB
+	m_project_export_wiring_list = new QAction(QET::Icons::DocumentSpreadsheet, tr("Exporter le plan de câblage"), this);
-	m_export_project_db = new QAction(QET::Icons::DocumentSpreadsheet, tr("Exporter la base de donnée interne du projet"), this);
+	connect(m_project_export_wiring_list, &QAction::triggered, [this]() {
-	connect(m_export_project_db, &QAction::triggered, [this]() {
+		QETProject *project = this->currentProject();
-		projectDataBase::exportDb(this->currentProject()->dataBase(), this);
+		if (project)
+		{
+			WiringListExport wle(project, this);
+			wle.toCsv();
+		}
 	});
-#endif
+
+	// Terminal Numbering
+	m_terminal_numbering = new QAction(QET::Icons::TerminalStrip, tr("Numérotation automatique des bornes"), this);
+	connect(m_terminal_numbering, &QAction::triggered, this, &QETDiagramEditor::slot_terminalNumbering);
+
+	#ifdef QET_EXPORT_PROJECT_DB
+		m_export_project_db = new QAction(QET::Icons::DocumentSpreadsheet, tr("Exporter la base de donnée interne du projet"), this);
+		connect(m_export_project_db, &QAction::triggered, [this]() {
+			projectDataBase::exportDb(this->currentProject()->dataBase(), this);
+		});
+	#endif
 
 		//MDI view style
 	m_tabbed_view_mode = new QAction(tr("en utilisant des onglets"), this);
@@ -835,6 +851,8 @@ void QETDiagramEditor::setUpMenu()
 	menu_project -> addAction(m_project_export_conductor_num);
 	menu_project -> addAction(m_terminal_strip_dialog);
 	menu_project -> addAction(m_project_terminalBloc);
+	menu_project -> addAction(m_project_export_wiring_list);
+	menu_project -> addAction(m_terminal_numbering);
 #ifdef QET_EXPORT_PROJECT_DB
 	menu_project -> addSeparator();
 	menu_project -> addAction(m_export_project_db);
@@ -1567,6 +1585,8 @@ void QETDiagramEditor::slot_updateActions()
 	m_csv_export                  -> setEnabled(editable_project);
 	m_project_export_conductor_num-> setEnabled(opened_project);
 	m_terminal_strip_dialog       -> setEnabled(editable_project);
+	m_project_export_wiring_list  -> setEnabled(opened_project);
+	m_terminal_numbering          -> setEnabled(editable_project);
 #ifdef QET_EXPORT_PROJECT_DB
 	m_export_project_db           -> setEnabled(editable_project);
 #endif
@@ -1828,6 +1848,31 @@ void QETDiagramEditor::addProjectView(ProjectView *project_view)
 	connect(project_view, SIGNAL(errorEncountered(QString)),
 		this, SLOT(showError(const QString &)));
 
+	//Highlight the current page
+	connect(project_view, &ProjectView::diagramActivated, this, [this](DiagramView *dv) {
+		if (dv && dv->diagram() && pa) {
+			// 1. Find the item in the tree that corresponds to this diagram
+			QTreeWidgetItem *item = pa->elementsPanel().getItemForDiagram(dv->diagram());
+
+				   // 2. If you find it, select it
+			if (item) {
+				pa->elementsPanel().setCurrentItem(item);
+			}
+		}
+	});
+
+		//Highlight the current page in projectView on project activation
+	connect(this, &QETDiagramEditor::syncElementsPanel, this, [this]() {
+		if (pa && currentDiagramView()) {
+				// In the tree, find the element that corresponds to the diagram of the selected project.
+			QTreeWidgetItem *item = pa->elementsPanel().getItemForDiagram(currentDiagramView()->diagram());
+			if (item) {
+					// select the diagram
+				pa->elementsPanel().setCurrentItem(item);
+			}
+		}
+	});
+
 	//We maximise the new window if the current window is inexistent or maximized
 	QWidget *current_window = m_workspace.activeSubWindow();
 	bool maximise = ((!current_window)
@@ -2336,6 +2381,7 @@ void QETDiagramEditor::subWindowActivated(QMdiSubWindow *subWindows)
 
 	slot_updateActions();
 	slot_updateWindowsMenu();
+	emit syncElementsPanel();
 }
 
 /**
@@ -2471,7 +2517,27 @@ void QETDiagramEditor::generateTerminalBlock()
 #endif
 	if ( !success ) {
 		QMessageBox::warning(nullptr,
-				     QObject::tr("Error launching qet_tb_generator plugin"),
+							 QObject::tr("Error launching qet_tb_generator plugin"),
-				     message);
+							 message);
+	}
+}
+
+/**
+ * @brief QETDiagramEditor::slot_terminalNumbering
+ * Opens the dialog for automatic terminal numbering and applies the generated undo command.
+ */
+void QETDiagramEditor::slot_terminalNumbering() {
+	TerminalNumberingDialog dialog(this);
+	if (dialog.exec() == QDialog::Accepted) {
+		QETProject *project = currentProject();
+		if (!project) return;
+
+		// Fetch the generated undo command from the dialog logic
+		QUndoCommand *macro = dialog.getUndoCommand(project);
+
+		// If changes were made, push them to the global undo stack
+		if (macro) {
+			undo_group.activeStack()->push(macro);
+		}
 	}
 }

sources/qetdiagrameditor.h

@@ -42,6 +42,7 @@ class RecentFiles;
 class DiagramPropertiesEditorDockWidget;
 class ElementsCollectionWidget;
 class AutoNumberingDockWidget;
+class TerminalNumberingDialog;
 
 #ifdef BUILD_WITHOUT_KF5
 #else
@@ -98,6 +99,9 @@ class QETDiagramEditor : public QETMainWindow
 		ProjectView *findProject(const QString &) const;
 		QMdiSubWindow *subWindowForWidget(QWidget *) const;
 
+	signals:
+		void syncElementsPanel();
+
 	public slots:
 		void save();
 		void saveAs();
@@ -129,6 +133,7 @@ class QETDiagramEditor : public QETMainWindow
 		void projectWasClosed(ProjectView *);
 		void editProjectProperties(ProjectView *);
 		void editProjectProperties(QETProject *);
+		void slot_terminalNumbering();
 		void editDiagramProperties(DiagramView *);
 		void editDiagramProperties(Diagram *);
 		void addDiagramToProject(QETProject *);
@@ -197,6 +202,8 @@ class QETDiagramEditor : public QETMainWindow
 		*m_terminal_strip_dialog = nullptr, ///<Launch terminal strip dialog
 		*m_project_terminalBloc,	///< generate terminal block
 		*m_project_export_conductor_num,///<Export the wire num to csv
+		*m_project_export_wiring_list, ///< Action to export the wiring list
+		*m_terminal_numbering,         ///< Action to launch terminal numbering
 		*m_export_project_db,		///Export to file the internal database of the current project
 		*m_tile_window,			///< Show MDI subwindows as tile
 		*m_cascade_window,		///< Show MDI subwindows as cascade

sources/qetgraphicsitem/dynamicelementtextitem.cpp

@@ -1351,6 +1351,7 @@ void DynamicElementTextItem::updateXref()
 				{
 					m_slave_Xref_item = new QGraphicsTextItem(xref_label, this);
 					m_slave_Xref_item->setFont(QETApp::diagramTextsFont(5));
+					m_slave_Xref_item->setDefaultTextColor(Qt::black);
 					m_slave_Xref_item->installSceneEventFilter(this);
 					
 					m_update_slave_Xref_connection << connect(m_master_element.data(), &Element::xChanged,                       this, &DynamicElementTextItem::updateXref);

sources/qetgraphicsitem/masterelement.cpp

@@ -183,3 +183,27 @@ void MasterElement::aboutDeleteXref()
 		return;
 	}
 }
+
+/**
+ * @brief MasterElement::isFull
+ * @return true if the master has reached its maximum number of slaves
+ */
+bool MasterElement::isFull() const
+{
+	// Set default value to -1 (unlimited slaves)
+	int max_slaves = -1;
+	QVariant max_slaves_variant = kindInformations().value("max_slaves");
+
+	// Overwrite default if a valid limit is defined in the element's XML
+	if (max_slaves_variant.isValid() && !max_slaves_variant.toString().isEmpty()) {
+		max_slaves = max_slaves_variant.toInt();
+	}
+
+	// If no limit is set (-1), the master is never full
+	if (max_slaves == -1) {
+		return false;
+	}
+
+	// Return true if current connected elements reached or exceeded the limit
+	return connected_elements.size() >= max_slaves;
+}

sources/qetgraphicsitem/masterelement.h

@@ -44,6 +44,8 @@ class MasterElement : public Element
 		void unlinkElement     (Element *elmt) override;
 		void initLink          (QETProject *project) override;
 		QRectF XrefBoundingRect() const;
+
+		bool isFull() const; // Check Slave-Limit
 		
 	protected:
 		QVariant itemChange(

sources/ui/elementinfowidget.cpp

@@ -160,6 +160,7 @@ void ElementInfoWidget::enableLiveEdit()
 {
 	for (ElementInfoPartWidget *eipw : m_eipw_list)
 		connect(eipw, &ElementInfoPartWidget::textChanged, this, &ElementInfoWidget::apply);
+	connect(ui->m_auto_num_locked_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply);
 }
 
 /**
@@ -170,6 +171,7 @@ void ElementInfoWidget::disableLiveEdit()
 {
 	for (ElementInfoPartWidget *eipw : m_eipw_list)
 		disconnect(eipw, &ElementInfoPartWidget::textChanged, this, &ElementInfoWidget::apply);
+	disconnect(ui->m_auto_num_locked_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply);
 }
 
 /**
@@ -193,6 +195,12 @@ void ElementInfoWidget::buildInterface()
 	}
 
 	ui->scroll_vlayout->addStretch();
+	// Show checkbox only if the element is a terminal
+	if (m_element.data()->elementData().m_type == ElementData::Terminal) {
+		ui->m_auto_num_locked_cb->setVisible(true);
+	} else {
+		ui->m_auto_num_locked_cb->setVisible(false);
+	}
 }
 
 /**
@@ -231,6 +239,11 @@ void ElementInfoWidget::updateUi()
 	for (ElementInfoPartWidget *eipw : m_eipw_list) {
 		eipw -> setText (element_info[eipw->key()].toString());
 	}
+	// Load the lock status for auto numbering
+	if (m_element->elementData().m_type == ElementData::Terminal) {
+		QString lock_value = element_info.value(QStringLiteral("auto_num_locked")).toString();
+		ui->m_auto_num_locked_cb->setChecked(lock_value == QLatin1String("true"));
+	}
 
 	if (m_live_edit) {
 		enableLiveEdit();
@@ -259,6 +272,10 @@ DiagramContext ElementInfoWidget::currentInfo() const
 		}
 	}
 
+	// Save the auto numbering lock status
+	if (m_element->elementData().m_type == ElementData::Terminal) {
+		info_.addValue(QStringLiteral("auto_num_locked"), ui->m_auto_num_locked_cb->isChecked() ? QStringLiteral("true") : QStringLiteral("false"));
+	}
 	return info_;
 }
 

sources/ui/elementinfowidget.ui

@@ -29,6 +29,19 @@
    <property name="spacing">
     <number>0</number>
    </property>
+   <item>
+    <widget class="QCheckBox" name="m_auto_num_locked_cb">
+     <property name="text">
+      <string>Exclure de la numérotation auto</string>
+     </property>
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">margin: 5px; font-weight: bold;</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="sizePolicy">

sources/ui/elementpropertieswidget.cpp

@@ -372,6 +372,10 @@ QWidget *ElementPropertiesWidget::generalWidget()
 	description_string += QString(tr("Rotation : %1°\n")).arg(m_element.data()->rotation());
 	description_string += QString(tr("Dimensions : %1*%2\n")).arg(m_element -> size().width()).arg(m_element -> size().height());
 	description_string += QString(tr("Bornes : %1\n")).arg(m_element -> terminals().count());
+	if (m_element->linkType() == Element::Master){
+	description_string += QString(tr("Nombre maximum de contacts esclaves définis : %1\n")).arg(m_element -> elementData().m_max_slaves);
+	description_string += QString(tr("Nombre de contacts esclaves utilisés : %1\n")).arg(m_element ->linkedElements().count());
+	}
 	description_string += QString(tr("Emplacement : %1\n")).arg(m_element.data()->location().toString());
 
 		// widget himself

sources/ui/linksingleelementwidget.cpp

@@ -16,7 +16,7 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "linksingleelementwidget.h"
-
+#include "../qetgraphicsitem/masterelement.h"
 #include "../qetgraphicsitem/conductor.h"
 #include "../diagram.h"
 #include "../diagramposition.h"
@@ -386,7 +386,22 @@ QVector <QPointer<Element>> LinkSingleElementWidget::availableElements()
 	
 	//If element is linked, remove is parent from the list
 	if(!m_element->isFree()) elmt_vector.removeAll(m_element->linkedElements().first());
-	
+	// Filter out all master elements from the list
+	for (int i = elmt_vector.size() - 1; i >= 0; --i) {
+		Element *elmt = elmt_vector.at(i);
+
+		// If the item in the list is a master
+		if (elmt->linkType() == Element::Master) {
+
+			// We convert the generic element pointer into a MasterElement pointer
+			MasterElement *master = static_cast<MasterElement*>(elmt);
+
+			// If the master is full, we'll remove it from the list!
+			if (master->isFull()) {
+				elmt_vector.removeAt(i);
+			}
+		}
+	}
 	return elmt_vector;
 }
 

sources/ui/linksingleelementwidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>389</width>
-    <height>442</height>
+    <height>460</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -64,6 +64,23 @@
      </property>
     </widget>
    </item>
+
+   <item row="4" column="0" colspan="3">
+    <widget class="QLabel" name="m_hidden_masters_label">
+     <property name="text">
+      <string>Remarque : les éléments maîtres ayant atteint leur nombre maximal d'esclaves sont masqués.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="font">
+      <font>
+       <italic>true</italic>
+      </font>
+     </property>
+    </widget>
+   </item>
+
   </layout>
  </widget>
  <resources/>

sources/ui/masterpropertieswidget.cpp

@@ -1,20 +1,20 @@
 /*
-	Copyright 2006-2026 The QElectroTech Team
+ *	Copyright 2006-2026 The QElectroTech Team
-	This file is part of QElectroTech.
+ *	This file is part of QElectroTech.
-
+ *
-	QElectroTech is free software: you can redistribute it and/or modify
+ *	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
+ *	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
+ *	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
+ *	(at your option) any later version.
-
+ *
-	QElectroTech is distributed in the hope that it will be useful,
+ *	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
+ *	GNU General Public License for more details.
-
+ *
-	You should have received a copy of the GNU General Public License
+ *	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+ *	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 #include "masterpropertieswidget.h"
 
 #include "../diagram.h"
@@ -25,64 +25,65 @@
 #include "ui_masterpropertieswidget.h"
 
 #include <QListWidgetItem>
+#include <QMessageBox>
 
 /**
-	@brief MasterPropertiesWidget::MasterPropertiesWidget
+ *	@brief MasterPropertiesWidget::MasterPropertiesWidget
-	Default constructor
+ *	Default constructor
-	@param elmt
+ *	@param elmt
-	@param parent
+ *	@param parent
-*/
+ */
 MasterPropertiesWidget::MasterPropertiesWidget(Element *elmt, QWidget *parent) :
-	AbstractElementPropertiesEditorWidget(parent),
+AbstractElementPropertiesEditorWidget(parent),
-	ui(new Ui::MasterPropertiesWidget),
+ui(new Ui::MasterPropertiesWidget),
-	m_project(nullptr)
+m_project(nullptr)
 {
 	ui->setupUi(this);
-	
+
 	ui->m_free_tree_widget->setContextMenuPolicy(Qt::CustomContextMenu);
 	ui->m_link_tree_widget->setContextMenuPolicy(Qt::CustomContextMenu);
-	
+
 	QStringList list;
 	QSettings settings;
 	if (settings.value("genericpanel/folio", false).toBool()) {
 		list << tr("Vignette")
-		     << tr("Label de folio")
+		<< tr("Label de folio")
-		     << tr("Titre de folio")
+		<< tr("Titre de folio")
-		     << tr("Position");
+		<< tr("Position");
 	}
 	else {
 		list << tr("Vignette")
-		     << tr("N° de folio")
+		<< tr("N° de folio")
-		     << tr("Titre de folio")
+		<< tr("Titre de folio")
-		     << tr("Position");
+		<< tr("Position");
 	}
 	ui->m_free_tree_widget->setHeaderLabels(list);
 	ui->m_link_tree_widget->setHeaderLabels(list);
-	
+
 	m_context_menu  = new QMenu(this);
 	m_link_action   = new QAction(tr("Lier l'élément"), this);
 	m_unlink_action = new QAction(tr("Délier l'élément"), this);
 	m_show_qtwi     = new QAction(tr("Montrer l'élément"), this);
 	m_show_element  = new QAction(tr("Montrer l'élément maître"), this);
 	m_save_header_state = new QAction(tr("Enregistrer la disposition"), this);
-	
+
 	connect(ui->m_free_tree_widget, &QTreeWidget::itemDoubleClicked,
-		this, &MasterPropertiesWidget::showElementFromTWI);
+			this, &MasterPropertiesWidget::showElementFromTWI);
 	connect(ui->m_link_tree_widget, &QTreeWidget::itemDoubleClicked,
-		this, &MasterPropertiesWidget::showElementFromTWI);
+			this, &MasterPropertiesWidget::showElementFromTWI);
-	
+
 	connect(ui->m_free_tree_widget, &QTreeWidget::customContextMenuRequested,
-		[this](QPoint point) {this->customContextMenu(point, 1);});
+			[this](QPoint point) {this->customContextMenu(point, 1);});
 	connect(ui->m_link_tree_widget, &QTreeWidget::customContextMenuRequested,
-		[this](QPoint point) {this->customContextMenu(point, 2);});
+			[this](QPoint point) {this->customContextMenu(point, 2);});
-	
+
 	connect(m_link_action,   &QAction::triggered,
-		this, &MasterPropertiesWidget::on_link_button_clicked);
+			this, &MasterPropertiesWidget::on_link_button_clicked);
 	connect(m_unlink_action, &QAction::triggered,
-		this, &MasterPropertiesWidget::on_unlink_button_clicked);
+			this, &MasterPropertiesWidget::on_unlink_button_clicked);
 	connect(m_show_qtwi,     &QAction::triggered,
-		[this]() {this->showElementFromTWI(this->m_qtwi_at_context_menu,0);});
+			[this]() {this->showElementFromTWI(this->m_qtwi_at_context_menu,0);});
-	
+
 	connect(m_show_element,  &QAction::triggered, [this]()
 	{
 		this->m_element->diagram()->showMe();
@@ -90,46 +91,46 @@ MasterPropertiesWidget::MasterPropertiesWidget(Element *elmt, QWidget *parent) :
 		if(this->m_showed_element)
 			m_showed_element->setHighlighted(false);
 	});
-	
+
 	QHeaderView *qhv = ui->m_free_tree_widget->header();
 	qhv->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(qhv, &QHeaderView::customContextMenuRequested,
-		this, &MasterPropertiesWidget::headerCustomContextMenuRequested);
+			this, &MasterPropertiesWidget::headerCustomContextMenuRequested);
 	connect(m_save_header_state, &QAction::triggered, [qhv]()
 	{
 		QByteArray qba = qhv->saveState();
 		QSettings settings;
 		settings.setValue("link-element-widget/master-state", qba);
 	});
-	
+
 	setElement(elmt);
 }
 
 /**
-	@brief MasterPropertiesWidget::~MasterPropertiesWidget
+ *	@brief MasterPropertiesWidget::~MasterPropertiesWidget
-	Destructor
+ *	Destructor
-*/
+ */
 MasterPropertiesWidget::~MasterPropertiesWidget()
 {
 	if (m_showed_element)
 		m_showed_element->setHighlighted(false);
-	
+
 	if(m_element)
 		m_element->setHighlighted(false);
-	
+
 	delete ui;
 }
 
 /**
-	@brief MasterPropertiesWidget::setElement
+ *	@brief MasterPropertiesWidget::setElement
-	Set the element to be edited
+ *	Set the element to be edited
-	@param element
+ *	@param element
-*/
+ */
 void MasterPropertiesWidget::setElement(Element *element)
 {
 	if (m_element == element)
 		return;
-	
+
 	if (m_showed_element)
 	{
 		m_showed_element->setHighlighted(false);
@@ -137,40 +138,40 @@ void MasterPropertiesWidget::setElement(Element *element)
 	}
 	if (m_element)
 		m_element->setHighlighted(false);
-	
+
 	if (m_project)
 		disconnect(m_project, SIGNAL(diagramRemoved(QETProject*,Diagram*)),
-			   this, SLOT(diagramWasdeletedFromProject()));
+				   this, SLOT(diagramWasdeletedFromProject()));
 
-	if(Q_LIKELY(element->diagram() && element->diagram()->project()))
+		if(Q_LIKELY(element->diagram() && element->diagram()->project()))
-	{
+		{
-		m_project = element->diagram()->project();
+			m_project = element->diagram()->project();
-		connect(m_project, SIGNAL(diagramRemoved(QETProject*,Diagram*)),
+			connect(m_project, SIGNAL(diagramRemoved(QETProject*,Diagram*)),
-			this, SLOT(diagramWasdeletedFromProject()));
+					this, SLOT(diagramWasdeletedFromProject()));
-	}
+		}
-	else
+		else
-		m_project = nullptr;
+			m_project = nullptr;
 
 	//Keep up to date this widget when the linked elements of m_element change
 	if (m_element)
 		disconnect(m_element.data(), &Element::linkedElementChanged,
-			   this, &MasterPropertiesWidget::updateUi);
+				   this, &MasterPropertiesWidget::updateUi);
-	
+
-	m_element = element;
+		m_element = element;
 	connect(m_element.data(), &Element::linkedElementChanged,
-		this, &MasterPropertiesWidget::updateUi);
+			this, &MasterPropertiesWidget::updateUi);
 
 	updateUi();
 }
 
 /**
-	@brief MasterPropertiesWidget::apply
+ *	@brief MasterPropertiesWidget::apply
-	If link between edited element and other change,
+ *	If link between edited element and other change,
-	apply the change with a QUndoCommand (got with method associatedUndo)
+ *	apply the change with a QUndoCommand (got with method associatedUndo)
-	pushed to the stack of element project.
+ *	pushed to the stack of element project.
-	Return true if link change, else false
+ *	Return true if link change, else false
-	@note is void no Return ???
+ *	@note is void no Return ???
-*/
+ */
 void MasterPropertiesWidget::apply()
 {
 	if (QUndoCommand *undo = associatedUndo())
@@ -178,25 +179,25 @@ void MasterPropertiesWidget::apply()
 }
 
 /**
-	@brief MasterPropertiesWidget::reset
+ *	@brief MasterPropertiesWidget::reset
-	Reset current widget, clear eveything and rebuild widget.
+ *	Reset current widget, clear eveything and rebuild widget.
-*/
+ */
 void MasterPropertiesWidget::reset()
 {
 	foreach (QTreeWidgetItem *qtwi, m_qtwi_hash.keys())
 		delete qtwi;
-	
+
 	m_qtwi_hash.clear();
 	updateUi();
 }
 
 /**
-	@brief MasterPropertiesWidget::associatedUndo
+ *	@brief MasterPropertiesWidget::associatedUndo
-	If link between the edited element and other change,
+ *	If link between the edited element and other change,
-	return a QUndoCommand with this change.
+ *	return a QUndoCommand with this change.
-	If no change return nullptr.
+ *	If no change return nullptr.
-	@return
+ *	@return
-*/
+ */
 QUndoCommand* MasterPropertiesWidget::associatedUndo() const
 {
 	QList <Element *> to_link;
@@ -205,7 +206,7 @@ QUndoCommand* MasterPropertiesWidget::associatedUndo() const
 	for (int i=0; i<ui->m_link_tree_widget->topLevelItemCount(); i++)
 		to_link << m_qtwi_hash[ui->m_link_tree_widget->topLevelItem(i)];
 
-		//The two list contain the same element, there is no change
+	//The two list contain the same element, there is no change
 	if (to_link.size() == linked_.size())
 	{
 		bool equal = true;
@@ -229,11 +230,11 @@ QUndoCommand* MasterPropertiesWidget::associatedUndo() const
 }
 
 /**
-	@brief MasterPropertiesWidget::setLiveEdit
+ *	@brief MasterPropertiesWidget::setLiveEdit
-	@param live_edit = true : live edit is enable
+ *	@param live_edit = true : live edit is enable
-	else false : live edit is disable.
+ *	else false : live edit is disable.
-	@return always true because live edit is handled by this editor widget
+ *	@return always true because live edit is handled by this editor widget
-*/
+ */
 bool MasterPropertiesWidget::setLiveEdit(bool live_edit)
 {
 	m_live_edit = live_edit;
@@ -241,9 +242,9 @@ bool MasterPropertiesWidget::setLiveEdit(bool live_edit)
 }
 
 /**
-	@brief MasterPropertiesWidget::updateUi
+ *	@brief MasterPropertiesWidget::updateUi
-	Build the interface of the widget
+ *	Build the interface of the widget
-*/
+ */
 void MasterPropertiesWidget::updateUi()
 {
 	ui->m_free_tree_widget->clear();
@@ -256,75 +257,75 @@ void MasterPropertiesWidget::updateUi()
 	ElementProvider elmt_prov(m_project);
 	QSettings settings;
 
-		//Build the list of free available element
+	//Build the list of free available element
 	QList <QTreeWidgetItem *> items_list;
 	for(const auto &elmt : elmt_prov.freeElement(ElementData::Slave))
 	{
 		QTreeWidgetItem *qtwi = new QTreeWidgetItem(ui->m_free_tree_widget);
 		qtwi->setIcon(0, elmt->pixmap());
-		
+
 		if(settings.value("genericpanel/folio", false).toBool())
 		{
 			autonum::sequentialNumbers seq;
 			QString F =autonum::AssignVariables::formulaToLabel(
-						elmt->diagram()->border_and_titleblock.folio(),
+				elmt->diagram()->border_and_titleblock.folio(),
-						seq,
+																seq,
-						elmt->diagram(),
+													   elmt->diagram(),
-						elmt);
+																elmt);
 			qtwi->setText(1, F);
 		}
 		else
 		{
 			qtwi->setText(1, QString::number(
-					      elmt->diagram()->folioIndex()
+				elmt->diagram()->folioIndex()
-					      + 1));
+				+ 1));
 		}
-		
+
 
 		qtwi->setText(2, elmt->diagram()->title());
 		qtwi->setText(4, elmt->diagram()->convertPosition(
-				      elmt->scenePos()).toString());
+			elmt->scenePos()).toString());
 		items_list.append(qtwi);
 		m_qtwi_hash.insert(qtwi, elmt);
 	}
-	
+
 	ui->m_free_tree_widget->addTopLevelItems(items_list);
 	items_list.clear();
 
-		//Build the list of already linked element
+	//Build the list of already linked element
 	const QList<Element *> link_list = m_element->linkedElements();
 	for(Element *elmt : link_list)
 	{
 		QTreeWidgetItem *qtwi = new QTreeWidgetItem(ui->m_link_tree_widget);
 		qtwi->setIcon(0, elmt->pixmap());
-		
+
 		if(settings.value("genericpanel/folio", false).toBool())
 		{
 			autonum::sequentialNumbers seq;
 			QString F =autonum::AssignVariables::formulaToLabel(
-						elmt->diagram()->border_and_titleblock.folio(),
+				elmt->diagram()->border_and_titleblock.folio(),
-						seq,
+																seq,
-						elmt->diagram(),
+													   elmt->diagram(),
-						elmt);
+																elmt);
 			qtwi->setText(1, F);
 		}
 		else
 		{
 			qtwi->setText(1, QString::number(
-					      elmt->diagram()->folioIndex()
+				elmt->diagram()->folioIndex()
-					      + 1));
+				+ 1));
 		}
 
 		qtwi->setText(2, elmt->diagram()->title());
 		qtwi->setText(3, elmt->diagram()->convertPosition(
-				      elmt->scenePos()).toString());
+			elmt->scenePos()).toString());
 		items_list.append(qtwi);
 		m_qtwi_hash.insert(qtwi, elmt);
 	}
-	
+
 	if(items_list.count())
 		ui->m_link_tree_widget->addTopLevelItems(items_list);
-	
+
 	QVariant v = settings.value("link-element-widget/master-state");
 	if(!v.isNull())
 	{
@@ -334,9 +335,9 @@ void MasterPropertiesWidget::updateUi()
 }
 
 /**
-	@brief MasterPropertiesWidget::headerCustomContextMenuRequested
+ *	@brief MasterPropertiesWidget::headerCustomContextMenuRequested
-	@param pos
+ *	@param pos
-*/
+ */
 void MasterPropertiesWidget::headerCustomContextMenuRequested(const QPoint &pos)
 {
 	m_context_menu->clear();
@@ -345,36 +346,57 @@ void MasterPropertiesWidget::headerCustomContextMenuRequested(const QPoint &pos)
 }
 
 /**
-	@brief MasterPropertiesWidget::on_link_button_clicked
+ * @brief MasterPropertiesWidget::on_link_button_clicked
-	move current item in the free_list to linked_list
+ * Moves the current item from the free_list to the linked_list,
-*/
+ * provided the master's slave limit has not been reached.
+ */
 void MasterPropertiesWidget::on_link_button_clicked()
 {
-		//take the current item from free_list and push it to linked_list
+	// Get the maximum number of allowed slaves from the element's information
+	QVariant max_slaves_variant = m_element->kindInformations().value("max_slaves");
+
+	if (max_slaves_variant.isValid() && !max_slaves_variant.toString().isEmpty()) {
+		int max_slaves = max_slaves_variant.toInt();
+		int current_slaves = ui->m_link_tree_widget->topLevelItemCount();
+
+		// If a limit is set and reached
+		if (max_slaves != -1 && current_slaves >= max_slaves) {
+
+
+			// Show a message box with the actual window as parent to ensure it's on top
+			QMessageBox::warning(this->window(),
+								 tr("Nombre maximal d'esclaves atteint."),
+								 tr("Cet élément maître ne peut plus accepter aucun nouveau contact esclave, la limite fixée a été atteinte (Limite: %1).").arg(max_slaves));
+			return;
+		}
+	}
+
+	// Move current item from free_list to linked_list
 	QTreeWidgetItem *qtwi = ui->m_free_tree_widget->currentItem();
 	if (qtwi)
 	{
 		ui->m_free_tree_widget->takeTopLevelItem(
-					ui->m_free_tree_widget->indexOfTopLevelItem(qtwi));
+			ui->m_free_tree_widget->indexOfTopLevelItem(qtwi));
 		ui->m_link_tree_widget->insertTopLevelItem(0, qtwi);
-		
+
 		if(m_live_edit)
 			apply();
 	}
 }
 
+
 /**
-	@brief MasterPropertiesWidget::on_unlink_button_clicked
+ *	@brief MasterPropertiesWidget::on_unlink_button_clicked
-	move current item in linked_list to free_list
+ *	move current item in linked_list to free_list
-*/
+ */
 void MasterPropertiesWidget::on_unlink_button_clicked()
 {
-		//take the current item from linked_list and push it to free_list
+	//take the current item from linked_list and push it to free_list
 	QTreeWidgetItem *qtwi = ui->m_link_tree_widget->currentItem();
 	if(qtwi)
 	{
 		ui->m_link_tree_widget->takeTopLevelItem(
-					ui->m_link_tree_widget->indexOfTopLevelItem(qtwi));
+			ui->m_link_tree_widget->indexOfTopLevelItem(qtwi));
 		ui->m_free_tree_widget->insertTopLevelItem(0, qtwi);
 
 		if(m_live_edit)
@@ -383,18 +405,18 @@ void MasterPropertiesWidget::on_unlink_button_clicked()
 }
 
 /**
-	@brief MasterPropertiesWidget::showElementFromTWI
+ *	@brief MasterPropertiesWidget::showElementFromTWI
-	Show the element corresponding to the given QTreeWidgetItem
+ *	Show the element corresponding to the given QTreeWidgetItem
-	@param qtwi
+ *	@param qtwi
-	@param column
+ *	@param column
-*/
+ */
 void MasterPropertiesWidget::showElementFromTWI(QTreeWidgetItem *qtwi, int column)
 {
 	Q_UNUSED(column);
 	if (m_showed_element)
 	{
 		disconnect(m_showed_element, SIGNAL(destroyed()),
-			   this, SLOT(showedElementWasDeleted()));
+				   this, SLOT(showedElementWasDeleted()));
 		m_showed_element -> setHighlighted(false);
 	}
 	if (m_element)
@@ -404,23 +426,23 @@ void MasterPropertiesWidget::showElementFromTWI(QTreeWidgetItem *qtwi, int colum
 	m_showed_element->diagram()->showMe();
 	m_showed_element->setHighlighted(true);
 	connect(m_showed_element, SIGNAL(destroyed()),
-		this, SLOT(showedElementWasDeleted()));
+			this, SLOT(showedElementWasDeleted()));
 }
 
 /**
-	@brief MasterPropertiesWidget::showedElementWasDeleted
+ *	@brief MasterPropertiesWidget::showedElementWasDeleted
-	Set to nullptr the current showed element when he was deleted
+ *	Set to nullptr the current showed element when he was deleted
-*/
+ */
 void MasterPropertiesWidget::showedElementWasDeleted()
 {
 	m_showed_element = nullptr;
 }
 
 /**
-	@brief MasterPropertiesWidget::diagramWasdeletedFromProject
+ *	@brief MasterPropertiesWidget::diagramWasdeletedFromProject
-	This slot is called when a diagram is removed from the parent project
+ *	This slot is called when a diagram is removed from the parent project
-	of edited element to update the content of this widget
+ *	of edited element to update the content of this widget
-*/
+ */
 void MasterPropertiesWidget::diagramWasdeletedFromProject()
 {
 	// We use a timer because if the removed diagram
@@ -431,11 +453,11 @@ void MasterPropertiesWidget::diagramWasdeletedFromProject()
 }
 
 /**
-	@brief MasterPropertiesWidget::customContextMenu
+ *	@brief MasterPropertiesWidget::customContextMenu
-	Display a context menu
+ *	Display a context menu
-	@param pos
+ *	@param pos
-	@param i : the tree widget where the context menu was requested.
+ *	@param i : the tree widget where the context menu was requested.
-*/
+ */
 void MasterPropertiesWidget::customContextMenu(const QPoint &pos, int i)
 {
 	// add the size of the header to display the topleft of the QMenu
@@ -444,14 +466,14 @@ void MasterPropertiesWidget::customContextMenu(const QPoint &pos, int i)
 	// section related to QAbstractScrollArea
 	QPoint point = pos;
 	point.ry()+=ui->m_free_tree_widget->header()->height();
-	
+
 	m_context_menu->clear();
-	
+
 	if (i == 1)
 	{
 		point = ui->m_free_tree_widget->mapToGlobal(point);
-		
+
-			//Context at for free tree widget
+		//Context at for free tree widget
 		if (ui->m_free_tree_widget->currentItem())
 		{
 			m_qtwi_at_context_menu = ui->m_free_tree_widget->currentItem();
@@ -462,8 +484,8 @@ void MasterPropertiesWidget::customContextMenu(const QPoint &pos, int i)
 	else
 	{
 		point = ui->m_link_tree_widget->mapToGlobal(point);
-		
+
-			//context at for link tre widget
+		//context at for link tre widget
 		if (ui->m_link_tree_widget->currentItem())
 		{
 			m_qtwi_at_context_menu = ui->m_link_tree_widget->currentItem();
@@ -471,7 +493,7 @@ void MasterPropertiesWidget::customContextMenu(const QPoint &pos, int i)
 			m_context_menu->addAction(m_show_qtwi);
 		}
 	}
-	
+
 	m_context_menu->addAction(m_show_element);
 	m_context_menu->popup(point);
 }

sources/ui/terminalnumberingdialog.cpp

@@ -0,0 +1,178 @@
+#include "terminalnumberingdialog.h"
+#include "ui_terminalnumberingdialog.h"
+#include "../qetproject.h"
+#include "../diagram.h"
+#include "../qetgraphicsitem/element.h"
+#include "../undocommand/changeelementinformationcommand.h"
+#include <QUndoCommand>
+#include <algorithm>
+
+/**
+ * @brief TerminalNumberingDialog::TerminalNumberingDialog
+ * Constructor
+ * @param parent
+ */
+TerminalNumberingDialog::TerminalNumberingDialog(QWidget *parent) :
+QDialog(parent),
+ui(new Ui::TerminalNumberingDialog)
+{
+    ui->setupUi(this);
+}
+
+/**
+ * @brief TerminalNumberingDialog::~TerminalNumberingDialog
+ * Destructor
+ */
+TerminalNumberingDialog::~TerminalNumberingDialog()
+{
+    delete ui;
+}
+
+/**
+ * @brief TerminalNumberingDialog::isXAxisPriority
+ * @return true if X axis has priority, false if Y axis has priority
+ */
+bool TerminalNumberingDialog::isXAxisPriority() const
+{
+    return ui->rb_priority_x->isChecked();
+}
+
+/**
+ * @brief TerminalNumberingDialog::isAlphanumeric
+ * @return true if alphanumeric sorting is enabled, false if numeric only
+ */
+bool TerminalNumberingDialog::isAlphanumeric() const
+{
+    return ui->rb_type_alpha->isChecked();
+}
+
+/**
+ * @brief TerminalNumberingDialog::getUndoCommand
+ * Scans the given project for terminals, sorts them according to user preferences
+ * (X/Y axis, alphanumeric rules), and generates an undo command containing all label changes.
+ * * @param project Pointer to the current QETProject
+ * @return QUndoCommand* containing the modifications, or nullptr if no changes are needed.
+ */
+QUndoCommand* TerminalNumberingDialog::getUndoCommand(QETProject *project) const {
+    if (!project) return nullptr;
+
+    bool axisX = isXAxisPriority();
+    bool alpha = isAlphanumeric();
+
+    // 1. Helper structure to store and sort terminal data
+    struct TermInfo {
+        Element *elmt;
+        QString prefix;
+        QString suffix;
+        int folioIndex;
+        qreal x;
+        qreal y;
+    };
+    QList<TermInfo> termList;
+
+    // 2. Collect all terminals from all folios in the project
+    foreach (Diagram *diagram, project->diagrams()) {
+        int fIndex = diagram->folioIndex();
+        foreach (QGraphicsItem *qgi, diagram->items()) {
+            if (Element *elmt = qgraphicsitem_cast<Element *>(qgi)) {
+
+                // Check if the element is actually a terminal
+                if (elmt->elementData().m_type == ElementData::Terminal) {
+                    DiagramContext info = elmt->elementInformations();
+
+                    // Ignore locked terminals (if the user checked a 'lock' property)
+                    if (info.value(QStringLiteral("auto_num_locked")).toString() == QLatin1String("true")) {
+                        continue;
+                    }
+
+                    QString label = elmt->actualLabel();
+                    if (label.isEmpty()) continue;
+
+                    // Split prefix (e.g., "-X1") and suffix (e.g., "1" or "A")
+                    QString prefix = label;
+                    QString suffix = "";
+                    int colonIndex = label.lastIndexOf(':');
+                    if (colonIndex != -1) {
+                        prefix = label.left(colonIndex);
+                        suffix = label.mid(colonIndex + 1);
+                    }
+
+                    // If user chose purely numeric, skip terminals with alphabetical suffixes
+                    if (!alpha && !suffix.isEmpty()) {
+                        bool isNum;
+                        suffix.toInt(&isNum);
+                        if (!isNum) continue;
+                    }
+
+                    TermInfo ti;
+                    ti.elmt = elmt;
+                    ti.prefix = prefix;
+                    ti.suffix = suffix;
+                    ti.folioIndex = fIndex;
+                    ti.x = elmt->pos().x();
+                    ti.y = elmt->pos().y();
+                    termList.append(ti);
+                }
+            }
+        }
+    }
+
+    // 3. Sort terminals based on user selection (X or Y axis priority)
+    std::sort(termList.begin(), termList.end(), [axisX](const TermInfo &a, const TermInfo &b) {
+        // First sort by BMK Prefix alphabetically (case insensitive)
+        int prefixCmp = a.prefix.compare(b.prefix, Qt::CaseInsensitive);
+        if (prefixCmp != 0) return prefixCmp < 0;
+
+        // Then sort by folio (page) index
+        if (a.folioIndex != b.folioIndex) return a.folioIndex < b.folioIndex;
+
+        // Finally sort by coordinates (with a 1.0px tolerance to handle slight misalignments)
+        if (axisX) {
+            if (qAbs(a.x - b.x) > 1.0) return a.x < b.x;
+            return a.y < b.y;
+        } else {
+            if (qAbs(a.y - b.y) > 1.0) return a.y < b.y;
+            return a.x < b.x;
+        }
+    });
+
+    // 4. Generate new numbering and create the undo command macro
+    QUndoCommand *macro = new QUndoCommand(QObject::tr("Automatic terminal numbering"));
+    QMap<QString, int> counters;
+
+    foreach (const TermInfo &ti, termList) {
+        // Increment the counter for this terminal block (e.g., "-X3")
+        counters[ti.prefix]++;
+        int newNum = counters[ti.prefix];
+
+        // Determine if the original suffix was a pure number
+        QString newLabel;
+        bool isNum;
+        ti.suffix.toInt(&isNum);
+
+        if (isNum || ti.suffix.isEmpty()) {
+            // If it was a number (e.g., "1") or empty, update it with the new counter
+            newLabel = ti.prefix + ":" + QString::number(newNum);
+        } else {
+            // If it was alphabetical (e.g., "N", "PE"), keep the original text but consume the count!
+            newLabel = ti.prefix + ":" + ti.suffix;
+        }
+
+        DiagramContext oldInfo = ti.elmt->elementInformations();
+        DiagramContext newInfo = oldInfo;
+        newInfo.addValue(QStringLiteral("label"), newLabel);
+
+        // Create an undo command only if the label actually changes
+        if (oldInfo != newInfo) {
+            new ChangeElementInformationCommand(ti.elmt, oldInfo, newInfo, macro);
+        }
+    }
+
+    // 5. Return the macro if it contains changes, otherwise delete and return null
+    if (macro->childCount() > 0) {
+        return macro;
+    } else {
+        delete macro;
+        return nullptr;
+    }
+}

sources/ui/terminalnumberingdialog.h

@@ -0,0 +1,35 @@
+#ifndef TERMINALNUMBERINGDIALOG_H
+#define TERMINALNUMBERINGDIALOG_H
+
+#include <QDialog>
+
+class QETProject;
+class QUndoCommand;
+
+namespace Ui {
+    class TerminalNumberingDialog;
+}
+
+/**
+ * @brief The TerminalNumberingDialog class
+ * Dialog to configure the automatic numbering of terminals.
+ */
+class TerminalNumberingDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit TerminalNumberingDialog(QWidget *parent = nullptr);
+    ~TerminalNumberingDialog();
+
+    // Getters for the user's choices
+    bool isXAxisPriority() const;
+    bool isAlphanumeric() const;
+
+    QUndoCommand* getUndoCommand(QETProject *project) const;
+
+private:
+    Ui::TerminalNumberingDialog *ui;
+};
+
+#endif // TERMINALNUMBERINGDIALOG_H

sources/ui/terminalnumberingdialog.ui

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+    <class>TerminalNumberingDialog</class>
+    <widget class="QDialog" name="TerminalNumberingDialog">
+        <property name="geometry">
+            <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>400</width>
+                <height>300</height>
+            </rect>
+        </property>
+        <property name="windowTitle">
+            <string>Numérotation automatique des bornes</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout">
+            <item>
+                <widget class="QLabel" name="label_description">
+                    <property name="text">
+                        <string>Cette fonction numérote les bornes du projet selon leur position. Les bornes vides ou verrouillées sont ignorées.Le marquage des bornes doit être configuré au préalable comme suit : '-X:AB'. La partie avant les deux-points (le bornier) peut être nommée au choix. 'AB' peut être composé de chiffres ou de lettres."</string>
+                    </property>
+                    <property name="wordWrap">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </item>
+            <item>
+                <widget class="QGroupBox" name="groupBox_axis">
+                    <property name="title">
+                        <string>Priorité des axes</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_2">
+                        <item>
+                            <widget class="QRadioButton" name="rb_priority_x">
+                                <property name="text">
+                                    <string>Priorité à l'axe X (horizontal)</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                        </item>
+                        <item>
+                            <widget class="QRadioButton" name="rb_priority_y">
+                                <property name="text">
+                                    <string>Priorité à l'axe Y (vertical)</string>
+                                </property>
+                            </widget>
+                        </item>
+                    </layout>
+                </widget>
+            </item>
+            <item>
+                <widget class="QGroupBox" name="groupBox_type">
+                    <property name="title">
+                        <string>Type de numérotation</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_3">
+                        <item>
+                            <widget class="QRadioButton" name="rb_type_num">
+                                <property name="text">
+                                    <string>Numérique uniquement (1, 2, 3...)</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                        </item>
+                        <item>
+                            <widget class="QRadioButton" name="rb_type_alpha">
+                                <property name="text">
+                                    <string>Alphanumérique (A, B, C... 1, 2...)</string>
+                                </property>
+                            </widget>
+                        </item>
+                    </layout>
+                </widget>
+            </item>
+            <item>
+                <spacer name="verticalSpacer">
+                    <property name="orientation">
+                        <enum>Qt::Vertical</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                        <size>
+                            <width>20</width>
+                            <height>40</height>
+                        </size>
+                    </property>
+                </spacer>
+            </item>
+            <item>
+                <widget class="QDialogButtonBox" name="buttonBox">
+                    <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="standardButtons">
+                        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+                    </property>
+                </widget>
+            </item>
+        </layout>
+    </widget>
+    <resources/>
+    <connections>
+        <connection>
+            <sender>buttonBox</sender>
+            <signal>accepted()</signal>
+            <receiver>TerminalNumberingDialog</receiver>
+            <slot>accept()</slot>
+            <hints>
+                <hint type="sourcelabel">
+                    <x>248</x>
+                    <y>254</y>
+                </hint>
+                <hint type="destinationlabel">
+                    <x>157</x>
+                    <y>274</y>
+                </hint>
+            </hints>
+        </connection>
+        <connection>
+            <sender>buttonBox</sender>
+            <signal>rejected()</signal>
+            <receiver>TerminalNumberingDialog</receiver>
+            <slot>reject()</slot>
+            <hints>
+                <hint type="sourcelabel">
+                    <x>316</x>
+                    <y>260</y>
+                </hint>
+                <hint type="destinationlabel">
+                    <x>286</x>
+                    <y>274</y>
+                </hint>
+            </hints>
+        </connection>
+    </connections>
+</ui>

sources/wiringlistexport.cpp

@@ -0,0 +1,290 @@
+#include "wiringlistexport.h"
+#include "qetproject.h"
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QTextStream>
+#include <QDomDocument>
+#include <QFile>
+#include <QRegularExpression>
+#include <QQueue>
+#include <QSet>
+
+WiringListExport::WiringListExport(QETProject *project, QWidget *parent) :
+QObject(parent),
+m_project(project),
+m_parent(parent)
+{
+}
+
+QString WiringListExport::normalizeUuid(const QString &u) const
+{
+    QString res = u;
+    res.remove('{').remove('}');
+    return res.trimmed().toLower();
+}
+
+QString WiringListExport::findDiagramFolio(const QDomElement &diagramElem) const
+{
+    if (diagramElem.isNull()) return "";
+    if (diagramElem.hasAttribute("folio")) return diagramElem.attribute("folio");
+    if (diagramElem.hasAttribute("title")) return diagramElem.attribute("title");
+    return "";
+}
+
+QDomElement WiringListExport::climbToDiagram(QDomNode node) const
+{
+    while (!node.isNull()) {
+        if (node.isElement() && node.toElement().tagName().toLower() == "diagram") {
+            return node.toElement();
+        }
+        node = node.parentNode();
+    }
+    return QDomElement();
+}
+
+QMap<QString, ElementInfo> WiringListExport::collectElementsInfo(const QDomElement &root) const
+{
+    QMap<QString, ElementInfo> infoMap;
+    QDomNodeList elements = root.elementsByTagName("element");
+
+    for (int i = 0; i < elements.size(); ++i) {
+        QDomElement el = elements.at(i).toElement();
+        QString uuid = normalizeUuid(el.attribute("uuid", el.attribute("id", "")));
+        if (uuid.isEmpty()) continue;
+
+        ElementInfo info;
+        info.folio = findDiagramFolio(climbToDiagram(el));
+
+        QDomElement linksNode = el.firstChildElement("links_uuids");
+        if (!linksNode.isNull()) {
+            QDomNodeList linkUuids = linksNode.elementsByTagName("link_uuid");
+            for (int j = 0; j < linkUuids.size(); ++j) {
+                QString luuid = normalizeUuid(linkUuids.at(j).toElement().attribute("uuid"));
+                if (!luuid.isEmpty()) info.links.append(luuid);
+            }
+        }
+
+        QDomElement elInfoNode = el.firstChildElement("elementInformations");
+        if (!elInfoNode.isNull()) {
+            QDomNodeList eics = elInfoNode.elementsByTagName("elementInformation");
+            for (int j = 0; j < eics.size(); ++j) {
+                QDomElement eic = eics.at(j).toElement();
+                QString nameAttr = eic.attribute("name").toLower();
+                if (nameAttr == "label") info.label = eic.text().trimmed();
+                if (nameAttr == "name") info.name = eic.text().trimmed();
+            }
+        }
+
+        QString typeVal = el.attribute("type").toLower();
+        if (typeVal.contains("naechste") || typeVal.contains("vorherige") ||
+            typeVal.contains("next") || typeVal.contains("previous")) {
+            info.isPlaceholder = true;
+            }
+
+            infoMap.insert(uuid, info);
+    }
+    return infoMap;
+}
+
+QList<ConductorData> WiringListExport::collectConductors(const QDomElement &root) const
+{
+    QList<ConductorData> conductors;
+    QDomNodeList conductorNodes = root.elementsByTagName("conductor");
+
+    for (int i = 0; i < conductorNodes.size(); ++i) {
+        QDomElement cond = conductorNodes.at(i).toElement();
+
+        if (cond.attribute("num") == "Brücke") continue;
+
+        ConductorData data;
+        data.index = i;
+        data.el1_uuid = normalizeUuid(cond.attribute("element1", cond.attribute("element1id", "")));
+        data.el2_uuid = normalizeUuid(cond.attribute("element2", cond.attribute("element2id", "")));
+
+        data.element1_label = cond.attribute("element1_label");
+        data.element2_label = cond.attribute("element2_label");
+        data.terminalname1 = cond.attribute("terminalname1");
+        data.terminalname2 = cond.attribute("terminalname2");
+        data.tension_protocol = cond.attribute("tension_protocol");
+        data.conductor_color = cond.attribute("conductor_color");
+        data.conductor_section = cond.attribute("conductor_section");
+        data.function = cond.attribute("function");
+
+        QDomElement diag = climbToDiagram(cond);
+        data.folio = findDiagramFolio(diag);
+        if (data.folio.isEmpty()) data.folio = cond.attribute("folio", cond.attribute("page", ""));
+
+        conductors.append(data);
+    }
+    return conductors;
+}
+
+void WiringListExport::resolveEndpoints(QList<ConductorData> &conductors, const QMap<QString, ElementInfo> &elementsInfo) const
+{
+    QRegularExpression numericLabelRe("^\\d+(\\.\\d+)?$");
+
+    QMap<QString, QList<ConductorData>> el_to_cons;
+    for (const ConductorData &c : conductors) {
+        if (!c.el1_uuid.isEmpty()) el_to_cons[c.el1_uuid].append(c);
+        if (!c.el2_uuid.isEmpty()) el_to_cons[c.el2_uuid].append(c);
+    }
+
+    for (int i = 0; i < conductors.size(); ++i) {
+        ConductorData &c = conductors[i];
+
+        auto resolveSide = [&](const QString &startUuid, QString &outLabel, QString &outTerminal) {
+            if (startUuid.isEmpty() || !elementsInfo.contains(startUuid)) return;
+
+            const ElementInfo &startInfo = elementsInfo[startUuid];
+            if (!startInfo.links.isEmpty() || startInfo.isPlaceholder) {
+                QQueue<QString> q;
+                QSet<QString> visited;
+                q.enqueue(startUuid);
+                visited.insert(startUuid);
+
+                int depth = 0;
+                while (!q.isEmpty() && depth < 3) {
+                    int levelSize = q.size();
+                    for (int k = 0; k < levelSize; ++k) {
+                        QString curr = q.dequeue();
+
+                        if (elementsInfo.contains(curr)) {
+                            const ElementInfo &currInfo = elementsInfo[curr];
+
+                            if (!currInfo.isPlaceholder && !currInfo.label.isEmpty() && !numericLabelRe.match(currInfo.label).hasMatch()) {
+                                outLabel = currInfo.label;
+                                return;
+                            }
+
+                            for (const QString &lnk : currInfo.links) {
+                                if (!visited.contains(lnk)) {
+                                    visited.insert(lnk);
+                                    q.enqueue(lnk);
+                                }
+                            }
+                        }
+
+                        for (const ConductorData &cond : el_to_cons.value(curr)) {
+                            if (cond.index == c.index) continue;
+
+                            QString other;
+                            QString terminalHint;
+                            if (cond.el1_uuid == curr) {
+                                other = cond.el2_uuid;
+                                terminalHint = cond.terminalname2;
+                            } else {
+                                other = cond.el1_uuid;
+                                terminalHint = cond.terminalname1;
+                            }
+
+                            if (!other.isEmpty() && !visited.contains(other)) {
+                                if (elementsInfo.contains(other)) {
+                                    const ElementInfo &oInfo = elementsInfo[other];
+                                    if (!oInfo.isPlaceholder && !oInfo.label.isEmpty() && !numericLabelRe.match(oInfo.label).hasMatch()) {
+                                        outLabel = oInfo.label;
+                                        if (outTerminal.isEmpty()) outTerminal = terminalHint;
+                                        return;
+                                    }
+                                }
+                                visited.insert(other);
+                                q.enqueue(other);
+                            }
+                        }
+                    }
+                    depth++;
+                }
+            } else {
+                if (outLabel.isEmpty()) {
+                    outLabel = startInfo.label.isEmpty() ? startInfo.name : startInfo.label;
+                }
+            }
+        };
+
+        bool p1 = elementsInfo.value(c.el1_uuid).isPlaceholder;
+        bool p2 = elementsInfo.value(c.el2_uuid).isPlaceholder;
+
+        if (c.element1_label.isEmpty() || p1) {
+            if (p1) c.element1_label = "";
+            resolveSide(c.el1_uuid, c.element1_label, c.terminalname1);
+        }
+        if (c.element2_label.isEmpty() || p2) {
+            if (p2) c.element2_label = "";
+            resolveSide(c.el2_uuid, c.element2_label, c.terminalname2);
+        }
+    }
+}
+
+void WiringListExport::toCsv()
+{
+    if (!m_project) return;
+
+    QDomDocument doc = m_project->toXml();
+
+    if (doc.isNull()) {
+        QMessageBox::warning(m_parent, tr("Erreur"), tr("Impossible de lire la structure en mémoire du projet."));
+        return;
+    }
+
+    QFileDialog dialog(m_parent);
+    dialog.setAcceptMode(QFileDialog::AcceptSave);
+    dialog.setWindowTitle(tr("Exporter le plan de câblage"));
+    dialog.setDefaultSuffix("csv");
+    dialog.setNameFilter(tr("Fichiers CSV (*.csv)"));
+
+    if (dialog.exec() != QDialog::Accepted) return;
+    QString fileName = dialog.selectedFiles().first();
+
+    QFile file(fileName);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        QMessageBox::warning(m_parent, tr("Erreur"), tr("Impossible d'ouvrir le fichier pour l'écriture."));
+        return;
+    }
+
+    QMap<QString, ElementInfo> elementsInfo = collectElementsInfo(doc.documentElement());
+    QList<ConductorData> conductors = collectConductors(doc.documentElement());
+
+    resolveEndpoints(conductors, elementsInfo);
+
+    QList<ConductorData> uniqueConductors;
+    QSet<QString> seenConnections;
+
+    for (const ConductorData &c : conductors) {
+        if (c.element1_label.isEmpty() && c.element2_label.isEmpty()) continue;
+
+        QString sideA = c.element1_label + ":" + c.terminalname1;
+        QString sideB = c.element2_label + ":" + c.terminalname2;
+
+        QString key = (sideA < sideB) ? (sideA + "||" + sideB) : (sideB + "||" + sideA);
+
+        if (!seenConnections.contains(key)) {
+            seenConnections.insert(key);
+            uniqueConductors.append(c);
+        }
+    }
+
+    QTextStream out(&file);
+    out << tr("Page", "Wiring list CSV header") << ";"
+    << tr("Composant 1", "Wiring list CSV header") << ";"
+    << tr("Borne 1", "Wiring list CSV header") << ";"
+    << tr("Composant 2", "Wiring list CSV header") << ";"
+    << tr("Borne 2", "Wiring list CSV header") << ";"
+    << tr("Tension / Protocole", "Wiring list CSV header") << ";"
+    << tr("Couleur du fil", "Wiring list CSV header") << ";"
+    << tr("Section du fil", "Wiring list CSV header") << ";"
+    << tr("Fonction", "Wiring list CSV header") << "\n";
+
+    for (const ConductorData &c : uniqueConductors) {
+        out << c.folio << ";"
+        << c.element1_label << ";"
+        << c.terminalname1 << ";"
+        << c.element2_label << ";"
+        << c.terminalname2 << ";"
+        << c.tension_protocol << ";"
+        << c.conductor_color << ";"
+        << c.conductor_section << ";"
+        << c.function << "\n";
+    }
+
+    file.close();
+    QMessageBox::information(m_parent, tr("Export réussi"), tr("Le plan de câblage a été exporté avec succès !"));
+}

sources/wiringlistexport.h

@@ -0,0 +1,71 @@
+#ifndef WIRINGLISTEXPORT_H
+#define WIRINGLISTEXPORT_H
+
+#include <QObject>
+#include <QString>
+#include <QMap>
+#include <QList>
+#include <QStringList>
+
+class QETProject;
+class QWidget;
+class QDomElement;
+class QDomNode;
+
+// Internal data structures for parsing the XML graph
+struct ElementInfo {
+    QString folio;
+    QStringList links;
+    QString label;
+    QString name;
+    bool isPlaceholder = false;
+};
+
+struct ConductorData {
+    int index = 0;
+    QString el1_uuid;
+    QString el2_uuid;
+    QString element1_label;
+    QString element2_label;
+    QString terminalname1;
+    QString terminalname2;
+    QString tension_protocol;
+    QString conductor_color;
+    QString conductor_section;
+    QString function;
+    QString folio;
+
+    // Resolved endpoints
+    QString chosen_a_uuid;
+    QString chosen_a_label;
+    QString chosen_b_uuid;
+    QString chosen_b_label;
+};
+
+/**
+ * @brief The WiringListExport class
+ * Handles the export of the wiring list (Verdrahtungsplan) to a CSV file.
+ * Automatically resolves links and placeholders to find physical endpoints.
+ */
+class WiringListExport : public QObject
+{
+    Q_OBJECT
+public:
+    explicit WiringListExport(QETProject *project, QWidget *parent = nullptr);
+    void toCsv();
+
+private:
+    QETProject *m_project;
+    QWidget *m_parent;
+
+    QString normalizeUuid(const QString &u) const;
+    QString findDiagramFolio(const QDomElement &diagramElem) const;
+    QDomElement climbToDiagram(QDomNode node) const;
+
+    QMap<QString, ElementInfo> collectElementsInfo(const QDomElement &root) const;
+    QList<ConductorData> collectConductors(const QDomElement &root) const;
+
+    void resolveEndpoints(QList<ConductorData> &conductors, const QMap<QString, ElementInfo> &elementsInfo) const;
+};
+
+#endif // WIRINGLISTEXPORT_H