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

ui: Fixes for release

Browse Source 
* improved color scheme contrasts
* fixed code view single not updated to font size change
* fixed tooltip shown when hovering error location
* fixed previous reference count shown when fulltext search has no results
This commit is contained in:
Eberhard Graether
2017-08-10 03:16:29 +02:00
parent d9c8de2951
commit bb5c1d49b6
5 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/color_schemes/bad_rainbow.xml
+18 -18
View File
@@ -93,7 +93,7 @@
</title> </title>
<ref_count> <ref_count>
<text>#C4C4C4</text> <text>#D4D4D4</text>
<background>#494949</background> <background>#494949</background>
</ref_count> </ref_count>
</file> </file>
@@ -108,21 +108,21 @@
</title> </title>
<line_number> <line_number>
<text>#C4C4C4</text> <text>#D4D4D4</text>
<inactive_text>#A0A0A0</inactive_text> <inactive_text>#A0A0A0</inactive_text>
<background>#494949</background> <background>#494949</background>
<marker>#C4C4C4</marker> <marker>#D4D4D4</marker>
</line_number> </line_number>
<syntax> <syntax>
<normal>#C4C4C4</normal> <normal>#D4D4D4</normal>
<directive>#00A0B6</directive> <directive>#00A0B6</directive>
<keyword>#00A0B6</keyword> <keyword>#00BCD6</keyword>
<type>#FF4A52</type> <type>#FF5961</type>
<comment>#9DC28D</comment> <comment>#78946B</comment>
<number>#EE7326</number> <number>#FC7F30</number>
<quotation>#D663D6</quotation> <quotation>#F283F2</quotation>
<function>#FBBA00</function> <function>#FFCC3B</function>
</syntax> </syntax>
<selection> <selection>
@@ -255,7 +255,7 @@
<function> <function>
<fill> <fill>
<normal>#FBBA00</normal> <normal>#FFCC3B</normal>
<focus>#FFD05A</focus> <focus>#FFD05A</focus>
</fill> </fill>
<border> <border>
@@ -272,8 +272,8 @@
<global_variable> <global_variable>
<fill> <fill>
<normal>#00A0B6</normal> <normal>#00BCD6</normal>
<focus>#3BAFB2</focus> <focus>#38D3E8</focus>
</fill> </fill>
<border> <border>
<normal>transparent</normal> <normal>transparent</normal>
@@ -396,12 +396,12 @@
</override> </override>
<call> <call>
<normal>#FBBA00</normal> <normal>#DEA400</normal>
<trail_focus>#FFFFFF</trail_focus> <trail_focus>#FFFFFF</trail_focus>
</call> </call>
<use> <use>
<normal>#2A6484</normal> <normal>#00A0B6</normal>
</use> </use>
<template_argument> <template_argument>
@@ -435,9 +435,9 @@
</graph> </graph>
<table> <table>
<background>#494949</background> <background>#494949</background>
<table>#C4C4C4</table> <table>#D4D4D4</table>
<text> <text>
<normal>#C4C4C4</normal> <normal>#D4D4D4</normal>
<active>black</active> <active>black</active>
</text> </text>
<table_line_1> <table_line_1>
@@ -451,7 +451,7 @@
</table> </table>
<tab> <tab>
<background>#494949</background> <background>#494949</background>
<active>#C4C4C4</active> <active>#D4D4D4</active>
<hover>#878787</hover> <hover>#878787</hover>
<text>#878787</text> <text>#878787</text>
</tab> </tab>
bin/app/data/color_schemes/bright.xml
+1 -1
View File
@@ -119,7 +119,7 @@
<directive>#1B8856</directive> <directive>#1B8856</directive>
<keyword>#1B8856</keyword> <keyword>#1B8856</keyword>
<type>#C1492D</type> <type>#C1492D</type>
<comment>#287299</comment> <comment>#8FB2C4</comment>
<number>#C1315E</number> <number>#C1315E</number>
<quotation>#865F9E</quotation> <quotation>#865F9E</quotation>
<function>#CC9533</function> <function>#CC9533</function>
bin/app/data/color_schemes/dark.xml
+1 -1
View File
@@ -119,7 +119,7 @@
<directive>#1F9C62</directive> <directive>#1F9C62</directive>
<keyword>#1F9C62</keyword> <keyword>#1F9C62</keyword>
<type>#D95233</type> <type>#D95233</type>
<comment>#487F9C</comment> <comment>#456A7D</comment>
<number>#CC3463</number> <number>#CC3463</number>
<quotation>#9368AD</quotation> <quotation>#9368AD</quotation>
<function>#D69C36</function> <function>#D69C36</function>
src/lib_gui/qt/element/QtCodeArea.cpp
+12
View File
@@ -459,11 +459,23 @@ void QtCodeArea::contextMenuEvent(QContextMenuEvent* event)
void QtCodeArea::focusTokenIds(const std::vector<Id>& tokenIds) void QtCodeArea::focusTokenIds(const std::vector<Id>& tokenIds)
{ {
if (m_navigator->hasErrors() && tokenIds.size() == 1)
{
QtCodeField::focusTokenIds(tokenIds);
return;
}
MessageFocusIn(tokenIds, TOOLTIP_ORIGIN_CODE).dispatch(); MessageFocusIn(tokenIds, TOOLTIP_ORIGIN_CODE).dispatch();
} }
void QtCodeArea::defocusTokenIds(const std::vector<Id>& tokenIds) void QtCodeArea::defocusTokenIds(const std::vector<Id>& tokenIds)
{ {
if (m_navigator->hasErrors() && tokenIds.size() == 1)
{
QtCodeField::defocusTokenIds(tokenIds);
return;
}
MessageFocusOut(tokenIds).dispatch(); MessageFocusOut(tokenIds).dispatch();
} }
src/lib_gui/qt/element/QtCodeNavigator.cpp
+6 -2
View File
@@ -88,8 +88,6 @@ QtCodeNavigator::QtCodeNavigator(QWidget* parent)
navigation->setLayout(navLayout); navigation->setLayout(navLayout);
layout->addWidget(navigation); layout->addWidget(navigation);
refreshStyle();
QHBoxLayout* separatorLayout = new QHBoxLayout(); QHBoxLayout* separatorLayout = new QHBoxLayout();
QWidget* widget = new QWidget(); QWidget* widget = new QWidget();
@@ -128,6 +126,8 @@ QtCodeNavigator::QtCodeNavigator(QWidget* parent)
setModeList(); setModeList();
} }
refreshStyle();
connect(this, &QtCodeNavigator::scrollRequest, this, &QtCodeNavigator::handleScrollRequest, Qt::QueuedConnection); connect(this, &QtCodeNavigator::scrollRequest, this, &QtCodeNavigator::handleScrollRequest, Qt::QueuedConnection);
} }
@@ -260,6 +260,8 @@ void QtCodeNavigator::clearCodeSnippets()
void QtCodeNavigator::clearFile() void QtCodeNavigator::clearFile()
{ {
m_single->clearFile(); m_single->clearFile();
updateRefLabel();
} }
void QtCodeNavigator::clearCaches() void QtCodeNavigator::clearCaches()
@@ -543,6 +545,8 @@ void QtCodeNavigator::refreshStyle()
m_nextButton->setIconSize(QSize(12, 12)); m_nextButton->setIconSize(QSize(12, 12));
m_listButton->setIconSize(QSize(14, 14)); m_listButton->setIconSize(QSize(14, 14));
m_fileButton->setIconSize(QSize(14, 14)); m_fileButton->setIconSize(QSize(14, 14));
clearCaches();
} }
void QtCodeNavigator::scrollToValue(int value, bool inListMode) void QtCodeNavigator::scrollToValue(int value, bool inListMode)