Browse Source

Moved connecting slots out of Dialog

Felix Turo 4 years ago
parent
commit
29b70238f1

+ 5 - 0
mainwindow.cpp

@@ -139,5 +139,10 @@ void MainWindow::on_actionNewAircraft_triggered()
 void MainWindow::on_actionNewPilot_triggered()
 {
     NewPilotDialog np =NewPilotDialog(Db::createNew, this);
+    using namespace experimental;
+    QObject::connect(DB(), &DataBase::commitSuccessful,
+                     &np, &NewPilotDialog::onCommitSuccessful);
+    QObject::connect(DB(), &DataBase::commitUnsuccessful,
+                     &np, &NewPilotDialog::onCommitUnsuccessful);
     np.exec();
 }

+ 1 - 0
mainwindow.h

@@ -36,6 +36,7 @@
 #include "src/gui/dialogues/newtaildialog.h"
 #include "src/gui/dialogues/newpilotdialog.h"
 #include "src/classes/runguard.h"
+#include "src/experimental/DataBase.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui {

+ 0 - 12
src/gui/dialogues/newpilotdialog.cpp

@@ -65,12 +65,6 @@ NewPilotDialog::NewPilotDialog(QWidget *parent) :
     setupCompleter();
 
     using namespace experimental;
-
-    QObject::connect(DB(), &DataBase::commitSuccessful,
-            this, &NewPilotDialog::onCommitSuccessful);
-    QObject::connect(DB(), &DataBase::commitUnsuccessful,
-            this, &NewPilotDialog::onCommitUnsuccessful);
-
     pilotEntry = PilotEntry();
     ui->piclastnameLineEdit->setFocus();
 }
@@ -84,12 +78,6 @@ NewPilotDialog::NewPilotDialog(int rowId, QWidget *parent) :
     setupCompleter();
 
     using namespace experimental;
-
-    QObject::connect(DB(), &DataBase::commitSuccessful,
-            this, &NewPilotDialog::onCommitSuccessful);
-    QObject::connect(DB(), &DataBase::commitUnsuccessful,
-            this, &NewPilotDialog::onCommitUnsuccessful);
-
     pilotEntry = DB()->getPilotEntry(rowId);
     DEB("Pilot Entry position: " << pilotEntry.position);
     formFiller();

+ 2 - 0
src/gui/dialogues/newpilotdialog.h

@@ -44,6 +44,8 @@ public:
 private slots:
     void on_buttonBox_accepted();
 
+public slots:
+
     void onCommitSuccessful();
 
     void onCommitUnsuccessful(const QString &sqlError, const QString &);

+ 10 - 0
src/gui/widgets/pilotswidget.cpp

@@ -45,6 +45,11 @@ void PilotsWidget::tableView_selectionChanged()//const QItemSelection &index, co
     if(selectedPilots.length() == 1) {
 
         NewPilotDialog* np = new NewPilotDialog(selectedPilots.first(), this);
+        using namespace experimental;
+        QObject::connect(DB(), &DataBase::commitSuccessful,
+                         np,   &NewPilotDialog::onCommitSuccessful);
+        QObject::connect(DB(), &DataBase::commitUnsuccessful,
+                         np,   &NewPilotDialog::onCommitUnsuccessful);
         connect(np, SIGNAL(accepted()), this, SLOT(pilot_editing_finished()));
         connect(np, SIGNAL(rejected()), this, SLOT(pilot_editing_finished()));
         np->setWindowFlag(Qt::Widget);
@@ -67,6 +72,11 @@ void PilotsWidget::on_newButton_clicked()
     np->setAttribute(Qt::WA_DeleteOnClose);
     connect(np, SIGNAL(accepted()), this, SLOT(pilot_editing_finished()));
     connect(np, SIGNAL(rejected()), this, SLOT(pilot_editing_finished()));
+    using namespace experimental;
+    QObject::connect(DB(), &DataBase::commitSuccessful,
+                     np,   &NewPilotDialog::onCommitSuccessful);
+    QObject::connect(DB(), &DataBase::commitUnsuccessful,
+                     np,   &NewPilotDialog::onCommitUnsuccessful);
     np->exec();
 }