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

QmlProjectManager: moved the no-observer warning dialog to qmlprojectplugin

Browse Source 
Change-Id: I6ce724e0db17d22616adcdf058d1f05af7124b64
Reviewed-on: http://codereview.qt.nokia.com/1929
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christiaan Janssen
2011-07-21 10:40:56 +02:00
parent c9ffc770aa
commit ed5030f124
4 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -50,10 +50,15 @@
#include <projectexplorer/taskhub.h>
#include <qtsupport/qtsupportconstants.h>
#include <QtCore/QtPlugin>
#include <QtGui/QApplication>
#include <QtGui/QMessageBox>
#include <QtGui/QPushButton>
namespace QmlProjectManager {
namespace Internal {
QmlProjectPlugin::QmlProjectPlugin()
{ }
@@ -74,13 +79,13 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
if (! mimeDB->addMimeTypes(mimetypesXml, errorMessage))
return false;
Manager *manager = new Manager;
Internal::Manager *manager = new Internal::Manager;
addAutoReleasedObject(manager);
addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);
addAutoReleasedObject(new Internal::QmlProjectRunControlFactory);
addAutoReleasedObject(new QmlProjectApplicationWizard);
addAutoReleasedObject(new QmlProjectTargetFactory);
addAutoReleasedObject(new Internal::QmlProjectApplicationWizard);
addAutoReleasedObject(new Internal::QmlProjectTargetFactory);
QmlProjectFileFormat::registerDeclarativeTypes();
@@ -93,7 +98,29 @@ void QmlProjectPlugin::extensionsInitialized()
{
}
} // namespace Internal
void QmlProjectPlugin::showQmlObserverToolWarning()
{
QMessageBox dialog(QApplication::activeWindow());
QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"),
QMessageBox::ActionRole);
dialog.addButton(tr("Cancel"), QMessageBox::ActionRole);
dialog.setDefaultButton(qtPref);
dialog.setWindowTitle(tr("QML Observer Missing"));
dialog.setText(tr("QML Observer could not be found."));
dialog.setInformativeText(tr(
"QML Observer is used to offer debugging features for "
"QML applications, such as interactive debugging and inspection tools. "
"It must be compiled for each used Qt version separately. "
"On the Qt4 options page, select the current Qt installation "
"and click Rebuild."));
dialog.exec();
if (dialog.clickedButton() == qtPref) {
Core::ICore::instance()->showOptionsDialog(
QtSupport::Constants::QT_SETTINGS_CATEGORY,
QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
}
}
} // namespace QmlProjectManager
Q_EXPORT_PLUGIN(QmlProjectManager::Internal::QmlProjectPlugin)
Q_EXPORT_PLUGIN(QmlProjectManager::QmlProjectPlugin)