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

Fix File/New in the deployment folders.

Browse Source 
That is tell the user that those files need not be added to any project,
and show "<Implicitly Add>" for them on the last wizard page.
This fixes Add/New for the QML/OTHER_FILES folder structure, except for
the virtual folder itself.

Reviewed-By: Jarek Kobus <jaroslaw.kobus@nokia.com>
This commit is contained in:
dt
2010-08-24 17:17:11 +02:00
parent 6bc346443a
commit e5f8a31b9e
12 changed files with 127 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -702,6 +702,20 @@ void Qt4PriFileNode::folderChanged(const QString &)
contents.updateSubFolders(this, this);
}
bool Qt4PriFileNode::deploysFolder(const QString &folder) const
{
QString f = folder;
if (!f.endsWith('/'))
f.append('/');
foreach (const QString &wf, m_watchedFolders) {
if (f.startsWith(wf)
&& (wf.endsWith('/')
|| (wf.length() < f.length() && f.at(wf.length()) == '/')))
return true;
}
return false;
}
QList<ProjectNode::ProjectAction> Qt4PriFileNode::supportedActions(Node *node) const
{
QList<ProjectAction> actions;
@@ -715,11 +729,17 @@ QList<ProjectNode::ProjectAction> Qt4PriFileNode::supportedActions(Node *node) c
switch (proFileNode->projectType()) {
case ApplicationTemplate:
case LibraryTemplate:
actions << AddFile;
if (m_recursiveEnumerateFiles.contains(node->path()))
actions << AddNewFile;
if (m_recursiveEnumerateFiles.contains(node->path())) {
actions << EraseFile;
else
} else {
actions << RemoveFile;
}
// Only enable 'add existing file' if we don't deploy the folder
if (!deploysFolder(node->path()))
actions << AddExistingFile;
break;
case SubDirsTemplate:
actions << AddSubProject << RemoveSubProject;