From ee49086d0343b3b79d8be66748aa6a959f8ae00c Mon Sep 17 00:00:00 2001
From: Pascal Sander
Date: Sun, 17 Aug 2025 17:48:29 +0200
Subject: [PATCH] QMenu must set a parent for correct position. #3
---
sources/qetdiagrameditor.cpp | 12 ++++++------
sources/qetmainwindow.cpp | 5 ++---
sources/titleblock/qettemplateeditor.cpp | 4 ++--
sources/ui/titleblockpropertieswidget.cpp | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp
index 8e8b8c263..ca1868d97 100644
--- a/sources/qetdiagrameditor.cpp
+++ b/sources/qetdiagrameditor.cpp
@@ -775,12 +775,12 @@ void QETDiagramEditor::setUpToolBar()
void QETDiagramEditor::setUpMenu()
{
- QMenu *menu_fichier = new QMenu(tr("&Fichier"));
- QMenu *menu_edition = new QMenu(tr("&Édition"));
- QMenu *menu_project = new QMenu(tr("&Projet"));
- QMenu *menu_affichage = new QMenu(tr("Afficha&ge"));
- //QMenu *menu_outils = new QMenu(tr("O&utils"));
- windows_menu = new QMenu(tr("Fe&nêtres"));
+ QMenu* menu_fichier = new QMenu(tr("&Fichier"), this);
+ QMenu* menu_edition = new QMenu(tr("&Édition"), this);
+ QMenu* menu_project = new QMenu(tr("&Projet"), this);
+ QMenu* menu_affichage = new QMenu(tr("Afficha&ge"), this);
+ // QMenu *menu_outils = new QMenu(tr("O&utils"), this);
+ windows_menu = new QMenu(tr("Fe&nêtres"), this);
insertMenu(settings_menu_, menu_fichier);
insertMenu(settings_menu_, menu_edition);
diff --git a/sources/qetmainwindow.cpp b/sources/qetmainwindow.cpp
index db20a1a93..c9f4c9570 100644
--- a/sources/qetmainwindow.cpp
+++ b/sources/qetmainwindow.cpp
@@ -142,13 +142,12 @@ void QETMainWindow::initCommonActions()
*/
void QETMainWindow::initCommonMenus()
{
- settings_menu_ = new QMenu(tr("&Configuration", "window menu"));
+ settings_menu_ = new QMenu(tr("&Configuration", "window menu"), this);
settings_menu_ -> addAction(fullscreen_action_);
settings_menu_ -> addAction(configure_action_);
connect(settings_menu_, SIGNAL(aboutToShow()), this, SLOT(checkToolbarsmenu()));
-
- help_menu_ = new QMenu(tr("&Aide", "window menu"));
+ help_menu_ = new QMenu(tr("&Aide", "window menu"), this);
help_menu_ -> addAction(whatsthis_action_);
help_menu_ -> addSeparator();
help_menu_ -> addAction(manual_online_);
diff --git a/sources/titleblock/qettemplateeditor.cpp b/sources/titleblock/qettemplateeditor.cpp
index d270567cd..07dfb2d48 100644
--- a/sources/titleblock/qettemplateeditor.cpp
+++ b/sources/titleblock/qettemplateeditor.cpp
@@ -437,8 +437,8 @@ void QETTitleBlockTemplateEditor::initActions()
*/
void QETTitleBlockTemplateEditor::initMenus()
{
- file_menu_ = new QMenu(tr("&Fichier", "menu title"), this);
- edit_menu_ = new QMenu(tr("&Édition", "menu title"), this);
+ file_menu_ = new QMenu(tr("&Fichier", "menu title"), this);
+ edit_menu_ = new QMenu(tr("&Édition", "menu title"), this);
display_menu_ = new QMenu(tr("Afficha&ge", "menu title"), this);
file_menu_ -> addAction(new_);
diff --git a/sources/ui/titleblockpropertieswidget.cpp b/sources/ui/titleblockpropertieswidget.cpp
index e1fb9e250..109362380 100644
--- a/sources/ui/titleblockpropertieswidget.cpp
+++ b/sources/ui/titleblockpropertieswidget.cpp
@@ -338,7 +338,7 @@ void TitleBlockPropertiesWidget::initDialog(
this,
SLOT(duplicateCurrentTitleBlockTemplate()));
- m_tbt_menu = new QMenu(tr("Title block templates actions"));
+ m_tbt_menu = new QMenu(tr("Title block templates actions"), ui->m_tbt_pb);
m_tbt_menu -> addAction(m_tbt_edit);
m_tbt_menu -> addAction(m_tbt_duplicate);
ui -> m_tbt_pb -> setMenu(m_tbt_menu);