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

Gui: Add setting enabling workbench selector to be on the menubar. Restart required.

Browse Source
This commit is contained in:
Paddle
2022-11-02 19:03:26 +01:00
committed by WandererFan
parent e75ffa0566
commit c87c4bbd9f
6 changed files with 118 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Gui/Action.cpp
View File

@@ -35,6 +35,7 @@
# include <QToolBar>
# include <QToolButton>
# include <QToolTip>
# include <QMenuBar>
#endif
#include <Base/Exception.h>
@@ -529,16 +530,27 @@ WorkbenchGroup::~WorkbenchGroup()
void WorkbenchGroup::addTo(QWidget *w)
{
refreshWorkbenchList();
if (w->inherits("QToolBar")) {
auto bar = qobject_cast<QToolBar*>(w);
QComboBox* box = new WorkbenchComboBox(this, w);
auto setupBox = [&](QComboBox* box) {
box->setIconSize(QSize(16, 16));
box->setToolTip(_action->toolTip());
box->setStatusTip(_action->statusTip());
box->setWhatsThis(_action->whatsThis());
box->addActions(_group->actions());
connect(_group, SIGNAL(triggered(QAction*)), box, SLOT(onActivated (QAction*)));
bar->addWidget(box);
connect(_group, SIGNAL(triggered(QAction*)), box, SLOT(onActivated(QAction*)));
};
if (w->inherits("QToolBar")) {
QComboBox* box = new WorkbenchComboBox(this, w);
setupBox(box);
qobject_cast<QToolBar*>(w)->addWidget(box);
}
else if (w->inherits("QMenuBar")) {
QComboBox* box = new WorkbenchComboBox(this, w);
setupBox(box);
bool left = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow")->GetBool("WSLeftCorner", true);
qobject_cast<QMenuBar*>(w)->setCornerWidget(box, left ? Qt::TopLeftCorner : Qt::TopRightCorner);
}
else if (w->inherits("QMenu")) {
auto menu = qobject_cast<QMenu*>(w);