Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make configuration handling on non-windows multi-level (Qt default ini) #11

Merged
merged 1 commit into from
Nov 13, 2019
Merged

Make configuration handling on non-windows multi-level (Qt default ini) #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/dinsightconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,20 @@
* Handles config file settings.
*
*/


#ifdef _WIN32
// Stay compatible with released Windows version, looking for insight.conf
// file only in current working directory
# define SETTINGS QSettings( defaultFileName(), QSettings::IniFormat )
#else // _WIN32
// Use default Qt behaviour elsewhere, looking for insight.ini in
// /usr/share/, /etc/ and ~/.config/ on unix and MacOS.
# define SETTINGS QSettings( QSettings::IniFormat, \
QSettings::UserScope, \
QCoreApplication::organizationName(),\
QCoreApplication::applicationName())
#endif // _WIN32

//===================================
// P U B L I C I N T E R F A C E
//===================================
Expand All @@ -41,7 +54,7 @@

QString DInsightConfig::get( const QString& key, const QString& def /*= ""*/ )
{
return QSettings( defaultFileName(), QSettings::IniFormat ).value( key, def ).toString();
return SETTINGS.value( key, def ).toString();
}


Expand All @@ -52,7 +65,7 @@ QString DInsightConfig::get( const QString& key, const QString& def /*= ""*/ )

int DInsightConfig::getInt( const QString& key, int def /*= -1*/ )
{
return QSettings( defaultFileName(), QSettings::IniFormat ).value( key, def ).toInt();
return SETTINGS.value( key, def ).toInt();
}


Expand All @@ -63,7 +76,7 @@ int DInsightConfig::getInt( const QString& key, int def /*= -1*/ )

bool DInsightConfig::getBool( const QString& key, bool def /*= false*/ )
{
return QSettings( defaultFileName(), QSettings::IniFormat ).value( key, def ).toBool();
return SETTINGS.value( key, def ).toBool();
}


Expand Down Expand Up @@ -106,7 +119,7 @@ QString DInsightConfig::getLocalizedKey( const QString& key )

void DInsightConfig::set( const QString& key, const QString& value )
{
QSettings( defaultFileName(), QSettings::IniFormat ).setValue( key, value );
SETTINGS.setValue( key, value );
}


Expand Down