merged improvements and fixes from devel-newmaster-newpilot

mainwindow.cpp

@@ -115,19 +115,19 @@ void MainWindow::on_actionAircraft_triggered()
 
 void MainWindow::on_actionNewFlight_triggered()
 {
-    NewFlightDialog* nf = new NewFlightDialog(this, Db::createNew);
-    nf->exec();
+    NewFlightDialog nf = NewFlightDialog(this, Db::createNew);
+    nf.exec();
 
 }
 
 void MainWindow::on_actionNewAircraft_triggered()
 {
-    NewTailDialog* nt = new NewTailDialog(QString(), Db::createNew, this);
-    nt->exec();
+    NewTailDialog nt = NewTailDialog(QString(), Db::createNew, this);
+    nt.exec();
 }
 
 void MainWindow::on_actionNewPilot_triggered()
 {
-    NewPilotDialog* np = new NewPilotDialog(Db::createNew, this);
-    np->exec();
+    NewPilotDialog np =NewPilotDialog(Db::createNew, this);
+    np.exec();
 }

src/gui/dialogues/newtaildialog.cpp

@@ -35,6 +35,7 @@ NewTailDialog::NewTailDialog(QString newreg, Db::editRole edRole, QWidget *paren
     QDialog(parent),
     ui(new Ui::NewTail)
 {
+    DEB("new NewTailDialog\n");
     ui->setupUi(this);
 
     role = edRole;
@@ -51,6 +52,7 @@ NewTailDialog::NewTailDialog(Aircraft dbentry, Db::editRole edRole, QWidget *par
     QDialog(parent),
     ui(new Ui::NewTail)
 {
+    DEB("new NewTailDialog\n");
     oldEntry = dbentry;
     role = edRole;
     ui->setupUi(this);
@@ -65,6 +67,7 @@ NewTailDialog::NewTailDialog(Aircraft dbentry, Db::editRole edRole, QWidget *par
 
 NewTailDialog::~NewTailDialog()
 {
+    DEB("Deleting NewTailDialog\n");
     delete ui;
 }
 /// Functions

src/gui/widgets/aircraftwidget.cpp

@@ -26,6 +26,7 @@ AircraftWidget::AircraftWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::AircraftWidget)
 {
+    DEB("New AircraftWidet");
     ui->setupUi(this);
     sortColumn = Settings::read("userdata/acSortColumn").toInt();
     refreshModelAndView();
@@ -33,6 +34,7 @@ AircraftWidget::AircraftWidget(QWidget *parent) :
 
 AircraftWidget::~AircraftWidget()
 {
+    DEB("Deleting NewAircraftWidget");
     delete ui;
 }
 
@@ -44,7 +46,6 @@ void AircraftWidget::refreshModelAndView()
 {
     ui->stackedWidget->addWidget(parent()->findChild<QWidget*>("welcomePageTails"));
     ui->stackedWidget->setCurrentWidget(parent()->findChild<QWidget*>("welcomePageTails"));
-    DEB("wp" << parent()->findChild<QWidget*>("welcomePageTails"));
 
     model->setTable("viewTails");
     model->select();
@@ -61,7 +62,7 @@ void AircraftWidget::refreshModelAndView()
     view->verticalHeader()->hide();
     view->setAlternatingRowColors(true);
     view->setSortingEnabled(true);
-    view->sortByColumn(sortColumn);
+    view->sortByColumn(sortColumn, Qt::DescendingOrder);
 
     view->show();
 
@@ -125,11 +126,10 @@ void AircraftWidget::on_deleteButton_clicked()
 
 void AircraftWidget::on_newButton_clicked()
 {
-    auto nt = new NewTailDialog(QString(), Db::createNew, this);
-    connect(nt, SIGNAL(accepted()), this, SLOT(acft_editing_finished()));
-    connect(nt, SIGNAL(rejected()), this, SLOT(acft_editing_finished()));
-    nt->setAttribute(Qt::WA_DeleteOnClose);
-    nt->exec();
+    auto nt = NewTailDialog(QString(), Db::createNew, this);
+    connect(&nt, SIGNAL(accepted()), this, SLOT(acft_editing_finished()));
+    connect(&nt, SIGNAL(rejected()), this, SLOT(acft_editing_finished()));
+    nt.exec();
 }
 
 void AircraftWidget::on_searchLineEdit_textChanged(const QString &arg1)
@@ -150,14 +150,13 @@ void AircraftWidget::tableView_selectionChanged()
         DEB("Selected Tails(s) with ID: " << selectedTails);
     }
     if(selectedTails.length() == 1) {
-        auto nt = new NewTailDialog(Aircraft(selectedTails.first()), Db::editExisting, this);
-        connect(nt, SIGNAL(accepted()), this, SLOT(acft_editing_finished()));
-        connect(nt, SIGNAL(rejected()), this, SLOT(acft_editing_finished()));
-        nt->setWindowFlag(Qt::Widget);
-        nt->setAttribute(Qt::WA_DeleteOnClose);
-        ui->stackedWidget->addWidget(nt);
-        ui->stackedWidget->setCurrentWidget(nt);
-        nt->exec();
+        auto nt = NewTailDialog(Aircraft(selectedTails.first()), Db::editExisting, this);
+        connect(&nt, SIGNAL(accepted()), this, SLOT(acft_editing_finished()));
+        connect(&nt, SIGNAL(rejected()), this, SLOT(acft_editing_finished()));
+        ui->stackedWidget->addWidget(&nt);
+        ui->stackedWidget->setCurrentWidget(&nt);
+        nt.setWindowFlag(Qt::Widget);
+        nt.exec();
     }
 }