|
@@ -20,14 +20,12 @@
|
|
|
|
|
|
|
|
|
QMap<ASettings::Main, QString> ASettings::mainMap = {
|
|
|
+ {Main::SetupComplete, QStringLiteral("setupComplete")},
|
|
|
{Main::Style, QStringLiteral("style")},
|
|
|
{Main::Font, QStringLiteral("font")},
|
|
|
{Main::FontSize, QStringLiteral("fontSize")},
|
|
|
{Main::UseSystemFont, QStringLiteral("useSystemFont")},
|
|
|
-};
|
|
|
-
|
|
|
-QMap<ASettings::LogBook, QString> ASettings::logBookMap = {
|
|
|
- {LogBook::View, QStringLiteral("view")},
|
|
|
+ {Main::LogbookView, QStringLiteral("logbookView")},
|
|
|
};
|
|
|
|
|
|
QMap<ASettings::UserData, QString> ASettings::userDataMap = {
|
|
@@ -35,6 +33,7 @@ QMap<ASettings::UserData, QString> ASettings::userDataMap = {
|
|
|
{UserData::AcftSortColumn, QStringLiteral("acSortColumn")}, // [G]: inconsistent naming
|
|
|
{UserData::PilSortColumn, QStringLiteral("pilSortColumn")},
|
|
|
{UserData::AcAllowIncomplete, QStringLiteral("acAllowIncomplete")},
|
|
|
+ {UserData::FtlWarningThreshold, QStringLiteral("ftlWarningThreshold")},
|
|
|
};
|
|
|
|
|
|
QMap<ASettings::FlightLogging, QString> ASettings::flightLoggingMap = {
|
|
@@ -49,16 +48,9 @@ QMap<ASettings::FlightLogging, QString> ASettings::flightLoggingMap = {
|
|
|
{FlightLogging::PilotFlying, QStringLiteral("pilotFlying")},
|
|
|
{FlightLogging::NightAngle, QStringLiteral("nightangle")},
|
|
|
{FlightLogging::Rules, QStringLiteral("rules")},
|
|
|
- {FlightLogging::FlightTimeFormat, QStringLiteral("flightTimeFormat")}
|
|
|
-};
|
|
|
-
|
|
|
-QMap<ASettings::Setup, QString> ASettings::setupMap = {
|
|
|
- {Setup::SetupComplete, QStringLiteral("setupComplete")}
|
|
|
-};
|
|
|
-
|
|
|
-QMap<ASettings::NewFlight, QString> ASettings::newFlightMap = {
|
|
|
- {NewFlight::FunctionComboBox, QStringLiteral("FunctionComboBox")}, // inconsistent naming
|
|
|
- {NewFlight::CalendarCheckBox, QStringLiteral("calendarCheckBox")},
|
|
|
+ {FlightLogging::FlightTimeFormat, QStringLiteral("flightTimeFormat")},
|
|
|
+ {FlightLogging::FunctionComboBox, QStringLiteral("functionComboBox")},
|
|
|
+ {FlightLogging::CalendarCheckBox, QStringLiteral("calendarCheckBox")},
|
|
|
};
|
|
|
|
|
|
void ASettings::setup()
|
|
@@ -77,30 +69,12 @@ QVariant ASettings::read(const FlightLogging key)
|
|
|
void ASettings::write(const FlightLogging key, const QVariant &val)
|
|
|
{ QSettings().setValue(groupOfKey(key), val); }
|
|
|
|
|
|
-QVariant ASettings::read(const LogBook key)
|
|
|
-{ return QSettings().value(groupOfKey(key)); }
|
|
|
-
|
|
|
-void ASettings::write(const LogBook key, const QVariant &val)
|
|
|
-{ QSettings().setValue(groupOfKey(key), val); }
|
|
|
-
|
|
|
QVariant ASettings::read(const Main key)
|
|
|
{ return QSettings().value(groupOfKey(key)); }
|
|
|
|
|
|
void ASettings::write(const Main key, const QVariant &val)
|
|
|
{ QSettings().setValue(groupOfKey(key), val); }
|
|
|
|
|
|
-QVariant ASettings::read(const Setup key)
|
|
|
-{ return QSettings().value(groupOfKey(key)); }
|
|
|
-
|
|
|
-void ASettings::write(const Setup key, const QVariant &val)
|
|
|
-{ QSettings().setValue(groupOfKey(key), val); }
|
|
|
-
|
|
|
-QVariant ASettings::read(const NewFlight key)
|
|
|
-{ return QSettings().value(groupOfKey(key)); }
|
|
|
-
|
|
|
-void ASettings::write(const NewFlight key, const QVariant &val)
|
|
|
-{ QSettings().setValue(groupOfKey(key), val); }
|
|
|
-
|
|
|
QVariant ASettings::read(const UserData key)
|
|
|
{ return QSettings().value(groupOfKey(key)); }
|
|
|
|
|
@@ -113,18 +87,9 @@ void ASettings::write(const UserData key, const QVariant &val)
|
|
|
QString ASettings::groupOfKey (const ASettings::FlightLogging key)
|
|
|
{ return QStringLiteral("flightlogging/") + flightLoggingMap[key]; }
|
|
|
|
|
|
-QString ASettings::groupOfKey (const ASettings::LogBook key)
|
|
|
-{ return QStringLiteral("logbook/") + logBookMap[key]; }
|
|
|
-
|
|
|
QString ASettings::groupOfKey (const ASettings::Main key)
|
|
|
{ return QStringLiteral("main/") + mainMap[key]; }
|
|
|
|
|
|
-QString ASettings::groupOfKey (const ASettings::NewFlight key)
|
|
|
-{ return QStringLiteral("NewFlight/") + newFlightMap[key]; }
|
|
|
-
|
|
|
-QString ASettings::groupOfKey (const ASettings::Setup key)
|
|
|
-{ return QStringLiteral("setup/") + setupMap[key]; }
|
|
|
-
|
|
|
QString ASettings::groupOfKey (const ASettings::UserData key)
|
|
|
{ return QStringLiteral("userdata/") + userDataMap[key]; }
|
|
|
|
|
@@ -134,17 +99,8 @@ QString ASettings::groupOfKey (const ASettings::UserData key)
|
|
|
QString ASettings::stringOfKey (const ASettings::FlightLogging key)
|
|
|
{ return flightLoggingMap[key]; }
|
|
|
|
|
|
-QString ASettings::stringOfKey (const ASettings::LogBook key)
|
|
|
-{ return logBookMap[key]; }
|
|
|
-
|
|
|
QString ASettings::stringOfKey (const ASettings::Main key)
|
|
|
{ return mainMap[key]; }
|
|
|
|
|
|
-QString ASettings::stringOfKey (const ASettings::NewFlight key)
|
|
|
-{ return newFlightMap[key]; }
|
|
|
-
|
|
|
-QString ASettings::stringOfKey (const ASettings::Setup key)
|
|
|
-{ return setupMap[key]; }
|
|
|
-
|
|
|
QString ASettings::stringOfKey (const ASettings::UserData key)
|
|
|
{ return userDataMap[key]; }
|