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

ICore: Don't split context in contextChanged signal

Browse Source 
This way the order of the context doesn't get lost between context from
the focus widget and additional contexts

Change-Id: I371c411a5d9c9f31ae1f8631a6ede4eda100b0c5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-09-22 09:17:59 +02:00
parent d46e5025e5
commit 972731d42e
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/icore.cpp
View File

@@ -279,10 +279,9 @@
*/
/*!
\fn void ICore::contextChanged(Core::IContext *context, const Core::Context &additionalContexts)
Indicates that a new \a context just became the current context
(meaning that its widget got focus), or that the additional context ids
specified by \a additionalContexts changed.
\fn void ICore::contextChanged(const Core::Context &context)
Indicates that a new \a context just became the current context. This includes the context
from the focus object as well as the additional context.
*/
#include "dialogs/newdialog.h"

2
src/plugins/coreplugin/icore.h
View File

@@ -136,7 +136,7 @@ signals:
void optionsDialogRequested();
void coreAboutToClose();
void contextAboutToChange(const QList<Core::IContext *> &context);
void contextChanged(const QList<Core::IContext *> &context, const Core::Context &additionalContexts);
void contextChanged(const Core::Context &context);
void themeChanged();
private:

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -1024,7 +1024,7 @@ void MainWindow::updateContext()
}
ActionManager::setContext(uniquecontexts);
emit m_coreImpl->contextChanged(m_activeContext, m_additionalContexts);
emit m_coreImpl->contextChanged(uniquecontexts);
}
void MainWindow::aboutToShowRecentFiles()

6
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -203,12 +203,6 @@ void QmlDesignerPlugin::createDesignModeWidget()
this,
SLOT(onTextEditorsClosed(QList<Core::IEditor*>)));
// connect(Core::ICore::editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)),
// &data->documentManager, SLOT(currentTextEditorChanged(Core::IEditor*)));
// connect(Core::ICore::instance(), SIGNAL(contextChanged(Core::IContext*,Core::Context)),
// this, SLOT(contextChanged(Core::IContext*,Core::Context)));
connect(Core::ModeManager::instance(),
SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
SLOT(onCurrentModeChanged(Core::IMode*,Core::IMode*)));