flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #209, reset method for settings

Browse Source
This commit is contained in:
Klaus Basan
2014-04-15 02:50:29 +02:00
parent 04bd01687e
commit 284a130669
6 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackcore/context_settings.h
View File

@@ -116,12 +116,15 @@ namespace BlackCore
//! Hotkeys
virtual BlackMisc::Hardware::CKeyboardKeyList getHotkeys() const = 0;
//! save settings
//! Save settings
virtual BlackMisc::CStatusMessage write() const = 0;
//! Read settings
virtual BlackMisc::CStatusMessage read() = 0;
//! Reset settings
virtual BlackMisc::CStatusMessage reset(bool write = true) = 0;
//! Read settings
virtual QString getSettingsFileName() const = 0;

29
src/blackcore/context_settings_impl.cpp
View File

@@ -99,16 +99,32 @@ namespace BlackCore
}
if (ok)
{
return CStatusMessage(CStatusMessage::TypeCore, CStatusMessage::SeverityInfo,
return CStatusMessage(CStatusMessage::TypeSettings, CStatusMessage::SeverityInfo,
QString("Written settings: %1").arg(this->getSettingsFileName()));
}
else
{
return CStatusMessage(CStatusMessage::TypeCore, CStatusMessage::SeverityError,
return CStatusMessage(CStatusMessage::TypeSettings, CStatusMessage::SeverityError,
QString("Problem writing settings: %1").arg(this->getSettingsFileName()));
}
}
/*
* Reset settings file
*/
CStatusMessage CContextSettings::reset(bool write)
{
this->m_hotkeys.initAsHotkeyList(true);
this->m_settingsNetwork.initDefaultValues();
this->emitCompletelyChanged();
if (write)
return this->write();
else
return CStatusMessage(CStatusMessage::TypeSettings, CStatusMessage::SeverityInfo,
QString("Reset settings data, not written"));
}
QString CContextSettings::getSettingsAsJsonString() const
{
QJsonDocument doc = this->toJsonDocument();
@@ -127,6 +143,15 @@ namespace BlackCore
return doc;
}
/*
* Emit all changed signals
*/
void CContextSettings::emitCompletelyChanged()
{
emit this->changedSettings(IContextSettings::SettingsHotKeys);
emit this->changedSettings(IContextSettings::SettingsNetwork);
}
/*
* Hotkeys
*/

4
src/blackcore/context_settings_impl.h
View File

@@ -69,6 +69,9 @@ namespace BlackCore
//! \copydoc IContextSettings::write
virtual BlackMisc::CStatusMessage write() const override;
//! \copydoc IContextSettings::reset
virtual BlackMisc::CStatusMessage reset(bool write = true) override;
//! Settings file name
virtual QString getSettingsFileName() const override { return BlackMisc::Settings::CSettingUtilities::getSettingsFile(); }
@@ -79,6 +82,7 @@ namespace BlackCore
BlackMisc::Settings::CSettingsNetwork m_settingsNetwork;
BlackMisc::Hardware::CKeyboardKeyList m_hotkeys;
QJsonDocument toJsonDocument() const;
void emitCompletelyChanged();
};
}

8
src/blackcore/context_settings_proxy.cpp
View File

@@ -80,6 +80,14 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1Literal("read"));
}
/*
* Reset settings
*/
CStatusMessage CContextSettingsProxy::reset(bool write)
{
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1Literal("reset"), write);
}
/*
* File name
*/

3
src/blackcore/context_settings_proxy.h
View File

@@ -61,6 +61,9 @@ namespace BlackCore
//! \brief read settings
virtual BlackMisc::CStatusMessage read() override;
//! \copydoc IContextSettings::reset
virtual BlackMisc::CStatusMessage reset(bool write = true) override;
//! \brief settings file name
virtual QString getSettingsFileName() const override;