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

ui: Updates for release

Browse Source 
* updated color scheme highlight colors
* fixed highlight color resetting
* prevent project file being save with no changes
* fixed MessageListener crash due to alive flag being set too late
* new edit project icon
This commit is contained in:
Eberhard Graether
2016-04-26 16:40:09 +02:00
parent 279f7410d3
commit fd905f76e5
10 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/color_schemes/bad_rainbow.xml
+10 -7
View File
@@ -93,12 +93,13 @@
<fill>transparent</fill>
</normal>
<focus>
<border>#B2B2B2</border>
<border>#EDEDED</border>
<fill>transparent</fill>
</focus>
<active>
<border>#B2B2B2</border>
<fill>#4A4A4A</fill>
<border>#EDEDED</border>
<fill>#EDEDED</fill>
<text>#262626</text>
</active>
</token>
<local_symbol>
@@ -107,12 +108,14 @@
<fill>transparent</fill>
</normal>
<focus>
<border>#FF9C3C</border>
<fill>transparent</fill>
<border>#9BDAFF</border>
<fill>#A5DEFF</fill>
<text>#262626</text>
</focus>
<active>
<border>#FF9C3C</border>
<fill>#695540</fill>
<border>transparent</border>
<fill>#A5DEFF</fill>
<text>#262626</text>
</active>
</local_symbol>
<scope>
bin/app/data/color_schemes/bright.xml
+8 -8
View File
@@ -93,13 +93,13 @@
<fill>transparent</fill>
</normal>
<focus>
<border>#B2B2B2</border>
<border>#8E8E8E</border>
<fill>transparent</fill>
</focus>
<active>
<border>#B2B2B2</border>
<fill>#EDEDED</fill>
<text>#000000</text>
<border>#A0A0A0</border>
<fill>#A0A0A0</fill>
<text>#FFFFFF</text>
</active>
</token>
<local_symbol>
@@ -108,12 +108,12 @@
<fill>transparent</fill>
</normal>
<focus>
<border>#FF9C3C</border>
<fill>transparent</fill>
<border>#AAE0FF</border>
<fill>#C6EAFF</fill>
</focus>
<active>
<border>#FF9C3C</border>
<fill>#FFDFC0</fill>
<border>transparent</border>
<fill>#C6EAFF</fill>
</active>
</local_symbol>
<scope>
bin/app/data/color_schemes/dark.xml
+10 -8
View File
@@ -93,13 +93,13 @@
<fill>transparent</fill>
</normal>
<focus>
<border>#B2B2B2</border>
<border>#F7F7F7</border>
<fill>transparent</fill>
</focus>
<active>
<border>#B2B2B2</border>
<fill>#4A4A4A</fill>
<text>#F7F7F7</text>
<border>transparent</border>
<fill>#F7F7F7</fill>
<text>#272728</text>
</active>
</token>
<local_symbol>
@@ -108,12 +108,14 @@
<fill>transparent</fill>
</normal>
<focus>
<border>#FF9C3C</border>
<fill>transparent</fill>
<border>#A0A0A0</border>
<fill>#969696</fill>
<text>#191919</text>
</focus>
<active>
<border>#FF9C3C</border>
<fill>#695540</fill>
<border>transparent</border>
<fill>#969696</fill>
<text>#272728</text>
</active>
</local_symbol>
<scope>
bin/app/data/gui/code_view/images/edit.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 464 B

After

Width:  |  Height:  |  Size: 1007 B

src/lib/Application.cpp
+7 -2
View File
@@ -15,6 +15,7 @@
#include "component/view/MainView.h"
#include "component/view/ViewFactory.h"
#include "data/StorageCache.h"
#include "isTrial.h"
#include "LicenseChecker.h"
#include "settings/ApplicationSettings.h"
#include "settings/ColorScheme.h"
@@ -120,7 +121,7 @@ void Application::loadProject(const FilePath& projectSettingsFilePath)
Project::ProjectState state = m_project->load(projectSettingsFilePath);
if (state == Project::PROJECT_OUTDATED)
{
if (m_hasGUI)
if (m_hasGUI && !isTrial())
{
std::vector<std::string> options;
options.push_back("Yes");
@@ -182,6 +183,10 @@ void Application::saveProject(const FilePath& projectSettingsFilePath)
{
LOG_ERROR("No Project Settings File defined");
}
else
{
MessageStatus("Project saved").dispatch();
}
}
void Application::handleMessage(MessageActivateWindow* message)
@@ -213,7 +218,7 @@ void Application::handleMessage(MessageLoadProject* message)
}
}
if (message->forceRefresh)
if (message->forceRefresh && !isTrial())
{
if (m_hasGUI)
{
src/lib/Project.cpp
+13 -2
View File
@@ -90,19 +90,30 @@ Project::ProjectState Project::reload()
bool Project::save(const FilePath& projectSettingsFile)
{
bool differentLocation = (projectSettingsFile != m_projectSettingsFilepath);
if (!projectSettingsFile.empty())
{
setProjectSettingsFilePath(projectSettingsFile);
}
else
{
differentLocation = false;
}
if (m_projectSettingsFilepath.empty())
{
return false;
}
ProjectSettings::getInstance()->save(m_projectSettingsFilepath);
ProjectSettings settings;
settings.load(m_projectSettingsFilepath);
LOG_INFO_STREAM(<< "ProjectSettings saved to file: " << m_projectSettingsFilepath.str());
if (differentLocation || settings != *ProjectSettings::getInstance().get())
{
ProjectSettings::getInstance()->save(m_projectSettingsFilepath);
LOG_INFO_STREAM(<< "ProjectSettings saved to file: " << m_projectSettingsFilepath.str());
}
return true;
}
src/lib/settings/ProjectSettings.cpp
+5
View File
@@ -57,6 +57,11 @@ bool ProjectSettings::operator==(const ProjectSettings& other) const
utility::isPermutation<std::string>(getSourceExtensions(), other.getSourceExtensions());
}
bool ProjectSettings::operator!=(const ProjectSettings& other) const
{
return !(*this == other);
}
void ProjectSettings::save(const FilePath& filePath)
{
m_projectName = "";
src/lib/settings/ProjectSettings.h
+1
View File
@@ -18,6 +18,7 @@ public:
~ProjectSettings();
bool operator==(const ProjectSettings& other) const;
bool operator!=(const ProjectSettings& other) const;
virtual void save(const FilePath& filePath);
src/lib/utility/messaging/MessageListenerBase.h
+1 -1
View File
@@ -21,9 +21,9 @@ public:
{
if (m_alive)
{
m_alive = false;
MessageQueue::getInstance()->unregisterListener(this);
}
m_alive = false;
}
uint getId() const
src/lib_gui/qt/element/QtCodeArea.cpp
+5 -1
View File
@@ -712,7 +712,11 @@ void QtCodeArea::annotateText()
{
if (newColor.text.size() > 0 && newColor.text != "transparent")
{
annotation.oldTextColor = m_highlighter->getFormat(annotation.start, annotation.end).foreground().color();
if (!annotation.oldTextColor.isValid())
{
annotation.oldTextColor = m_highlighter->getFormat(annotation.start, annotation.end).foreground().color();
}
setTextColorForAnnotation(annotation, QColor(newColor.text.c_str()));
}
else if (annotation.oldTextColor.isValid())