Settings, added TSettingTrait::humanReadable and used copydoc, T159 related

This commit is contained in:
Klaus Basan
2017-09-22 01:17:04 +02:00
committed by Mathew Sutcliffe
parent 88a1c9f5d4
commit 7cdfe8c914
15 changed files with 116 additions and 24 deletions

View File

@@ -65,12 +65,18 @@ namespace BlackMisc
struct TModel : public BlackMisc::TSettingTrait<CModelSettings>
{
//! Key in data cache
static const char *key() { return "settingsmodels"; }
static const char *key() { return "Models"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Current traffic servers"); return name; }
};
//! Mapping preferences for model distributor list
struct TDistributorListPreferences : public BlackMisc::TSettingTrait<BlackMisc::Simulation::CDistributorListPreferences>
{
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Distributor preferences"); return name; }
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "mapping/distributorpreferences"; }
};

View File

@@ -102,29 +102,41 @@ namespace BlackMisc
//! Trait for simulator settings
struct TSimulatorFsx : public BlackMisc::TSettingTrait<CSimulatorSettings>
{
//! Key in data cache
//! \copydoc BlackCore::TSettingTrait::key
static const char *key() { return "settingssimulatorfsx"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("FSX"); return name; }
};
//! Trait for simulator settings
struct TSimulatorFs9 : public BlackMisc::TSettingTrait<CSimulatorSettings>
{
//! Key in data cache
//! \copydoc BlackCore::TSettingTrait::key
static const char *key() { return "settingssimulatorfs9"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("FS9"); return name; }
};
//! Trait for simulator settings
struct TSimulatorP3D : public BlackMisc::TSettingTrait<CSimulatorSettings>
{
//! Key in data cache
//! \copydoc BlackCore::TSettingTrait::key
static const char *key() { return "settingssimulatorp3d"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("P3D"); return name; }
};
//! Trait for simulator settings
struct TSimulatorXP : public BlackMisc::TSettingTrait<CSimulatorSettings>
{
//! Key in data cache
//! \copydoc BlackCore::TSettingTrait::key
static const char *key() { return "settingssimulatorxplane"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("XPlane"); return name; }
};
//! Bundle of settings for all simulators
@@ -284,8 +296,11 @@ namespace BlackMisc
//! Trait for simulator message settings
struct TSimulatorMessages : public BlackMisc::TSettingTrait<CSimulatorMessagesSettings>
{
//! Key in data cache
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "settingssimulatormessages"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Simulator messages"); return name; }
};
//! Selected weather scenario
@@ -294,6 +309,9 @@ namespace BlackMisc
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "simulator/selectedweatherscenario"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Weather scenario"); return name; }
//! \copydoc BlackMisc::TSettingTrait::defaultValue
static const BlackMisc::Weather::CWeatherScenario &defaultValue()
{

View File

@@ -92,10 +92,13 @@ namespace BlackMisc
//! Trait for swift plugin settings
struct TSwiftPlugin : public BlackMisc::TSettingTrait<CSwiftPluginSettings>
{
//! Key in data cache
//! \copydoc BlackCore::TSettingTrait::key
static const char *key() { return "settingsswiftplugin"; }
//! Validator function.
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("swift plugin"); return name; }
//! \copydoc BlackCore::TSettingTrait::isValid
static bool isValid(const CSwiftPluginSettings &value) { return value.getEmulatedSimulator().isSingleSimulator(); }
};
} // ns

View File

@@ -30,6 +30,9 @@ namespace BlackMisc
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "xswiftbus/server"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("XSwiftBus"); return name; }
//! \copydoc BlackMisc::TSettingTrait::defaultValue
static QString defaultValue() { return BlackMisc::CDBusServer::sessionBusAddress(); }