Fixed bugs: dialogs remained disabled (signals were not attached to

[emufront] / src / dialogs / dataobjecteditdialog.cpp

diff --git a/src/dialogs/dataobjecteditdialog.cpp b/src/dialogs/dataobjecteditdialog.cpp
index b6da83c..c6644ba 100644 (file)
--- a/src/dialogs/dataobjecteditdialog.cpp
+++ b/src/dialogs/dataobjecteditdialog.cpp
@@ -5,9 +5,9 @@
 //
 //
 // EmuFront is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// it under the terms of the GNU General Public License version 2 as published by
+// the Free Software Foundation and appearing in the file gpl.txt included in the
+// packaging of this file.
 //
 // EmuFront is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,6 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <QtGui>
 #include <QDialogButtonBox>
 #include <QSqlQueryModel>
 #include <QSqlRecord>
@@ -27,7 +28,6 @@
 DataObjectEditDialog::DataObjectEditDialog(QWidget *parent, EmuFrontObject *ob, Qt::Orientation orientation)
     : EmuFrontDialog(parent), efObject(ob), orientation(orientation)
 {
-    qDebug("DataObjectEditDialog creating buttonBox");
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Abort, orientation);
 }
 
@@ -37,24 +37,14 @@ void DataObjectEditDialog::connectSignals()
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(rejectChanges()));
 }
 
-// TODO: remove this after implementing all the combo boxes using EFComboBox
-void DataObjectEditDialog::setSelected(QComboBox *cbox, const EmuFrontObject *ob, int idIndex)
+void DataObjectEditDialog::closeEvent(QCloseEvent *ev)
 {
-    if (!ob) return;
-    QSqlQueryModel *model = dynamic_cast<QSqlQueryModel*>(cbox->model());
-    for (int i = 0; i < model->rowCount(); i++)
-    {
-        qDebug() << "i: " << i << ", rowcount: " << model->rowCount();
-        qDebug() << ", object id:" << ob->getId();
-        QSqlRecord rec = model->record(i);
-        if (rec.value(idIndex) == ob->getId())
-        {
-            cbox->setCurrentIndex(i);
-            break;
-        }
-    }
+    qDebug() << "Emitting dialog closed";
+    emit dialogClosed();
+    ev->accept();
 }
 
+
 void DataObjectEditDialog::rejectChanges()
 {
     efObject = 0;