Merge pull request #775 from ispyisail/fix/jump-to-element-shortcutmanager

Register jump-to-element (Ctrl+G) with ShortcutManager

.github/workflows/windows-msi.yml

@@ -35,7 +35,7 @@ jobs:
           - flavor: qt6
             portable_artifact: qelectrotech-windows-portable-qt6
             version_source: hardcoded    # see note in "Extract version" step
-            label_suffix: "-qt6-EXPERIMENTAL"
+            label_suffix: "-qt6"
             experimental: true
 
     permissions:
@@ -319,10 +319,10 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}
         run: |
-          $pattern = if ("${{ matrix.flavor }}" -eq "qt6") { "-qt6-EXPERIMENTAL.*\\.msi$" } else { "\\.msi$" }
+          $pattern = if ("${{ matrix.flavor }}" -eq "qt6") { "-qt6.*\\.msi$" } else { "\\.msi$" }
           $names = gh release view nightly --repo $env:REPO --json assets --jq ".assets[] | select(.name | test(`"$pattern`")) | .name"
           foreach ($name in ($names -split "`n" | Where-Object { $_ })) {
-            if ("${{ matrix.flavor }}" -eq "qt5" -and $name -match "-qt6-EXPERIMENTAL") { continue }
+            if ("${{ matrix.flavor }}" -eq "qt5" -and $name -match "-qt6") { continue }
             Write-Host "Deleting old asset: $name"
             gh release delete-asset nightly $name --repo $env:REPO --yes
           }

build-aux/generate-page.py

@@ -5,7 +5,7 @@ Called from windows-msi.yml deploy-pages job.
 Environment variables required:
   DATE, SHORT, REPO, SHA, RUN_URL, RUN_NUMBER,
   INSTALLER_URL, PORTABLE_URL, MSI_URL (optional)
-Optional (Qt6 experimental track — omitted entirely if empty):
+Optional (Qt6 track — omitted entirely if empty):
   INSTALLER_QT6_URL, PORTABLE_QT6_URL, MSI_QT6_URL
 """
 import os
@@ -32,7 +32,7 @@ if msi_url:
 <span class="btn-text">Windows Installer .msi<small>.msi &mdash; for enterprise / GPO deployment</small></span>
 </a>"""
 
-# Qt6 experimental section — only rendered if at least one Qt6 asset exists.
+# Qt6 section — only rendered if at least one Qt6 asset exists.
 qt6_block = ""
 if installer_qt6_url or portable_qt6_url or msi_qt6_url:
     qt6_msi_btn = ""
@@ -40,21 +40,21 @@ if installer_qt6_url or portable_qt6_url or msi_qt6_url:
         qt6_msi_btn = f"""
 <a class="btn btn-msi" href="{msi_qt6_url}">
 <span class="btn-icon">&#11015;</span>
-<span class="btn-text">Windows Installer .msi (Qt6)<small>.msi &mdash; experimental, for enterprise / GPO deployment</small></span>
+<span class="btn-text">Windows Installer .msi (Qt6)<small>.msi &mdash; for enterprise / GPO deployment</small></span>
 </a>"""
     qt6_installer_btn = ""
     if installer_qt6_url:
         qt6_installer_btn = f"""
 <a class="btn btn-primary" href="{installer_qt6_url}">
 <span class="btn-icon">&#11015;</span>
-<span class="btn-text">Windows Installer (Qt6)<small>.exe &mdash; experimental, includes all dependencies</small></span>
+<span class="btn-text">Windows Installer (Qt6)<small>.exe &mdash; includes all dependencies</small></span>
 </a>"""
     qt6_portable_btn = ""
     if portable_qt6_url:
         qt6_portable_btn = f"""
 <a class="btn btn-secondary" href="{portable_qt6_url}">
 <span class="btn-icon">&#128230;</span>
-<span class="btn-text">Windows Portable (Qt6)<small>.zip &mdash; experimental, no installation required</small></span>
+<span class="btn-text">Windows Portable (Qt6)<small>.zip &mdash; no installation required</small></span>
 </a>"""
 
     qt6_block = f"""

sources/qetdiagrameditor.cpp

@@ -778,7 +778,7 @@ void QETDiagramEditor::setUpActions()
 	});
 
 	m_jump_to_element = new QAction(tr("Atteindre un élément"), this);
-	m_jump_to_element->setShortcut(Qt::CTRL | Qt::Key_G);
+	ShortcutManager::instance().registerAction(m_jump_to_element, "diagrameditor.jump_to_element", tr("Éditeur de schémas"), Qt::CTRL | Qt::Key_G);
 	m_jump_to_element->setStatusTip(tr("Recherche et sélectionne rapidement un élément du folio", "status bar tip"));
 	connect(m_jump_to_element, &QAction::triggered, [this]()
 	{