colormanager: implement default config
This commit is contained in:
+18
-15
@@ -116,6 +116,9 @@ void Core::Start()
|
||||
// Set up the index manager for renderers
|
||||
IndexManager::CreateInstance();
|
||||
|
||||
// Set up color manager's default config
|
||||
ColorManager::SetUpDefaultConfig();
|
||||
|
||||
// Reset config (Config sets to default on construction already, but we do it again here as a workaround that fixes
|
||||
// the fact that some of the config paths set by default rely on the app name having been set (in main())
|
||||
Config::Current().SetDefaults();
|
||||
@@ -123,20 +126,6 @@ void Core::Start()
|
||||
// Load application config
|
||||
Config::Load();
|
||||
|
||||
// Load recently opened projects list
|
||||
{
|
||||
QFile recent_projects_file(GetRecentProjectsFilePath());
|
||||
if (recent_projects_file.open(QFile::ReadOnly | QFile::Text)) {
|
||||
QTextStream ts(&recent_projects_file);
|
||||
|
||||
while (!ts.atEnd()) {
|
||||
recent_projects_.append(ts.readLine());
|
||||
}
|
||||
|
||||
recent_projects_file.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Start GUI (FIXME CLI mode)
|
||||
@@ -555,6 +544,20 @@ void Core::StartGUI(bool full_screen)
|
||||
// Start autorecovery timer using the config value as its interval
|
||||
SetAutorecoveryInterval(Config::Current()["AutorecoveryInterval"].toInt());
|
||||
autorecovery_timer_.start();
|
||||
|
||||
// Load recently opened projects list
|
||||
{
|
||||
QFile recent_projects_file(GetRecentProjectsFilePath());
|
||||
if (recent_projects_file.open(QFile::ReadOnly | QFile::Text)) {
|
||||
QTextStream ts(&recent_projects_file);
|
||||
|
||||
while (!ts.atEnd()) {
|
||||
recent_projects_.append(ts.readLine());
|
||||
}
|
||||
|
||||
recent_projects_file.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Core::SaveProjectInternal(ProjectPtr project)
|
||||
@@ -783,7 +786,7 @@ QString Core::GetProjectFilter()
|
||||
|
||||
QString Core::GetRecentProjectsFilePath()
|
||||
{
|
||||
return QDir(GetConfigurationLocation()).filePath(QStringLiteral("recent"));
|
||||
return QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("recent"));
|
||||
}
|
||||
|
||||
bool Core::SaveProject(ProjectPtr p)
|
||||
|
||||
Reference in New Issue
Block a user