--- Vago/trunk/Vago/mainwindow.cpp	2016/10/30 14:42:39	1058
+++ s10k/Vago/mainwindow.cpp	2017/12/30 13:43:28	1092
@@ -241,20 +241,26 @@ void MainWindow::on_actionAbout_triggere
 
 void MainWindow::on_actionAE_Package_Creator_triggered()
 {
-    PackageWizard myWizard = PackageWizard(this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
-    myWizard.exec();
+    // it deletes itself once closed
+    WizardFactory<PackageWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
 }
 
 void MainWindow::on_actionSound_Wizard_triggered()
 {
-    SoundWizard myWizard (UtilVago::getAppPath(), this->workspaceWizardsLocation, this->myLogger, &this->commandMap);
-    myWizard.exec();
+    // it deletes itself once closed
+    WizardFactory<SoundWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger, &this->commandMap);
 }
 
 void MainWindow::on_actionBackground_Image_Wizard_triggered()
 {
-    BGImageWizard myWizard (UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
-    myWizard.exec();
+    // it deletes itself once closed
+    WizardFactory<BGImageWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
+}
+
+void MainWindow::on_actionWindow_Messages_Wizard_triggered()
+{
+    // it deletes itself once closed
+    WizardFactory<WmWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
 }
 
 void MainWindow::on_tbOni_clicked()
@@ -556,7 +562,6 @@ QString MainWindow::fileParsingObjects(Q
 
     QString command=this->commandMap.value(tabTitle+"->"+from+"->"+to)+" "+myOutputFolder;
 
-    //TODO: This can be optimized. When some are not enable others are.
     if(ui->cbTexture->isChecked()){
         if(ui->leTextureName->text().isEmpty()){
             showErrStatusMessage("Checkbox '"+ui->cbTexture->text()+"' is selected. The file source cannot be empty.");
@@ -978,7 +983,7 @@ void MainWindow::updateComboBox(const QS
         ui->cbCellShading->setChecked(false);
         ui->cbNormals->setEnabled(false);
         ui->cbNormals->setChecked(false);
-
+//#error add drag and drop to Extract TRAM with TRBS/ONCC
         if(QString::compare(arg1,"TRAM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
             ui->cbWithTRBS_ONCC->setEnabled(true);
         }