Renamed some variables

Renamed some variables, functions etc iaw naming conventions.

Added a signal-slot connection between settingswidget and logbookwidget to update view when the user changes his selection.

mainwindow.cpp

@@ -134,6 +134,8 @@ void MainWindow::connectWidgets()
 {
     QObject::connect(experimental::aDB(), &experimental::ADataBase::updated,
                      logbookWidget, &LogbookWidget::onDatabaseChanged);
+    QObject::connect(settingsWidget, &SettingsWidget::logbookviewSelectionChanged,
+                     logbookWidget, &LogbookWidget::onLogbookviewSelectionChanged);
     QObject::connect(experimental::aDB(), &experimental::ADataBase::updated,
                      pilotsWidget, &PilotsWidget::onDatabaseChanged);
     QObject::connect(experimental::aDB(), &experimental::ADataBase::updated,

src/gui/dialogues/firstrundialog.h

@@ -4,7 +4,6 @@
 #include <QDialog>
 #include <QButtonGroup>
 #include <QMessageBox>
-#include <QRegularExpressionValidator>
 #include "src/classes/asettings.h"
 #include "src/classes/pilot.h"
 

src/gui/dialogues/newflightdialog.cpp

@@ -277,11 +277,11 @@ void NewFlightDialog::setupLineEditSignalsAndSlots()
         line_edit->installEventFilter(this);
         if(line_edit->objectName().contains("Loc")){
             QObject::connect(line_edit, &QLineEdit::textChanged,
-                             this, &NewFlightDialog::onTextChangedToUpper);
+                             this, &NewFlightDialog::onToUpperTriggered_textChanged);
         }
         if(line_edit->objectName().contains("acft")){
             QObject::connect(line_edit, &QLineEdit::textChanged,
-                             this, &NewFlightDialog::onTextChangedToUpper);
+                             this, &NewFlightDialog::onToUpperTriggered_textChanged);
         }
         if(line_edit->objectName().contains("Name")){
             QObject::connect(line_edit, &QLineEdit::editingFinished,
@@ -294,9 +294,9 @@ void NewFlightDialog::setupLineEditSignalsAndSlots()
     }
     for (const auto &line_edit : mandatoryLineEdits) {
         QObject::connect(line_edit->completer(), QOverload<const QString &>::of(&QCompleter::highlighted),
-                         this, &NewFlightDialog::onCompleterHighlighted);
+                         this, &NewFlightDialog::onCompleter_highlighted);
         QObject::connect(line_edit->completer(), QOverload<const QString &>::of(&QCompleter::activated),
-                         this, &NewFlightDialog::onCompleterActivated);
+                         this, &NewFlightDialog::onCompleter_activated);
     }
     QObject::connect(this, &NewFlightDialog::goodInputReceived,
                      this, &NewFlightDialog::onGoodInputReceived);
