Renamed AircraftWidget to TailsWidget

In line with application wide distinction of tail = specific aircraft, aircraft = general aircraft type

CMakeLists.txt

@@ -50,8 +50,8 @@ set(PROJECT_SOURCES
     src/gui/dialogues/newsimdialog.cpp
     src/gui/dialogues/newsimdialog.ui
     # Widgets
-    src/gui/widgets/aircraftwidget.h
-    src/gui/widgets/aircraftwidget.cpp
+    src/gui/widgets/tailswidget.h
+    src/gui/widgets/tailswidget.cpp
     src/gui/widgets/aircraftwidget.ui
     src/gui/widgets/airportwidget.h
     src/gui/widgets/airportwidget.cpp

mainwindow.cpp

@@ -61,7 +61,7 @@ MainWindow::MainWindow(QWidget *parent)
     ui->stackedWidget->addWidget(homeWidget);
     logbookWidget = new LogbookWidget(this);
     ui->stackedWidget->addWidget(logbookWidget);
-    aircraftWidget = new AircraftWidget(this);
+    aircraftWidget = new TailsWidget(this);
     ui->stackedWidget->addWidget(aircraftWidget);
     pilotsWidget = new PilotsWidget(this);
     ui->stackedWidget->addWidget(pilotsWidget);
@@ -167,9 +167,9 @@ void MainWindow::connectWidgets()
                      logbookWidget,  &LogbookWidget::onLogbookWidget_viewSelectionChanged);
 
     QObject::connect(DB,             &OPL::Database::dataBaseUpdated,
-                     aircraftWidget, &AircraftWidget::onAircraftWidget_dataBaseUpdated);
+                     aircraftWidget, &TailsWidget::onAircraftWidget_dataBaseUpdated);
     QObject::connect(settingsWidget, &SettingsWidget::settingChanged,
-                     aircraftWidget, &AircraftWidget::onAircraftWidget_settingChanged);
+                     aircraftWidget, &TailsWidget::onAircraftWidget_settingChanged);
 
     QObject::connect(DB,             &OPL::Database::dataBaseUpdated,
                      pilotsWidget,   &PilotsWidget::onPilotsWidget_databaseUpdated);
@@ -183,7 +183,7 @@ void MainWindow::connectWidgets()
     QObject::connect(DB,              &OPL::Database::connectionReset,
                      pilotsWidget,    &PilotsWidget::repopulateModel);
     QObject::connect(DB,              &OPL::Database::connectionReset,
-                     aircraftWidget,  &AircraftWidget::repopulateModel);
+                     aircraftWidget,  &TailsWidget::repopulateModel);
 }
 
 void MainWindow::onDatabaseInvalid()

mainwindow.h

@@ -32,7 +32,7 @@
 #include "src/gui/widgets/homewidget.h"
 #include "src/gui/widgets/settingswidget.h"
 #include "src/gui/widgets/logbookwidget.h"
-#include "src/gui/widgets/aircraftwidget.h"
+#include "src/gui/widgets/tailswidget.h"
 #include "src/gui/widgets/airportwidget.h"
 #include "src/gui/widgets/airportwidget.h"
 #include "src/gui/widgets/pilotswidget.h"
@@ -123,7 +123,7 @@ private:
 
     LogbookWidget* logbookWidget;
 
-    AircraftWidget* aircraftWidget;
+    TailsWidget* aircraftWidget;
 
     PilotsWidget* pilotsWidget;
 

src/gui/widgets/aircraftwidget.cpp → src/gui/widgets/tailswidget.cpp

@@ -15,14 +15,16 @@
  *You should have received a copy of the GNU General Public License
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "aircraftwidget.h"
+#include "tailswidget.h"
 #include "ui_aircraftwidget.h"
 #include "src/opl.h"
 #include "src/classes/settings.h"
 #include "src/database/database.h"
 #include "src/database/row.h"
+#include "src/gui/dialogues/newtaildialog.h"
 
-AircraftWidget::AircraftWidget(QWidget *parent) :
+
+TailsWidget::TailsWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::AircraftWidget)
 {
@@ -34,12 +36,12 @@ AircraftWidget::AircraftWidget(QWidget *parent) :
     setupModelAndView();
 }
 
-AircraftWidget::~AircraftWidget()
+TailsWidget::~TailsWidget()
 {
     delete ui;
 }
 
-void AircraftWidget::setupModelAndView()
+void TailsWidget::setupModelAndView()
 {
     model = new QSqlTableModel(this);
     model->setTable(QStringLiteral("viewTails"));
@@ -67,19 +69,19 @@ void AircraftWidget::setupModelAndView()
     connectSignalsAndSlots();
 }
 
-void AircraftWidget::connectSignalsAndSlots()
+void TailsWidget::connectSignalsAndSlots()
 {
     QObject::connect(ui->tableView->selectionModel(),   &QItemSelectionModel::selectionChanged,
-                     this,                              &AircraftWidget::tableView_selectionChanged);
+                     this,                              &TailsWidget::tableView_selectionChanged);
     QObject::connect(ui->tableView->horizontalHeader(), &QHeaderView::sectionClicked,
-                     this,                              &AircraftWidget::tableView_headerClicked);
+                     this,                              &TailsWidget::tableView_headerClicked);
 }
 
 /*
  * Slots
  */
 
