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

PythonEditor: Avoid creation of useless empty run config

Browse Source 
Opening a python project created an empty 'Custom RunConfiguration'
the first time it had been opened.
Avoid this by re-ordering and simplifying the processing of the
project and its respective settings.

Change-Id: I0c0f71e0dab6f03df46e5ddbdc7e1dbf73e8bef8
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2017-10-18 12:58:59 +02:00
parent 172f25d97d
commit 0a931c56a4
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/pythoneditor/pythoneditorplugin.cpp
View File

@@ -312,7 +312,10 @@ public:
if (!canHandle(parent)) if (!canHandle(parent))
return false; return false;
PythonProject *project = static_cast<PythonProject *>(parent->project()); PythonProject *project = static_cast<PythonProject *>(parent->project());
return project->files(ProjectExplorer::Project::AllFiles).contains(scriptFromId(id)); const QString script = scriptFromId(id);
if (script.endsWith(".pyqtc"))
return false;
return project->files(ProjectExplorer::Project::AllFiles).contains(script);
} }
bool canRestore(Target *parent, const QVariantMap &map) const override bool canRestore(Target *parent, const QVariantMap &map) const override
@@ -560,31 +563,11 @@ Project::RestoreResult PythonProject::fromMap(const QVariantMap &map, QString *e
{ {
Project::RestoreResult res = Project::fromMap(map, errorMessage); Project::RestoreResult res = Project::fromMap(map, errorMessage);
if (res == RestoreResult::Ok) { if (res == RestoreResult::Ok) {
refresh();
Kit *defaultKit = KitManager::defaultKit(); Kit *defaultKit = KitManager::defaultKit();
if (!activeTarget() && defaultKit) if (!activeTarget() && defaultKit)
addTarget(createTarget(defaultKit)); addTarget(createTarget(defaultKit));
refresh();
QList<Target *> targetList = targets();
foreach (Target *t, targetList) {
const QList<RunConfiguration *> runConfigs = t->runConfigurations();
foreach (const QString &file, m_files) {
// skip the 'project' file
if (file.endsWith(".pyqtc"))
continue;
const Id id = idFromScript(file);
bool alreadyPresent = false;
foreach (RunConfiguration *runCfg, runConfigs) {
if (runCfg->id() == id) {
alreadyPresent = true;
break;
}
}
if (!alreadyPresent)
t->addRunConfiguration(IRunConfigurationFactory::createHelper<PythonRunConfiguration>(t, id));
}
}
} }
return res; return res;