mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-13 20:23:04 +02:00
QMenu must set a parent for correct position. #3
This commit is contained in:
parent
c31cab34e4
commit
ee49086d03
@ -775,12 +775,12 @@ void QETDiagramEditor::setUpToolBar()
|
|||||||
void QETDiagramEditor::setUpMenu()
|
void QETDiagramEditor::setUpMenu()
|
||||||
{
|
{
|
||||||
|
|
||||||
QMenu *menu_fichier = new QMenu(tr("&Fichier"));
|
QMenu* menu_fichier = new QMenu(tr("&Fichier"), this);
|
||||||
QMenu *menu_edition = new QMenu(tr("&Édition"));
|
QMenu* menu_edition = new QMenu(tr("&Édition"), this);
|
||||||
QMenu *menu_project = new QMenu(tr("&Projet"));
|
QMenu* menu_project = new QMenu(tr("&Projet"), this);
|
||||||
QMenu *menu_affichage = new QMenu(tr("Afficha&ge"));
|
QMenu* menu_affichage = new QMenu(tr("Afficha&ge"), this);
|
||||||
//QMenu *menu_outils = new QMenu(tr("O&utils"));
|
// QMenu *menu_outils = new QMenu(tr("O&utils"), this);
|
||||||
windows_menu = new QMenu(tr("Fe&nêtres"));
|
windows_menu = new QMenu(tr("Fe&nêtres"), this);
|
||||||
|
|
||||||
insertMenu(settings_menu_, menu_fichier);
|
insertMenu(settings_menu_, menu_fichier);
|
||||||
insertMenu(settings_menu_, menu_edition);
|
insertMenu(settings_menu_, menu_edition);
|
||||||
|
@ -142,13 +142,12 @@ void QETMainWindow::initCommonActions()
|
|||||||
*/
|
*/
|
||||||
void QETMainWindow::initCommonMenus()
|
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(fullscreen_action_);
|
||||||
settings_menu_ -> addAction(configure_action_);
|
settings_menu_ -> addAction(configure_action_);
|
||||||
connect(settings_menu_, SIGNAL(aboutToShow()), this, SLOT(checkToolbarsmenu()));
|
connect(settings_menu_, SIGNAL(aboutToShow()), this, SLOT(checkToolbarsmenu()));
|
||||||
|
|
||||||
|
help_menu_ = new QMenu(tr("&Aide", "window menu"), this);
|
||||||
help_menu_ = new QMenu(tr("&Aide", "window menu"));
|
|
||||||
help_menu_ -> addAction(whatsthis_action_);
|
help_menu_ -> addAction(whatsthis_action_);
|
||||||
help_menu_ -> addSeparator();
|
help_menu_ -> addSeparator();
|
||||||
help_menu_ -> addAction(manual_online_);
|
help_menu_ -> addAction(manual_online_);
|
||||||
|
@ -338,7 +338,7 @@ void TitleBlockPropertiesWidget::initDialog(
|
|||||||
this,
|
this,
|
||||||
SLOT(duplicateCurrentTitleBlockTemplate()));
|
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_edit);
|
||||||
m_tbt_menu -> addAction(m_tbt_duplicate);
|
m_tbt_menu -> addAction(m_tbt_duplicate);
|
||||||
ui -> m_tbt_pb -> setMenu(m_tbt_menu);
|
ui -> m_tbt_pb -> setMenu(m_tbt_menu);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user