-void AircraftWidget::onAircraftWidget_settingChanged(SettingsWidget::SettingSignal signal)
+void TailsWidget::onAircraftWidget_settingChanged(SettingsWidget::SettingSignal signal)
 {
     if (signal != SettingsWidget::AircraftWidget)
         return;
@@ -87,19 +89,19 @@ void AircraftWidget::onAircraftWidget_settingChanged(SettingsWidget::SettingSign
     setupModelAndView();
 }
 
-void AircraftWidget::onAircraftWidget_dataBaseUpdated()
+void TailsWidget::onAircraftWidget_dataBaseUpdated()
 {
     refreshView();
 }
 
-void AircraftWidget::changeEvent(QEvent *event)
+void TailsWidget::changeEvent(QEvent *event)
 {
     if (event != nullptr)
         if(event->type() == QEvent::LanguageChange)
             ui->retranslateUi(this);
 }
 
-void AircraftWidget::on_newAircraftButton_clicked()
+void TailsWidget::on_newAircraftButton_clicked()
 {
     NewTailDialog nt(QString(), this);
     setUiEnabled(false);
@@ -111,7 +113,7 @@ void AircraftWidget::on_newAircraftButton_clicked()
 /*!
  * \brief Displays a dialog in which the Tail can be edited
  */
-void AircraftWidget::tableView_selectionChanged()
+void TailsWidget::tableView_selectionChanged()
 {
     if (this->findChild<NewTailDialog*>() != nullptr)
         delete this->findChild<NewTailDialog*>();
@@ -139,7 +141,7 @@ void AircraftWidget::tableView_selectionChanged()
 /*!
  * \brief Acts as a filter on the display model
  */
-void AircraftWidget::on_aircraftSearchLineEdit_textChanged(const QString &arg1)
+void TailsWidget::on_aircraftSearchLineEdit_textChanged(const QString &arg1)
 {
     if(ui->aircraftSearchComboBox->currentIndex() == 0){
         ui->aircraftSearchLineEdit->setText(arg1.toUpper());
@@ -149,13 +151,13 @@ void AircraftWidget::on_aircraftSearchLineEdit_textChanged(const QString &arg1)
                      + arg1 + QLatin1String("%\""));
 }
 
-void AircraftWidget::tableView_headerClicked(int column)
+void TailsWidget::tableView_headerClicked(int column)
 {
     sortColumn = column;
     Settings::write(Settings::UserData::TailSortColumn, column);
 }
 
-void AircraftWidget::on_deleteAircraftButton_clicked()
+void TailsWidget::on_deleteAircraftButton_clicked()
 {
     if (selectedTails.length() == 0) {
         INFO(tr("No Aircraft selected."));
@@ -202,7 +204,7 @@ void AircraftWidget::on_deleteAircraftButton_clicked()
  *
  * This function is used to inform the user and give hints on how to solve the problem.
  */
-void AircraftWidget::onDeleteUnsuccessful()
+void TailsWidget::onDeleteUnsuccessful()
 {
     QList<int> foreign_key_constraints = DB->getForeignKeyConstraints(selectedTails.first(),
                                                                        OPL::DbTable::Tails);
@@ -239,7 +241,7 @@ void AircraftWidget::onDeleteUnsuccessful()
     }
 }
 
-void AircraftWidget::setUiEnabled(bool enabled)
+void TailsWidget::setUiEnabled(bool enabled)
 {
     ui->newAircraftButton->setEnabled(enabled);
     ui->deleteAircraftButton->setEnabled(enabled);
@@ -248,7 +250,7 @@ void AircraftWidget::setUiEnabled(bool enabled)
     ui->aircraftSearchComboBox->setEnabled(enabled);
 }
 
-void AircraftWidget::repopulateModel()
+void TailsWidget::repopulateModel()
 {
     // unset the current model and delete it to avoid leak
     view->setModel(nullptr);
@@ -259,7 +261,7 @@ void AircraftWidget::repopulateModel()
     connectSignalsAndSlots();
 }
 
-const QString AircraftWidget::getAircraftTypeString(const OPL::Row &row) const
+const QString TailsWidget::getAircraftTypeString(const OPL::Row &row) const
 {
     QString type_string;
     if (!row.getData().value(OPL::Db::TAILS_MAKE).toString().isEmpty())
@@ -272,7 +274,7 @@ const QString AircraftWidget::getAircraftTypeString(const OPL::Row &row) const
     return type_string;
 }
 
-const QString AircraftWidget::getFlightSummary(const OPL::FlightEntry &flight) const
+const QString TailsWidget::getFlightSummary(const OPL::FlightEntry &flight) const
 {
     if(!flight.isValid())
         return QString();

src/gui/widgets/aircraftwidget.h → src/gui/widgets/tailswidget.h

@@ -15,16 +15,15 @@
  *You should have received a copy of the GNU General Public License
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef AIRCRAFTWIDGET_H
-#define AIRCRAFTWIDGET_H
+#ifndef TAILSWIDGET_H
+#define TAILSWIDGET_H
 
 #include <QWidget>
 #include <QItemSelection>
 #include <QSqlTableModel>
 #include <QTableView>
+#include "src/database/row.h"
 #include "src/gui/widgets/settingswidget.h"
-#include "src/gui/dialogues/newtaildialog.h"
-
 
 namespace Ui {
 class AircraftWidget;
@@ -50,13 +49,13 @@ class AircraftWidget;
  * templates of aircraft types. For example, 'D-ABCD' and 'N-XYZ' are different tails (Registrations), but they might be the same type of aircraft,
  * for example 'Boeing 737-800'.
  */
-class AircraftWidget : public QWidget
+class TailsWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit AircraftWidget(QWidget *parent = nullptr);
-    ~AircraftWidget();
+    explicit TailsWidget(QWidget *parent = nullptr);
+    ~TailsWidget();
 
 private slots:
     void tableView_selectionChanged();
@@ -121,4 +120,4 @@ protected:
     void changeEvent(QEvent* event) override;
 };
 
-#endif // AIRCRAFTWIDGET_H
+#endif // TAILSWIDGET_H