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

Better error feedback on Open project

Browse Source 
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995

Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Teske
2011-09-05 13:47:29 +02:00
parent 61a887a755
commit 4e41308a0f
16 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/genericprojectmanager/genericprojectmanager.cpp
View File

@@ -35,7 +35,6 @@
#include "genericproject.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/session.h>
@@ -52,7 +51,7 @@ QString Manager::mimeType() const
return QLatin1String(Constants::GENERICMIMETYPE);
}
ProjectExplorer::Project *Manager::openProject(const QString &fileName)
ProjectExplorer::Project *Manager::openProject(const QString &fileName, QString *errorString)
{
if (!QFileInfo(fileName).isFile())
return 0;
@@ -60,9 +59,9 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName)
ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
foreach (ProjectExplorer::Project *pi, projectExplorer->session()->projects()) {
if (fileName == pi->file()->fileName()) {
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
messageManager->printToOutputPanePopup(tr("Failed opening project '%1': Project already open")
.arg(QDir::toNativeSeparators(fileName)));
if (errorString)
*errorString = tr("Failed opening project '%1': Project already open")
.arg(QDir::toNativeSeparators(fileName));
return 0;
}
}