Cleanup.

[emufront] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cdc0f29..858aede 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -20,8 +20,12 @@
 #include <QtGui>
 #include "mainwindow.h"
 #include "emulauncher.h"
+// TODO: deprecated
 #include "dialogs/platformdialog.h"
+#include "dialogs/platformmaindialog.h"
 #include "dialogs/mediatypedialog.h"
+// TODO: deprecated
+#include "dialogs/mediatypemaindialog.h"
 #include "dialogs/mediaimagepathmaindialog.h"
 #include "dialogs/setupmaindialog.h"
 #include "dialogs/executablemaindialog.h"
@@ -44,19 +48,24 @@ QString MainWindow::aboutTitle = tr("About EmuFront");
 MainWindow::MainWindow(bool reset)
 {
     if (!testDB(reset)) close();
+    errorMessage = new QErrorMessage(this);
     setWindowTitle("EmuFront");
     tmpDirFilePath = DbConfig::getTmpDir();
     if (tmpDirFilePath.isEmpty())
         tmpDirFilePath = QDir::homePath();
     qDebug() << "Temporary dir is " << tmpDirFilePath;
-    launcher = new EmuLauncher(this, tmpDirFilePath);
+    launcher = new EmuLauncher(errorMessage, this, tmpDirFilePath);
     setCentralWidget(launcher);
     createActions();
     createMenus();
     createStatusBar();
     readSettings();
+    // TODO: deprecated
     platformDialog = 0;
+    plfDialog = 0;
+    // TODO: deprecated
     mediaTypeDialog = 0;
+    mdtDialog = 0;
     mediaImagePathDialog = 0;
     setupMainDialog = 0;
     executableMainDialog = 0;
@@ -68,15 +77,26 @@ void MainWindow::connectSignals()
 
 void MainWindow::createActions()
 {
+    // TODO: deprecated
     configPlatformAction = new QAction(tr("&Platforms"), this);
     configPlatformAction->setStatusTip(tr("Configure platforms"));
     connect(configPlatformAction, SIGNAL(triggered()),
-           this, SLOT(configurePlatforms()));
+        this, SLOT(configurePlatforms()));
 
+    configPlatformsAction = new QAction(tr("&Set Platforms"), this);
+    configPlatformsAction->setStatusTip(tr("Add, edit and delete platforms"));
+    connect(configPlatformsAction, SIGNAL(triggered()),
+        this, SLOT(configurePlatformss()));
+
+    // TODO: deprecated
     configMediaTypeAction = new QAction(tr("&Media Types"), this);
     configMediaTypeAction->setStatusTip(tr("Configure media types"));
     connect(configMediaTypeAction, SIGNAL(triggered()), this, SLOT(configureMediaTypes()));
 
+    configMediaTypesAction = new QAction(tr("&Set Media Types"), this);
+    configMediaTypeAction->setStatusTip(tr("Add, edit and delete media types"));
+    connect(configMediaTypesAction, SIGNAL(triggered()), this, SLOT(configureMediaTypess()));
+
     configMediaImagePathAction = new QAction(tr("Media &Image Paths"), this);
     configMediaImagePathAction->setStatusTip(tr("Configure media image file paths."));
     connect(configMediaImagePathAction, SIGNAL(triggered()),
@@ -112,6 +132,7 @@ void MainWindow::createActions()
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
 }
 
+// TODO: deprecated
 void MainWindow::configurePlatforms()
 {
    if (!platformDialog)
@@ -122,6 +143,16 @@ void MainWindow::configurePlatforms()
    activateDialog(platformDialog);
 }
 
+void MainWindow::configurePlatformss()
+{
+    if (!plfDialog) {
+        plfDialog = new PlatformMainDialog(this);
+        connect(plfDialog, SIGNAL(finished(int)), this, SLOT(updateData()));
+    }
+    activateDialog(plfDialog);
+}
+
+// TODO: deprecated
 void MainWindow::configureMediaTypes()
 {
     if (!mediaTypeDialog)
@@ -132,6 +163,17 @@ void MainWindow::configureMediaTypes()
    activateDialog(mediaTypeDialog);
 }
 
+void MainWindow::configureMediaTypess()
+{
+    if (!mdtDialog)
+    {
+        mdtDialog = new MediaTypeMainDialog(this);
+        connect(mdtDialog, SIGNAL(finished(int)), this, SLOT(updateData()));
+   }
+   activateDialog(mdtDialog);
+}
+
+
 void MainWindow::configureMediaImagePaths()
 {
     if (!mediaImagePathDialog)
@@ -193,8 +235,7 @@ void MainWindow::resetDb()
         createDB();
     }
     catch (EmuFrontException e) {
-        qDebug() << e.what();
-        QMessageBox::critical(this, "Exception", e.what());
+        errorMessage->showMessage(e.what());
     }
 }
 
@@ -221,8 +262,12 @@ void MainWindow::createMenus()
     configMenu = menuBar()->addMenu(tr("&Config"));
     configMenu->addAction(configTmpDirAction);
     configMenu->addSeparator();
+    // TODO: deprecated
     configMenu->addAction(configPlatformAction);
+    configMenu->addAction(configPlatformsAction);
+    // TODO: deprecated
     configMenu->addAction(configMediaTypeAction);
+    configMenu->addAction(configMediaTypesAction);
     configMenu->addAction(configSetupAction);
     configMenu->addAction(configMediaImagePathAction);
     configMenu->addAction(configEmulatorAction);
@@ -267,7 +312,7 @@ void MainWindow::updateData()
 
 void MainWindow::about()
 {
-    QMessageBox::about(this, aboutTitle, aboutStr );
+    QMessageBox::about(this, aboutTitle, aboutStr);
 }
 
 bool MainWindow::testDB(bool reset)
@@ -302,12 +347,11 @@ bool MainWindow::testDB(bool reset)
     }
     catch (EmuFrontException e) {
         qDebug() << e.what();
-        QMessageBox::critical(this, "Exception", e.what());
+        errorMessage->showMessage(e.what());
         return false;
     }
 }
 
-/* Throws EmuFrontException */
 void MainWindow::createDB() const
 {
     try
@@ -318,7 +362,7 @@ void MainWindow::createDB() const
     catch (QString str) {
         QString msg(tr("Exception while trying to create"
                        " EmuFront database: %s").arg(str));
-        throw EmuFrontException(msg);
+        errorMessage->showMessage(msg);
     }
 }