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

rewrite editor info bar handling

Browse Source 
the info about the bars is now stored in the IFile, not in the
EditorView. this is somewhat more expensive for the bars which
identically apply to all editors of one type, but fixes consistency
issues between views.

additionally, it is now possible to set several simultaneous
info bars per file, which ensures that no information is lost.

Co-authored-by: mae
This commit is contained in:
Oswald Buddenhagen
2011-05-06 12:48:44 +02:00
parent 46c09e77cd
commit 882e34ee28
21 changed files with 446 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/qmljsinspector/qmljslivetextpreview.cpp
View File

@@ -47,6 +47,7 @@
#include <projectexplorer/project.h>
#include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/editormanager/editormanager.h>
@@ -568,19 +569,20 @@ void QmlJSLiveTextPreview::documentChanged(QmlJS::Document::Ptr doc)
void QmlJSLiveTextPreview::showExperimentalWarning()
{
Core::EditorManager *em = Core::EditorManager::instance();
em->showEditorInfoBar(Constants::INFO_EXPERIMENTAL,
tr("You changed a QML file in Live Preview mode, which modifies the running QML application. "
"In case of unexpected behavior, please reload the QML application. "
),
tr("Disable Live Preview"), this, SLOT(disableLivePreview()));
foreach (QWeakPointer<QmlJSEditor::QmlJSTextEditorWidget> editor, m_editors)
if (editor) {
Core::InfoBarEntry info(
Constants::INFO_EXPERIMENTAL,
tr("You changed a QML file in Live Preview mode, which modifies the running QML application. "
"In case of unexpected behavior, please reload the QML application."));
info.setCustomButtonInfo(tr("Disable Live Preview"), this, SLOT(disableLivePreview()));
editor.data()->file()->infoBar()->addInfo(info);
}
}
void QmlJSLiveTextPreview::showSyncWarning(UnsyncronizableChangeType unsyncronizableChangeType,
const QString &elementName, unsigned line, unsigned column)
{
Core::EditorManager *em = Core::EditorManager::instance();
QString errorMessage;
switch (unsyncronizableChangeType) {
case AttributeChangeWarning:
@@ -598,18 +600,25 @@ void QmlJSLiveTextPreview::showSyncWarning(UnsyncronizableChangeType unsyncroniz
errorMessage.append(tr("You can continue debugging, but behavior can be unexpected."));
em->showEditorInfoBar(Constants::INFO_OUT_OF_SYNC, errorMessage);
foreach (QWeakPointer<QmlJSEditor::QmlJSTextEditorWidget> editor, m_editors)
if (editor)
editor.data()->file()->infoBar()->addInfo(Core::InfoBarEntry(
QLatin1String(Constants::INFO_OUT_OF_SYNC), errorMessage));
}
void QmlJSLiveTextPreview::reloadQmlViewer()
{
Core::EditorManager::instance()->hideEditorInfoBar(Constants::INFO_OUT_OF_SYNC);
foreach (QWeakPointer<QmlJSEditor::QmlJSTextEditorWidget> editor, m_editors)
if (editor)
editor.data()->file()->infoBar()->removeInfo(Constants::INFO_OUT_OF_SYNC);
emit reloadQmlViewerRequested();
}
void QmlJSLiveTextPreview::disableLivePreview()
{
Core::EditorManager::instance()->hideEditorInfoBar(Constants::INFO_EXPERIMENTAL);
foreach (QWeakPointer<QmlJSEditor::QmlJSTextEditorWidget> editor, m_editors)
if (editor)
editor.data()->file()->infoBar()->removeInfo(Constants::INFO_OUT_OF_SYNC);
emit disableLivePreviewRequested();
}