Integrated platforn name dialog to platform dialog.

diff --git a/src/dialogs/dbobjectdialog.cpp b/src/dialogs/dbobjectdialog.cpp
index a082620..e2d8b8d 100644 (file)
--- a/src/dialogs/dbobjectdialog.cpp
+++ b/src/dialogs/dbobjectdialog.cpp
@@ -31,6 +31,7 @@ void DbObjectDialog::connectSignals()
 void DbObjectDialog::addButtonClicked()
 {
     disableSelection();
+    addObject();
 }
 
 void DbObjectDialog::editButtonClicked()

diff --git a/src/dialogs/dbobjectdialog.h b/src/dialogs/dbobjectdialog.h
index 74222da..1a04772 100644 (file)
--- a/src/dialogs/dbobjectdialog.h
+++ b/src/dialogs/dbobjectdialog.h
@@ -2,12 +2,12 @@
 #define DBOBJECTDIALOG_H
 
 #include <QDialog>
+#include "namedialog.h"
 
 class QPushButton;
 class QModelIndex;
 class QDialogButtonBox;
 class QListView;
-class NameDialog;
 
 class DbObjectDialog : public QDialog 
 {
@@ -28,6 +28,7 @@ class DbObjectDialog : public QDialog
        virtual int deleteObject() =0;
        virtual void addObject() =0;
        virtual void editObject() =0;
+        NameDialog *nameDialog;
        
     private:
        QDialogButtonBox *buttonBox;
@@ -35,7 +36,6 @@ class DbObjectDialog : public QDialog
        QPushButton *addButton;
        QPushButton *deleteButton;
        QListView *objectList;
-       NameDialog *nameDialog;
 
        void setButtonsEnabled(bool);
        void connectSignals();

diff --git a/src/dialogs/namedialog.cpp b/src/dialogs/namedialog.cpp
index 282a9fd..91189dc 100644 (file)
--- a/src/dialogs/namedialog.cpp
+++ b/src/dialogs/namedialog.cpp
@@ -16,8 +16,8 @@ NameDialog::NameDialog(QWidget *parent, bool edit)
        setWindowTitle(tr("Set names"));
 }
 
-NameDialog::~NameDialog()
-{
+/*NameDialog::~NameDialog()
+{*/
        /* deleting objects in heap is not needed here
         * because when deleting a parent widget
         * the child widgets will be also deleted:
@@ -26,7 +26,7 @@ NameDialog::~NameDialog()
         * delete saveButton;
         * delete closeButton;
         */
-}
+//}
 
 void NameDialog::setEdit(bool edit)
 {

diff --git a/src/dialogs/namedialog.h b/src/dialogs/namedialog.h
index 9932bd9..4003d13 100644 (file)
--- a/src/dialogs/namedialog.h
+++ b/src/dialogs/namedialog.h
@@ -13,7 +13,7 @@ class NameDialog : public QDialog
 
 public:
        NameDialog(QWidget *parent = 0, bool edit = false);
-       ~NameDialog();
+       //~NameDialog();
        void setEdit(bool edit);
 
 signals:
@@ -24,15 +24,15 @@ protected slots:
        void enableSaveButton(const QString &);
 
 protected:
+       virtual void save() =0;
        QLabel *nameLabel;
        QLineEdit *nameEdit;
        QPushButton *saveButton;
        QPushButton *closeButton;
+       bool edit;
 private:
        void connectSignals();
        void layout();
-
-       bool edit;
 };
 
 #endif

diff --git a/src/dialogs/platformdialog.cpp b/src/dialogs/platformdialog.cpp
index 3160151..3e620b4 100644 (file)
--- a/src/dialogs/platformdialog.cpp
+++ b/src/dialogs/platformdialog.cpp
@@ -1,9 +1,11 @@
 #include "platformdialog.h"
+#include "platformnamedialog.h"
 
 PlatformDialog::PlatformDialog(QWidget *parent)
     : DbObjectDialog(parent)
 {
     setWindowTitle(tr("Set emulated platforms"));
+    nameDialog = new PlatformNameDialog(this);
 }
 
 int PlatformDialog::deleteObject()
@@ -13,6 +15,13 @@ int PlatformDialog::deleteObject()
 
 void PlatformDialog::addObject()
 {
+    if (!nameDialog)
+    {
+       nameDialog = new PlatformNameDialog(this);
+    }
+    nameDialog->show();
+    nameDialog->raise();
+    nameDialog->activateWindow();
 }
 
 void PlatformDialog::editObject()

diff --git a/src/dialogs/platformdialog.h b/src/dialogs/platformdialog.h
index ad8cc59..2f7e72b 100644 (file)
--- a/src/dialogs/platformdialog.h
+++ b/src/dialogs/platformdialog.h
@@ -14,7 +14,7 @@ class PlatformDialog : public DbObjectDialog
        virtual int deleteObject();
        virtual void addObject();
        virtual void editObject();
-
+        //PlatformNameDialog *nameDialog;
 };
 
 #endif

diff --git a/src/dialogs/platformnamedialog.cpp b/src/dialogs/platformnamedialog.cpp
index d0eb807..21b1ba6 100644 (file)
--- a/src/dialogs/platformnamedialog.cpp
+++ b/src/dialogs/platformnamedialog.cpp
@@ -5,3 +5,7 @@ PlatformNameDialog::PlatformNameDialog(QWidget *parent, bool edit)
 {
        setWindowTitle(tr("Set platform name"));
 }
+
+void PlatformNameDialog::save()
+{
+}

diff --git a/src/dialogs/platformnamedialog.h b/src/dialogs/platformnamedialog.h
index 11114ad..272c8c1 100644 (file)
--- a/src/dialogs/platformnamedialog.h
+++ b/src/dialogs/platformnamedialog.h
@@ -1,5 +1,5 @@
-#ifndef PLATFORMDIALOG_H
-#define PLATFORMDIALOG_H
+#ifndef PLATFORMNAMEDIALOG_H
+#define PLATFORMNAMEDIALOG_H
 
 #include "namedialog.h"
 
@@ -9,6 +9,9 @@ class PlatformNameDialog : public NameDialog
 
 public:
        PlatformNameDialog(QWidget *parent = 0, bool edit = false);
+
+protected:
+       virtual void save();
 };
 
 #endif