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

src: more bug fixes

Browse Source 
* fixed snippets added twice on token reactivation for errors and fulltext search results
* fixed colorscheme gets refreshed when cancelling preferences
* scroll to first line in errors table after indexing and showing view
* fixed file not properly expanded when snippet covers full file
* fixed project type naming in project setup
* fixed set delimiter of NameHierarchy for projects that can't be loaded yet
* changed language order for project setup
This commit is contained in:
Eberhard Graether
2017-04-07 17:14:34 +02:00
parent 5570458e53
commit 6ba93ca39f
12 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
+4 -1
View File
@@ -12,6 +12,7 @@ QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
)
: QtProjectWizzardContent(window)
, m_oldColorSchemeIndex(-1)
, m_newColorSchemeIndex(-1)
{
std::vector<std::string> colorSchemePaths =
FileSystem::getFileNamesFromDirectory(ResourcePaths::getColorSchemesPath(), std::vector<std::string>(1, ".xml"));
@@ -23,7 +24,7 @@ QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
QtProjectWizzardContentPreferences::~QtProjectWizzardContentPreferences()
{
if (m_oldColorSchemeIndex != -1)
if (m_oldColorSchemeIndex != -1 && m_oldColorSchemeIndex != m_newColorSchemeIndex)
{
colorSchemeChanged(m_oldColorSchemeIndex);
}
@@ -212,6 +213,7 @@ void QtProjectWizzardContentPreferences::load()
{
m_colorSchemes->setCurrentIndex(i);
m_oldColorSchemeIndex = i;
m_newColorSchemeIndex = i;
break;
}
}
@@ -294,6 +296,7 @@ bool QtProjectWizzardContentPreferences::check()
void QtProjectWizzardContentPreferences::colorSchemeChanged(int index)
{
m_newColorSchemeIndex = index;
MessageSwitchColorScheme(m_colorSchemePaths[index]).dispatch();
}
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h
+2
View File
@@ -52,6 +52,8 @@ private:
QComboBox* m_colorSchemes;
std::vector<FilePath> m_colorSchemePaths;
int m_oldColorSchemeIndex;
int m_newColorSchemeIndex;
QCheckBox* m_useAnimations;
QCheckBox* m_loggingEnabled;
QCheckBox* m_verboseIndexerLoggingEnabled;
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
+1 -1
View File
@@ -110,7 +110,7 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
for (auto projectIt: languageIt.second)
{
QToolButton* b = createProjectButton(
utility::insertLineBreaksAtBlankSpaces(sourceGroupTypeToString(projectIt.type), 15).c_str(),
utility::insertLineBreaksAtBlankSpaces(sourceGroupTypeToProjectSetupString(projectIt.type), 15).c_str(),
(ResourcePaths::getGuiPath() + "icon/" + m_projectTypeIconName[projectIt.type] + ".png").c_str()
);
b->setProperty("source_group_type", int(projectIt.type));