Update / reject signals were not emitted. Fixed.

diff --git a/src/dialogs/dataobjecteditdialog.h b/src/dialogs/dataobjecteditdialog.h
index e2bf3eb..7b88d9b 100644 (file)
--- a/src/dialogs/dataobjecteditdialog.h
+++ b/src/dialogs/dataobjecteditdialog.h
@@ -34,16 +34,16 @@ public:
     DataObjectEditDialog(QWidget *parent, EmuFrontObject *ob, Qt::Orientation orientation = Qt::Horizontal);
     virtual void setDataObject(EmuFrontObject *) = 0;
 
-signals:
-    void dataObjectUpdated();
-    void updateRejected();
-
 protected:
     virtual void connectSignals();
     EmuFrontObject *efObject;
     QDialogButtonBox *buttonBox;
     void setSelected(QComboBox*, const EmuFrontObject*, int idIndex);
 
+signals:
+    void updateRejected();
+    void dataObjectUpdated();
+
 protected slots:
     virtual void acceptChanges() =0;
     virtual void rejectChanges();

diff --git a/src/dialogs/dbobjectdialog.cpp b/src/dialogs/dbobjectdialog.cpp
index 1b48c1c..03085d3 100644 (file)
--- a/src/dialogs/dbobjectdialog.cpp
+++ b/src/dialogs/dbobjectdialog.cpp
@@ -63,6 +63,12 @@ void DbObjectDialog::connectSignals()
     connect(deleteButton, SIGNAL(clicked()), this, SLOT(deleteButtonClicked()));
     connect(nameDialog, SIGNAL(dataObjectUpdated()), this, SLOT(updateData()));
     connect(nameDialog, SIGNAL(updateRejected()), this, SLOT(updateReject()));
+    connect(nameDialog, SIGNAL(test()), this, SLOT(testSlot()));
+}
+
+void DbObjectDialog::testSlot()
+{
+    qDebug() << "TEST SIGNAL RECEIVED!";
 }
 
 void DbObjectDialog::insertDb(const EmuFrontObject *ob) const

diff --git a/src/dialogs/dbobjectdialog.h b/src/dialogs/dbobjectdialog.h
index d615d83..2c1eb75 100644 (file)
--- a/src/dialogs/dbobjectdialog.h
+++ b/src/dialogs/dbobjectdialog.h
@@ -46,6 +46,7 @@ private slots:
     void updateData();
     void updateReject();
     void updateList() const;
+    void testSlot();
 
 protected:
     // implementation specific, deletes current data object from memory

diff --git a/src/dialogs/mediaimagepathmaindialog.cpp b/src/dialogs/mediaimagepathmaindialog.cpp
index 680426d..22f58a5 100644 (file)
--- a/src/dialogs/mediaimagepathmaindialog.cpp
+++ b/src/dialogs/mediaimagepathmaindialog.cpp
@@ -39,6 +39,7 @@ MediaImagePathMainDialog::MediaImagePathMainDialog(QWidget *parent)
     scanButton = new QPushButton(tr("&Scan"));
     buttonBox->addButton(scanButton, QDialogButtonBox::ActionRole);
 
+    initEditDialog();
     qDebug() << "Connecting signals";
     // do not move to parent class:
     connectSignals();

diff --git a/src/dialogs/mediatypedialog.cpp b/src/dialogs/mediatypedialog.cpp
index e1bad78..6a3b3c2 100644 (file)
--- a/src/dialogs/mediatypedialog.cpp
+++ b/src/dialogs/mediatypedialog.cpp
@@ -32,6 +32,7 @@ MediaTypeDialog::MediaTypeDialog(QWidget* parent)
     setWindowTitle(tr("Set media types"));
     dbManager = new DbMediaType(this);
     initDataTable();
+    initEditDialog();
 
     // do not move to parent class:
     connectSignals();

diff --git a/src/dialogs/namedialog.cpp b/src/dialogs/namedialog.cpp
index 215116a..5e3542a 100644 (file)
--- a/src/dialogs/namedialog.cpp
+++ b/src/dialogs/namedialog.cpp
@@ -28,6 +28,7 @@ NameDialog::NameDialog(QWidget *parent, EmuFrontObject *efObj)
        nameLabel->setBuddy(nameEdit);
     connectSignals();
        layout();
+    emit test();
        setWindowTitle(tr("Set names"));
 }
 
@@ -72,8 +73,10 @@ void NameDialog::acceptChanges()
     }
 
        QString name = nameEdit->text().simplified();
+    qDebug() << "We have a name " << name << ".";
     setDataObject(name);
     emit dataObjectUpdated();
+    qDebug() << "Signal emitted.";
     efObject = 0; // TODO we should also set efObject to null when user clicks abort
     close();
 }

diff --git a/src/dialogs/namedialog.h b/src/dialogs/namedialog.h
index ff05459..b22e0ca 100644 (file)
--- a/src/dialogs/namedialog.h
+++ b/src/dialogs/namedialog.h
@@ -36,6 +36,9 @@ public:
     ~NameDialog();
     virtual void setDataObject(EmuFrontObject *) = 0;
 
+signals:
+    void test();
+
 protected slots:
     virtual void acceptChanges();
     void enableSaveButton(const QString &);

diff --git a/src/dialogs/platformdialog.cpp b/src/dialogs/platformdialog.cpp
index 0c69bb4..f04355e 100644 (file)
--- a/src/dialogs/platformdialog.cpp
+++ b/src/dialogs/platformdialog.cpp
@@ -29,6 +29,7 @@ PlatformDialog::PlatformDialog(QWidget *parent)
     setWindowTitle(tr("Set emulated platforms"));
     dbManager = new DbPlatform(this);
     initDataTable();
+    initEditDialog();
     
     // do not move to parent class:
     connectSignals();

diff --git a/src/dialogs/setupeditdialog.cpp b/src/dialogs/setupeditdialog.cpp
index 34aab82..980feb8 100644 (file)
--- a/src/dialogs/setupeditdialog.cpp
+++ b/src/dialogs/setupeditdialog.cpp
@@ -126,6 +126,7 @@ void SetupEditDialog::acceptChanges()
     sup->setSupportedFileTypeExtensions(supportedFileTypesList->getItems());
     emit dataObjectUpdated();
     efObject = 0;
+    qDebug() << "Closing setup edit dialog";
     close();
 }
 

diff --git a/src/dialogs/setupmaindialog.cpp b/src/dialogs/setupmaindialog.cpp
index 110237c..6445304 100644 (file)
--- a/src/dialogs/setupmaindialog.cpp
+++ b/src/dialogs/setupmaindialog.cpp
@@ -31,6 +31,7 @@ SetupMainDialog::SetupMainDialog(QWidget *parent)
     dbManager = new DbSetup(this);
     qDebug() << "Initializing data table";
     initDataTable();
+    initEditDialog();
     qDebug() << "Connecting signals";
     connectSignals();
 }