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

ui: Text color for highlights in code view

Browse Source 
* Deactivate local symbols by clicking into void
* Refactored QtHightlighter to only highlight once
* Removed undo for local symbol activation
This commit is contained in:
Eberhard Graether
2016-04-18 12:34:35 +02:00
parent 985be86da0
commit 325bc6ac83
9 changed files with 106 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/utility/QtHighlighter.cpp
+41 -23
View File
@@ -5,8 +5,11 @@
#include "settings/ColorScheme.h"
QtHighlighter::QtHighlighter(QTextDocument *parent)
: QSyntaxHighlighter(parent)
QVector<QtHighlighter::HighlightingRule> QtHighlighter::s_highlightingRules;
QtHighlighter::HighlightingRule QtHighlighter::s_quotationRule;
QtHighlighter::HighlightingRule QtHighlighter::s_commentRule;
void QtHighlighter::createHighlightingRules()
{
QStringList keywordPatterns;
keywordPatterns
@@ -41,47 +44,60 @@ QtHighlighter::QtHighlighter(QTextDocument *parent)
QColor quotationColor(scheme->getSyntaxColor("quotation").c_str());
QColor commentColor = scheme->getSyntaxColor("comment").c_str();
s_highlightingRules.clear();
foreach (const QString &pattern, keywordPatterns)
{
addHighlightingRule(keywordColor, QRegExp("\\b" + pattern + "\\b"));
s_highlightingRules.append(HighlightingRule(keywordColor, QRegExp("\\b" + pattern + "\\b")));
}
foreach (const QString &pattern, typePatterns)
{
addHighlightingRule(typeColor, QRegExp("\\b" + pattern + "\\b"));
s_highlightingRules.append(HighlightingRule(typeColor, QRegExp("\\b" + pattern + "\\b")));
}
addHighlightingRule(directiveColor, directiveRegExp);
addHighlightingRule(numberColor, numberRegExp);
addHighlightingRule(functionColor, functionRegExp);
addHighlightingRule(quotationColor, quotation2RegExp);
s_highlightingRules.append(HighlightingRule(directiveColor, directiveRegExp));
s_highlightingRules.append(HighlightingRule(numberColor, numberRegExp));
s_highlightingRules.append(HighlightingRule(functionColor, functionRegExp));
s_highlightingRules.append(HighlightingRule(quotationColor, quotation2RegExp));
m_quotationRule = HighlightingRule(quotationColor, quotationRegExp);
m_commentRule = HighlightingRule(commentColor, commentRegExp);
s_quotationRule = HighlightingRule(quotationColor, quotationRegExp);
s_commentRule = HighlightingRule(commentColor, commentRegExp);
}
void QtHighlighter::clearHighlightingRules()
{
s_highlightingRules.clear();
}
QtHighlighter::QtHighlighter(QTextDocument *parent)
: QSyntaxHighlighter(parent)
{
}
void QtHighlighter::highlightBlock(const QString& text)
{
if (currentBlock().blockNumber() == 0)
{
highlightDocument();
}
}
void QtHighlighter::highlightDocument()
{
if (!s_highlightingRules.size())
{
createHighlightingRules();
}
QTextDocument* doc = document();
std::vector<std::pair<int, int>> ranges;
for (QTextBlock it = doc->begin(); it != doc->end(); it = it.next())
{
formatBlock(it, m_quotationRule, &ranges, true);
formatBlock(it, s_quotationRule, &ranges, true);
}
for (QTextBlock it = doc->begin(); it != doc->end(); it = it.next())
{
foreach (const HighlightingRule &rule, m_highlightingRules)
foreach (const HighlightingRule &rule, s_highlightingRules)
{
formatBlock(it, rule, &ranges, false);
}
@@ -91,7 +107,7 @@ void QtHighlighter::highlightDocument()
for (QTextBlock it = doc->begin(); it != doc->end(); it = it.next())
{
formatBlock(it, m_commentRule, &ranges, true);
formatBlock(it, s_commentRule, &ranges, true);
}
}
@@ -128,7 +144,7 @@ void QtHighlighter::highlightMultiLineComments(std::vector<std::pair<int, int>>*
break;
}
applyFormat(cursorStart.selectionStart(), cursorEnd.position(), m_commentRule.format);
applyFormat(cursorStart.selectionStart(), cursorEnd.position(), s_commentRule.format);
ranges->push_back(std::pair<int, int>(cursorStart.selectionStart(), cursorEnd.position()));
cursorStart = cursorEnd;
@@ -145,11 +161,6 @@ QtHighlighter::HighlightingRule::HighlightingRule(const QColor& color, const QRe
pattern = regExp;
}
void QtHighlighter::addHighlightingRule(const QColor& color, const QRegExp& regExp)
{
m_highlightingRules.append(HighlightingRule(color, regExp));
}
bool QtHighlighter::isInRange(int pos, const std::vector<std::pair<int, int>>& ranges) const
{
for (const std::pair<int, int> p : ranges)
@@ -197,3 +208,10 @@ void QtHighlighter::applyFormat(int startPosition, int endPosition, const QTextC
cursor.setPosition(endPosition, QTextCursor::KeepAnchor);
cursor.setCharFormat(format);
}
QTextCharFormat QtHighlighter::getFormat(int startPosition, int endPosition) const
{
QTextCursor cursor(document());
cursor.setPosition(endPosition);
return cursor.charFormat();
}
src/lib_gui/qt/utility/QtHighlighter.h
+10 -7
View File
@@ -12,7 +12,14 @@ class QtHighlighter
Q_OBJECT
public:
static void createHighlightingRules();
static void clearHighlightingRules();
QtHighlighter(QTextDocument *parent = 0);
void highlightDocument();
void applyFormat(int startPosition, int endPosition, const QTextCharFormat& format);
QTextCharFormat getFormat(int startPosition, int endPosition) const;
protected:
void highlightBlock(const QString& text);
@@ -27,18 +34,14 @@ private:
QTextCharFormat format;
};
void highlightDocument();
void highlightMultiLineComments(std::vector<std::pair<int, int>>* ranges);
void addHighlightingRule(const QColor& color, const QRegExp& regExp);
bool isInRange(int index, const std::vector<std::pair<int, int>>& ranges) const;
void formatBlock(const QTextBlock& block, const HighlightingRule& rule, std::vector<std::pair<int, int>>* ranges, bool saveRange);
void applyFormat(int startPosition, int endPosition, const QTextCharFormat& format);
QVector<HighlightingRule> m_highlightingRules;
HighlightingRule m_quotationRule;
HighlightingRule m_commentRule;
static QVector<HighlightingRule> s_highlightingRules;
static HighlightingRule s_quotationRule;
static HighlightingRule s_commentRule;
};
#endif // QT_HIGHLIGHTER_H