src: more bug fixes
* 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:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user