From 28597e5124185d045d4ed5381cc7490f67350222 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mikko=20Kein=C3=A4nen?= Date: Wed, 27 Oct 2010 22:15:54 +0300 Subject: [PATCH] SetupEditDialog data object updated signal was received afterall (today) and is working ... no actual changes done. --- src/dialogs/setupeditdialog.cpp | 3 --- src/dialogs/setupmaindialog.cpp | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/dialogs/setupeditdialog.cpp b/src/dialogs/setupeditdialog.cpp index 9dc7545..36f28d8 100644 --- a/src/dialogs/setupeditdialog.cpp +++ b/src/dialogs/setupeditdialog.cpp @@ -98,11 +98,8 @@ void SetupEditDialog::acceptChanges() sup->setMediaType(mt); } sup->setSupportedFileTypeExtensions(supportedFileTypesList->getItems()); - qDebug() << "Emitting dataObjectUpdated"; - // TODO: this is not received emit dataObjectUpdated(); efObject = 0; - qDebug() << "Closing setup edit dialog"; close(); } diff --git a/src/dialogs/setupmaindialog.cpp b/src/dialogs/setupmaindialog.cpp index 4f9a6b2..40268ef 100644 --- a/src/dialogs/setupmaindialog.cpp +++ b/src/dialogs/setupmaindialog.cpp @@ -28,16 +28,10 @@ SetupMainDialog::SetupMainDialog(QWidget *parent) setWindowTitle(tr("Setups")); dbManager = new DbSetup(this); initDataTable(); - initEditDialog(); // this is called when editObject is called! + initEditDialog(); 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(); } @@ -48,6 +42,7 @@ SetupMainDialog::~SetupMainDialog() void SetupMainDialog::initEditDialog() { + if (nameDialog) delete nameDialog; nameDialog = new SetupEditDialog(this, dynamic_cast(dbObject)); } -- 1.7.9.5