ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: implemented handling of non-ascii characters in screen search

Browse Source
This commit is contained in:
mlangkabel
2018-02-26 13:56:47 +01:00
parent 42342c5c5f
commit 6d82e9265a
26 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/view/graphElements/QtGraphNode.cpp
+5 -5
View File
@@ -271,7 +271,7 @@ void QtGraphNode::showNodeRecursive()
}
}
void QtGraphNode::matchNameRecursive(const std::string& query, std::vector<QtGraphNode*>* matchedNodes)
void QtGraphNode::matchNameRecursive(const std::wstring& query, std::vector<QtGraphNode*>* matchedNodes)
{
matchName(query, matchedNodes);
@@ -473,10 +473,10 @@ void QtGraphNode::notifyEdgesAfterMove()
}
}
void QtGraphNode::matchName(const std::string& query, std::vector<QtGraphNode*>* matchedNodes)
void QtGraphNode::matchName(const std::wstring& query, std::vector<QtGraphNode*>* matchedNodes)
{
m_isActiveMatch = false;
std::string name = utility::encodeToUtf8(getName());
const std::wstring name = getName();
size_t pos = utility::toLowerCase(name).find(query);
if (pos != std::string::npos)
@@ -490,9 +490,9 @@ void QtGraphNode::matchName(const std::string& query, std::vector<QtGraphNode*>*
m_matchRect->show();
m_matchText->show();
std::string matchName(name.length(), ' ');
std::wstring matchName(name.length(), L' ');
matchName.replace(pos, query.length(), name.substr(pos, query.length()));
m_matchText->setText(matchName.c_str());
m_matchText->setText(QString::fromStdWString(matchName));
matchedNodes->push_back(this);
src/lib_gui/qt/view/graphElements/QtGraphNode.h
+2 -2
View File
@@ -77,7 +77,7 @@ public:
void showNodeRecursive();
void matchNameRecursive(const std::string& query, std::vector<QtGraphNode*>* matchedNodes);
void matchNameRecursive(const std::wstring& query, std::vector<QtGraphNode*>* matchedNodes);
void removeNameMatch();
void setActiveMatch(bool active);
@@ -107,7 +107,7 @@ protected:
void notifyEdgesAfterMove();
virtual void matchName(const std::string& query, std::vector<QtGraphNode*>* matchedNodes);
virtual void matchName(const std::wstring& query, std::vector<QtGraphNode*>* matchedNodes);
void setStyle(const GraphViewStyle::NodeStyle& style);
src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
void hideLabel();
protected:
virtual void matchName(const std::string& query, std::vector<QtGraphNode*>* matchedNodes) override {}
virtual void matchName(const std::wstring& query, std::vector<QtGraphNode*>* matchedNodes) override {}
private:
AccessKind m_accessKind;
src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
virtual void updateStyle();
protected:
virtual void matchName(const std::string& query, std::vector<QtGraphNode*>* matchedNodes) {}
virtual void matchName(const std::wstring& query, std::vector<QtGraphNode*>* matchedNodes) {}
private:
QGraphicsPixmapItem* m_icon;
src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.h
+1 -1
View File
@@ -26,7 +26,7 @@ protected:
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* event);
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event);
virtual void matchName(const std::string& query, std::vector<QtGraphNode*>* matchedNodes) {}
virtual void matchName(const std::wstring& query, std::vector<QtGraphNode*>* matchedNodes) {}
private:
const NameHierarchy m_qualifierName;