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

QmlDebugger: removed "Reload" button on live preview error

Browse Source 
Reviewed-by:  Kai Koehne
This commit is contained in:
Christiaan Janssen
2010-12-15 16:12:10 +01:00
parent 972eb8f6e2
commit c8f050715f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/editormanager/editorview.cpp
View File

@@ -176,6 +176,12 @@ void EditorView::showEditorInfoBar(const QString &id,
m_infoWidgetLabel->setText(infoText); m_infoWidgetLabel->setText(infoText);
m_infoWidgetButton->setText(buttonText); m_infoWidgetButton->setText(buttonText);
if (object && !buttonText.isEmpty()) {
m_infoWidgetButton->show();
} else {
m_infoWidgetButton->hide();
}
m_infoWidgetButton->disconnect(); m_infoWidgetButton->disconnect();
if (object && buttonPressMember) if (object && buttonPressMember)
connect(m_infoWidgetButton, SIGNAL(clicked()), object, buttonPressMember); connect(m_infoWidgetButton, SIGNAL(clicked()), object, buttonPressMember);

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

@@ -584,7 +584,7 @@ void QmlJSLiveTextPreview::showSyncWarning(UnsyncronizableChangeType unsyncroniz
errorMessage.append(tr("You can continue debugging, but behavior can be unexpected.")); errorMessage.append(tr("You can continue debugging, but behavior can be unexpected."));
em->showEditorInfoBar(Constants::INFO_OUT_OF_SYNC, errorMessage, tr("Reload"), this, SLOT(reloadQmlViewer())); em->showEditorInfoBar(Constants::INFO_OUT_OF_SYNC, errorMessage);
} }
void QmlJSLiveTextPreview::reloadQmlViewer() void QmlJSLiveTextPreview::reloadQmlViewer()