refs #273, added settings for simulator

* added class
* adjusted settings context
* adjusted "global" methods as register metadata
* improved settings utility
* renamed "settingsallclasses" as settings can also be in other namespaces, settingsallclasses now in core
This commit is contained in:
Klaus Basan
2014-06-25 19:12:00 +02:00
parent abd2d6d86d
commit 42db1fe9ae
15 changed files with 360 additions and 34 deletions

View File

@@ -11,11 +11,9 @@
#include "blackinput/keyboard.h"
#include "blackmisc/hwkeyboardkeylist.h"
#include "blackmisc/statusmessagelist.h"
#include "blackmisc/settingutilities.h"
#include "blackmisc/setnetwork.h"
#include "blackmisc/setaudio.h"
#include "blackmisc/dbus.h"
#include "blackmisc/variant.h"
#include "blackcore/settingsallclasses.h"
#include <QObject>
#include <QVariant>
@@ -38,7 +36,8 @@ namespace BlackCore
{
SettingsHotKeys,
SettingsNetwork,
SettingsAudio
SettingsAudio,
SettingsSimulator
};
protected:
@@ -82,6 +81,13 @@ namespace BlackCore
return s;
}
//! Path for simulator settings
static const QString &PathSimulatorSettings()
{
static QString s("simulator");
return s;
}
//! Root path
static const QString &PathRoot()
{
@@ -123,6 +129,9 @@ namespace BlackCore
//! Audio settings
virtual BlackMisc::Settings::CSettingsAudio getAudioSettings() const = 0;
//! Audio settings
virtual BlackSim::Settings::CSettingsSimulator getSimulatorSettings() const = 0;
//! Hotkeys
virtual BlackMisc::Hardware::CKeyboardKeyList getHotkeys() const = 0;