@@ -323,25 +323,25 @@ void NewFlightDialog::setPopUpCalendarEnabled(bool state)
         ui->doftLineEdit->installEventFilter(this);
 
         QObject::connect(ui->calendarWidget, &QCalendarWidget::clicked,
-                         this, &NewFlightDialog::onDateClicked);
+                         this, &NewFlightDialog::onCalendarWidget_clicked);
         QObject::connect(ui->calendarWidget, &QCalendarWidget::activated,
-                         this, &NewFlightDialog::onDateSelected);
+                         this, &NewFlightDialog::onCalendarWidget_selected);
     } else {
         DEB("Disabling pop-up calendar widget...");
         ui->calendarWidget->removeEventFilter(this);
         ui->placeLabel1->removeEventFilter(this);
         ui->doftLineEdit->removeEventFilter(this);
         QObject::disconnect(ui->calendarWidget, &QCalendarWidget::clicked,
-                            this, &NewFlightDialog::onDateClicked);
+                            this, &NewFlightDialog::onCalendarWidget_clicked);
         QObject::disconnect(ui->calendarWidget, &QCalendarWidget::activated,
-                            this, &NewFlightDialog::onDateSelected);
+                            this, &NewFlightDialog::onCalendarWidget_selected);
     }
 }
 
 bool NewFlightDialog::eventFilter(QObject* object, QEvent* event)
 {
     if (object == ui->doftLineEdit && event->type() == QEvent::MouseButtonPress) {
-        onDoftLineEditEntered();
+        onDoftLineEdit_entered();
         return false; // let the event continue to the edit
     }
 
@@ -387,9 +387,8 @@ void NewFlightDialog::fillDeductibleData()
     ui->tblkTimeLineEdit->setText(block_time);
     // get acft data and fill deductible entries
     auto acft = aDB()->getTailEntry(tailsIdMap.value(ui->acftLineEdit->text()));
-    DEB("Created acft object with data: " << acft.getData());
     if (acft.getData().isEmpty())
-        DEB("No valid aircraft object available.");
+        DEB("Error: No valid aircraft object available, unable to deterime auto times.");
     // SP SE
     if(acft.getData().value("singlepilot") == "1" && acft.getData().value("singleengine") == "1"){
         ui->tSPSETimeLineEdit->setText(block_time);
@@ -606,7 +605,6 @@ TableData NewFlightDialog::collectInput()
         newData.insert("ldgNight", "0");
     }
 
-
     newData.insert("autoland", QString::number(ui->AutolandSpinBox->value()));
     newData.insert("ApproachType", ui->ApproachComboBox->currentText());
     newData.insert("FlightNumber", ui->FlightNumberLineEdit->text());
@@ -618,11 +616,6 @@ TableData NewFlightDialog::collectInput()
 void NewFlightDialog::formFiller()
 {
     DEB("Filling Line Edits...");
-    DEB("With Data: " << flightEntry.getData());
-    // Date
-    //ui->doftLineEdit->setDate(QDate::fromString(flightEntry.getData().value("doft"), Qt::ISODate));
-    QStringList filled;
-
     // get Line Edits
     auto line_edits = this->findChildren<QLineEdit *>();
     QStringList line_edits_names;
@@ -641,7 +634,6 @@ void NewFlightDialog::formFiller()
                 auto le = this->findChild<QLineEdit *>(leName);
                 if(le != nullptr){
                     le->setText(flightEntry.getData().value(data_key));
-                    filled << leName;
                     line_edits_names.removeOne(leName);
                 }
                 break;
@@ -654,7 +646,6 @@ void NewFlightDialog::formFiller()
                 auto le = this->findChild<QLineEdit *>(leName);
                 if(le != nullptr){
                     le->setText(flightEntry.getData().value(data_key));
-                    filled << leName;
                     line_edits_names.removeOne(leName);
                 }
                 break;
@@ -669,7 +660,6 @@ void NewFlightDialog::formFiller()
                     DEB("Setting " << le->objectName() << " to " << ACalc::minutesToString(flightEntry.getData().value(data_key)));
                     le->setText(ACalc::minutesToString(
                                     flightEntry.getData().value(data_key)));
-                    filled << leName;
                     line_edits_names.removeOne(leName);
                 }
                 break;
@@ -678,13 +668,10 @@ void NewFlightDialog::formFiller()
         rx = QRegularExpression(data_key + "Name\\w+?");
         for(const auto& leName : line_edits_names){
             if(rx.match(leName).hasMatch())  {
-                DEB("Name Match found: " << data_key << " - " << leName);
                 auto le = this->findChild<QLineEdit *>(leName);
                 if(le != nullptr){
                     DEB(pilotsIdMap.key(1));
-                    DEB("Matching name..." << data_key << " to " << flightEntry.getData().value(data_key).toInt());
                     le->setText(pilotsIdMap.key(flightEntry.getData().value(data_key).toInt()));
-                    filled << leName;
                     line_edits_names.removeOne(leName);
                 }
                 break;
@@ -724,7 +711,6 @@ void NewFlightDialog::formFiller()
     // Take Off and Landing
     qint8 TO = flightEntry.getData().value("toDay").toInt() + flightEntry.getData().value("toNight").toInt();
     qint8 LDG = flightEntry.getData().value("ldgDay").toInt() + flightEntry.getData().value("ldgNight").toInt();
-    DEB("TO and LDG:" << TO << LDG);
     if(TO > 0) {
         ui->TakeoffCheckBox->setChecked(true);
         ui->TakeoffSpinBox->setValue(TO);
@@ -916,7 +902,7 @@ void NewFlightDialog::onBadInputReceived(QLineEdit *line_edit)
 }
 
 // capitalize input for dept, dest and registration input
-void NewFlightDialog::onTextChangedToUpper(const QString &text)
+void NewFlightDialog::onToUpperTriggered_textChanged(const QString &text)
 {
     auto sender_object = sender();
     auto line_edit = this->findChild<QLineEdit*>(sender_object->objectName());
@@ -944,7 +930,7 @@ void NewFlightDialog::onMandatoryLineEditsFilled()
 }
 
 // make sure that when using keyboard to scroll through completer sugggestions, line edit is up to date
-void NewFlightDialog::onCompleterHighlighted(const QString &completion)
+void NewFlightDialog::onCompleter_highlighted(const QString &completion)
 {
     auto sender_object = sender();
     auto line_edit = this->findChild<QLineEdit*>(sender_object->objectName());
@@ -952,7 +938,7 @@ void NewFlightDialog::onCompleterHighlighted(const QString &completion)
     line_edit->setText(completion);
 }
 
-void NewFlightDialog::onCompleterActivated(const QString &)
+void NewFlightDialog::onCompleter_activated(const QString &)
 {
     auto sender_object = sender();
     auto line_edit = this->findChild<QLineEdit*>(sender_object->objectName());
@@ -995,7 +981,7 @@ void NewFlightDialog::on_doftLineEdit_editingFinished()
     emit badInputReceived(line_edit);
 }
 
-void NewFlightDialog::onDateClicked(const QDate &date)
+void NewFlightDialog::onCalendarWidget_clicked(const QDate &date)
 {
     const auto& le = ui->doftLineEdit;
     le->blockSignals(false);
@@ -1005,7 +991,7 @@ void NewFlightDialog::onDateClicked(const QDate &date)
     le->setFocus();
 }
 
-void NewFlightDialog::onDateSelected(const QDate &date)
+void NewFlightDialog::onCalendarWidget_selected(const QDate &date)
 {
     ui->calendarWidget->hide();
     ui->placeLabel1->resize(ui->placeLabel2->size());
@@ -1016,7 +1002,7 @@ void NewFlightDialog::onDateSelected(const QDate &date)
     le->blockSignals(false);
 }
 
-void NewFlightDialog::onDoftLineEditEntered()
+void NewFlightDialog::onDoftLineEdit_entered()
 {
     const auto& cw = ui->calendarWidget;
     const auto& le = ui->doftLineEdit;

src/gui/dialogues/newflightdialog.h

@@ -23,10 +23,7 @@
 #include <QMessageBox>
 #include <QDebug>
 #include <QCompleter>
-#include <QLatin1Char>
 #include <QStringList>
-#include <QStringListModel>
-#include <QSortFilterProxyModel>
 #include <QButtonGroup>
 #include <QBitArray>
 #include <QLineEdit>
@@ -65,51 +62,35 @@ signals:
     void mandatoryLineEditsFilled();
 
 private slots:
-
     void onGoodInputReceived(QLineEdit*);
     void onBadInputReceived(QLineEdit *);
-    void onTextChangedToUpper(const QString&);
+    void onToUpperTriggered_textChanged(const QString&);
     void onPilotNameLineEdit_editingFinished();
     void onLocLineEdit_editingFinished(QLineEdit*, QLabel*);
     void onTimeLineEdit_editingFinished();
     void onMandatoryLineEditsFilled();
-    void onCompleterHighlighted(const QString&);
-    void onCompleterActivated(const QString &);
-    void onDateClicked(const QDate &date);
-    void onDateSelected(const QDate &date);
-    void onDoftLineEditEntered();
-
-    void on_deptLocLineEdit_editingFinished();
-    void on_destLocLineEdit_editingFinished();
-    void on_acftLineEdit_editingFinished();
-
-
+    void onCompleter_highlighted(const QString&);
+    void onCompleter_activated(const QString &);
+    void onCalendarWidget_clicked(const QDate &date);
+    void onCalendarWidget_selected(const QDate &date);
+    void onDoftLineEdit_entered();
 /////// DEBUG
     void onInputRejected();
 /////// DEBUG
-
     void on_calendarCheckBox_stateChanged(int arg1);
-
     void on_doftLineEdit_editingFinished();
-
     void on_cancelButton_clicked();
-
     void on_submitButton_clicked();
-
     void on_setAsDefaultButton_clicked();
-
     void on_restoreDefaultButton_clicked();
-
     void on_PilotFlyingCheckBox_stateChanged(int arg1);
-
     void on_IfrCheckBox_stateChanged(int);
-
     void on_manualEditingCheckBox_stateChanged(int arg1);
-
     void on_ApproachComboBox_currentTextChanged(const QString &arg1);
-
-
     void on_FunctionComboBox_currentIndexChanged(int index);
+    void on_deptLocLineEdit_editingFinished();
+    void on_destLocLineEdit_editingFinished();
+    void on_acftLineEdit_editingFinished();
 
 private:
     Ui::NewFlight *ui;
@@ -132,12 +113,6 @@ private:
     QMap<QString, int> airportIataIdMap;
     QMap<QString, int> airportNameIdMap;
 
-    bool eventFilter(QObject *object, QEvent *event);
-
-    bool updateEnabled;
-
-    bool isLessOrEqualThanBlockTime(const QString time_string);
-
     void setup();
     void readSettings();
     void writeSettings();
@@ -145,11 +120,12 @@ private:
     void setPopUpCalendarEnabled(bool state);
     void setupRawInputValidation();
     void setupLineEditSignalsAndSlots();
-
     void formFiller();
-
     void fillDeductibleData();
     experimental::TableData collectInput();
+    bool eventFilter(QObject *object, QEvent *event);
+    bool updateEnabled;
+    bool isLessOrEqualThanBlockTime(const QString time_string);
 
     void addNewTail(QLineEdit*);
     void addNewPilot(QLineEdit *);

src/gui/dialogues/newtaildialog.cpp

@@ -329,12 +329,3 @@ void NewTailDialog::on_registrationLineEdit_textChanged(const QString &arg1)
 {
     ui->registrationLineEdit->setText(arg1.toUpper());
 }
-
-/*
-    auto mb = QMessageBox(this);
-    mb.setIcon(QMessageBox::Critical);
-    mb.setText("The following error has ocurred.\n\n"
-               + sqlError.text()
-               + "\n\nYour entry has not been saved.");
-    mb.exec();
-*/

src/gui/dialogues/newtaildialog.h

@@ -25,9 +25,7 @@
 
 #include "src/classes/asettings.h"
 #include "src/classes/aircraft.h"
-#include "src/classes/astrictrxvalidator.h"
 #include "src/functions/acalc.h"
-#include "src/database/entry_deprecated.h"
 #include "src/experimental/adatabase.h"
 #include "src/experimental/atailentry.h"
 #include "src/experimental/aaircraftentry.h"
@@ -64,29 +62,18 @@ private:
     QMap<QString, int> idMap;
 
     void setupCompleter();
-
     void setupValidators();
-
     void fillForm(experimental::AEntry entry, bool is_template);
-
-    void submitForm();
-
     bool verify();
+    void submitForm();
 
 private slots:
-
     void on_operationComboBox_currentIndexChanged(int index);
-
     void on_ppTypeComboBox_currentIndexChanged(int index);
-
     void on_ppNumberComboBox_currentIndexChanged(int index);
-
     void on_weightComboBox_currentIndexChanged(int index);
-
     void on_registrationLineEdit_textChanged(const QString &arg1);
-
     void on_buttonBox_accepted();
-
     void onSearchCompleterActivated();
 
 };

src/gui/widgets/logbookwidget.cpp

@@ -74,7 +74,7 @@ void LogbookWidget::prepareModelAndView(int view_id)
 
 void LogbookWidget::connectSignalsAndSlots()
 {
-    selection = view->selectionModel();
+    selectionModel = view->selectionModel();
     QObject::connect(view->selectionModel(), &QItemSelectionModel::selectionChanged,
                      this, &LogbookWidget::flightsTableView_selectionChanged);
 }
@@ -163,7 +163,7 @@ void LogbookWidget::setupEasaView()
 void LogbookWidget::flightsTableView_selectionChanged()//
 {
     selectedFlights.clear();
-    for (const auto& row : selection->selectedRows()) {
+    for (const auto& row : selectionModel->selectedRows()) {
         selectedFlights.append(row.data().toInt());
         DEB("Selected Flight(s) with ID: " << selectedFlights);
     }
@@ -299,6 +299,11 @@ void LogbookWidget::onDatabaseChanged()
     displayModel->select();
 }
 
+void LogbookWidget::onLogbookviewSelectionChanged(int view_id)
+{
+    prepareModelAndView(view_id);
+}
+
 void LogbookWidget::on_showAllButton_clicked()
 {
     ui->flightSearchLlineEdit->setText(QString());

src/gui/widgets/logbookwidget.h

@@ -22,7 +22,6 @@
 #include <QItemSelection>
 #include <QSqlTableModel>
 #include <QMessageBox>
-#include <chrono>
 #include <QDebug>
 #include <QMenu>
 #include <QTableView>
@@ -47,29 +46,20 @@ public:
 
 private slots:
     void on_newFlightButton_clicked();
-
     void on_editFlightButton_clicked();
-
     void on_deleteFlightPushButton_clicked();
-
     void on_showAllButton_clicked();
-
     void flightsTableView_selectionChanged();
-
     void on_tableView_customContextMenuRequested(const QPoint &pos);
-
     void on_actionDelete_Flight_triggered();
-
     void on_actionEdit_Flight_triggered();
-
     void on_tableView_doubleClicked();
-
     void on_flightSearchLlineEdit_textChanged(const QString &arg1);
-
     void on_flightSearchComboBox_currentIndexChanged(int);
 
 public slots:
     void onDatabaseChanged();
+    void onLogbookviewSelectionChanged(int);
 
 private:
     Ui::LogbookWidget *ui;
@@ -78,7 +68,7 @@ private:
 
     QSqlTableModel* displayModel;
 
-    QItemSelectionModel* selection;
+    QItemSelectionModel* selectionModel;
 
     QMenu* menu;
 
@@ -87,14 +77,9 @@ private:
     QVector<qint32> selectedFlights;
 
     void prepareModelAndView(int view_id);
-
+    void connectSignalsAndSlots();
     void setupDefaultView();
-
     void setupEasaView();
-
-    void connectSignalsAndSlots();
-
-
 };
 
 #endif // LOGBOOKWIDGET_H

src/gui/widgets/pilotswidget.cpp

@@ -58,7 +58,7 @@ void PilotsWidget::setupModelAndView()
     view->sortByColumn(sortColumn, Qt::AscendingOrder);
 
     view->show();
-    selection = view->selectionModel();
+    selectionModel = view->selectionModel();
 
     QObject::connect(ui->pilotsTableView->selectionModel(), &QItemSelectionModel::selectionChanged,
                      this, &PilotsWidget::tableView_selectionChanged);

src/gui/widgets/pilotswidget.h

@@ -22,7 +22,6 @@
 #include <QItemSelection>
 #include <QSqlTableModel>
 #include <QDebug>
-#include <QLabel>
 #include <QTableView>
 #include "src/classes/asettings.h"
 #include "src/classes/pilot.h"
@@ -42,17 +41,11 @@ public:
 
 private slots:
     void tableView_selectionChanged();
-
     void tableView_headerClicked(int);
-
     void on_newPilotButton_clicked();
-
     void on_deletePilotButton_clicked();
-
     void on_deleteUnsuccessful();
-
     void pilot_editing_finished();
-
     void on_pilotSearchLineEdit_textChanged(const QString &arg1);
 
 public slots:
@@ -65,7 +58,7 @@ private:
 
     QTableView *view;
 
-    QItemSelectionModel* selection;
+    QItemSelectionModel* selectionModel;
 
     qint32 sortColumn;
 

src/gui/widgets/settingswidget.cpp

@@ -279,6 +279,7 @@ void SettingsWidget::themeGroup_toggled(int id)
 void SettingsWidget::on_logbookViewComboBox_currentIndexChanged(int index)
 {
     ASettings::write("logbook/view", index);
+    emit logbookviewSelectionChanged(index);
 }
 void SettingsWidget::on_pilotSortComboBox_currentIndexChanged(int index)
 {

src/gui/widgets/settingswidget.h

@@ -20,7 +20,6 @@
 
 #include <QWidget>
 #include <QButtonGroup>
-#include <QRegExp>
 #include <QValidator>
 #include <QMessageBox>
 #include <QProcess>
@@ -44,39 +43,22 @@ public:
 private slots:
 
     void themeGroup_toggled(int id);
-
     void on_aboutPushButton_clicked();
-
     void on_acSortComboBox_currentIndexChanged(int index);
-
     void on_acAllowIncompleteComboBox_currentIndexChanged(int index);
-
     void on_prefixLineEdit_textChanged(const QString &arg1);
-
     void on_piclastnameLineEdit_editingFinished();
-
     void on_picfirstnameLineEdit_editingFinished();
-
     void on_employeeidLineEdit_editingFinished();
-
     void on_emailLineEdit_editingFinished();
-
     void on_phoneLineEdit_editingFinished();
-
     void on_aliasComboBox_currentIndexChanged(int index);
-
     void on_functionComboBox_currentIndexChanged(const QString &arg1);
-
     void on_rulesComboBox_currentIndexChanged(const QString &arg1);
-
     void on_approachComboBox_currentIndexChanged(const QString &arg1);
-
     void on_nightComboBox_currentIndexChanged(int index);
-
     void on_pilotSortComboBox_currentIndexChanged(int index);
-
     void on_logbookViewComboBox_currentIndexChanged(int index);
-
     void on_companyLineEdit_editingFinished();
 
 private:
@@ -87,6 +69,8 @@ private:
     void setupValidators();
 
     void updatePersonalDetails();
+signals:
+    void logbookviewSelectionChanged(int view_id);
 };
 
 #endif // SETTINGSWIDGET_H