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
+2 -2
View File
@@ -294,9 +294,9 @@
<like>global_variable</like>
</enum_constant>
<non-indexed>
<non_indexed>
<like>type</like>
</non-indexed>
</non_indexed>
<namespace>
<fill>
<normal>#873E3E</normal>
+2 -2
View File
@@ -283,9 +283,9 @@
<like>global_variable</like>>
</enum_constant>
<non-indexed>
<non_indexed>
<like>type</like>
</non-indexed>
</non_indexed>
<namespace>
<fill>
<normal>#78282D</normal>
@@ -8,28 +8,37 @@
class ProducerOfTheLastMember
{
public:
void go()
{
ClassWithHiddenMembers::this_last_member = 42;
}
void on()
void in()
{
ClassWithHiddenMembers::this_last_member++;
}
//------------------------------------------------------------------------------
//
// 6 - FOCUSING EDGES
// Even though Coati doesn't allow to activate an edge, you can still focus on
// edges. This doesn't change the currently active symbol (which would cause
// Coati to hide everything but the edge). Instead Coati just highlights the
// relation's location in the code and scrolls you there, so you don't lose
// context.
// Try to activate an edge that comes from the "ConsumerOfTheLastMember" class.
// Which one you pick doesn't really matter for this tutorial.
// 7 - THAT'S IT
// You completed the tutorial on the graph view. There is still more to learn
// but I guess you will figure it out on your own. One last thing: If you see
// an element with a hatched background please call us. It's a runaway!
// Just kidding. Those are elements that are used within your code, but have no
// definition anywhere in your source folder (like the "int" symbol on the
// right hand side of the graph). So if you click them, Coati will display
// all the relations for the element, but the code view won't show a
// definition. If you want to learn more about Coati, go back to the central
// hub. It is called in the function below but you can also try to get there
// using only the graph.
//
//------------------------------------------------------------------------------
void reading()
private:
void the()
{
if (ClassWithHiddenMembers::this_last_member <= 0);
{
the_central_hub();
}
}
void codeview()
{
ClassWithHiddenMembers::this_last_member *= 2;
}
@@ -9,37 +9,28 @@
class ConsumerOfTheLastMember
{
public:
void in()
void go()
{
ClassWithHiddenMembers::this_last_member = 42;
}
void on()
{
ClassWithHiddenMembers::this_last_member--;
}
//------------------------------------------------------------------------------
//
// 7 - THAT'S IT
// You completed the tutorial on the graph view. There is still more to learn
// but I guess you will figure it out on your own. One last thing: If you see
// an element with a hatched background please call us. It's a runaway!
// Just kidding. Those are elements that are used within your code, but have no
// definition anywhere in your source folder (like the "int" symbol on the
// right hand side of the graph). So if you click them, Coati will display
// all the relations for the element, but the code view won't show a
// definition. If you want to learn more about Coati, go back to the central
// hub. It is called in the function below but you can also try to get there
// using only the graph.
// 6 - FOCUSING EDGES
// Even though Coati doesn't allow to activate an edge, you can still focus on
// edges. This doesn't change the currently active symbol (which would cause
// Coati to hide everything but the edge). Instead Coati just highlights the
// relation's location in the code and scrolls you there, so you don't lose
// context.
// Try to activate an edge that comes from the "ProducerOfTheLastMember" class.
// Which one you pick doesn't really matter for this tutorial.
//
//------------------------------------------------------------------------------
private:
void the()
{
if (ClassWithHiddenMembers::this_last_member <= 0);
{
the_central_hub();
}
}
void codeview()
void reading()
{
ClassWithHiddenMembers::this_last_member /= 2;
}
@@ -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)");