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

ProjectManager: Show .qrc contents again

Browse Source 
This fixes the second regression introduced by 04a525877b.

Change-Id: I5c5c72a036f139fa564c40e95ebf6acafc99792c
Reviewed-by: Mathias Hasselmann <mathias.hasselmann@kdab.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
hjk
2017-02-10 13:23:53 +01:00
committed by Tim Jenssen
parent 1f540c6c9d
commit a2c6e28478
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/resourceeditor/resourcenode.cpp
View File

@@ -122,7 +122,6 @@ ResourceTopLevelNode::~ResourceTopLevelNode()
void ResourceTopLevelNode::addInternalNodes()
{
QMap<PrefixFolderLang, QList<ProjectExplorer::Node *>> nodesToAdd;
QMap<PrefixFolderLang, QList<ProjectExplorer::FolderNode *>> foldersToAddToFolders;
QMap<PrefixFolderLang, QList<ProjectExplorer::FolderNode *>> foldersToAddToPrefix;
ResourceFile file(filePath().toString(), m_contents);
@@ -186,9 +185,9 @@ void ResourceTopLevelNode::addInternalNodes()
this, currentPrefixNode);
if (parentIsPrefix) {
foldersToAddToPrefix[prefixId] << newNode;
nodesToAdd[prefixId] << newNode;
} else {
PrefixFolderLang parentFolderId(prefix, parentFolderName, lang);
foldersToAddToFolders[parentFolderId] << newNode;
nodesToAdd[parentFolderId] << newNode;
}
folderNodes.insert(folderId, newNode);
@@ -207,13 +206,17 @@ void ResourceTopLevelNode::addInternalNodes()
}
}
foreach (FolderNode *sfn, folderNodes()) {
const QList<FolderNode *> fnodes = folderNodes();
for (FolderNode *sfn : fnodes) {
ResourceFolderNode *srn = static_cast<ResourceFolderNode *>(sfn);
PrefixFolderLang folderId(srn->prefix(), QString(), srn->lang());
srn->setNodes(nodesToAdd[folderId]);
foreach (FolderNode* ssfn, sfn->folderNodes()) {
const QList<ProjectExplorer::Node *> nodes = nodesToAdd[folderId];
for (Node *n : nodes)
srn->addNode(n);
const QList<FolderNode *> sfnodes = sfn->folderNodes();
for (FolderNode *ssfn : sfnodes) {
SimpleResourceFolderNode *sssn = static_cast<SimpleResourceFolderNode *>(ssfn);
sssn->addFilesAndSubfolders(foldersToAddToFolders, nodesToAdd, srn->prefix(), srn->lang());
sssn->addFilesAndSubfolders(nodesToAdd, srn->prefix(), srn->lang());
}
}
}
@@ -649,13 +652,13 @@ ResourceFolderNode *SimpleResourceFolderNode::prefixNode() const
return m_prefixNode;
}
void SimpleResourceFolderNode::addFilesAndSubfolders(const QMap<PrefixFolderLang, QList<ProjectExplorer::FolderNode*> > &foldersToAdd,
const QMap<PrefixFolderLang, QList<ProjectExplorer::Node*> > &nodesToAdd,
void SimpleResourceFolderNode::addFilesAndSubfolders(const QMap<PrefixFolderLang, QList<Node *>> &nodesToAdd,
const QString &prefix, const QString &lang)
{
setNodes(nodesToAdd.value(PrefixFolderLang(prefix, m_folderName, lang)));
for (Node *node : nodesToAdd.value(PrefixFolderLang(prefix, m_folderName, lang)))
addNode(node);
foreach (FolderNode* subNode, folderNodes()) {
SimpleResourceFolderNode* sn = static_cast<SimpleResourceFolderNode*>(subNode);
sn->addFilesAndSubfolders(foldersToAdd, nodesToAdd, prefix, lang);
sn->addFilesAndSubfolders(nodesToAdd, prefix, lang);
}
}