src: Bug fixes

* fixed - to _ in color schemes
* fixed yoda talk in Tutorial
* fixed graph node with no children but qualifier has expand toggle
* added placeholder and file filter for maven detection on MacOS
* fixed NameHierarchy delimiter wrong in SearchIndex
This commit is contained in:
Eberhard Graether
2017-04-06 16:53:17 +02:00
parent 30dda62970
commit 8391a6da57
7 changed files with 58 additions and 53 deletions
@@ -1332,6 +1332,7 @@ void GraphController::addExpandToggleNode(DummyNode* node) const
expandNode->visible = true;
expandNode->expanded = node->expanded;
bool hasVisibleSubNode = false;
for (size_t i = 0; i < node->subNodes.size(); i++)
{
DummyNode* subNode = node->subNodes[i].get();
@@ -1343,16 +1344,25 @@ void GraphController::addExpandToggleNode(DummyNode* node) const
continue;
}
if (subNode->isQualifierNode())
{
continue;
}
for (std::shared_ptr<DummyNode> subSubNode : subNode->subNodes)
{
if (!subSubNode->visible)
{
expandNode->invisibleSubNodeCount++;
}
else
{
hasVisibleSubNode = true;
}
}
}
if (expandNode->isExpanded() || expandNode->invisibleSubNodeCount)
if ((expandNode->isExpanded() && hasVisibleSubNode) || expandNode->invisibleSubNodeCount)
{
node->subNodes.push_back(expandNode);
}
+4 -4
View File
@@ -225,16 +225,16 @@ void Project::load()
if (canLoad)
{
m_storage->setMode(SqliteStorage::STORAGE_MODE_READ);
m_storage->buildCaches();
m_storageAccessProxy->setSubject(m_storage.get());
m_sourceGroups = SourceGroupFactory::getInstance()->createSourceGroups(m_settings->getAllSourceGroupSettings());
if (!m_sourceGroups.empty())
{
NameHierarchy::setDelimiter(getSymbolNameDelimiterForLanguage(m_sourceGroups.front()->getLanguage()));
}
m_storage->setMode(SqliteStorage::STORAGE_MODE_READ);
m_storage->buildCaches();
m_storageAccessProxy->setSubject(m_storage.get());
MessageFinishedParsing().dispatch();
MessageStatus("Finished Loading", false, false).dispatch();
}
@@ -172,11 +172,6 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
m_mavenPath->setFileFilter("Maven command (mvn.cmd)");
m_mavenPath->setPlaceholderText("<maven_path>/bin/mvn.cmd");
}
else if (QSysInfo::macVersion() != QSysInfo::MV_None)
{
// todo: add filter here
// todo: add placeholder here
}
else
{
m_mavenPath->setFileFilter("Maven command (mvn)");