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

ProjectExplorer: Register createes' base id in RunConfigurationFactory

Browse Source 
This shifts the resposibility of creation/splitting of RunConfiguration
ids into what are essentially "type ids" and "build targets" to the base
implementation, possibly opening the path of abandoning the mangled ids
in favor of explicitly storing their constituent parts.

Take advantage of base id split in RunConfigurations for availableIds
/displayNameForId and for canCreate/canRestore/canClone.

Change-Id: I19fefb32757407ab5053a2ae0e5a79438659f6ec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
This commit is contained in:
hjk
2017-11-20 11:56:19 +01:00
parent dbd365afe6
commit 1697f97aff
32 changed files with 243 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,11 +84,6 @@ static QString scriptFromId(Core::Id id)
return id.suffixAfter(PythonRunConfigurationPrefix);
}
static Core::Id idFromScript(const QString &target)
{
return Core::Id(PythonRunConfigurationPrefix).withSuffix(target);
}
class PythonProject : public Project
{
Q_OBJECT
@@ -279,52 +274,26 @@ public:
PythonRunConfigurationFactory()
{
setObjectName("PythonRunConfigurationFactory");
registerRunConfiguration<PythonRunConfiguration>();
registerRunConfiguration<PythonRunConfiguration>(PythonRunConfigurationPrefix);
setSupportedProjectType<PythonProject>();
}
QList<Core::Id> availableCreationIds(Target *parent, CreationMode mode) const override
QList<QString> availableBuildTargets(Target *parent, CreationMode mode) const override
{
Q_UNUSED(mode);
if (!canHandle(parent))
return {};
//return { Core::Id(PythonExecutableId) };
PythonProject *project = static_cast<PythonProject *>(parent->project());
QList<Core::Id> allIds;
foreach (const QString &file, project->files(ProjectExplorer::Project::AllFiles))
allIds.append(idFromScript(file));
return allIds;
return project->files(ProjectExplorer::Project::AllFiles);
}
QString displayNameForId(Core::Id id) const override
bool canCreateHelper(Target *parent, const QString &buildTarget) const override
{
return scriptFromId(id);
}
bool canCreate(Target *parent, Core::Id id) const override
{
if (!canHandle(parent))
return false;
PythonProject *project = static_cast<PythonProject *>(parent->project());
const QString script = scriptFromId(id);
const QString script = buildTarget;
if (script.endsWith(".pyqtc"))
return false;
return project->files(ProjectExplorer::Project::AllFiles).contains(script);
}
bool canRestore(Target *parent, const QVariantMap &map) const override
{
Q_UNUSED(parent);
return idFromMap(map).name().startsWith(PythonRunConfigurationPrefix);
}
bool canClone(Target *parent, RunConfiguration *source) const override
{
if (!canHandle(parent))
return false;
return source->id().name().startsWith(PythonRunConfigurationPrefix);
}
};
PythonProject::PythonProject(const FileName &fileName) :