X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=858aedeb17fffbc6bfb7a540590cc1ec157c4be3;hb=834546992df17f10f984d9aece4c5721cde25b8b;hp=eecab3974bf74cdeb6b63f234e416a296bccfc04;hpb=fc4f578420b02ccb6532815ce651d37186cf2710;p=emufront

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index eecab39..858aede 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -20,9 +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"
@@ -57,8 +60,12 @@ MainWindow::MainWindow(bool reset)
     createMenus();
     createStatusBar();
     readSettings();
+    // TODO: deprecated
     platformDialog = 0;
+    plfDialog = 0;
+    // TODO: deprecated
     mediaTypeDialog = 0;
+    mdtDialog = 0;
     mediaImagePathDialog = 0;
     setupMainDialog = 0;
     executableMainDialog = 0;
@@ -70,6 +77,7 @@ void MainWindow::connectSignals()
 
 void MainWindow::createActions()
 {
+    // TODO: deprecated
     configPlatformAction = new QAction(tr("&Platforms"), this);
     configPlatformAction->setStatusTip(tr("Configure platforms"));
     connect(configPlatformAction, SIGNAL(triggered()),
@@ -80,10 +88,15 @@ void MainWindow::createActions()
     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()),
@@ -119,6 +132,7 @@ void MainWindow::createActions()
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
 }
 
+// TODO: deprecated
 void MainWindow::configurePlatforms()
 {
    if (!platformDialog)
@@ -131,11 +145,14 @@ void MainWindow::configurePlatforms()
 
 void MainWindow::configurePlatformss()
 {
-    plfDialog = new PlatformMainDialog(this);
-    connect(plfDialog, SIGNAL(finished(int)), this, SLOT(updateData()));
+    if (!plfDialog) {
+        plfDialog = new PlatformMainDialog(this);
+        connect(plfDialog, SIGNAL(finished(int)), this, SLOT(updateData()));
+    }
     activateDialog(plfDialog);
 }
 
+// TODO: deprecated
 void MainWindow::configureMediaTypes()
 {
     if (!mediaTypeDialog)
@@ -146,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)
@@ -234,9 +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);