From 035c3bd399935624b096f60dcb2c31f48ab5ca93 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 11 May 2017 00:01:47 -0400 Subject: [PATCH 1/2] Provide support for fallback config values Supercedes #3541 --- include/ConfigManager.h | 3 +++ src/core/ConfigManager.cpp | 10 ++++++++++ src/gui/SetupDialog.cpp | 6 +++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/ConfigManager.h b/include/ConfigManager.h index c5ef45b340c..946bcae3c62 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -217,6 +217,9 @@ class EXPORT ConfigManager const QString & value( const QString & cls, const QString & attribute ) const; + const QString & value( const QString & cls, + const QString & attribute, + const QString & defaultVal) const; void setValue( const QString & cls, const QString & attribute, const QString & value ); void deleteValue( const QString & cls, const QString & attribute); diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index 13c6d9a85b3..c9cf773572c 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -318,6 +318,16 @@ const QString & ConfigManager::value( const QString & cls, +const QString & ConfigManager::value( const QString & cls, + const QString & attribute, + const QString & defaultVal ) const +{ + const QString & val = value( cls, attribute ); + return val.isEmpty() ? defaultVal : val; +} + + + void ConfigManager::setValue( const QString & cls, const QString & attribute, diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp index f2fb66cd36f..d43aa3eae3b 100644 --- a/src/gui/SetupDialog.cpp +++ b/src/gui/SetupDialog.cpp @@ -119,8 +119,8 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) : #endif m_backgroundArtwork( QDir::toNativeSeparators( ConfigManager::inst()->backgroundArtwork() ) ), m_smoothScroll( ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt() ), - m_enableAutoSave( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt() ), - m_enableRunningAutoSave( ConfigManager::inst()->value( "ui", "enablerunningautosave" ).toInt() ), + m_enableAutoSave( ConfigManager::inst()->value( "ui", "enableautosave", "1" ).toInt() ), + m_enableRunningAutoSave( ConfigManager::inst()->value( "ui", "enablerunningautosave", "1" ).toInt() ), m_saveInterval( ConfigManager::inst()->value( "ui", "saveinterval" ).toInt() < 1 ? MainWindow::DEFAULT_SAVE_INTERVAL_MINUTES : ConfigManager::inst()->value( "ui", "saveinterval" ).toInt() ), @@ -131,7 +131,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) : m_syncVSTPlugins( ConfigManager::inst()->value( "ui", "syncvstplugins" ).toInt() ), m_animateAFP(ConfigManager::inst()->value( "ui", - "animateafp").toInt() ), + "animateafp", "1").toInt() ), m_printNoteLabels(ConfigManager::inst()->value( "ui", "printnotelabels").toInt() ), m_displayWaveform(ConfigManager::inst()->value( "ui", From 364cea18eb0d67f93803b269c0da8a1d9ea266b0 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sat, 13 May 2017 10:17:46 -0400 Subject: [PATCH 2/2] Formatting --- include/ConfigManager.h | 2 +- src/gui/SetupDialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ConfigManager.h b/include/ConfigManager.h index 946bcae3c62..4c0a73e056a 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -219,7 +219,7 @@ class EXPORT ConfigManager const QString & attribute ) const; const QString & value( const QString & cls, const QString & attribute, - const QString & defaultVal) const; + const QString & defaultVal ) const; void setValue( const QString & cls, const QString & attribute, const QString & value ); void deleteValue( const QString & cls, const QString & attribute); diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp index d43aa3eae3b..9f135784e47 100644 --- a/src/gui/SetupDialog.cpp +++ b/src/gui/SetupDialog.cpp @@ -131,7 +131,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) : m_syncVSTPlugins( ConfigManager::inst()->value( "ui", "syncvstplugins" ).toInt() ), m_animateAFP(ConfigManager::inst()->value( "ui", - "animateafp", "1").toInt() ), + "animateafp", "1" ).toInt() ), m_printNoteLabels(ConfigManager::inst()->value( "ui", "printnotelabels").toInt() ), m_displayWaveform(ConfigManager::inst()->value( "ui",