aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in pandel/valentina-devel/feature (pull request #123)

Browse Source 
Resolve issue #508. Settings saved to INI files in different folders.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-06-10 17:51:06 +03:00
commit 777efb9a88
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -1,4 +1,5 @@
# Version 0.5.0 # Version 0.5.0
- [#508] Settings saved to INI files in different folders.
- [#193] Undeletable zombie arc objects. - [#193] Undeletable zombie arc objects.
- New feature. Groups. - New feature. Groups.
- Tool "Curve intersect axis" store data about subpaths. - Tool "Curve intersect axis" store data about subpaths.

14
src/libs/vmisc/vcommonsettings.cpp
View File

@ -65,6 +65,8 @@ const QString VCommonSettings::SettingGeneralGeometry = QString
const QString VCommonSettings::SettingGeneralWindowState = QStringLiteral("windowState"); const QString VCommonSettings::SettingGeneralWindowState = QStringLiteral("windowState");
const QString VCommonSettings::SettingGeneralToolbarsState = QStringLiteral("toolbarsState"); const QString VCommonSettings::SettingGeneralToolbarsState = QStringLiteral("toolbarsState");
static const QString commonIniFilename = QStringLiteral("common");
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VCommonSettings::VCommonSettings(Format format, Scope scope, const QString &organization, VCommonSettings::VCommonSettings(Format format, Scope scope, const QString &organization,
const QString &application, QObject *parent) const QString &application, QObject *parent)
@ -115,14 +117,14 @@ QString VCommonSettings::StandardTablesPath() const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString VCommonSettings::GetPathIndividualMeasurements() const QString VCommonSettings::GetPathIndividualMeasurements() const
{ {
QSettings settings(this->format(), this->scope(), this->organizationName()); QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
return settings.value(SettingPathsIndividualMeasurements, QDir::homePath()).toString(); return settings.value(SettingPathsIndividualMeasurements, QDir::homePath()).toString();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VCommonSettings::SetPathIndividualMeasurements(const QString &value) void VCommonSettings::SetPathIndividualMeasurements(const QString &value)
{ {
QSettings settings(this->format(), this->scope(), this->organizationName()); QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
settings.setValue(SettingPathsIndividualMeasurements, value); settings.setValue(SettingPathsIndividualMeasurements, value);
settings.sync(); settings.sync();
} }
@ -130,14 +132,14 @@ void VCommonSettings::SetPathIndividualMeasurements(const QString &value)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString VCommonSettings::GetPathStandardMeasurements() const QString VCommonSettings::GetPathStandardMeasurements() const
{ {
QSettings settings(this->format(), this->scope(), this->organizationName()); QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
return settings.value(SettingPathsStandardMeasurements, StandardTablesPath()).toString(); return settings.value(SettingPathsStandardMeasurements, StandardTablesPath()).toString();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VCommonSettings::SetPathStandardMeasurements(const QString &value) void VCommonSettings::SetPathStandardMeasurements(const QString &value)
{ {
QSettings settings(this->format(), this->scope(), this->organizationName()); QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
settings.setValue(SettingPathsStandardMeasurements, value); settings.setValue(SettingPathsStandardMeasurements, value);
settings.sync(); settings.sync();
} }
@ -146,14 +148,14 @@ void VCommonSettings::SetPathStandardMeasurements(const QString &value)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString VCommonSettings::GetPathTemplate() const QString VCommonSettings::GetPathTemplate() const
{ {
QSettings settings(this->format(), this->scope(), this->organizationName()); QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
return settings.value(SettingPathsTemplates, TemplatesPath()).toString(); return settings.value(SettingPathsTemplates, TemplatesPath()).toString();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VCommonSettings::SetPathTemplate(const QString &value) void VCommonSettings::SetPathTemplate(const QString &value)
{ {
QSettings settings(this->format(), this->scope(), this->organizationName()); QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
settings.setValue(SettingPathsTemplates, value); settings.setValue(SettingPathsTemplates, value);
settings.sync(); settings.sync();
} }