kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: replace old-style with new-style connect

Browse Source
This commit is contained in:
wmayer
2022-11-12 21:57:26 +01:00
parent a2a285b7c9
commit e470bdc018
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Gui/Action.cpp
View File

@@ -649,8 +649,6 @@ void WorkbenchComboBox::onActivated(int i)
int index = itemData(i).toInt();
auto ev = new WorkbenchActionEvent(this->actions().at(index));
QApplication::postEvent(this->group, ev);
// TODO: Test if we can use this instead
//QTimer::singleShot(20, this->actions()[i], SLOT(trigger()));
}
void WorkbenchComboBox::onActivated(QAction* action)
@@ -1358,9 +1356,9 @@ DockWidgetAction::~DockWidgetAction()
void DockWidgetAction::addTo ( QWidget * w )
{
if (!_menu) {
_menu = new QMenu();
_action->setMenu(_menu);
connect(_menu, SIGNAL(aboutToShow()), getMainWindow(), SLOT(onDockWindowMenuAboutToShow()));
_menu = new QMenu();
_action->setMenu(_menu);
getMainWindow()->setDockWindowMenu(_menu);
}
w->addAction(_action);
@@ -1383,7 +1381,7 @@ void ToolBarAction::addTo ( QWidget * w )
if (!_menu) {
_menu = new QMenu();
_action->setMenu(_menu);
connect(_menu, SIGNAL(aboutToShow()), getMainWindow(), SLOT(onToolBarMenuAboutToShow()));
getMainWindow()->setToolBarMenu(_menu);
}
w->addAction(_action);
@@ -1408,16 +1406,14 @@ void WindowAction::addTo ( QWidget * w )
_menu = new QMenu();
_action->setMenu(_menu);
_menu->addActions(_group->actions());
connect(_menu, SIGNAL(aboutToShow()),
getMainWindow(), SLOT(onWindowsMenuAboutToShow()));
getMainWindow()->setWindowsMenu(_menu);
}
w->addAction(_action);
}
else {
menu->addActions(_group->actions());
connect(menu, SIGNAL(aboutToShow()),
getMainWindow(), SLOT(onWindowsMenuAboutToShow()));
getMainWindow()->setWindowsMenu(menu);
}
}

15
src/Gui/MainWindow.cpp
View File

@@ -1165,6 +1165,21 @@ void MainWindow::onDockWindowMenuAboutToShow()
}
}
void MainWindow::setDockWindowMenu(QMenu* menu)
{
connect(menu, &QMenu::aboutToShow, this, &MainWindow::onDockWindowMenuAboutToShow);
}
void MainWindow::setToolBarMenu(QMenu* menu)
{
connect(menu, &QMenu::aboutToShow, this, &MainWindow::onToolBarMenuAboutToShow);
}
void MainWindow::setWindowsMenu(QMenu* menu)
{
connect(menu, &QMenu::aboutToShow, this, &MainWindow::onWindowsMenuAboutToShow);
}
QList<QWidget*> MainWindow::windows(QMdiArea::WindowOrder order) const
{
QList<QWidget*> mdis;

11
src/Gui/MainWindow.h
View File

@@ -156,6 +156,17 @@ public:
void saveWindowSettings();
//@}
/** @name Menu
*/
//@{
/// Set menu for dock windows.
void setDockWindowMenu(QMenu*);
/// Set menu for toolbars.
void setToolBarMenu(QMenu*);
/// Set menu for sub-windows
void setWindowsMenu(QMenu*);
//@}
/** @name MIME data handling
*/
//@{