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

use Constants values and refactor a little bit

Browse Source 
Change-Id: If14ee4840040ce088340990d6291cfd0bbd47771
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Tim Jenssen
2015-08-05 15:16:27 +02:00
parent 201abfe5f1
commit 8d88138f87
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -46,6 +46,7 @@
#include <utils/mimetypes/mimedatabase.h> #include <utils/mimetypes/mimedatabase.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/winutils.h> #include <utils/winutils.h>
#include <qmljstools/qmljstoolsconstants.h>
using namespace Core; using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -266,23 +267,24 @@ void QmlProjectRunConfiguration::changeCurrentFile(IEditor *editor)
void QmlProjectRunConfiguration::updateEnabled() void QmlProjectRunConfiguration::updateEnabled()
{ {
bool qmlFileFound = false; bool qmlFileFound = false;
Utils::MimeDatabase mdb;
if (mainScriptSource() == FileInEditor) { if (mainScriptSource() == FileInEditor) {
Utils::MimeDatabase mimeDataBase;
IDocument *document = EditorManager::currentDocument(); IDocument *document = EditorManager::currentDocument();
Utils::MimeType mainScriptMimeType = mimeDataBase.mimeTypeForFile(mainScript());
if (document) { if (document) {
m_currentFileFilename = document->filePath().toString(); m_currentFileFilename = document->filePath().toString();
if (mdb.mimeTypeForFile(mainScript()).matchesName(QLatin1String("text/x-qml"))) if (mainScriptMimeType.matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE)))
qmlFileFound = true; qmlFileFound = true;
} }
if (!document if (!document
|| mdb.mimeTypeForFile(mainScript()).matchesName(QLatin1String("application/x-qmlproject"))) { || mainScriptMimeType.matchesName(QLatin1String(QmlJSTools::Constants::QMLPROJECT_MIMETYPE))) {
// find a qml file with lowercase filename. This is slow, but only done // find a qml file with lowercase filename. This is slow, but only done
// in initialization/other border cases. // in initialization/other border cases.
foreach (const QString &filename, target()->project()->files(Project::AllFiles)) { foreach (const QString &filename, target()->project()->files(Project::AllFiles)) {
const QFileInfo fi(filename); const QFileInfo fi(filename);
if (!filename.isEmpty() && fi.baseName()[0].isLower() if (!filename.isEmpty() && fi.baseName()[0].isLower()
&& mdb.mimeTypeForFile(fi).matchesName(QLatin1String("text/x-qml"))) && mimeDataBase.mimeTypeForFile(fi).matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE)))
{ {
m_currentFileFilename = filename; m_currentFileFilename = filename;
qmlFileFound = true; qmlFileFound = true;
@@ -296,9 +298,9 @@ void QmlProjectRunConfiguration::updateEnabled()
} }
bool newValue = QFileInfo::exists(executable()) && qmlFileFound; bool newValue = QFileInfo::exists(executable()) && qmlFileFound;
m_isEnabled = newValue;
// Always emit change signal to force reevaluation of run/debug buttons // Always emit change signal to force reevaluation of run/debug buttons
m_isEnabled = newValue;
emit enabledChanged(); emit enabledChanged();
} }