projects
/
emufront
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
47463dc
)
signals not connected for SetupEditDialog!
author
Mikko Keinänen
<mikko.keinanen@gmail.com>
Tue, 26 Oct 2010 21:35:02 +0000
(
00:35
+0300)
committer
Mikko Keinänen
<mikko.keinanen@gmail.com>
Tue, 26 Oct 2010 21:35:02 +0000
(
00:35
+0300)
src/dialogs/dataobjecteditdialog.h
patch
|
blob
|
history
src/dialogs/dbobjectdialog.cpp
patch
|
blob
|
history
src/dialogs/namedialog.h
patch
|
blob
|
history
src/dialogs/setupeditdialog.cpp
patch
|
blob
|
history
src/dialogs/setupmaindialog.cpp
patch
|
blob
|
history
diff --git
a/src/dialogs/dataobjecteditdialog.h
b/src/dialogs/dataobjecteditdialog.h
index
225d1b6
..
09f840d
100644
(file)
--- a/
src/dialogs/dataobjecteditdialog.h
+++ b/
src/dialogs/dataobjecteditdialog.h
@@
-44,6
+44,7
@@
protected:
signals:
void updateRejected();
void dataObjectUpdated();
signals:
void updateRejected();
void dataObjectUpdated();
+ void test();
protected slots:
virtual void acceptChanges() =0;
protected slots:
virtual void acceptChanges() =0;
diff --git
a/src/dialogs/dbobjectdialog.cpp
b/src/dialogs/dbobjectdialog.cpp
index
75afef5
..
5770282
100644
(file)
--- a/
src/dialogs/dbobjectdialog.cpp
+++ b/
src/dialogs/dbobjectdialog.cpp
@@
-234,9
+234,11
@@
void DbObjectDialog::updateReject()
void DbObjectDialog::updateData()
{
void DbObjectDialog::updateData()
{
+ qDebug() << "DbObjectDialog::updateData()";
// update data model
if (!dbObject) return;
// update data model
if (!dbObject) return;
+
// if data object id > -1 we are updating the data otherwise we are inserting new data
if (dbObject->getId() > -1) updateDb(dbObject);
else insertDb(dbObject);
// if data object id > -1 we are updating the data otherwise we are inserting new data
if (dbObject->getId() > -1) updateDb(dbObject);
else insertDb(dbObject);
diff --git
a/src/dialogs/namedialog.h
b/src/dialogs/namedialog.h
index
d0aca61
..
0218efa
100644
(file)
--- a/
src/dialogs/namedialog.h
+++ b/
src/dialogs/namedialog.h
@@
-36,9
+36,6
@@
public:
~NameDialog();
virtual void setDataObject(EmuFrontObject *) = 0;
~NameDialog();
virtual void setDataObject(EmuFrontObject *) = 0;
-signals:
- void test();
-
protected slots:
virtual void acceptChanges();
void enableSaveButton(const QString &);
protected slots:
virtual void acceptChanges();
void enableSaveButton(const QString &);
diff --git
a/src/dialogs/setupeditdialog.cpp
b/src/dialogs/setupeditdialog.cpp
index
e36cd45
..
9dc7545
100644
(file)
--- a/
src/dialogs/setupeditdialog.cpp
+++ b/
src/dialogs/setupeditdialog.cpp
@@
-35,6
+35,7
@@
SetupEditDialog::SetupEditDialog(QWidget *parent, EmuFrontObject* obj)
dbMediaType = new DbMediaType(this);
initWidgets();
connectSignals();
dbMediaType = new DbMediaType(this);
initWidgets();
connectSignals();
+ emit test();
layout();
}
layout();
}
@@
-97,6
+98,8
@@
void SetupEditDialog::acceptChanges()
sup->setMediaType(mt);
}
sup->setSupportedFileTypeExtensions(supportedFileTypesList->getItems());
sup->setMediaType(mt);
}
sup->setSupportedFileTypeExtensions(supportedFileTypesList->getItems());
+ qDebug() << "Emitting dataObjectUpdated";
+ // TODO: this is not received
emit dataObjectUpdated();
efObject = 0;
qDebug() << "Closing setup edit dialog";
emit dataObjectUpdated();
efObject = 0;
qDebug() << "Closing setup edit dialog";
diff --git
a/src/dialogs/setupmaindialog.cpp
b/src/dialogs/setupmaindialog.cpp
index
82b9a05
..
4f9a6b2
100644
(file)
--- a/
src/dialogs/setupmaindialog.cpp
+++ b/
src/dialogs/setupmaindialog.cpp
@@
-28,10
+28,16
@@
SetupMainDialog::SetupMainDialog(QWidget *parent)
setWindowTitle(tr("Setups"));
dbManager = new DbSetup(this);
initDataTable();
setWindowTitle(tr("Setups"));
dbManager = new DbSetup(this);
initDataTable();
- //initEditDialog(); this is called when editObject is called!
+ initEditDialog(); // this is called when editObject is called!
objectList->hideColumn(DbSetup::Setup_Id);
objectList->hideColumn(DbSetup::Setup_PlatformId);
objectList->hideColumn(DbSetup::Setup_MediaTypeId);
objectList->hideColumn(DbSetup::Setup_Id);
objectList->hideColumn(DbSetup::Setup_PlatformId);
objectList->hideColumn(DbSetup::Setup_MediaTypeId);
+ // TODO: this is not working:
+ /*QObject::connect: Cannot connect (null)::dataObjectUpdated() to SetupMainDialog::updateData()
+QObject::connect: Cannot connect (null)::updateRejected() to SetupMainDialog::updateReject()
+QObject::connect: Cannot connect (null)::test() to SetupMainDialog::testSlot()
+*/
+
connectSignals();
}
connectSignals();
}