feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

EditorManager: Avoid warnings about already registered actions

Browse Source 
When opening new editor windows, we want the _window_ to have the
EditorManager context as well as the individual window context, but the
window _actions_ (close, etc) may only be registered for the individual
window context.

Add the corresponding option to ICore::registerWindow et al.

Change-Id: I67d0a6b386603e0047a77dfb357c207e7ffe99e6
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2024-02-16 16:00:12 +01:00
parent 04d7f63186
commit 70f7e275e2
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/coreplugin/windowsupport.cpp
View File

@@ -28,9 +28,9 @@ namespace Internal {
Q_GLOBAL_STATIC(WindowList, m_windowList)
WindowSupport::WindowSupport(QWidget *window, const Context &context)
: QObject(window),
m_window(window)
WindowSupport::WindowSupport(QWidget *window, const Context &context, const Context &actionContext)
: QObject(window)
, m_window(window)
{
m_window->installEventFilter(this);
@@ -38,14 +38,15 @@ WindowSupport::WindowSupport(QWidget *window, const Context &context)
m_contextObject->setWidget(window);
m_contextObject->setContext(context);
ICore::addContextObject(m_contextObject);
const Context ac = actionContext.isEmpty() ? context : actionContext;
if (useMacShortcuts) {
m_minimizeAction = new QAction(this);
ActionManager::registerAction(m_minimizeAction, Constants::MINIMIZE_WINDOW, context);
ActionManager::registerAction(m_minimizeAction, Constants::MINIMIZE_WINDOW, ac);
connect(m_minimizeAction, &QAction::triggered, m_window, &QWidget::showMinimized);
m_zoomAction = new QAction(this);
ActionManager::registerAction(m_zoomAction, Constants::ZOOM_WINDOW, context);
ActionManager::registerAction(m_zoomAction, Constants::ZOOM_WINDOW, ac);
connect(m_zoomAction, &QAction::triggered, m_window, [this] {
if (m_window->isMaximized()) {
// similar to QWidget::showMaximized
@@ -58,13 +59,13 @@ WindowSupport::WindowSupport(QWidget *window, const Context &context)
});
m_closeAction = new QAction(this);
ActionManager::registerAction(m_closeAction, Constants::CLOSE_WINDOW, context);
ActionManager::registerAction(m_closeAction, Constants::CLOSE_WINDOW, ac);
connect(m_closeAction, &QAction::triggered, m_window, &QWidget::close, Qt::QueuedConnection);
}
m_toggleFullScreenAction = new QAction(this);
updateFullScreenAction();
ActionManager::registerAction(m_toggleFullScreenAction, Constants::TOGGLE_FULLSCREEN, context);
ActionManager::registerAction(m_toggleFullScreenAction, Constants::TOGGLE_FULLSCREEN, ac);
connect(m_toggleFullScreenAction, &QAction::triggered, this, &WindowSupport::toggleFullScreen);
m_windowList->addWindow(window);