Refactoring hardcoded ini keys to enums of ASettings INCOMPLETE

main.cpp

@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 //    }
 
     //Theming
-    switch (ASettings::read("main/theme").toInt()) {
+    switch (ASettings::read(ASettings::Main::Theme).toInt()) {
     case 1:{
         DEB << "main :: Loading light theme";
         QFile file(":light.qss");

src/classes/asettings.cpp

@@ -19,23 +19,102 @@
 #include "src/astandardpaths.h"
 #include <QSettings>
 
+QMap<ASettings::Main, QString> ASettings::mainMap = {
+    {Main::Theme, "theme"},
+    {Main::ThemeID, "theme_id"}, // inconsistent naming
+};
+
+QMap<ASettings::UserData, QString> ASettings::userDataMap = {
+    {UserData::LastName, "lastname"},
+    {UserData::FirstName, "firstname" },
+    {UserData::Company, "company"},
+    {UserData::EmployeeID, "employeeid"},
+    {UserData::Phone, "phone"},
+    {UserData::Email, "email"},
+    {UserData::DisplaySelfAs, "displayselfas"},
+    {UserData::Alias, "alias"},
+    {UserData::AcSortColumn, "acSortColumn"},  // [G]: inconsistent naming
+    {UserData::PilSortColumn, "pilSortColumn"},
+    {UserData::AcAllowIncomplete, "acAllowIncomplete"},
+};
+
+QMap<ASettings::FlightLogging, QString> ASettings::flightLoggingMap = {
+    {FlightLogging::Function, "function"},
+    {FlightLogging::Approach, "approach"},
+    {FlightLogging::NightLogging, "nightlogging"},
+    {FlightLogging::LogIFR, "logIfr"},
+    {FlightLogging::FlightNumberPrefix, "flightnumberPrefix"},
+    {FlightLogging::NumberTakeoffs, "numberTakeoffs"},
+    {FlightLogging::NumberLandings, "numberLandings"},
+    {FlightLogging::PopupCalendar,  "popupCalendar"},
+    {FlightLogging::PilotFlying, "pilotFlying"},
+    {FlightLogging::NightAngle, "nightangle"},
+    {FlightLogging::Rules, "rules"},
+};
+
+QMap<ASettings::Setup, QString> ASettings::setupMap = {
+    {Setup::SetupComplete, "setup_complete"},  // inconsistent naming
+};
+
+QMap<ASettings::NewFlight, QString> ASettings::newFlightMap = {
+    {NewFlight::FunctionComboBox, "FunctionComboBox"},  // inconsistent naming
+    {NewFlight::CalendarCheckBox, "calendarCheckBox"},
+};
+
 void ASettings::setup()
 {
     QSettings::setDefaultFormat(QSettings::IniFormat);
     QSettings();
 }
 
-QVariant ASettings::read(const QString &key)
-{
-    return QSettings().value(key);
-}
+//
+// Read/Write
+//
 
-void ASettings::write(const QString &key, const QVariant &val)
-{
-    QSettings().setValue(key, val);
-}
+QVariant ASettings::read(const Main key)
+{ return QSettings().value(QStringLiteral("main/") + mainMap[key]); }
+
+void ASettings::write(const Main key, const QVariant &val)
+{ QSettings().setValue(QStringLiteral("main/") + mainMap[key], val); }
+
+QVariant ASettings::read(const UserData key)
+{ return QSettings().value(QStringLiteral("userdata/") + userDataMap[key]); }
+
+void ASettings::write(const UserData key, const QVariant &val)
+{ QSettings().setValue(QStringLiteral("userdata/") + userDataMap[key], val); }
+
+QVariant ASettings::read(const FlightLogging key)
+{ return QSettings().value(QStringLiteral("flightlogging/") + flightLoggingMap[key]); }
+
+void ASettings::write(const FlightLogging key, const QVariant &val)
+{ QSettings().setValue(QStringLiteral("flightlogging/") + flightLoggingMap[key], val); }
+
+QVariant ASettings::read(const Setup key)
+{ return QSettings().value(QStringLiteral("setup/") + setupMap[key]); }
+
+void ASettings::write(const Setup key, const QVariant &val)
+{ QSettings().setValue(QStringLiteral("setup/") + setupMap[key], val); }
+
+QVariant ASettings::read(const NewFlight key)
+{ return QSettings().value(QStringLiteral("NewFlight/") + newFlightMap[key]); }
+
+void ASettings::write(const NewFlight key, const QVariant &val)
+{ QSettings().setValue(QStringLiteral("NewFlight/") + newFlightMap[key], val); }
+
+//
+// to QString conversion
+//
+QString ASettings::stringOfKey(const Main key)
+{ return mainMap[key]; }
+
+QString ASettings::stringOfKey(const UserData key)
+{ return userDataMap[key]; }
+
+QString ASettings::stringOfKey(const FlightLogging key)
+{ return flightLoggingMap[key]; }
+
+QString ASettings::stringOfKey(const Setup key)
+{ return setupMap[key]; }
 
 QSettings ASettings::settings()
-{
-    return QSettings();
-}
+{ return QSettings(); }

src/classes/asettings.h

@@ -24,20 +24,93 @@
  * \brief Thin (namespace) wrapper for the QSettings class,
  * simplifying reading and writing of settings.
  */
-namespace ASettings
-{
+class ASettings {
+public:
+    enum class Setup {
+        SetupComplete,
+    };
 
-/*!
- * \brief Should be called after QCoreApplication::set...Name have been called.
- */
-void setup();
+    enum class Main {
+        Theme,
+        ThemeID,
+    };
+
+    enum class LogBook {
+        View,
+    };
+
+    enum class UserData {
+        LastName,
+        FirstName,
+        Company,
+        EmployeeID,
+        Phone,
+        Email,
+        DisplaySelfAs,
+        Alias,
+        AcSortColumn, // not sure what ac is
+        PilSortColumn,
+        AcAllowIncomplete,
+    };
+
+    enum class FlightLogging {
+        Function,
+        Approach,
+        NightLogging,
+        LogIFR,
+        FlightNumberPrefix,
+        NumberTakeoffs,
+        NumberLandings,
+        PopupCalendar,
+        PilotFlying,
+        NightAngle,
+        Rules,
+    };
+
+    enum class NewFlight {
+        FunctionComboBox,
+        CalendarCheckBox,
+    };
+
+    /*!
+     * \brief Should be called after QCoreApplication::set...Name have been called.
+     */
+    static void setup();
+
+    static inline QVariant read(const Main key);
+    static inline void write(const Main key, const QVariant &val);
+
+    static inline QVariant read(const FlightLogging key);
+    static inline void write(const UserData key, const QVariant &val);
+
+    static inline QVariant read(const UserData key);
+    static inline void write(const FlightLogging key, const QVariant &val);
+
+    static inline QVariant read(const Setup key);
+    static inline void write(const Setup key, const QVariant &val);
+
+    static inline QVariant read(const NewFlight key);
+    static inline void write(const NewFlight key, const QVariant &val);
+
+    static inline QString stringOfKey(const Main key);
+    static inline QString stringOfKey(const UserData key);
+    static inline QString stringOfKey(const FlightLogging key);
+    static inline QString stringOfKey(const Setup key);
 
-QVariant read(const QString &key);
+    static QSettings settings();
 
-void write(const QString &key, const QVariant &val);
+private:
+    static QMap<Main, QString> mainMap;
+    static QMap<LogBook, QString> logBookMap;
+    static QMap<UserData, QString> userDataMap;
+    static QMap<FlightLogging, QString> flightLoggingMap;
+    static QMap<Setup, QString> setupMap;
+    static QMap<NewFlight, QString> newFlightMap;
 
-QSettings settings();
+// [G]: no need for these anymore
+//	static QVariant read(const QString &key);
+//	static void write(const QString &key, const QVariant &val);
 
-}
+};
 
 #endif // ASETTINGS_H

src/functions/acalc.cpp

@@ -303,7 +303,7 @@ void ACalc::updateAutoTimes(int acft_id)
  */
 void ACalc::updateNightTimes()
 {
-    const int night_angle = ASettings::read(QStringLiteral("flightlogging/nightangle")).toInt();
+    const int night_angle = ASettings::read(ASettings::FlightLogging::NightAngle).toInt();
 
     //find all flights for aircraft
     auto statement = "SELECT ROWID FROM flights";

src/gui/dialogues/firstrundialog.cpp

@@ -81,54 +81,42 @@ void FirstRunDialog::on_nextPushButton_clicked()
 
 void FirstRunDialog::on_themeGroup_toggled(int id)
 {
-    ASettings::write("main/theme", id);
+    ASettings::write(ASettings::Main::Theme, id);
 }
 
 void FirstRunDialog::finish()
 {
-    ASettings::write("userdata/lastname", ui->lastnameLineEdit->text());
-    ASettings::write("userdata/firstname", ui->firstnameLineEdit->text());
-    ASettings::write("userdata/employeeid", ui->employeeidLineEdit->text());
-    ASettings::write("userdata/phone", ui->phoneLineEdit->text());
-    ASettings::write("userdata/email", ui->emailLineEdit->text());
-
-    ASettings::write("flightlogging/function", ui->functionComboBox->currentText());
-    ASettings::write("flightlogging/approach", ui->approachComboBox->currentText());
-    ASettings::write("flightlogging/nightlogging", ui->nightComboBox->currentIndex());
-    ASettings::write("flightlogging/logIfr", ui->rulesComboBox->currentIndex());
-    ASettings::write("flightlogging/flightnumberPrefix", ui->prefixLineEdit->text());
-
-    ASettings::write("flightlogging/numberTakeoffs", 1);
-    ASettings::write("flightlogging/numberLandings", 1);
-    ASettings::write("flightlogging/popupCalendar", true);
-    ASettings::write("flightlogging/pilotFlying", true);
+
+    ASettings::write(ASettings::UserData::LastName, ui->lastnameLineEdit->text());
+    ASettings::write(ASettings::UserData::FirstName, ui->firstnameLineEdit->text());
+    ASettings::write(ASettings::UserData::EmployeeID, ui->employeeidLineEdit->text());
+    ASettings::write(ASettings::UserData::Phone, ui->phoneLineEdit->text());
+    ASettings::write(ASettings::UserData::Email, ui->emailLineEdit->text());
+
+    ASettings::write(ASettings::FlightLogging::Function, ui->functionComboBox->currentText());
+    ASettings::write(ASettings::FlightLogging::Approach, ui->approachComboBox->currentText());
+    ASettings::write(ASettings::FlightLogging::NightLogging, ui->nightComboBox->currentIndex());
+    ASettings::write(ASettings::FlightLogging::LogIFR, ui->rulesComboBox->currentIndex());
+    ASettings::write(ASettings::FlightLogging::FlightNumberPrefix, ui->prefixLineEdit->text());
+    ASettings::write(ASettings::FlightLogging::NumberTakeoffs, 1);
+    ASettings::write(ASettings::FlightLogging::NumberLandings, 1);
+    ASettings::write(ASettings::FlightLogging::PopupCalendar, true);
+    ASettings::write(ASettings::FlightLogging::PilotFlying, true);
 
     QMap<QString, QVariant> data;
-    switch (ui->aliasComboBox->currentIndex()) {
-    case 0:
-        ASettings::write("userdata/displayselfas", ui->aliasComboBox->currentIndex());
-        break;
-    case 1:
-        ASettings::write("userdata/displayselfas", ui->aliasComboBox->currentIndex());
-        break;
-    case 2:
-        ASettings::write("userdata/displayselfas", ui->aliasComboBox->currentIndex());
-        break;
-    default:
-        break;
-    }
-    data.insert("lastname", ui->lastnameLineEdit->text());
-    data.insert("firstname", ui->firstnameLineEdit->text());
-    data.insert("alias", "self");
-    data.insert("employeeid", ui->employeeidLineEdit->text());
-    data.insert("phone", ui->phoneLineEdit->text());
-    data.insert("email", ui->emailLineEdit->text());
+    ASettings::write(ASettings::UserData::DisplaySelfAs, ui->aliasComboBox->currentIndex());
+    data.insert(ASettings::stringOfKey(ASettings::UserData::LastName), ui->lastnameLineEdit->text());
+    data.insert(ASettings::stringOfKey(ASettings::UserData::FirstName), ui->firstnameLineEdit->text());
+    data.insert(ASettings::stringOfKey(ASettings::UserData::Alias), "self");
+    data.insert(ASettings::stringOfKey(ASettings::UserData::EmployeeID), ui->employeeidLineEdit->text());
+    data.insert(ASettings::stringOfKey(ASettings::UserData::Phone), ui->phoneLineEdit->text());
+    data.insert(ASettings::stringOfKey(ASettings::UserData::Email), ui->emailLineEdit->text());
 
     if (!finishSetup()) {
         QMessageBox message_box(this);
         message_box.setText("Errors have ocurred creating the database. Without a working database The application will not be usable.");
     }
-    ASettings::write("setup/setup_complete", true);
+    ASettings::write(ASettings::Setup::SetupComplete, true);
     aDB()->disconnect(); // reset db connection to refresh layout after initial setup.
     aDB()->connect();
     auto pilot = APilotEntry(1);
@@ -165,7 +153,7 @@ bool FirstRunDialog::finishSetup()
         return false;
     if(!ADataBaseSetup::importDefaultData())
         return false;
-    ASettings::write("setup/setup_complete", true);
+    ASettings::write(ASettings::Setup::SetupComplete, true);
     return true;
 }
 

src/gui/dialogues/newflightdialog.cpp

@@ -107,11 +107,11 @@ NewFlightDialog::NewFlightDialog(QWidget *parent) :
     ui->setupUi(this);
     flightEntry = AFlightEntry();
     setup();
-    if (ASettings::read("NewFlight/FunctionComboBox").toString() == "SIC") {
+    if (ASettings::read(ASettings::NewFlight::FunctionComboBox).toString() == "SIC") {
         ui->picNameLineEdit->setText(DB_NULL);
         ui->secondPilotNameLineEdit->setText("self");
     }
-    if(ASettings::read("NewFlight/FunctionComboBox").toString() == "PIC"){
+    if(ASettings::read(ASettings::NewFlight::FunctionComboBox).toString() == "PIC"){
         ui->picNameLineEdit->setText("self");
         emit ui->picNameLineEdit->editingFinished();
     }
@@ -160,26 +160,26 @@ void NewFlightDialog::readSettings()
 {
     DEB << "Reading Settings...";
     QSettings settings;
-    ui->FunctionComboBox->setCurrentText(ASettings::read("flightlogging/function").toString());
-    ui->ApproachComboBox->setCurrentText(ASettings::read("flightlogging/approach").toString());
+    ui->FunctionComboBox->setCurrentText(ASettings::read(ASettings::FlightLogging::Function).toString());
+    ui->ApproachComboBox->setCurrentText(ASettings::read(ASettings::FlightLogging::Approach).toString());
 
-    ASettings::read("flightlogging/pilotFlying").toBool() ? ui->PilotFlyingCheckBox->setChecked(true)
+    ASettings::read(ASettings::FlightLogging::PilotFlying).toBool() ? ui->PilotFlyingCheckBox->setChecked(true)
                                                           : ui->PilotMonitoringCheckBox->setChecked(true);
 
-    ui->TakeoffSpinBox->setValue(ASettings::read("flightlogging/numberTakeoffs").toInt());
+    ui->TakeoffSpinBox->setValue(ASettings::read(ASettings::FlightLogging::NumberTakeoffs).toInt());
     ui->TakeoffSpinBox->value() > 0 ? ui->TakeoffCheckBox->setChecked(true)
                                     : ui->TakeoffCheckBox->setChecked(false);
-    ui->LandingSpinBox->setValue(ASettings::read("flightlogging/numberLandings").toInt());
+    ui->LandingSpinBox->setValue(ASettings::read(ASettings::FlightLogging::NumberLandings).toInt());
     ui->LandingSpinBox->value() > 0 ? ui->LandingCheckBox->setChecked(true)
                                     : ui->LandingCheckBox->setChecked(false);
-    if (ASettings::read("flightlogging/logIfr").toBool()) {
+    if (ASettings::read(ASettings::FlightLogging::LogIFR).toBool()) {
         ui->IfrCheckBox->setChecked(true);
     } else {
         ui->VfrCheckBox->setChecked(true);
     }
 
-    ui->FlightNumberLineEdit->setText(ASettings::read("flightlogging/flightnumberPrefix").toString());
-    ui->calendarCheckBox->setChecked(ASettings::read("flightlogging/popupCalendar").toBool());
+    ui->FlightNumberLineEdit->setText(ASettings::read(ASettings::FlightLogging::FlightNumberPrefix).toString());
+    ui->calendarCheckBox->setChecked(ASettings::read(ASettings::FlightLogging::PopupCalendar).toBool());
 
 }
 
@@ -187,13 +187,13 @@ void NewFlightDialog::writeSettings()
 {
     DEB << "Writing Settings...";
 
-    ASettings::write("flightlogging/function", ui->FunctionComboBox->currentText());
-    ASettings::write("flightlogging/approach", ui->ApproachComboBox->currentText());
-    ASettings::write("flightlogging/pilotFlying", ui->PilotFlyingCheckBox->isChecked());
-    ASettings::write("flightlogging/numberTakeoffs", ui->TakeoffSpinBox->value());
-    ASettings::write("flightlogging/numberLandings", ui->LandingSpinBox->value());
-    ASettings::write("flightlogging/logIfr", ui->IfrCheckBox->isChecked());
-    ASettings::write("flightlogging/popupCalendar", ui->calendarCheckBox->isChecked());
+    ASettings::write(ASettings::FlightLogging::Function, ui->FunctionComboBox->currentText());
+    ASettings::write(ASettings::FlightLogging::Approach, ui->ApproachComboBox->currentText());
+    ASettings::write(ASettings::FlightLogging::PilotFlying, ui->PilotFlyingCheckBox->isChecked());
+    ASettings::write(ASettings::FlightLogging::NumberTakeoffs, ui->TakeoffSpinBox->value());
+    ASettings::write(ASettings::FlightLogging::NumberLandings, ui->LandingSpinBox->value());
+    ASettings::write(ASettings::FlightLogging::LogIFR, ui->IfrCheckBox->isChecked());
+    ASettings::write(ASettings::FlightLogging::PopupCalendar, ui->calendarCheckBox->isChecked());
 }
 
 void NewFlightDialog::setupButtonGroups()
@@ -442,7 +442,7 @@ void NewFlightDialog::fillDeductibleData()
     QString dept_date = ui->doftLineEdit->text() + 'T' + tofb.toString(TIME_FORMAT);
     QDateTime dept_date_time = QDateTime::fromString(dept_date,"yyyy-MM-ddThh:mm");
     int tblk = block_minutes.toInt();
-    const int night_angle = ASettings::read("flightlogging/nightangle").toInt();
+    const int night_angle = ASettings::read(ASettings::FlightLogging::NightAngle).toInt();
     QString night_minutes = QString::number(
                 ACalc::calculateNightTime(
                     ui->deptLocLineEdit->text(),
@@ -530,7 +530,7 @@ RowData NewFlightDialog::collectInput()
     const auto dept_date = ui->doftLineEdit->text() + QStringLiteral("T") + tofb.toString(TIME_FORMAT);
     const auto dept_date_time = QDateTime::fromString(dept_date, QStringLiteral("yyyy-MM-ddThh:mm"));
 
-    const auto night_angle = ASettings::read("flightlogging/nightangle").toInt();
+    const auto night_angle = ASettings::read(ASettings::FlightLogging::NightAngle).toInt();
     const auto night_minutes = ACalc::calculateNightTime(
                     ui->deptLocLineEdit->text(),
                     ui->destLocLineEdit->text(),
@@ -1063,7 +1063,7 @@ void NewFlightDialog::onDoftLineEdit_entered()
 
 void NewFlightDialog::on_calendarCheckBox_stateChanged(int arg1)
 {
-    ASettings::write("NewFlight/calendarCheckBox", ui->calendarCheckBox->isChecked());
+    ASettings::write(ASettings::NewFlight::CalendarCheckBox, ui->calendarCheckBox->isChecked());
     DEB << "Calendar check box state changed.";
     switch (arg1) {
     case 0: // unchecked

src/gui/dialogues/newtaildialog.cpp

@@ -263,7 +263,7 @@ void NewTailDialog::on_buttonBox_accepted()
     }
 
     if (!verify()) {
-        if (!ASettings::read("userdata/acAllowIncomplete").toInt()) {
+        if (!ASettings::read(ASettings::UserData::AcAllowIncomplete).toInt()) {
             auto nope = QMessageBox(this);
             nope.setIcon(QMessageBox::Warning);
             nope.setText("Some or all recommended fields are empty.\nPlease go back and "

src/gui/widgets/aircraftwidget.cpp

@@ -48,7 +48,7 @@ AircraftWidget::~AircraftWidget()
 
 void AircraftWidget::setupModelAndView()
 {
-    sortColumn = ASettings::read("userdata/acSortColumn").toInt();
+    sortColumn = ASettings::read(ASettings::UserData::AcSortColumn).toInt();
 
     model = new QSqlTableModel(this);
     model->setTable("viewTails");
@@ -199,7 +199,7 @@ void AircraftWidget::tableView_selectionChanged()
 void AircraftWidget::tableView_headerClicked(int column)
 {
     sortColumn = column;
-    ASettings::write("userdata/acSortColumn", column);
+    ASettings::write(ASettings::UserData::AcSortColumn, column);
 }
 
 void AircraftWidget::acft_editing_finished()

src/gui/widgets/logbookwidget.cpp

@@ -48,7 +48,7 @@ LogbookWidget::LogbookWidget(QWidget *parent) :
     //Initialise message Box
     messageBox = new QMessageBox(this);
 
-    prepareModelAndView(ASettings::read("logbook/view").toInt());
+    prepareModelAndView(ASettings::read(ASettings::LogBook::View).toInt());
     connectSignalsAndSlots();
 }
 

src/gui/widgets/pilotswidget.cpp

@@ -37,7 +37,7 @@ PilotsWidget::~PilotsWidget()
 
 void PilotsWidget::setupModelAndView()
 {
-    sortColumn = ASettings::read("userdata/pilSortColumn").toInt();
+    sortColumn = ASettings::read(ASettings::UserData::PilSortColumn).toInt();
 
     model = new QSqlTableModel(this);
     model->setTable("viewPilots");
@@ -115,7 +115,7 @@ void PilotsWidget::tableView_selectionChanged()//const QItemSelection &index, co
 void PilotsWidget::tableView_headerClicked(int column)
 {
     sortColumn = column;
-    ASettings::write("userdata/pilSortColumn", column);
+    ASettings::write(ASettings::UserData::PilSortColumn, column);
 }
 
 void PilotsWidget::on_newPilotButton_clicked()

src/gui/widgets/settingswidget.cpp

@@ -73,21 +73,23 @@ void SettingsWidget::readSettings()
     /*
      * Personal Tab
      */
-    ui->lastnameLineEdit->setText(ASettings::read("userdata/lastname").toString());
-    ui->firstnameLineEdit->setText(ASettings::read("userdata/firstname").toString());
-    ui->companyLineEdit->setText(ASettings::read("userdata/company").toString());
-    ui->employeeidLineEdit->setText(ASettings::read("userdata/employeeid").toString());
-    ui->phoneLineEdit->setText(ASettings::read("userdata/phone").toString());
-    ui->emailLineEdit->setText(ASettings::read("userdata/email").toString());
+    ui->lastnameLineEdit->setText(ASettings::read(ASettings::UserData::LastName).toString());
+    ui->firstnameLineEdit->setText(ASettings::read(ASettings::UserData::FirstName).toString());
+    ui->companyLineEdit->setText(ASettings::read(ASettings::UserData::Company).toString());
+    ui->employeeidLineEdit->setText(ASettings::read(ASettings::UserData::EmployeeID).toString());
+    ui->phoneLineEdit->setText(ASettings::read(ASettings::UserData::Phone).toString());
+    ui->emailLineEdit->setText(ASettings::read(ASettings::UserData::Email).toString());
     /*
      * Flight Logging Tab
      */
-    ui->aliasComboBox->setCurrentIndex(ASettings::read("userdata/displayselfas").toInt());
-    ui->functionComboBox->setCurrentText(ASettings::read("flightlogging/function").toString());
-    ui->rulesComboBox->setCurrentText(ASettings::read("flightlogging/rules").toString());
-    ui->approachComboBox->setCurrentText(ASettings::read("flightlogging/approach").toString());
-    ui->nightComboBox->setCurrentIndex(ASettings::read("flightlogging/nightlogging").toInt());
-    ui->prefixLineEdit->setText(ASettings::read("flightlogging/flightnumberPrefix").toString());
+    ui->aliasComboBox->setCurrentIndex(ASettings::read(ASettings::UserData::DisplaySelfAs).toInt());
+    ui->functionComboBox->setCurrentText(ASettings::read(ASettings::FlightLogging::Function).toString());
+    ui->rulesComboBox->setCurrentText(ASettings::read(ASettings::FlightLogging::Rules).toString());
+    ui->approachComboBox->setCurrentText(ASettings::read(ASettings::FlightLogging::Approach).toString());
+    ui->nightComboBox->setCurrentIndex(ASettings::read(ASettings::FlightLogging::NightLogging).toInt());
+    ui->prefixLineEdit->setText(ASettings::read(ASettings::FlightLogging::FlightNumberPrefix).toString());
+    //////////////////// CONTINUE changin "setup/setup_complete" to enum of ASETTINGS
+
     /*
      * Misc Tab
      */