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 43e9e85..c6644ba 100644 (file)
--- a/src/dialogs/dataobjecteditdialog.cpp
+++ b/src/dialogs/dataobjecteditdialog.cpp
@@ -5,25 +5,29 @@
 //
 //
 // 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.
 //
-// Foobar is distributed in the hope that it will be useful,
+// EmuFront is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+// along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <QtGui>
 #include <QDialogButtonBox>
+#include <QSqlQueryModel>
+#include <QSqlRecord>
+#include <QComboBox>
+#include <QDebug>
 #include "dataobjecteditdialog.h"
 
 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);
 }
 
@@ -32,3 +36,22 @@ void DataObjectEditDialog::connectSignals()
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(acceptChanges()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(rejectChanges()));
 }
+
+void DataObjectEditDialog::closeEvent(QCloseEvent *ev)
+{
+    qDebug() << "Emitting dialog closed";
+    emit dialogClosed();
+    ev->accept();
+}
+
+
+void DataObjectEditDialog::rejectChanges()
+{
+    efObject = 0;
+    emit updateRejected();
+    close();
+}
+
+void DataObjectEditDialog::updateData()
+{
+}