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

ProjectExplorer: Make "Add New File" work on FolderNodes

Browse Source 
The ResoureceNode will be a folder node, this enables that to work for
add new file.

Change-Id: Ifb4827d0900ce550be164c44979c5b72ab947c42
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2014-02-18 16:31:36 +01:00
parent fba7dcdbaa
commit a23b349882
7 changed files with 186 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -2782,7 +2782,7 @@ void ProjectExplorerPlugin::addNewFile()
QString location = directoryFor(d->m_currentNode); QString location = directoryFor(d->m_currentNode);
QVariantMap map; QVariantMap map;
map.insert(QLatin1String(Constants::PREFERED_PROJECT_NODE), d->m_currentNode->projectNode()->path()); map.insert(QLatin1String(Constants::PREFERED_PROJECT_NODE), QVariant::fromValue(d->m_currentNode));
if (d->m_currentProject) { if (d->m_currentProject) {
QList<Id> profileIds; QList<Id> profileIds;
foreach (Target *target, d->m_currentProject->targets()) foreach (Target *target, d->m_currentProject->targets())
@@ -2804,7 +2804,7 @@ void ProjectExplorerPlugin::addNewSubproject()
&& d->m_currentNode->supportedActions( && d->m_currentNode->supportedActions(
d->m_currentNode).contains(ProjectExplorer::AddSubProject)) { d->m_currentNode).contains(ProjectExplorer::AddSubProject)) {
QVariantMap map; QVariantMap map;
map.insert(QLatin1String(Constants::PREFERED_PROJECT_NODE), d->m_currentNode->projectNode()->path()); map.insert(QLatin1String(Constants::PREFERED_PROJECT_NODE), QVariant::fromValue(d->m_currentNode));
if (d->m_currentProject) { if (d->m_currentProject) {
QList<Id> profileIds; QList<Id> profileIds;
foreach (Target *target, d->m_currentProject->targets()) foreach (Target *target, d->m_currentProject->targets())

224
src/plugins/projectexplorer/projectfilewizardextension.cpp
View File

@@ -85,92 +85,133 @@ enum { debugExtension = 0 };
namespace ProjectExplorer { namespace ProjectExplorer {
typedef QList<FolderNode *> FolderNodeList;
typedef QList<ProjectNode *> ProjectNodeList; typedef QList<ProjectNode *> ProjectNodeList;
namespace Internal { namespace Internal {
// AllProjectNodesVisitor: Retrieve all projects (*.pri/*.pro) // AddNewFileNodesVisitor: Retrieve all folders which support AddNew
// which support adding files class AddNewFileNodesVisitor : public NodesVisitor
class AllProjectNodesVisitor : public NodesVisitor
{ {
public: public:
AllProjectNodesVisitor(ProjectExplorer::ProjectAction action) AddNewFileNodesVisitor();
: m_action(action)
static FolderNodeList allFolders();
virtual void visitProjectNode(ProjectNode *node);
virtual void visitFolderNode(FolderNode *node);
private:
FolderNodeList m_folderNodes;
};
AddNewFileNodesVisitor::AddNewFileNodesVisitor()
{} {}
static ProjectNodeList allProjects(ProjectExplorer::ProjectAction action); FolderNodeList AddNewFileNodesVisitor::allFolders()
{
AddNewFileNodesVisitor visitor;
SessionManager::sessionNode()->accept(&visitor);
return visitor.m_folderNodes;
}
void AddNewFileNodesVisitor::visitProjectNode(ProjectNode *node)
{
visitFolderNode(node);
}
void AddNewFileNodesVisitor::visitFolderNode(FolderNode *node)
{
const QList<ProjectExplorer::ProjectAction> &list = node->supportedActions(node);
if (list.contains(ProjectExplorer::AddNewFile) && !list.contains(ProjectExplorer::InheritedFromParent))
m_folderNodes.push_back(node);
}
// AddNewProjectNodesVisitor: Retrieve all folders which support AddNewProject
// also checks the path of the added subproject
class AddNewProjectNodesVisitor : public NodesVisitor
{
public:
AddNewProjectNodesVisitor(const QString &subProjectPath);
static ProjectNodeList projectNodes(const QString &subProjectPath);
virtual void visitProjectNode(ProjectNode *node); virtual void visitProjectNode(ProjectNode *node);
private: private:
ProjectNodeList m_projectNodes; ProjectNodeList m_projectNodes;
ProjectExplorer::ProjectAction m_action; QString m_subProjectPath;
}; };
ProjectNodeList AllProjectNodesVisitor::allProjects(ProjectExplorer::ProjectAction action) AddNewProjectNodesVisitor::AddNewProjectNodesVisitor(const QString &subProjectPath)
: m_subProjectPath(subProjectPath)
{}
ProjectNodeList AddNewProjectNodesVisitor::projectNodes(const QString &subProjectPath)
{ {
AllProjectNodesVisitor visitor(action); AddNewProjectNodesVisitor visitor(subProjectPath);
SessionManager::sessionNode()->accept(&visitor); SessionManager::sessionNode()->accept(&visitor);
return visitor.m_projectNodes; return visitor.m_projectNodes;
} }
void AllProjectNodesVisitor::visitProjectNode(ProjectNode *node) void AddNewProjectNodesVisitor::visitProjectNode(ProjectNode *node)
{ {
if (node->supportedActions(node).contains(m_action)) const QList<ProjectExplorer::ProjectAction> &list = node->supportedActions(node);
if (list.contains(ProjectExplorer::AddSubProject) && !list.contains(ProjectExplorer::InheritedFromParent))
if (m_subProjectPath.isEmpty() || node->canAddSubProject(m_subProjectPath))
m_projectNodes.push_back(node); m_projectNodes.push_back(node);
} }
// ProjectEntry: Context entry for a *.pri/*.pro file. Stores name and path // ProjectEntry: Context entry for a *.pri/*.pro file. Stores name and path
// for quick sort and path search, provides operator<() for maps. // for quick sort and path search, provides operator<() for maps.
struct ProjectEntry { struct FolderEntry {
enum Type { ProFile, PriFile }; // Sort order: 'pro' before 'pri' FolderEntry() : node(0), priority(-1) {}
explicit FolderEntry(FolderNode *node, const QStringList &generatedFiles);
ProjectEntry() : node(0), type(ProFile) {} int compare(const FolderEntry &rhs) const;
explicit ProjectEntry(ProjectNode *node);
int compare(const ProjectEntry &rhs) const; FolderNode *node;
ProjectNode *node;
QString directory; // For matching against wizards' files, which are native. QString directory; // For matching against wizards' files, which are native.
QString fileName; QString displayName;
QString baseName; QString baseName;
Type type; int priority;
}; };
ProjectEntry::ProjectEntry(ProjectNode *n) : FolderEntry::FolderEntry(FolderNode *n, const QStringList &generatedFiles) :
node(n), node(n)
type(ProFile)
{ {
const QFileInfo fi(node->path()); FolderNode::AddNewInformation info = node->addNewInformation(generatedFiles);
fileName = fi.fileName(); displayName = info.displayName;
const QFileInfo fi(ProjectExplorerPlugin::pathFor(node));
baseName = fi.baseName(); baseName = fi.baseName();
if (fi.suffix() != QLatin1String("pro")) priority = info.priority;
type = PriFile; directory = ProjectExplorerPlugin::directoryFor(node);
directory = fi.absolutePath();
} }
// Sort helper that sorts by base name and puts '*.pro' before '*.pri' // Sort helper that sorts by base name and puts '*.pro' before '*.pri'
int ProjectEntry::compare(const ProjectEntry &rhs) const int FolderEntry::compare(const FolderEntry &rhs) const
{ {
if (const int drc = displayName.compare(rhs.displayName))
return drc;
if (const int drc = directory.compare(rhs.directory)) if (const int drc = directory.compare(rhs.directory))
return drc; return drc;
if (const int brc = baseName.compare(rhs.baseName)) if (const int brc = baseName.compare(rhs.baseName))
return brc; return brc;
if (type < rhs.type) if (priority > rhs.priority)
return -1; return -1;
if (type > rhs.type) if (priority < rhs.priority)
return 1; return 1;
return 0; return 0;
} }
inline bool operator<(const ProjectEntry &pe1, const ProjectEntry &pe2) inline bool operator<(const FolderEntry &pe1, const FolderEntry &pe2)
{ {
return pe1.compare(pe2) < 0; return pe1.compare(pe2) < 0;
} }
QDebug operator<<(QDebug d, const ProjectEntry &e) QDebug operator<<(QDebug d, const FolderEntry &e)
{ {
d.nospace() << e.directory << ' ' << e.fileName << ' ' << e.type; d.nospace() << e.directory << ' ' << e.displayName << ' ' << e.priority;
return d; return d;
} }
@@ -182,7 +223,7 @@ struct ProjectWizardContext
QList<IVersionControl*> versionControls; QList<IVersionControl*> versionControls;
QList<IVersionControl*> activeVersionControls; QList<IVersionControl*> activeVersionControls;
QList<ProjectEntry> projects; QList<FolderEntry> projects;
QPointer<ProjectWizardPage> page; // this is managed by the wizard! QPointer<ProjectWizardPage> page; // this is managed by the wizard!
bool repositoryExists; // Is VCS 'add' sufficient, or should a repository be created? bool repositoryExists; // Is VCS 'add' sufficient, or should a repository be created?
QString commonDirectory; QString commonDirectory;
@@ -217,13 +258,14 @@ ProjectFileWizardExtension::~ProjectFileWizardExtension()
delete m_context; delete m_context;
} }
static QList<ProjectEntry> findDeployProject(const QList<ProjectEntry> &projects, static QList<FolderEntry> findDeployProject(const QList<FolderEntry> &folders,
QString &commonPath) QString &commonPath)
{ {
QList<ProjectEntry> filtered; QList<FolderEntry> filtered;
foreach (const ProjectEntry &project, projects) foreach (const FolderEntry &folder, folders)
if (project.node->deploysFolder(commonPath)) if (folder.node->nodeType() == ProjectNodeType)
filtered << project; if (static_cast<ProjectNode *>(folder.node)->deploysFolder(commonPath))
filtered << folder;
return filtered; return filtered;
} }
@@ -231,39 +273,43 @@ static QList<ProjectEntry> findDeployProject(const QList<ProjectEntry> &projects
// path. Either a direct match on the directory or the directory with // path. Either a direct match on the directory or the directory with
// the longest matching path (list containing"/project/subproject1" matching // the longest matching path (list containing"/project/subproject1" matching
// common path "/project/subproject1/newuserpath"). // common path "/project/subproject1/newuserpath").
static int findMatchingProject(const QList<ProjectEntry> &projects, static int findMatchingProject(const QList<FolderEntry> &projects,
const QString &commonPath, const QString &commonPath,
const QString &preferedProjectNode) Node *preferedProjectNode)
{ {
if (projects.isEmpty() || commonPath.isEmpty()) if (projects.isEmpty() || commonPath.isEmpty())
return -1; return -1;
const int count = projects.size(); const int count = projects.size();
if (!preferedProjectNode.isEmpty()) { if (preferedProjectNode) {
for (int p = 0; p < count; ++p) { for (int p = 0; p < count; ++p) {
if (projects.at(p).node->path() == preferedProjectNode) if (projects.at(p).node == preferedProjectNode)
return p; return p;
} }
} }
int bestMatch = -1; int bestMatch = -1;
int bestMatchLength = 0; int bestMatchLength = 0;
bool bestMatchIsProFile = false; int bestMatchPriority = -1;
for (int p = 0; p < count; p++) { for (int p = 0; p < count; p++) {
// Direct match or better match? (note that the wizards' files are native). // Direct match or better match? (note that the wizards' files are native).
const ProjectEntry &entry = projects.at(p); const FolderEntry &entry = projects.at(p);
const QString &projectDirectory = entry.directory; const QString &projectDirectory = entry.directory;
const int projectDirectorySize = projectDirectory.size(); const int projectDirectorySize = projectDirectory.size();
if (projectDirectorySize == bestMatchLength && bestMatchIsProFile) if (entry.priority > bestMatchPriority) {
continue; // prefer first pro file over all other files with same bestMatchLength if (commonPath.startsWith(projectDirectory)) {
if (projectDirectorySize == bestMatchLength && entry.type == ProjectEntry::PriFile) bestMatchPriority = entry.priority;
continue; // we already have a match with same bestMatchLength that is at least a pri file
if (projectDirectorySize >= bestMatchLength
&& commonPath.startsWith(projectDirectory)) {
bestMatchIsProFile = (entry.type == ProjectEntry::ProFile);
bestMatchLength = projectDirectory.size(); bestMatchLength = projectDirectory.size();
bestMatch = p; bestMatch = p;
} }
} else if (entry.priority == bestMatchPriority) {
if (projectDirectorySize > bestMatchLength
&& commonPath.startsWith(projectDirectory)) {
bestMatchPriority = entry.priority;
bestMatchLength = projectDirectory.size();
bestMatch = p;
}
}
} }
return bestMatch; return bestMatch;
} }
@@ -280,10 +326,11 @@ void ProjectFileWizardExtension::firstExtensionPageShown(
const QList<GeneratedFile> &files, const QList<GeneratedFile> &files,
const QVariantMap &extraValues) const QVariantMap &extraValues)
{ {
initProjectChoices(generatedProjectFilePath(files)); initProjectChoices(files);
if (debugExtension) if (debugExtension)
qDebug() << Q_FUNC_INFO << files.size(); qDebug() << Q_FUNC_INFO << files.size();
// Parametrize wizard page: find best project to add to, set up files display and // Parametrize wizard page: find best project to add to, set up files display and
// version control depending on path // version control depending on path
QStringList fileNames; QStringList fileNames;
@@ -295,7 +342,7 @@ void ProjectFileWizardExtension::firstExtensionPageShown(
int bestProjectIndex = -1; int bestProjectIndex = -1;
QList<ProjectEntry> deployingProjects = findDeployProject(m_context->projects, m_context->commonDirectory); QList<FolderEntry> deployingProjects = findDeployProject(m_context->projects, m_context->commonDirectory);
if (!deployingProjects.isEmpty()) { if (!deployingProjects.isEmpty()) {
// Oh we do have someone that deploys it // Oh we do have someone that deploys it
// then the best match is NONE // then the best match is NONE
@@ -305,8 +352,8 @@ void ProjectFileWizardExtension::firstExtensionPageShown(
QString text = tr("The files are implicitly added to the projects:"); QString text = tr("The files are implicitly added to the projects:");
text += QLatin1Char('\n'); text += QLatin1Char('\n');
foreach (const ProjectEntry &project, deployingProjects) { foreach (const FolderEntry &project, deployingProjects) {
text += project.fileName; text += project.displayName;
text += QLatin1Char('\n'); text += QLatin1Char('\n');
} }
@@ -314,7 +361,7 @@ void ProjectFileWizardExtension::firstExtensionPageShown(
bestProjectIndex = -1; bestProjectIndex = -1;
} else { } else {
bestProjectIndex = findMatchingProject(m_context->projects, m_context->commonDirectory, bestProjectIndex = findMatchingProject(m_context->projects, m_context->commonDirectory,
extraValues.value(QLatin1String(Constants::PREFERED_PROJECT_NODE)).toString()); extraValues.value(QLatin1String(Constants::PREFERED_PROJECT_NODE)).value<Node *>());
m_context->page->setNoneLabel(tr("<None>")); m_context->page->setNoneLabel(tr("<None>"));
} }
@@ -398,7 +445,7 @@ QList<QWizardPage *> ProjectFileWizardExtension::extensionPages(const IWizard *w
static inline void getProjectChoicesAndToolTips(QStringList *projectChoicesParam, static inline void getProjectChoicesAndToolTips(QStringList *projectChoicesParam,
QStringList *projectToolTipsParam, QStringList *projectToolTipsParam,
ProjectExplorer::ProjectAction *projectActionParam, ProjectExplorer::ProjectAction *projectActionParam,
const QString &generatedProjectFilePath, const QList<GeneratedFile> &generatedFiles,
ProjectWizardContext *context) ProjectWizardContext *context)
{ {
// Set up project list which remains the same over duration of wizard execution // Set up project list which remains the same over duration of wizard execution
@@ -408,43 +455,50 @@ static inline void getProjectChoicesAndToolTips(QStringList *projectChoicesParam
QStringList projectChoices(ProjectFileWizardExtension::tr("<None>")); QStringList projectChoices(ProjectFileWizardExtension::tr("<None>"));
QStringList projectToolTips((QString())); QStringList projectToolTips((QString()));
typedef QMap<ProjectEntry, bool> ProjectEntryMap; typedef QMap<FolderEntry, bool> FolderEntryMap;
// Sort by base name and purge duplicated entries (resulting from dependencies) // Sort by base name and purge duplicated entries (resulting from dependencies)
// via Map. // via Map.
ProjectEntryMap entryMap; FolderEntryMap entryMap;
ProjectExplorer::ProjectAction projectAction;
if (context->wizard->kind()== IWizard::ProjectWizard) {
const QString projectFilePath = generatedProjectFilePath(generatedFiles);
projectAction = ProjectExplorer::AddNewFile;
foreach (ProjectNode *pn, AddNewProjectNodesVisitor::projectNodes(projectFilePath))
entryMap.insert(FolderEntry(pn, QStringList() << projectFilePath), true);
ProjectExplorer::ProjectAction projectAction = } else {
context->wizard->kind() == IWizard::ProjectWizard QStringList filePaths;
? ProjectExplorer::AddSubProject : ProjectExplorer::AddNewFile; foreach (const GeneratedFile &gf, generatedFiles)
foreach (ProjectNode *n, AllProjectNodesVisitor::allProjects(projectAction)) { filePaths << gf.path();
if (projectAction == ProjectExplorer::AddNewFile
|| (projectAction == ProjectExplorer::AddSubProject projectAction = ProjectExplorer::AddSubProject;
&& (generatedProjectFilePath.isEmpty() ? true : n->canAddSubProject(generatedProjectFilePath)))) foreach (FolderNode *fn, AddNewFileNodesVisitor::allFolders())
entryMap.insert(ProjectEntry(n), true); entryMap.insert(FolderEntry(fn, filePaths), true);
} }
context->projects.clear(); context->projects.clear();
// Collect names // Collect names
const ProjectEntryMap::const_iterator cend = entryMap.constEnd(); const FolderEntryMap::const_iterator cend = entryMap.constEnd();
for (ProjectEntryMap::const_iterator it = entryMap.constBegin(); it != cend; ++it) { for (FolderEntryMap::const_iterator it = entryMap.constBegin(); it != cend; ++it) {
context->projects.push_back(it.key()); context->projects.push_back(it.key());
projectChoices.push_back(it.key().fileName); projectChoices.push_back(it.key().displayName);
projectToolTips.push_back(QDir::toNativeSeparators(it.key().directory)); projectToolTips.push_back(QDir::toNativeSeparators(it.key().directory));
} }
*projectChoicesParam = projectChoices; *projectChoicesParam = projectChoices;
*projectToolTipsParam = projectToolTips; *projectToolTipsParam = projectToolTips;
*projectActionParam = projectAction; *projectActionParam = projectAction;
} }
void ProjectFileWizardExtension::initProjectChoices(const QString &generatedProjectFilePath) void ProjectFileWizardExtension::initProjectChoices(const QList<GeneratedFile> generatedFiles)
{ {
QStringList projectChoices; QStringList projectChoices;
QStringList projectToolTips; QStringList projectToolTips;
ProjectExplorer::ProjectAction projectAction; ProjectExplorer::ProjectAction projectAction;
getProjectChoicesAndToolTips(&projectChoices, &projectToolTips, &projectAction, getProjectChoicesAndToolTips(&projectChoices, &projectToolTips, &projectAction,
generatedProjectFilePath, m_context); generatedFiles, m_context);
m_context->page->setProjects(projectChoices); m_context->page->setProjects(projectChoices);
m_context->page->setProjectToolTips(projectToolTips); m_context->page->setProjectToolTips(projectToolTips);
@@ -481,15 +535,15 @@ bool ProjectFileWizardExtension::processProject(
QString generatedProject = generatedProjectFilePath(files); QString generatedProject = generatedProjectFilePath(files);
// Add files to project (Entry at 0 is 'None'). // Add files to folder (Entry at 0 is 'None').
const int projectIndex = m_context->page->currentProjectIndex() - 1; const int folderIndex = m_context->page->currentProjectIndex() - 1;
if (projectIndex < 0 || projectIndex >= m_context->projects.size()) if (folderIndex < 0 || folderIndex >= m_context->projects.size())
return true; return true;
ProjectNode *project = m_context->projects.at(projectIndex).node; FolderNode *folder = m_context->projects.at(folderIndex).node;
if (m_context->wizard->kind() == IWizard::ProjectWizard) { if (m_context->wizard->kind() == IWizard::ProjectWizard) {
if (!project->addSubProjects(QStringList(generatedProject))) { if (!static_cast<ProjectNode *>(folder)->addSubProjects(QStringList(generatedProject))) {
*errorMessage = tr("Failed to add subproject '%1'\nto project '%2'.") *errorMessage = tr("Failed to add subproject '%1'\nto project '%2'.")
.arg(generatedProject).arg(project->path()); .arg(generatedProject).arg(folder->path());
return false; return false;
} }
*removeOpenProjectAttribute = true; *removeOpenProjectAttribute = true;
@@ -497,9 +551,9 @@ bool ProjectFileWizardExtension::processProject(
QStringList filePaths; QStringList filePaths;
foreach (const GeneratedFile &generatedFile, files) foreach (const GeneratedFile &generatedFile, files)
filePaths << generatedFile.path(); filePaths << generatedFile.path();
if (!project->addFiles(filePaths)) { if (!folder->addFiles(filePaths)) {
*errorMessage = tr("Failed to add one or more files to project\n'%1' (%2)."). *errorMessage = tr("Failed to add one or more files to project\n'%1' (%2).").
arg(project->path(), filePaths.join(QString(QLatin1Char(',')))); arg(folder->path(), filePaths.join(QString(QLatin1Char(','))));
return false; return false;
} }
} }
@@ -556,12 +610,12 @@ void ProjectFileWizardExtension::applyCodeStyle(GeneratedFile *file) const
if (!languageId.isValid()) if (!languageId.isValid())
return; // don't modify files like *.ui *.pro return; // don't modify files like *.ui *.pro
ProjectNode *project = 0; FolderNode *folder = 0;
const int projectIndex = m_context->page->currentProjectIndex() - 1; const int projectIndex = m_context->page->currentProjectIndex() - 1;
if (projectIndex >= 0 && projectIndex < m_context->projects.size()) if (projectIndex >= 0 && projectIndex < m_context->projects.size())
project = m_context->projects.at(projectIndex).node; folder = m_context->projects.at(projectIndex).node;
Project *baseProject = SessionManager::projectForNode(project); Project *baseProject = SessionManager::projectForNode(folder);
ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory(languageId); ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory(languageId);

2
src/plugins/projectexplorer/projectfilewizardextension.h
View File

@@ -61,7 +61,7 @@ public slots:
void initializeVersionControlChoices(); void initializeVersionControlChoices();
private: private:
void initProjectChoices(const QString &generatedProjectFilePath); void initProjectChoices(const QList<Core::GeneratedFile> generatedFiles);
bool processProject(const QList<Core::GeneratedFile> &files, bool processProject(const QList<Core::GeneratedFile> &files,
bool *removeOpenProjectAttribute, QString *errorMessage); bool *removeOpenProjectAttribute, QString *errorMessage);
bool processVersionControl(const QList<Core::GeneratedFile> &files, QString *errorMessage); bool processVersionControl(const QList<Core::GeneratedFile> &files, QString *errorMessage);

10
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -180,7 +180,9 @@ bool Node::isEnabled() const
QList<ProjectAction> Node::supportedActions(Node *node) const QList<ProjectAction> Node::supportedActions(Node *node) const
{ {
return parentFolderNode()->supportedActions(node); QList<ProjectAction> list = parentFolderNode()->supportedActions(node);
list.append(ProjectExplorer::InheritedFromParent);
return list;
} }
void Node::setNodeType(NodeType type) void Node::setNodeType(NodeType type)
@@ -357,6 +359,12 @@ bool FolderNode::renameFile(const QString &filePath, const QString &newFilePath)
return false; return false;
} }
FolderNode::AddNewInformation FolderNode::addNewInformation(const QStringList &files) const
{
Q_UNUSED(files);
return AddNewInformation(QFileInfo(path()).fileName(), 100);
}
/*! /*!
Adds file nodes specified by \a files to the internal list of the folder Adds file nodes specified by \a files to the internal list of the folder
and emits the corresponding signals from the projectNode. and emits the corresponding signals from the projectNode.

16
src/plugins/projectexplorer/projectnodes.h
View File

@@ -68,6 +68,8 @@ enum FileType {
}; };
enum ProjectAction { enum ProjectAction {
// Special value to indicate that the actions are handled by the parent
InheritedFromParent,
AddSubProject, AddSubProject,
RemoveSubProject, RemoveSubProject,
// Let's the user select to which project file // Let's the user select to which project file
@@ -180,6 +182,18 @@ public:
virtual bool deleteFiles(const QStringList &filePaths); virtual bool deleteFiles(const QStringList &filePaths);
virtual bool renameFile(const QString &filePath, const QString &newFilePath); virtual bool renameFile(const QString &filePath, const QString &newFilePath);
class AddNewInformation
{
public:
AddNewInformation(const QString &name, int p)
:displayName(name), priority(p)
{}
QString displayName;
int priority;
};
virtual AddNewInformation addNewInformation(const QStringList &files) const;
void addFileNodes(const QList<FileNode*> &files); void addFileNodes(const QList<FileNode*> &files);
void removeFileNodes(const QList<FileNode*> &files); void removeFileNodes(const QList<FileNode*> &files);
@@ -442,4 +456,6 @@ T1 subtractSortedList(T1 list1, T1 list2, T3 sorter)
} // namespace ProjectExplorer } // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::Node *)
#endif // PROJECTNODES_H #endif // PROJECTNODES_H

12
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1040,6 +1040,12 @@ bool QmakePriFileNode::renameFile(const QString &filePath, const QString &newFil
return true; return true;
} }
ProjectExplorer::FolderNode::AddNewInformation QmakePriFileNode::addNewInformation(const QStringList &files) const
{
Q_UNUSED(files)
return ProjectExplorer::FolderNode::AddNewInformation(QFileInfo(path()).fileName(), 90);
}
bool QmakePriFileNode::priFileWritable(const QString &path) bool QmakePriFileNode::priFileWritable(const QString &path)
{ {
Core::Internal::ReadOnlyFilesDialog roDialog(path, Core::ICore::mainWindow()); Core::Internal::ReadOnlyFilesDialog roDialog(path, Core::ICore::mainWindow());
@@ -1540,6 +1546,12 @@ bool QmakeProFileNode::hasBuildTargets() const
return hasBuildTargets(projectType()); return hasBuildTargets(projectType());
} }
ProjectExplorer::FolderNode::AddNewInformation QmakeProFileNode::addNewInformation(const QStringList &files) const
{
Q_UNUSED(files)
return AddNewInformation(QFileInfo(path()).fileName(), 100);
}
bool QmakeProFileNode::hasBuildTargets(QmakeProjectType projectType) const bool QmakeProFileNode::hasBuildTargets(QmakeProjectType projectType) const
{ {
return (projectType == ApplicationTemplate || projectType == LibraryTemplate); return (projectType == ApplicationTemplate || projectType == LibraryTemplate);

3
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -158,6 +158,7 @@ public:
bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0); bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0);
bool deleteFiles(const QStringList &filePaths); bool deleteFiles(const QStringList &filePaths);
bool renameFile(const QString &filePath, const QString &newFilePath); bool renameFile(const QString &filePath, const QString &newFilePath);
AddNewInformation addNewInformation(const QStringList &files) const;
bool setProVariable(const QString &var, const QString &value); bool setProVariable(const QString &var, const QString &value);
@@ -367,6 +368,8 @@ public:
bool hasBuildTargets() const; bool hasBuildTargets() const;
AddNewInformation addNewInformation(const QStringList &files) const;
QmakeProjectType projectType() const; QmakeProjectType projectType() const;
QStringList variableValue(const QmakeVariable var) const; QStringList variableValue(const QmakeVariable var) const;