Changeset 1047 for Vago

Timestamp:

Sep 17, 2016, 12:51:26 AM (8 years ago)

Author:

s10k

Message:

Added Vago v1.0

Location:

Vago/trunk/Vago

Files:

• AE_icon.png (modified) ( previous)
• Vago.pro (modified) (6 diffs)
• abort.png (modified) ( previous)
• about.cpp (modified) (2 diffs)
• about.h (modified) (1 diff)
• about.png (modified) ( previous)
• clear_icon.png (modified) ( previous)
• command_icon.png (modified) ( previous)
• converter.cpp (modified) (4 diffs)
• converter.h (modified) (3 diffs)
• droptablewidget.h (modified) (1 diff)
• folder_icon.png (modified) ( previous)
• libs/pugixml (added)
• libs/pugixml/pugiconfig.hpp (added)
• libs/pugixml/pugixml.cpp (added)
• libs/pugixml/pugixml.hpp (added)
• log.png (modified) ( previous)
• logger.cpp (modified) (3 diffs)
• logger.h (modified) (1 diff)
• main.cpp (modified) (2 diffs)
• mainwindow.cpp (modified) (34 diffs)
• mainwindow.h (modified) (13 diffs)
• mainwindow.ui (modified) (9 diffs)
• manualcommands.cpp (modified) (2 diffs)
• manualcommands.h (modified) (1 diff)
• minus.png (modified) ( previous)
• oni_icon.png (modified) ( previous)
• oni_icon_mac.png (modified) ( previous)
• package.png (modified) ( previous)
• packageWizard/packagepage2.cpp (modified) (7 diffs)
• packageWizard/packagepage2.h (modified) (3 diffs)
• packageWizard/packagepagefinal.h (modified) (1 diff)
• packageWizard/packagewizard.cpp (modified) (2 diffs)
• packageWizard/packagewizard.h (modified) (3 diffs)
• plus.png (modified) ( previous)
• preferences.h (modified) (1 diff)
• preferences.ui (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• sound.png (modified) ( previous)
• soundWizard/soundpagefinal.cpp (modified) (5 diffs)
• switch.png (modified) ( previous)
• toolPackage.png (modified) ( previous)
• util.cpp (modified) (9 diffs)
• util.h (modified) (4 diffs)
• utilvago.cpp (added)
• utilvago.h (added)
• vago_icon.png (modified) ( previous)
• xmlprocessor.cpp (modified) (2 diffs)
• xmlprocessor.h (modified) (1 diff)

Vago/trunk/Vago/Vago.pro

@@ -8 +8 @@
 QT       += network #network communication
 QT       += script #for json parse
+win32 {
+QT       += winextras
+}
+CONFIG   += c++14
 
-INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
-INCLUDEPATH += ./libs
+#INCLUDEPATH += ./libs
 INCLUDEPATH += ./packageWizard
 INCLUDEPATH += ./soundWizard
+
+# Used this great tutorial to build zlib and quazip:
+# http://www.antonioborondo.com/2014/10/22/zipping-and-unzipping-files-with-qt/
+INCLUDEPATH += ../Libs/zlib-1.2.8
+LIBS += -LC:../Libs/zlib-1.2.8 -lz
+INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
+LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
 
 macx {
@@ -36 +46 @@
     converter.cpp \
     about.cpp \
-    libs/zipglobal.cpp \
-    libs/zip.cpp \
-    libs/unzip.cpp \
     packageWizard/packagewizard.cpp \
     packageWizard/packagepagefinal.cpp \
@@ -49 +56 @@
     soundWizard/soundpagefinal.cpp \
     soundWizard/soundwizard.cpp \
-    xmlprocessor.cpp
+    xmlprocessor.cpp \
+    libs/pugixml/pugixml.cpp \
+    utilvago.cpp
 
 HEADERS  += \
@@ -60 +69 @@
     converter.h \
     about.h \
-    libs/zipglobal.h \
-    libs/zipentry_p.h \
-    libs/zip_p.h \
-    libs/zip.h \
-    libs/unzip_p.h \
-    libs/unzip.h \
     packageWizard/packagewizard.h \
     packageWizard/packagepagefinal.h \
@@ -76 +79 @@
     soundWizard/soundpagefinal.h \
     soundWizard/soundwizard.h \
-    xmlprocessor.h
+    xmlprocessor.h \
+    libs/pugixml/pugixml.hpp \
+    utilvago.h
 
-FORMS    += mainwindow.ui \
+FORMS    += \
+    mainwindow.ui \
     preferences.ui \
     manualcommands.ui \
@@ -93 +99 @@
 RESOURCES += \
     resources.qrc \
-
-CONFIG += c++11

Vago/trunk/Vago/about.cpp

@@ -14 +14 @@
                          "<p style='font-size:small;'>"
                          "Written by s10k<br /><br/>"
+                         "Build Date " + __DATE__ + " " + __TIME__ + "<br /><br />"
                          "Thanks to:<br/>"
                          "Neo for OniSplit<br />"
@@ -27 +28 @@
                          "Also thanks to: <br />"
                          "StackOverflow Community<br />"
-                         "Fabrizio Angius for PKZIP 2.0 for zip handling<br />"
+                         "Sergey A. Tachenov for the QuaZIP library<br />"
+                         "Antonio Borondo for the documentation how to setup QuaZIP<br />"
+                         "Arseny Kapoulkine (and contributors)for pugixml library<br />"
                          "smashingmagazine for the folder icon :)<br />"
                          "<center>"

Vago/trunk/Vago/about.h

@@ -4 +4 @@
 #include <QDialog>
 
-#include "util.h"
+#include "utilvago.h"
 
 namespace Ui {

Vago/trunk/Vago/converter.cpp

@@ -8 +8 @@
 }
 
+#ifdef Q_OS_WIN
+Converter::Converter(QString AppDir, Logger *myLogger, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress)
+    : Converter(AppDir, myLogger, myData)
+{
+    this->win7TaskBarProgress = win7TaskBarProgress;
+}
+#endif
+
 void Converter::run()
 {
@@ -16 +24 @@
     int numErrors=0;
 
-    this->myLogger->writeString("Setting working dir. to "+this->AppDir+".");
+    this->myLogger->writeString("Setting working dir to "+this->AppDir+".");
     myProcess->setWorkingDirectory(this->AppDir); // Set working directory (for work with AEI2/Mac OS)
 
+#ifdef Q_OS_WIN
+    if(this->win7TaskBarProgress){
+        this->win7TaskBarProgress->reset();
+        this->win7TaskBarProgress->show();
+    }
+#endif
+
     if(this->myData->size()!=1){
+#ifdef Q_OS_WIN
+        if(this->win7TaskBarProgress){
+            this->win7TaskBarProgress->setRange(0,this->myData->size());
+        }
+#endif
         emit setupPB(this->myData->size());
     }
     else{
+#ifdef Q_OS_WIN
+        if(this->win7TaskBarProgress){
+            this->win7TaskBarProgress->setRange(0,0);
+        }
+#endif
         emit setupPB(0); //Intermitent bar, we don't have any estimation when the task is done
     }
@@ -37 +62 @@
 
             commandToExec=commands.mid(currentIndex,(nextIndex-currentIndex));
-            this->myProcess->start(Util::getOniSplitExeName() +" "+commandToExec);
+            this->myProcess->start(UtilVago::getOniSplitExeAbsolutePath() + " " + commandToExec);
             this->myProcess->waitForFinished(-1);
 
             if(this->processHasKilled){ // If the process has killed there's no need to proceed with reading output or process more commands
+
+#ifdef Q_OS_WIN
+                if(this->win7TaskBarProgress){
+                    this->win7TaskBarProgress->hide();
+                }
+#endif
+
                 delete this->myProcess; //delete object and make pointer invalid
                 this->myData->clear(); //clean list
                 emit conversionAborted();
+
                 return;
             }
@@ -62 +95 @@
         }
 
+#ifdef Q_OS_WIN
+        if(this->win7TaskBarProgress){
+            this->win7TaskBarProgress->setValue(win7TaskBarProgress->value()+1);
+        }
+#endif
+
         emit taskDone();
     }
+
+#ifdef Q_OS_WIN
+    if(this->win7TaskBarProgress){
+        this->win7TaskBarProgress->hide();
+    }
+#endif
 
     delete this->myProcess; //delete object and make pointer invalid

Vago/trunk/Vago/converter.h

@@ -4 +4 @@
 #include <QProgressBar>
 #include <QThread>
+#ifdef Q_OS_WIN
+#include <QWinTaskbarProgress>
+#endif
 
-#include "logger.h"
+#include "utilvago.h"
 
 class Converter : public QThread
@@ -12 +15 @@
 public:
     Converter(QString AppDir, Logger *myLogger, QStringList *myData);
+
+    #ifdef Q_OS_WIN
+    Converter(QString AppDir, Logger *myLogger, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress);
+    #endif
 private:
     QString AppDir;
@@ -18 +25 @@
     QProcess *myProcess;
     bool processHasKilled;
+    #ifdef Q_OS_WIN
+    QWinTaskbarProgress *win7TaskBarProgress = nullptr;
+    #endif
 
 protected:

Vago/trunk/Vago/droptablewidget.h

@@ -5 +5 @@
 #include <QtWidgets>
 
-#include "util.h"
+#include "utilvago.h"
 
 

Vago/trunk/Vago/logger.cpp

@@ -1 +1 @@
 #include "logger.h"
 
-Logger::Logger(QString appDir)
+Logger::Logger(QString appDir, QString logFileName)
 {
-     myLogFile = new QFile(appDir+"/"+GlobalVars::AppLogName);
+    myLogFile = std::make_unique<QFile>(appDir+"/"+logFileName);
 
-     if (!myLogFile->open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
-           return;
-     }
+    if (!myLogFile->open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
+        return;
+    }
 
-    logStream = new QTextStream (myLogFile);
+    logStream = std::make_unique<QTextStream>(myLogFile.get());
     //logStream->setCodec("UTF-8");
 }
 
- /**
+/**
   ** Mutex makes it thread safe. (not sure if needed although)
   **/
@@ -19 +19 @@
     mutex.lock();
     *this->logStream << "--------------------------------------------";
-    *this->logStream << "\nEvent Start: " << QDateTime::currentDateTime().toString() << "\n" << strToWrite << "\nEvent End.\n";
+    *this->logStream << "\nEvent Start: " << QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss") << "\n" << strToWrite << "\nEvent End.\n";
     *this->logStream << "--------------------------------------------\n";
     this->logStream->flush();
@@ -29 +29 @@
  **/
 void Logger::writeBytes(QByteArray arrToWrite){
-   mutex.lock();
-   *this->logStream << "--------------------------------------------";
-   *this->logStream << "\nEvent Start: " << QDateTime::currentDateTime().toString() << "\n" << arrToWrite << "\nEvent End.\n";
-   *this->logStream << "--------------------------------------------";
-   this->logStream->flush();
-   mutex.unlock();
+    mutex.lock();
+    *this->logStream << "--------------------------------------------";
+    *this->logStream << "\nEvent Start: " << QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss") << "\n" << arrToWrite << "\nEvent End.\n";
+    *this->logStream << "--------------------------------------------";
+    this->logStream->flush();
+    mutex.unlock();
 }
 
-//deconstructor, will close the file automatically and free the resources...
 Logger::~Logger(){
-    delete this->logStream;
-    delete this->myLogFile; //the deconstructor of the file will close it automatically
+
 }

Vago/trunk/Vago/logger.h

@@ -5 +5 @@
 #include <QMutex>
 #include <QDateTime>
-
-#include "util.h"
+#include <memory>
 
 class Logger
 {
 public:
-    Logger(QString  appDir);
+    Logger(QString  appDir, QString logFileName);
     ~Logger();
     void writeString(QString strToWrite);
     void writeBytes(QByteArray arrToWrite);
 private:
-    QFile *myLogFile;
-    QTextStream *logStream;
+    std::unique_ptr<QFile> myLogFile;
+    std::unique_ptr<QTextStream> logStream;
     QMutex mutex; //mutex for control writes to the logs
 };

Vago/trunk/Vago/main.cpp

@@ -1 +1 @@
 #include <QtWidgets/QApplication>
 #include "mainwindow.h"
+
 
 int main(int argc, char *argv[])
@@ -9 +10 @@
     w.show();
     a.setStyleSheet("QStatusBar::item { border: 0px; }"); //hide QLabels border in status bar //http://qt-project.org/forums/viewthread/18743
-    
+
     return a.exec();
 }

Vago/trunk/Vago/mainwindow.cpp

@@ -10 +10 @@
     ui->setupUi(this);
 
-    this->myLogger = new Logger(Util::getAppPath()); //start logger
-
-    this->myLogger->writeString("Detected AppDir: "+Util::getAppPath());
+    this->myLogger = new Logger(UtilVago::getAppPath(), GlobalVars::AppLogName); //start logger
+
+    this->myLogger->writeString("Detected AppDir: "+UtilVago::getAppPath());
     this->myLogger->writeString("True app dir: "+QDir::currentPath());
 
-    this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
-
-    if(!QFile::exists(Util::getAppPath()+"/"+GlobalVars::OniSplitString)){
-        Util::showErrorPopUp("OniSplit not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit.");
+    setVagoWindowTitle();
+
+    if(!QFile::exists(UtilVago::getOniSplitExeAbsolutePath())){
+        UtilVago::showAndLogErrorPopUp(this->myLogger, "OniSplit not found. Please download it at "+GlobalVars::ModsDomain+" and put it the Vago's tools folder. \n\nProgram will now exit.");
         exit(1);
     }
 
-    if(!QFile::exists(Util::getAppPath()+"/"+GlobalVars::XmlToolsString)){
-        Util::showErrorPopUp("xmlTools not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit.");
+    if(!QFile::exists(UtilVago::getXmlToolsExeAbsolutePath())){
+        UtilVago::showAndLogErrorPopUp(this->myLogger, "XmlTools not found. Please download it at "+GlobalVars::ModsDomain+" and put it the Vago's tools folder. \n\nProgram will now exit.");
         exit(1);
     }
 
-    this->vagoSettings = new QSettings(Util::getAppPath() + "/" + this->VagoSettingsName, QSettings::IniFormat);
+    this->vagoSettings = new QSettings(UtilVago::getAppPath() + "/" + this->VagoSettingsName, QSettings::IniFormat);
 
     //First Execution? Old configuration? Settings missed?
@@ -36 +36 @@
     }
     if(!this->vagoSettings->contains("Workspace")){
-        this->vagoSettings->setValue("Workspace", Util::getAppPath()+"/VagoWorkspace");
+        this->vagoSettings->setValue("Workspace", UtilVago::getAppPath()+"/VagoWorkspace");
         iniChanged=true;
     }
@@ -45 +45 @@
 
         if(aefolder.isEmpty()){
-            Util::showErrorPopUp("AE folder is mandatory. Application will now exit.");
+            UtilVago::showAndLogErrorPopUp(this->myLogger, "AE folder is mandatory. Application will now exit.");
             exit(1);
         }
@@ -75 +75 @@
         this->vagoSettings->setValue("ConfirmExit", false);
         iniChanged=true;
+    }
+    if(!this->vagoSettings->contains("LastProjectPath")){
+        this->vagoSettings->setValue("LastProjectPath", this->vagoSettings->value("Workspace"));
+        iniChanged=true;
+    }
+    for(int i=0; i<this->recentProjectsMaxSize; i++){
+        if(!this->vagoSettings->contains("RecentProject" + QString::number(i+1))){
+            this->vagoSettings->setValue("RecentProject" + QString::number(i+1), "");
+            iniChanged=true;
+        }
     }
 #ifdef Q_OS_MAC
@@ -118 +128 @@
     this->listToProccess = new QStringList;
 
-    //Create a thread for do the conversion in background
-    this->myConverter = new Converter(Util::getAppPath(),this->myLogger,this->listToProccess);
-
     // User interface
     ui->mainToolBar->addWidget(ui->tbAE); //add ae installer launch button
@@ -132 +139 @@
     ui->mainToolBar->setLayoutDirection(Qt::RightToLeft);
 
-    setConverterButtonsSize();
+    ui->pbConvert->setMinimumHeight(ui->pbConvert->sizeHint().height()*1.5); // This is OS indepented. It maintain size ratio over the Windows and Mac.
+
 
 #ifdef Q_OS_MAC
@@ -144 +152 @@
     // resize(800,600); // Mac OS pcs should be able to render this resolution without any problem. It's also better
     //// because the components on mac use more space
+#endif
+
+    resize(this->startedWindowWidth,this->startedWindowHeight);
+
+#ifdef Q_OS_MAC
+    ui->pbConvert->setToolTip(ui->pbConvert->toolTip() + " (⌘ + Enter)");
 #else
-    //resize(640,480); // windows stuff
+    ui->pbConvert->setToolTip(ui->pbConvert->toolTip() + " (Ctrl + Enter)");
 #endif
-
-    resize(this->startedWindowWidth,this->startedWindowHeight);
-
-    connectSlots();
 
     //Commands Mapping
@@ -158 +168 @@
     updateItemsLoaded(ui->twSourcesXML);
 
-    this->myLogger->writeString("Application started.");
+    loadRecentProjects();
 }
 
@@ -166 +176 @@
     this->myLogger->writeString("Application Exited.");
 }
+
+
+void MainWindow::showEvent(QShowEvent *e)
+{
+    #ifdef Q_OS_WIN
+    // QProgressBar only works after the windows was shown
+    // http://stackoverflow.com/questions/24840941/qwintaskbarprogress-wont-show (Kervala answer)
+
+    this->win7TaskBarButton = new QWinTaskbarButton();
+
+    this->win7TaskBarButton->setWindow(this->windowHandle());
+
+    this->win7TaskBarProgress = this->win7TaskBarButton->progress();
+
+    //Create a thread for do the conversion in background
+    this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, this->listToProccess, this->win7TaskBarProgress);
+    #else
+    this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, this->listToProccess);
+    #endif
+
+    connectSlots();
+
+    this->myLogger->writeString("Application started.");
+
+    e->accept();
+}
+
 
 void MainWindow::on_actionExit_triggered()
@@ -187 +224 @@
 void MainWindow::on_actionSound_Wizard_triggered()
 {
-    SoundWizard myWizard (Util::getAppPath(), this->workspaceWizardsLocation, this->myLogger, &this->commandMap);
+    SoundWizard myWizard (UtilVago::getAppPath(), this->workspaceWizardsLocation, this->myLogger, &this->commandMap);
     myWizard.exec();
 }
@@ -283 +320 @@
     }
     else{
-        Util::showErrorPopUp("An error occurred checking last version:\n\n"+result->errorString());
+        UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred checking last version:\n\n"+result->errorString());
     }
     result->deleteLater();
@@ -436 +473 @@
         }
 
-        if(ui->rbBGR32->isChecked()){
-            command+=" "+this->commandMap.value(tabTitle+"->"+ui->rbBGR32->text());
-        }
-        else if(ui->rbBGRA32->isChecked()){
-            command+=" "+this->commandMap.value(tabTitle+"->"+ui->rbBGRA32->text());
-        }
-        else if(ui->rbBGR555->isChecked()){
-            command+=" "+this->commandMap.value(tabTitle+"->"+ui->rbBGR555->text());
-        }
-        else if(ui->rbBGRA5551->isChecked()){
-            command+=" "+this->commandMap.value(tabTitle+"->"+ui->rbBGRA5551->text());
-        }
-        else if(ui->rbBGRA444->isChecked()){
-            command+=" "+this->commandMap.value(tabTitle+"->"+ui->rbBGRA444->text());
-        }
-        else{ //dxt1 checked
-            command+=" "+this->commandMap.value(tabTitle+"->"+ui->rbDxt1->text());
-        }
+        command+=" "+this->commandMap.value(tabTitle+"->"+getTextureRBCheckedTypeTexture()->text());
 
         if(ui->cbEnvMap->isChecked()){
@@ -635 +655 @@
 }
 
-void MainWindow::addRowTable(DropTableWidget *myTable, QString fileName, QString fromTo, QString command){
+void MainWindow::addRowTable(DropTableWidget *myTable, QString fileName, QString fromTo, QString command, bool isToDisabled){
     //Get actual number rows
     int twSize=myTable->rowCount();
@@ -647 +667 @@
     QTableWidgetItem *newCommand = new QTableWidgetItem(command);
 
+    if(isToDisabled){
+        myTable->setDisableStyleWidgetItem(newFile);
+        myTable->setDisableStyleWidgetItem(newConversion);
+        myTable->setDisableStyleWidgetItem(newCommand);
+    }
+
     myTable->setItem(twSize,0,newFile);
     myTable->setItem(twSize,1,newConversion);
@@ -654 +680 @@
 }
 
-void MainWindow::on_pbConvertXML_clicked()
-{
-    startConversion(ui->twSourcesXML);
-}
-
-void MainWindow::on_pbConvertTextures_clicked()
-{
-    startConversion(ui->twSourcesTextures);
-}
-
-void MainWindow::on_pbConvertObjects_clicked()
-{
-    startConversion(ui->twSourcesObjects);
-}
-
-void MainWindow::on_pbConvertCharacters_clicked()
-{
-    startConversion(ui->twSourcesCharacters);
-}
-
-void MainWindow::on_pbConvertLevels_clicked()
-{
-    startConversion(ui->twSourcesLevels);
-}
-
-void MainWindow::on_pbConvertMisc_clicked()
-{
-    startConversion(ui->twSourcesMisc);
-}
-
-void MainWindow::startConversion(DropTableWidget *myTable){
+void MainWindow::on_pbConvert_clicked()
+{
+    startConversion();
+}
+
+void MainWindow::startConversion(){
+
+    DropTableWidget* currTable = getCurrentTableWidget();
 
     bool ready=false;
-    for(int i=0; i<myTable->rowCount(); i++){ //There are items to process?
-        if(myTable->item(i,2)->background()!=myTable->disabledBackStyle){
+    for(int i=0; i<currTable->rowCount(); i++){ //There are items to process?
+        if(currTable->item(i,2)->background()!=currTable->disabledBackStyle){
             ready=true;
             break;
@@ -704 +707 @@
     }
 
-    for(int i=0; i<myTable->rowCount(); i++){
+    for(int i=0; i<currTable->rowCount(); i++){
         //Only process enabled items
-        if(myTable->item(i,2)->background()!=myTable->disabledBackStyle){
-            this->listToProccess->append(myTable->item(i,2)->text());
+        if(currTable->item(i,2)->background()!=currTable->disabledBackStyle){
+            this->listToProccess->append(currTable->item(i,2)->text());
         }
     }
@@ -733 +736 @@
         QString sNumErrors=QString::number(numErrors);
         if(numErrors>1){
-            Util::showErrorLogPopUp(result+"\n This is the last of "+sNumErrors+" Errors.");
+            UtilVago::showErrorPopUpLogButton(result+"\n This is the last of "+sNumErrors+" Errors.");
             showErrStatusMessage("Something gone wrong. Check log file ("+sNumErrors+" Errors).");
         }
         else{
-            Util::showErrorLogPopUp(result);
+            UtilVago::showErrorPopUpLogButton(result);
             showErrStatusMessage("Something gone wrong. Check log file.");
         }
@@ -887 +890 @@
 void MainWindow::on_cbFromTextures_currentIndexChanged(const QString &arg1)
 {
-    //Options are only used for DAT/ONI -> Image
-    if(QString::compare(arg1,"DAT / ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
-        ui->gbTextures->setEnabled(false);
-    }
-    else{
-        ui->gbTextures->setEnabled(true);
-    }
-
     updateComboBox(arg1, ui->cbToTextures);
 }
@@ -900 +895 @@
 void MainWindow::on_cbFromObjects_currentIndexChanged(const QString &arg1)
 {
-    ui->cbTexture->setEnabled(false);
-    ui->cbTexture->setChecked(false);
-    ui->cbWithAnimation->setEnabled(false);
-    ui->cbWithAnimation->setChecked(false);
-
-    if(QString::compare(arg1,"M3GM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
-        ui->cbWithAnimation->setEnabled(true);
-    }
-    else if(QString::compare(arg1,"OBJ",Qt::CaseSensitive)==0){
-        ui->cbTexture->setEnabled(true);
-    }
-
     updateComboBox(arg1, ui->cbToObjects);
 }
@@ -917 +900 @@
 void MainWindow::on_cbFromCharacters_currentIndexChanged(const QString &arg1)
 {
-    ui->cbWithTRBS_ONCC->setEnabled(false);
-    ui->cbWithTRBS_ONCC->setChecked(false);
-    ui->cbCellShading->setEnabled(false);
-    ui->cbCellShading->setChecked(false);
-    ui->cbNormals->setEnabled(false);
-    ui->cbNormals->setChecked(false);
-
-    if(QString::compare(arg1,"TRAM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
-        ui->cbWithTRBS_ONCC->setEnabled(true);
-    }
-    else if(QString::compare(arg1,"TRBS DAE",Qt::CaseSensitive)==0){
-        ui->cbNormals->setEnabled(true);
-        ui->cbCellShading->setEnabled(true);
-    }
-
     updateComboBox(arg1, ui->cbToCharacters);
 }
@@ -937 +905 @@
 void MainWindow::on_cbFromLevels_currentIndexChanged(const QString &arg1)
 {
-
-    ui->cbSpecificFilesLevels->setEnabled(false);
-    ui->cbSpecificFilesLevels->setChecked(false);
-    ui->cbDatLevels->setEnabled(false);
-    ui->cbDatLevels->setChecked(false);
-    ui->cbBnvLevels->setEnabled(false);
-    ui->cbBnvLevels->setChecked(false);
-    ui->cbAdditionalSourcesLevels->setEnabled(false);
-    ui->cbAdditionalSourcesLevels->setChecked(false);
-    ui->cbGridsLevels->setEnabled(false);
-    ui->cbGridsLevels->setChecked(false);
-
-    if(arg1=="DAT"){ //case sensitive is faster
-        ui->cbSpecificFilesLevels->setEnabled(true);
-    }
-    else if(arg1=="ONI FILES"){ //case sensitive is faster
-        ui->cbDatLevels->setEnabled(true);
-    }
-    else if(arg1=="DAE"){
-        ui->cbBnvLevels->setEnabled(true);
-        ui->cbAdditionalSourcesLevels->setEnabled(true);
-    }
-
     updateComboBox(arg1, ui->cbToLevels);
 }
@@ -969 +914 @@
 
 void MainWindow::updateComboBox(const QString &arg1, QComboBox *comboBox){
-    QString identifier=ui->tabWidget->tabText(ui->tabWidget->currentIndex()).toLower(); // get current tab title text (lower case)
+
+    QString identifier;
+
+    if(comboBox == ui->cbToXML){
+        identifier = ui->tabWidget->tabText(XMLTabIndex);
+    }
+    else if(comboBox == ui->cbToTextures){
+        identifier = ui->tabWidget->tabText(TexturesTabIndex);
+
+        //Options are only used for DAT/ONI -> Image
+        if(QString::compare(arg1,"DAT / ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
+            ui->gbTextures->setEnabled(false);
+        }
+        else{
+            ui->gbTextures->setEnabled(true);
+        }
+    }
+    else if(comboBox == ui->cbToCharacters){
+        identifier = ui->tabWidget->tabText(CharactersTabIndex);
+
+        ui->cbWithTRBS_ONCC->setEnabled(false);
+        ui->cbWithTRBS_ONCC->setChecked(false);
+        ui->cbCellShading->setEnabled(false);
+        ui->cbCellShading->setChecked(false);
+        ui->cbNormals->setEnabled(false);
+        ui->cbNormals->setChecked(false);
+
+        if(QString::compare(arg1,"TRAM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
+            ui->cbWithTRBS_ONCC->setEnabled(true);
+        }
+        else if(QString::compare(arg1,"TRBS DAE",Qt::CaseSensitive)==0){
+            ui->cbNormals->setEnabled(true);
+            ui->cbCellShading->setEnabled(true);
+        }
+
+    }
+    else if(comboBox == ui->cbToObjects){
+        identifier = ui->tabWidget->tabText(ObjectsTabIndex);
+
+        ui->cbTexture->setEnabled(false);
+        ui->cbTexture->setChecked(false);
+        ui->cbWithAnimation->setEnabled(false);
+        ui->cbWithAnimation->setChecked(false);
+
+        if(QString::compare(arg1,"M3GM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
+            ui->cbWithAnimation->setEnabled(true);
+        }
+        else if(QString::compare(arg1,"OBJ",Qt::CaseSensitive)==0){
+            ui->cbTexture->setEnabled(true);
+        }
+    }
+    else if(comboBox == ui->cbToLevels){
+        identifier = ui->tabWidget->tabText(LevelsTabIndex);
+
+        ui->cbSpecificFilesLevels->setEnabled(false);
+        ui->cbSpecificFilesLevels->setChecked(false);
+        ui->cbDatLevels->setEnabled(false);
+        ui->cbDatLevels->setChecked(false);
+        ui->cbBnvLevels->setEnabled(false);
+        ui->cbBnvLevels->setChecked(false);
+        ui->cbAdditionalSourcesLevels->setEnabled(false);
+        ui->cbAdditionalSourcesLevels->setChecked(false);
+        ui->cbGridsLevels->setEnabled(false);
+        ui->cbGridsLevels->setChecked(false);
+
+        if(arg1=="DAT"){ //case sensitive is faster
+            ui->cbSpecificFilesLevels->setEnabled(true);
+        }
+        else if(arg1=="ONI FILES"){ //case sensitive is faster
+            ui->cbDatLevels->setEnabled(true);
+        }
+        else if(arg1=="DAE"){
+            ui->cbBnvLevels->setEnabled(true);
+            ui->cbAdditionalSourcesLevels->setEnabled(true);
+        }
+    }
+    else{ // Misc
+        identifier = ui->tabWidget->tabText(MiscTabIndex);
+    }
+
+    identifier = identifier.toLower(); // get current tab title text (lower case)
 
     comboBox->clear();
@@ -1105 +1130 @@
 
     if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?",defaultButton)){
-        myTable->clearContents();
-        myTable->setRowCount(0);
+        clearTableNoPrompt(myTable);
     }
     updateItemsLoaded(myTable);
 }
 
+void MainWindow::clearTableNoPrompt(DropTableWidget *myTable){
+    myTable->clearContents();
+    myTable->setRowCount(0);
+}
 
 void MainWindow::on_actionPreferences_triggered()
@@ -1186 +1214 @@
 void MainWindow::on_actionCheck_OniSplit_version_triggered()
 {
-    QProcess *myProcess = new QProcess();
-    myProcess->setWorkingDirectory(Util::getAppPath());
-    myProcess->start(Util::getOniSplitExeName()+" -version");
-    myProcess->waitForFinished(-1);
-    QString result=myProcess->readAllStandardOutput();
-    delete myProcess;
-    Util::showPopUp("This Vago version was built with base in OniSplit version "+GlobalVars::BuiltOniSplitVersion+"\n\nActual version is:\n"+result);
+    QProcess myProcess;
+    myProcess.setWorkingDirectory(UtilVago::getAppPath());
+    myProcess.start(UtilVago::getOniSplitExeAbsolutePath()+" -version");
+    myProcess.waitForFinished();
+
+    QString result=myProcess.readAllStandardOutput();
+
+    Util::showPopUp("This Vago version was built with base in OniSplit version "+GlobalVars::BuiltOniSplitVersion+"\n\nCurrent version is:\n"+result.trimmed());
 }
 
 void MainWindow::on_actionCheck_xmlTools_version_triggered()
 {
-    QProcess *myProcess = new QProcess();
-    myProcess->setWorkingDirectory(Util::getAppPath());
-    myProcess->start(Util::getXmlToolsExeName()+" version");
-    myProcess->waitForFinished(-1);
-    QString result=myProcess->readLine();
-    delete myProcess;
-    Util::showPopUp("This Vago version was built with base in xmlTools version "+GlobalVars::BuiltXmlToolsVersion+"\n\nActual version is:\n"+result);
+    QProcess myProcess;
+    myProcess.setWorkingDirectory(UtilVago::getAppPath());
+    myProcess.start(UtilVago::getXmlToolsExeAbsolutePath()+" --version");
+    myProcess.waitForFinished();
+    QString result=myProcess.readLine();
+
+    Util::showPopUp("This Vago version was built with base in XmlTools version "+GlobalVars::BuiltXmlToolsVersion+"\n\nCurrent version is:\n"+result.trimmed());
 }
 
@@ -1209 +1238 @@
   Update items loaded
 **/
-void MainWindow::on_tabWidget_currentChanged(int index)
-{
-    QString tabtext = ui->tabWidget->tabText(index);
-
-    if(tabtext.compare("XML",Qt::CaseSensitive)==0){ //case sentive is faster
-        updateItemsLoaded(ui->twSourcesXML);
-    }
-    else if(tabtext.compare("Textures",Qt::CaseSensitive)==0){
-        updateItemsLoaded(ui->twSourcesTextures);
-    }
-    else if(tabtext.compare("Characters",Qt::CaseSensitive)==0){
-        updateItemsLoaded(ui->twSourcesCharacters);
-    }
-    else if(tabtext.compare("Objects",Qt::CaseSensitive)==0){
-        updateItemsLoaded(ui->twSourcesObjects);
-    }
-    else if(tabtext.compare("Levels",Qt::CaseSensitive)==0){
-        updateItemsLoaded(ui->twSourcesLevels);
-    }
-    else{
-        updateItemsLoaded(ui->twSourcesMisc);
-    }
+void MainWindow::on_tabWidget_currentChanged(int)
+{
+    updateItemsLoaded(getCurrentTableWidget());
 }
 
@@ -1283 +1293 @@
 void MainWindow::on_actionView_log_triggered()
 {
-    Util::openLogFile();
+    UtilVago::openLogFile();
 }
 
@@ -1289 +1299 @@
 {
     QDesktopServices::openUrl(QUrl("file:///"+this->AeLocation));
+}
+
+void MainWindow::on_actionSave_Project_triggered()
+{
+
+    QString filePath = QFileDialog::getSaveFileName(this, tr("Save File"),
+                                                    this->vagoSettings->value("LastProjectPath").toString(),
+                                                    tr("Vago project files (*.vgp)"));
+
+    if(!filePath.isEmpty()){
+        saveProjectState(filePath);
+    }
+
+}
+
+void MainWindow::on_actionSave_triggered()
+{
+    if(this->lastProjectFilePath.isEmpty()){
+        on_actionSave_Project_triggered();
+        return;
+    }
+
+    saveProjectState(this->lastProjectFilePath);
+}
+
+void MainWindow::on_actionLoad_Project_triggered()
+{
+
+    QString filePath = QFileDialog::getOpenFileName(this, tr("Load File"),
+                                                    this->vagoSettings->value("LastProjectPath").toString(),
+                                                    tr("Vago project files (*.vgp)"));
+    if(!filePath.isEmpty()){
+        loadProjectState(filePath);
+    }
+}
+
+void MainWindow::on_actionProject1_triggered()
+{
+    loadProjectState(this->ui->actionProject1->text());
+}
+
+void MainWindow::on_actionProject2_triggered()
+{
+    loadProjectState(this->ui->actionProject2->text());
+}
+
+void MainWindow::on_actionProject3_triggered()
+{
+    loadProjectState(this->ui->actionProject3->text());
+}
+
+void MainWindow::on_actionProject4_triggered()
+{
+    loadProjectState(this->ui->actionProject4->text());
+}
+
+void MainWindow::on_actionProject5_triggered()
+{
+    loadProjectState(this->ui->actionProject5->text());
 }
 
@@ -1340 +1409 @@
     }
 
-    QMenu *menu = new QMenu();
-    QAction *copy = new QAction("Copy",myTable);
-    QAction *moveUp = new QAction("Move Up",myTable);
-    QAction *moveDown = new QAction("Move Down",myTable);
-    QAction *changeOptions = new QAction("Change To Current Options",myTable);
-    QMenu *changeOutput = new QMenu("Change Output for:");
-    QAction *outWorkspace = new QAction("Workspace",myTable);
-    QAction *outCurrOutput = new QAction("Current Output Folder",myTable);
-    QAction *outOther = new QAction("Other...",myTable);
-    QAction *edisable = new QAction("Enable/Disable",myTable);
-
-    menu->addAction(copy);
+    std::unique_ptr<QMenu> menu = std::make_unique<QMenu>();
+    std::unique_ptr<QAction> copy =  std::make_unique<QAction>("Copy",myTable);
+    std::unique_ptr<QAction> moveUp = std::make_unique<QAction>("Move Up",myTable);
+    std::unique_ptr<QAction> moveDown = std::make_unique<QAction>("Move Down",myTable);
+    std::unique_ptr<QAction> changeOptions = std::make_unique<QAction>("Change To Current Options",myTable);
+    std::unique_ptr<QMenu> changeOutput = std::make_unique<QMenu>("Change Output for:");
+    std::unique_ptr<QAction> outWorkspace = std::make_unique<QAction>("Workspace",myTable);
+    std::unique_ptr<QAction> outCurrOutput = std::make_unique<QAction>("Current Output Folder",myTable);
+    std::unique_ptr<QAction> outOther = std::make_unique<QAction>("Other...",myTable);
+    std::unique_ptr<QAction> edisable = std::make_unique<QAction>("Enable/Disable",myTable);
+
+    menu->addAction(copy.get());
     menu->addSeparator();
-    menu->addAction(moveUp);
-    menu->addAction(moveDown);
+    menu->addAction(moveUp.get());
+    menu->addAction(moveDown.get());
     menu->addSeparator();
-    menu->addAction(changeOptions);
-    menu->addMenu(changeOutput);
-    changeOutput->addActions(QList<QAction*>() << outWorkspace << outCurrOutput << outOther);
-    menu->addAction(edisable);
+    menu->addAction(changeOptions.get());
+    menu->addMenu(changeOutput.get());
+    changeOutput->addActions(QList<QAction*>() << outWorkspace.get() << outCurrOutput.get() << outOther.get());
+    menu->addAction(edisable.get());
 
 
@@ -1383 +1452 @@
     QAction* selectedOption = menu->exec(event->globalPos());
 
-    if(selectedOption==copy){
+    if(selectedOption==copy.get()){
         //Let's copy the contents to the clipboard
 
@@ -1406 +1475 @@
         showSuccessStatusMessage(QString::number(size) + (size==1?" item ":" items ")+ "copied to the clipboard");
     }
-    else if(selectedOption==moveUp){
+    else if(selectedOption==moveUp.get()){
         qSort(selectedRows); //let's order the selections by the row number, so we know exactly how to swap it
         myTable->swapPositions(selectedRows,-1);
     }
-    else if(selectedOption==moveDown){
+    else if(selectedOption==moveDown.get()){
         qSort(selectedRows);
         myTable->swapPositions(selectedRows,+1);
     }
-    else if(selectedOption==changeOptions){
+    else if(selectedOption==changeOptions.get()){
         changeToCurrentSettings(selectedRows,myTable);
     }
-    else if(selectedOption==outWorkspace){
+    else if(selectedOption==outWorkspace.get()){
         changeItemsOutput(myTable,selectedRows,this->workspaceLocation);
     }
-    else if(selectedOption==outCurrOutput){
+    else if(selectedOption==outCurrOutput.get()){
         changeItemsOutput(myTable,selectedRows,this->outputFolder);
     }
-    else if(selectedOption==outOther){
+    else if(selectedOption==outOther.get()){
 
         QString newDir=QFileDialog::getExistingDirectory(this,"Choose the folder for the output of the files selected...",this->AeLocation+"/GameDataFolder");
@@ -1435 +1504 @@
 
     }
-    else if(selectedOption==edisable){
+    else if(selectedOption==edisable.get()){
 
         int enabledCount=0, disabledCount=0;
@@ -1473 +1542 @@
         showSuccessStatusMessage(result);
     }
-
-    delete copy;
-    delete moveUp;
-    delete moveDown;
-    delete changeOptions;
-    delete outWorkspace;
-    delete outCurrOutput;
-    delete outOther;
-    delete changeOutput;
-    delete edisable;
-    delete menu;
 }
 
@@ -1558 +1616 @@
 }
 
-/**
-  This is OS indepented. It maintain size ratio over the Windows and Mac.
-  **/
-void MainWindow::setConverterButtonsSize(){
-    int height=ui->pbConvertXML->sizeHint().height()*1.3;
-    ui->pbConvertXML->setMinimumHeight(height);
-    ui->pbConvertTextures->setMinimumHeight(height);
-    ui->pbConvertObjects->setMinimumHeight(height);
-    ui->pbConvertCharacters->setMinimumHeight(height);
-    ui->pbConvertLevels->setMinimumHeight(height);
-    ui->pbConvertMisc->setMinimumHeight(height);
-}
-
 void MainWindow::connectSlots(){
 
@@ -1624 +1669 @@
     connect(ui->twSourcesMisc, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
 }
+
+void MainWindow::saveProjectState(const QString &filePath)
+{
+
+    QList<DropTableWidget*> tableWidgets = getAllTableWidgets();
+
+    pugi::xml_document doc;
+
+    pugi::xml_node rootNode = doc.append_child("VagoProject");
+    rootNode.append_attribute("vagoVersion").set_value(GlobalVars::AppVersion.toUtf8().constData());
+
+    foreach(DropTableWidget* const &myTable, tableWidgets){
+        saveProjectWidget(rootNode, myTable);
+    }
+
+    if(!doc.save_file(filePath.toUtf8().constData(), PUGIXML_TEXT("\t"), pugi::format_default | pugi::format_write_bom, pugi::xml_encoding::encoding_utf8)){
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error ocurred while trying to save the project file. Please try another path.");
+        return;
+    }
+
+    this->vagoSettings->setValue("LastProjectPath",QFileInfo(filePath).absoluteDir().path());
+
+    this->lastProjectFilePath = filePath;
+
+    addNewRecentProject(filePath);
+
+    setVagoWindowTitle();
+}
+
+void MainWindow::saveProjectWidget(pugi::xml_node &rootNode, DropTableWidget* table)
+{
+    QString from;
+    QString to;
+    QString tabName = getTabNameByTableWidget(table);
+
+    pugi::xml_node currentNodeTable = rootNode.append_child("tempName");
+    pugi::xml_node options;
+
+    if(table==ui->twSourcesXML){ //So we only need to parse one command.
+        from = ui->cbFromXML->currentText().toUtf8().constData();
+        to = ui->cbToXML->currentText().toUtf8().constData();
+    }
+    else if(table==ui->twSourcesTextures){
+        from = ui->cbFromTextures->currentText().toUtf8().constData();
+        to = ui->cbToTextures->currentText().toUtf8().constData();
+        options = currentNodeTable.append_child("Options");
+        options.append_attribute("type").set_value(Util::qStrToCstr(getTextureRBCheckedTypeTexture()->text()));
+        options.append_attribute("genMipMaps").set_value(Util::boolToCstr(ui->cbMipMapsTextures->isChecked()));
+        options.append_attribute("noUwrap").set_value(Util::boolToCstr(ui->cbNoUwrap->isChecked()));
+        options.append_attribute("noVwrap").set_value(Util::boolToCstr(ui->cbNoVwrap->isChecked()));
+        options.append_attribute("large").set_value(Util::boolToCstr(ui->cbLarge->isChecked()));
+        options.append_attribute("envMap").set_value(Util::boolToCstr(ui->cbEnvMap->isChecked()));
+        options.append_attribute("envMapValue").set_value(Util::qStrToCstr(ui->leEnvMapTexture->text()));
+    }
+    else if(table==ui->twSourcesCharacters){
+        from = ui->cbFromCharacters->currentText().toUtf8().constData();
+        to = ui->cbToCharacters->currentText().toUtf8().constData();
+        options = currentNodeTable.append_child("Options");
+        options.append_attribute("cellShading").set_value(Util::boolToCstr(ui->cbCellShading->isChecked()));
+        options.append_attribute("normals").set_value(Util::boolToCstr(ui->cbNormals->isChecked()));
+        options.append_attribute("extractTRBSONCC").set_value(Util::boolToCstr(ui->cbWithTRBS_ONCC->isChecked()));
+        options.append_attribute("extractTRBSONCCValue").set_value(Util::qStrToCstr(ui->leTRBS_ONCC->text()));
+    }
+    else if(table==ui->twSourcesObjects){
+        from = ui->cbFromObjects->currentText().toUtf8().constData();
+        to = ui->cbToObjects->currentText().toUtf8().constData();
+        options = currentNodeTable.append_child("Options");
+        options.append_attribute("texture").set_value(Util::boolToCstr(ui->cbTexture->isChecked()));
+        options.append_attribute("textureValue").set_value(Util::qStrToCstr(ui->leTextureName->text()));
+        options.append_attribute("withAnimation").set_value(Util::boolToCstr(ui->cbWithAnimation->isChecked()));
+        options.append_attribute("withAnimationValue").set_value(Util::qStrToCstr(ui->leAnimationName->text()));
+    }
+    else if(table==ui->twSourcesLevels){
+        from = ui->cbFromLevels->currentText().toUtf8().constData();
+        to = ui->cbToLevels->currentText().toUtf8().constData();
+        options = currentNodeTable.append_child("Options");
+        options.append_attribute("extractWithFiles").set_value(Util::boolToCstr(ui->cbSpecificFilesLevels->isChecked()));
+        options.append_attribute("extractWithFilesValue").set_value(Util::qStrToCstr(ui->leSpecificFilesLevels->text()));
+        options.append_attribute("datFilename").set_value(Util::boolToCstr(ui->cbDatLevels->isChecked()));
+        options.append_attribute("datFilenameValue").set_value(Util::qStrToCstr(ui->leTargetDatLevels->text()));
+        options.append_attribute("bnvSource").set_value(Util::boolToCstr(ui->cbBnvLevels->isChecked()));
+        options.append_attribute("bnvSourceValue").set_value(Util::qStrToCstr(ui->leBnvLevels->text()));
+        options.append_attribute("generateGrids").set_value(Util::boolToCstr(ui->cbGridsLevels->isChecked()));
+        options.append_attribute("additionalSources").set_value(Util::boolToCstr(ui->cbAdditionalSourcesLevels->isChecked()));
+        options.append_attribute("additionalSourcesValue").set_value(Util::qStrToCstr(ui->leAdditSourcesLevels->text()));
+    }
+    else{
+        from = ui->cbFromMisc->currentText().toUtf8().constData();
+        to = ui->cbToMisc->currentText().toUtf8().constData();
+    }
+
+    currentNodeTable.set_name(tabName.toUtf8().constData());
+
+    currentNodeTable.append_attribute("from").set_value(from.toUtf8().constData());
+    currentNodeTable.append_attribute("to").set_value(to.toUtf8().constData());
+
+
+    for(int i=0; i<table->rowCount(); i++){
+
+        QString currFileFolder = table->item(i,0)->text();
+        QString currFromTo = table->item(i,1)->text();
+        QString currCommand = table->item(i,2)->text();
+
+        pugi::xml_node currentRow = currentNodeTable.append_child("Row");
+
+
+        currentRow.append_attribute("fileFolder").set_value(Util::qStrToCstr(currFileFolder));
+        currentRow.append_attribute("fromTo").set_value(Util::qStrToCstr(currFromTo));
+        currentRow.append_attribute("command").set_value(Util::qStrToCstr(currCommand));
+
+        if(table->item(i,2)->background()==table->disabledBackStyle){
+            currentRow.append_attribute("disabled").set_value(true);
+        }
+
+    }
+}
+
+QRadioButton* MainWindow::getTextureRBCheckedTypeTexture()
+{
+    if(ui->rbBGR32->isChecked()){
+        return ui->rbBGR32;
+    }
+    else if(ui->rbBGRA32->isChecked()){
+        return ui->rbBGRA32;
+    }
+    else if(ui->rbBGR555->isChecked()){
+        return ui->rbBGR555;
+    }
+    else if(ui->rbBGRA5551->isChecked()){
+        return ui->rbBGRA5551;
+    }
+    else if(ui->rbBGRA444->isChecked()){
+        return ui->rbBGRA444;
+    }
+    else{ //dxt1 checked
+        return ui->rbDxt1;
+    }
+}
+
+QRadioButton* MainWindow::getTextureRBTypeTextureByName(const QString &texType)
+{
+    if(QString::compare(texType,ui->rbBGR32->text(),Qt::CaseSensitive)==0){
+        return ui->rbBGR32;
+    }
+    else if(QString::compare(texType,ui->rbBGRA32->text(),Qt::CaseSensitive)==0){
+        return ui->rbBGRA32;
+    }
+    else if(QString::compare(texType, ui->rbBGR555->text(),Qt::CaseSensitive)==0){
+        return ui->rbBGR555;
+    }
+    else if(QString::compare(texType,ui->rbBGRA5551->text(),Qt::CaseSensitive)==0){
+        return ui->rbBGRA5551;
+    }
+    else if(QString::compare(texType,ui->rbBGRA444->text(),Qt::CaseSensitive)==0){
+        return ui->rbBGRA444;
+    }
+    else{ //dxt1
+        return ui->rbDxt1;
+    }
+
+}
+
+void MainWindow::setVagoWindowTitle(){
+
+    QString vagoTitle = "Vago v"+GlobalVars::AppVersion + " - ";
+
+    if(this->lastProjectFilePath.isEmpty()){
+        vagoTitle += "Untitled";
+    }
+    else{
+        vagoTitle += Util::cutNameWithoutBackSlash(this->lastProjectFilePath);
+    }
+
+    setWindowTitle(vagoTitle);
+}
+
+DropTableWidget* MainWindow::getCurrentTableWidget(){
+
+    return getTableWidgetByTabName(ui->tabWidget->tabText(ui->tabWidget->currentIndex()));
+
+}
+
+DropTableWidget* MainWindow::getTableWidgetByTabName(const QString &tabName){
+
+    if(tabName.compare("XML",Qt::CaseSensitive)==0){ //case sentive is faster
+        return ui->twSourcesXML;
+    }
+    else if(tabName.compare("Textures",Qt::CaseSensitive)==0){
+        return ui->twSourcesTextures;
+    }
+    else if(tabName.compare("Characters",Qt::CaseSensitive)==0){
+        return ui->twSourcesCharacters;
+    }
+    else if(tabName.compare("Objects",Qt::CaseSensitive)==0){
+        return ui->twSourcesObjects;
+    }
+    else if(tabName.compare("Levels",Qt::CaseSensitive)==0){
+        return ui->twSourcesLevels;
+    }
+    else{
+        return ui->twSourcesMisc;
+    }
+
+}
+
+QString MainWindow::getCurrentTabName(){
+    return ui->tabWidget->tabText(ui->tabWidget->currentIndex());
+}
+
+QString MainWindow::getTabNameByTableWidget(DropTableWidget* table){
+
+    if(table == ui->twSourcesXML){
+        return ui->tabWidget->tabText(XMLTabIndex);
+    }
+    else if(table == ui->twSourcesTextures){
+        return ui->tabWidget->tabText(TexturesTabIndex);
+    }
+    else if(table == ui->twSourcesCharacters){
+        return ui->tabWidget->tabText(CharactersTabIndex);
+    }
+    else if(table == ui->twSourcesObjects){
+        return ui->tabWidget->tabText(ObjectsTabIndex);
+    }
+    else if(table == ui->twSourcesLevels){
+        return ui->tabWidget->tabText(LevelsTabIndex);
+    }
+    else{
+        return ui->tabWidget->tabText(MiscTabIndex);
+    }
+
+}
+
+QList<DropTableWidget*> MainWindow::getAllTableWidgets()
+{
+    QList<DropTableWidget*> tableWidgets;
+
+    tableWidgets << ui->twSourcesXML << ui->twSourcesTextures << ui->twSourcesCharacters
+                 << ui->twSourcesObjects << ui->twSourcesLevels << ui->twSourcesMisc;
+
+    return tableWidgets;
+}
+
+void MainWindow::loadProjectState(const QString &filePath)
+{
+
+    QString statusError = "Couldn't load project.";
+
+    pugi::xml_document doc;
+
+    pugi::xml_parse_result result = doc.load_file(Util::qStrToCstr(filePath));
+
+    if(result.status!=pugi::status_ok){
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error ocurred while loading project file.\n" + QString(result.description()));
+        showErrStatusMessage(statusError);
+        return;
+    }
+
+
+    if(QString(doc.root().first_child().name()) != "VagoProject"){
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, QString(doc.root().name()) + "The file opened is not a valid VagoProject file. Load aborted.");
+        showErrStatusMessage(statusError);
+        return;
+    }
+
+    QString projVagoVersion;
+
+    try{
+        projVagoVersion = QString(doc.select_node("/VagoProject/@vagoVersion").attribute().value());
+    }
+    catch (const pugi::xpath_exception& e)
+    {
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't find the vagoVersion of the current project. Load aborted.\n" + QString(e.what()));
+        showErrStatusMessage(statusError);
+        return;
+    }
+
+    if(!projVagoVersion.startsWith(GlobalVars::LastCompatibleVersion)){
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "The project that you are trying to load seems it is not compatible with your Vago Version. Please update Vago and try again.");
+        showErrStatusMessage(statusError);
+        return;
+    }
+
+    // After the initial validations begin loading the project data
+
+    QList<DropTableWidget*> tableWidgets = getAllTableWidgets();
+
+    try{
+        foreach(DropTableWidget* const &myTable, tableWidgets){
+            loadProjectWidget(doc, myTable);
+        }
+    }
+    catch(const std::exception& e){
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't load the vago project. Error: " + QString(e.what()));
+        showErrStatusMessage(statusError);
+        return;
+    }
+
+    this->vagoSettings->setValue("LastProjectPath",QFileInfo(filePath).absoluteDir().path());
+
+    this->lastProjectFilePath = filePath;
+
+    addNewRecentProject(filePath);
+
+    setVagoWindowTitle();
+
+    showSuccessStatusMessage("Project loaded sucessfully.");
+}
+
+
+void MainWindow::loadProjectWidget(pugi::xml_document &doc, DropTableWidget* table)
+{
+    QString tabName = getTabNameByTableWidget(table);
+    QString from (doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/@from")).attribute().value());
+    QString to (doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/@to")).attribute().value());
+
+    if(table==ui->twSourcesXML){
+        ui->cbFromXML->setCurrentText(from);
+        on_cbFromXML_currentIndexChanged(from);
+        ui->cbToXML->setCurrentText(to);
+    }
+    else if(table==ui->twSourcesTextures){
+        //ui->cbFromTextures->setCurrentText(from);
+        on_cbFromTextures_currentIndexChanged(from);
+        ui->cbToTextures->setCurrentText(to);
+
+        getTextureRBTypeTextureByName((doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@type")).attribute().value()))->setChecked(true);
+        ui->cbMipMapsTextures->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@genMipMaps")).attribute().as_bool());
+        ui->cbNoUwrap->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@noUwrap")).attribute().as_bool());
+        ui->cbNoVwrap->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@noVwrap")).attribute().as_bool());
+        ui->cbLarge->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@large")).attribute().as_bool());
+        ui->cbEnvMap->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@envMap")).attribute().as_bool());
+        ui->leEnvMapTexture->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@envMapValue")).attribute().value()));
+    }
+    else if(table==ui->twSourcesCharacters){
+        ui->cbFromCharacters->setCurrentText(from);
+        on_cbFromCharacters_currentIndexChanged(from);
+        ui->cbToCharacters->setCurrentText(to);
+
+
+        ui->cbCellShading->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@cellShading")).attribute().as_bool());
+        ui->cbNormals->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@normals")).attribute().as_bool());
+        ui->cbWithTRBS_ONCC->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractTRBSONCC")).attribute().as_bool());
+        ui->leTRBS_ONCC->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractTRBSONCCValue")).attribute().value()));
+    }
+    else if(table==ui->twSourcesObjects){
+        ui->cbFromObjects->setCurrentText(from);
+        on_cbFromObjects_currentIndexChanged(from);
+        ui->cbToObjects->setCurrentText(to);
+
+        ui->cbTexture->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@texture")).attribute().as_bool());
+        ui->leTextureName->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@textureValue")).attribute().value()));
+        ui->cbWithAnimation->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@withAnimation")).attribute().as_bool());
+        ui->leAnimationName->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@withAnimationValue")).attribute().value()));
+    }
+    else if(table==ui->twSourcesLevels){
+        ui->cbFromLevels->setCurrentText(from);
+        on_cbFromLevels_currentIndexChanged(from);
+        ui->cbToLevels->setCurrentText(to);
+
+        ui->cbSpecificFilesLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractWithFiles")).attribute().as_bool());
+        ui->leSpecificFilesLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractWithFilesValue")).attribute().value()));
+        ui->cbDatLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@datFilename")).attribute().as_bool());
+        ui->leTargetDatLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@datFilenameValue")).attribute().value()));
+        ui->cbBnvLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@bnvSource")).attribute().as_bool());
+        ui->leBnvLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@bnvSourceValue")).attribute().value()));
+        ui->cbGridsLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@generateGrids")).attribute().as_bool());
+        ui->cbAdditionalSourcesLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@additionalSources")).attribute().as_bool());
+        ui->leAdditSourcesLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@bnvSource")).attribute().value()));
+    }
+    else{
+        ui->cbFromMisc->setCurrentText(from);
+        on_cbFromMisc_currentIndexChanged(from);
+        ui->cbToMisc->setCurrentText(to);
+    }
+
+    // Clean previous rows
+    clearTableNoPrompt(table);
+
+    for(const pugi::xpath_node &xPathNode : doc.select_nodes(Util::qStrToCstr("/VagoProject/"+tabName+"/Row"))){
+        pugi::xml_node currNode = xPathNode.node();
+
+        QString currFileFolder = currNode.attribute("fileFolder").value();
+        QString currFromTo = currNode.attribute("fromTo").value();
+        QString currCommand = currNode.attribute("command").value();
+
+        bool isToDisable = false;
+        pugi::xml_attribute disabledAttr = currNode.attribute("disabled");
+        isToDisable = disabledAttr.empty() ? false : disabledAttr.as_bool();
+
+        addRowTable(table,currFileFolder,currFromTo,currCommand, isToDisable);
+    }
+}
+
+void MainWindow::saveRecentProjects(){
+    for(int i=0; i<this->recentProjectsList.size(); i++){
+        this->vagoSettings->setValue("RecentProject" + QString::number(i+1), recentProjectsList[i]);
+    }
+}
+
+void MainWindow::loadRecentProjects(){
+    for(int i=0; i<this->recentProjectsMaxSize; i++){
+
+        QString currProj = this->vagoSettings->value("RecentProject" + QString::number(i+1)).toString();
+
+        if(!currProj.isEmpty()){
+            recentProjectsList.append(currProj);
+        }
+        else{
+            break;
+        }
+    }
+
+    reloadRecentProjectsMenu();
+
+}
+
+void MainWindow::addNewRecentProject(const QString &filePath){
+
+    // If the new project is equal to the last one simply ignore
+    if(filePath == this->vagoSettings->value("RecentProject1").toString()){
+        return;
+    }
+
+    // If the item already exists in our list remove it, so it can go to the top again
+    for(auto it = this->recentProjectsList.begin(); it != this->recentProjectsList.end();){
+        if(*it == filePath){
+            it = this->recentProjectsList.erase(it);
+        }
+        else{
+            it++;
+        }
+    }
+
+    // if we gonna overflow our list, remove the older item to reserve space to the new one
+    if(this->recentProjectsList.size()==this->recentProjectsMaxSize){
+        this->recentProjectsList.removeLast();
+    }
+
+    this->vagoSettings->setValue("LastProjectPath",QFileInfo(filePath).absoluteDir().path());
+
+    // add new recent file
+    this->recentProjectsList.prepend(filePath);
+
+    reloadRecentProjectsMenu();
+
+    saveRecentProjects();
+}
+
+void MainWindow::reloadRecentProjectsMenu(){
+
+    ui->menuRecent_Projects->setEnabled(false);
+    ui->actionProject1->setVisible(false);
+    ui->actionProject2->setVisible(false);
+    ui->actionProject3->setVisible(false);
+    ui->actionProject4->setVisible(false);
+    ui->actionProject5->setVisible(false);
+
+    {
+        QList<QString>::const_iterator it;
+        int i;
+        for(it = recentProjectsList.cbegin(), i=0; it != recentProjectsList.cend(); it++, i++){
+
+            QAction* currAction = nullptr;
+
+            switch (i){
+            case 0:
+                currAction = ui->actionProject1;
+                break;
+            case 1:
+                currAction = ui->actionProject2;
+                break;
+            case 2:
+                currAction = ui->actionProject3;
+                break;
+            case 3:
+                currAction = ui->actionProject4;
+                break;
+            case 4:
+                currAction = ui->actionProject5;
+                break;
+            }
+
+            if(currAction){
+                ui->menuRecent_Projects->setEnabled(true);
+                currAction->setText(*it);
+                currAction->setVisible(true);
+            }
+        }
+    }
+
+}

Vago/trunk/Vago/mainwindow.h

@@ -2 +2 @@
 #define MAINWINDOW_H
 
-#include "util.h"
+#include "utilvago.h"
 #include "preferences.h"
 #include "manualcommands.h"
@@ -12 +12 @@
 
 #include <QMainWindow>
-#include <QSettings>
 #include <QMessageBox>
 #include <QProcess>
@@ -30 +29 @@
 #include <QScriptEngine>
 #include <QScriptValueIterator>
+#include <QWinTaskbarProgress>
+#include <QWinTaskbarButton>
+
+#include "libs/pugixml/pugixml.hpp"
 //#include <QDebug>
 
@@ -39 +42 @@
 {
     Q_OBJECT
-    
+
 public:
     explicit MainWindow(QWidget *parent = 0);
@@ -47 +50 @@
 protected:
     void closeEvent(QCloseEvent *event);
-    
+
 private slots:
     void on_actionExit_triggered();
@@ -67 +70 @@
     void on_pbAddSourceXML_clicked();
 
-    void on_pbConvertXML_clicked();
+    void on_pbConvert_clicked();
 
     void TsetupProgressBar(int max);
@@ -105 +108 @@
     void on_pbAddSourceMisc_clicked();
 
-    void on_pbConvertTextures_clicked();
-
-    void on_pbConvertObjects_clicked();
-
-    void on_pbConvertLevels_clicked();
-
-    void on_pbConvertMisc_clicked();
-
     void on_pbRemoveSourceObjects_clicked();
 
@@ -155 +150 @@
     void on_cbFromCharacters_currentIndexChanged(const QString &arg1);
 
-    void on_pbConvertCharacters_clicked();
-
     void on_pbAddSourceCharacters_clicked();
 
@@ -179 +172 @@
     void on_tbAbortConversion_clicked();
 
-    void on_tabWidget_currentChanged(int index);
+    void on_tabWidget_currentChanged(int);
+
+    void on_actionSave_Project_triggered();
+
+    void on_actionSave_triggered();
+
+    void on_actionLoad_Project_triggered();
+
+    void on_actionProject1_triggered();
+
+    void on_actionProject2_triggered();
+
+    void on_actionProject3_triggered();
+
+    void on_actionProject4_triggered();
+
+    void on_actionProject5_triggered();
 
 private:
@@ -188 +197 @@
     QString outputFolder; //Output folder
     QString AeLocation; //Workspace location
+    QString lastProjectFilePath;
     int startedWindowWidth;
     int startedWindowHeight;
@@ -200 +210 @@
     QSettings *vagoSettings;
     static const QString VagoSettingsName;
+    static constexpr int recentProjectsMaxSize=5;
+    QList<QString> recentProjectsList;
+#ifdef Q_OS_WIN
+    // These are deleted automatically by the window (since button is attached to it)
+    QWinTaskbarProgress *win7TaskBarProgress;
+    QWinTaskbarButton *win7TaskBarButton;
+#endif
+
+    // anonymous enum
+    enum {XMLTabIndex, TexturesTabIndex, CharactersTabIndex, ObjectsTabIndex, LevelsTabIndex, MiscTabIndex};
 
     void connectSlots();
@@ -205 +225 @@
     void showSuccessStatusMessage(QString message);
     void mapCommands();
-    void addRowTable(DropTableWidget *myTable,QString file, QString fromTo, QString command);
+    void addRowTable(DropTableWidget *myTable, QString file, QString fromTo, QString command, bool isToDisabled=false);
     void clearTableContents(DropTableWidget *myTable);
+    void clearTableNoPrompt(DropTableWidget *myTable);
     void removeTableContents(DropTableWidget *myTable);
     void updateComboBox(const QString &arg1, QComboBox *comboBox);
-    void startConversion(DropTableWidget *myTable);
+    void startConversion();
     void updateItemsLoaded(DropTableWidget *currentTable);
     void changeToCurrentSettings(QList<int> rows, DropTableWidget* myTable); //change some rows to the current settings
     void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
     void setConverterButtonsSize();
+    void saveProjectState(const QString &filePath);
+    void saveProjectWidget(pugi::xml_node &rootNode, DropTableWidget* table);
+    void loadProjectState(const QString &filePath);
+    void setVagoWindowTitle();
+    void loadProjectWidget(pugi::xml_document &doc, DropTableWidget* table);
+    void saveRecentProjects();
+    void loadRecentProjects();
+    void addNewRecentProject(const QString &filePath);
+    void reloadRecentProjectsMenu();
+    void showEvent(QShowEvent *e);
     QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
     QString fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
@@ -224 +255 @@
     QString getTypeConversion(DropTableWidget *myTable); //get the current type for a table
     QString getOSIndependentAppPath();
+    QString getTabNameByTableWidget(DropTableWidget* table);
+    QString getCurrentTabName();
+    QRadioButton* getTextureRBCheckedTypeTexture();
+    QRadioButton *getTextureRBTypeTextureByName(const QString &texType);
+    DropTableWidget *getCurrentTableWidget();
+    DropTableWidget* getTableWidgetByTabName(const QString &tabName);
+    QList<DropTableWidget*> getAllTableWidgets();
 
 signals:

Vago/trunk/Vago/mainwindow.ui

@@ -284 +284 @@
          </layout>
         </item>
-        <item>
-         <widget class="Line" name="line_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pbConvertXML">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Convert</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
@@ -553 +533 @@
            </item>
           </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="Line" name="line_8">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pbConvertTextures">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Convert</string>
-          </property>
          </widget>
         </item>
@@ -758 +718 @@
          </widget>
         </item>
-        <item>
-         <widget class="Line" name="line_15">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pbConvertCharacters">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Convert</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
@@ -970 +910 @@
            </item>
           </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="Line" name="line_9">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pbConvertObjects">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Convert</string>
-          </property>
          </widget>
         </item>
@@ -1281 +1201 @@
          </widget>
         </item>
-        <item>
-         <widget class="Line" name="line_10">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pbConvertLevels">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Convert</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
@@ -1427 +1327 @@
          </widget>
         </item>
-        <item>
-         <widget class="Line" name="line_7">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pbConvertMisc">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Convert</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
+     </widget>
+    </item>
+    <item>
+     <widget class="Line" name="line_3">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="pbConvert">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="toolTip">
+       <string>Convert the sources above</string>
+      </property>
+      <property name="text">
+       <string>Convert</string>
+      </property>
+      <property name="shortcut">
+       <string>Ctrl+Return</string>
+      </property>
      </widget>
     </item>
@@ -1459 +1365 @@
      <y>0</y>
      <width>800</width>
-     <height>22</height>
+     <height>20</height>
     </rect>
    </property>
@@ -1466 +1372 @@
      <string>File</string>
     </property>
+    <widget class="QMenu" name="menuRecent_Projects">
+     <property name="title">
+      <string>Recent Projects</string>
+     </property>
+     <addaction name="actionProject1"/>
+     <addaction name="actionProject2"/>
+     <addaction name="actionProject3"/>
+     <addaction name="actionProject4"/>
+     <addaction name="actionProject5"/>
+    </widget>
     <addaction name="actionPreferences"/>
+    <addaction name="actionSave"/>
+    <addaction name="actionSave_Project"/>
+    <addaction name="actionLoad_Project"/>
+    <addaction name="menuRecent_Projects"/>
     <addaction name="separator"/>
     <addaction name="actionExit"/>
@@ -1639 +1559 @@
    </property>
   </action>
+  <action name="actionSave_Project">
+   <property name="text">
+    <string>Save Project As...</string>
+   </property>
+  </action>
+  <action name="actionLoad_Project">
+   <property name="text">
+    <string>Load Project...</string>
+   </property>
+   <property name="iconText">
+    <string>Load Project...</string>
+   </property>
+   <property name="toolTip">
+    <string>Load Project...</string>
+   </property>
+  </action>
+  <action name="actionSave">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Save</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionPlaceholder1">
+   <property name="text">
+    <string>Placeholder1</string>
+   </property>
+  </action>
+  <action name="actionProject1">
+   <property name="text">
+    <string>Project1</string>
+   </property>
+  </action>
+  <action name="actionProject2">
+   <property name="text">
+    <string>Project2</string>
+   </property>
+  </action>
+  <action name="actionProject3">
+   <property name="text">
+    <string>Project3</string>
+   </property>
+  </action>
+  <action name="actionProject4">
+   <property name="text">
+    <string>Project4</string>
+   </property>
+  </action>
+  <action name="actionProject5">
+   <property name="text">
+    <string>Project5</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>

Vago/trunk/Vago/manualcommands.cpp

@@ -11 +11 @@
     this->myProcess = new QProcess();
     this->myProcess->setProcessChannelMode(QProcess::MergedChannels);
-    this->myProcess->setWorkingDirectory(Util::getAppPath());
+    this->myProcess->setWorkingDirectory(UtilVago::getAppPath());
     ui->leManualCommand->installEventFilter(this);
 
@@ -62 +62 @@
     }
 
-    QString var = Util::getOniSplitExeName() +" "+ui->leManualCommand->text();
+    QString var = UtilVago::getOniSplitExeAbsolutePath() +" "+ui->leManualCommand->text();
 
-    this->myProcess->start(Util::getOniSplitExeName()+" "+ui->leManualCommand->text());
+    this->myProcess->start(UtilVago::getOniSplitExeAbsolutePath()+" "+ui->leManualCommand->text());
     this->myProcess->waitForFinished(120000); //wait 2 minutes at maximum
     ui->ptOutput->appendPlainText("> "+command);

Vago/trunk/Vago/manualcommands.h

@@ -7 +7 @@
 #include <QScrollBar>
 
-#include "util.h"
+#include "utilvago.h"
 
 

Vago/trunk/Vago/packageWizard/packagepage2.cpp

@@ -82 +82 @@
         bool necessaryToRedownload=false;
 
-        QFile *file = new QFile(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
+        QFile file(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
 
-        if(!file->exists()){
+        if(!file.exists()){
             necessaryToRedownload=true; //File doesn't exist yet, necessary to download
         }
-        else if (QDateTime::currentDateTime().toTime_t()-QFileInfo(*file).lastModified().toTime_t() > 150){ //checks between 2 minutes (give more 30 seconds due to zip extraction)
+        else if (QDateTime::currentDateTime().toTime_t()-QFileInfo(file).lastModified().toTime_t() > 150){ //checks between 2 minutes (give more 30 seconds due to zip extraction)
             necessaryToRedownload=true; //File already exists but already expired (+2 mins without update)
         }
-        delete file;
 
         if(necessaryToRedownload){
@@ -117 +116 @@
     if(result->error()==QNetworkReply::NoError){
 
-        QFile *file = new QFile(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
+        QFile file(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
 
         // Create temp folder if it doesn't exist
@@ -124 +123 @@
         }
 
-        if(!file->open(QIODevice::WriteOnly)){
-            const QString error="Error fetching package data: creating cache file.";
-            this->myLogger->writeString(error);
-            Util::showErrorPopUp(error);
+        if(!file.open(QIODevice::WriteOnly)){
+            UtilVago::showAndLogErrorPopUp(this->myLogger, "Error fetching package data: creating cache file.");
             return;
         }
-        file->write(result->readAll());
-        file->close();
+        file.write(result->readAll());
+        file.close();
 
         //Let's extract the cache data
-        UnZip uz;
-        UnZip::ErrorCode ec = uz.openArchive(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
-        checkForUnzipError(ec);
-
-        //Extract the cache files
-        ec = uz.extractAll(GlobalVars::VagoTemporaryDir);
-        checkForUnzipError(ec);
-
-        //Close zip archive
-        uz.closeArchive();
-
-        delete file;
+        if(JlCompress::extractFile(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile, "/"+this->CacheFile ,GlobalVars::VagoTemporaryDir+"/"+this->CacheFile).isEmpty()){
+            UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred while unzipping the package data.");
+        }
 
         checkForPackagesInCache();
@@ -151 +139 @@
     }
     else{
-        const QString error="An error occurred checking number availability:\n\n"+result->errorString();
-        this->myLogger->writeString(error);
-        Util::showErrorLogPopUp(error);
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error occurred checking number availability:\n\n"+result->errorString());
     }
 
@@ -162 +148 @@
     QString packageNumber=ui->lePackageNumber->text();
 
-    QFile *file = new QFile(GlobalVars::VagoTemporaryDir+"/"+this->CacheFile); //let's read the chache unzipped
-    if(!file->open(QIODevice::ReadOnly)){
-        const QString error="Error reading downloaded package cache data.";
-        this->myLogger->writeString(error);
-        Util::showErrorPopUp(error);
+    QFile file(GlobalVars::VagoTemporaryDir+"/"+this->CacheFile); //let's read the chache unzipped
+    if(!file.open(QIODevice::ReadOnly)){
+        UtilVago::showAndLogErrorPopUp(this->myLogger, "Error reading downloaded package cache data.");
         return;
     }
     //Read file cache to ram
-    QString data=file->readAll();
+    QString data=file.readAll();
 
 
@@ -200 +184 @@
         Util::showPopUp("It seems that the package number " + packageNumber + " is not being used yet! :)");
     }
-
-    delete file;
 }
 
@@ -208 +190 @@
     ui->lePackageNumber->setText(QString().setNum(index+1)+"XXXX");
 }
-
-void PackagePage2::checkForUnzipError(UnZip::ErrorCode ec){
-    if (ec != UnZip::Ok){
-        const QString error="Error found while unzipping the package data. Error number = "+QString::number(ec);
-        Util::showErrorPopUp(error);
-        this->myLogger->writeString(error);
-    }
-}

Vago/trunk/Vago/packageWizard/packagepage2.h

@@ -2 +2 @@
 #define PACKAGEPAGE2_H
 
-#include "util.h"
-#include "logger.h"
-#include "unzip.h"
+#include "utilvago.h"
 
 #include <QWizardPage>
@@ -12 +10 @@
 #include <QScriptEngine>
 #include <QScriptValueIterator>
+#include <JlCompress.h>
 
 namespace Ui {
@@ -39 +38 @@
     static const QString CacheFile;
     static const QString PackagesCacheUrl;
-    void checkForUnzipError(UnZip::ErrorCode ec);
     void checkForPackagesInCache();
 };

Vago/trunk/Vago/packageWizard/packagepagefinal.h

@@ -2 +2 @@
 #define PACKAGEPAGEFINAL_H
 
-#include "util.h"
-#include "logger.h"
+#include "utilvago.h"
 
 #include <QWizardPage>

Vago/trunk/Vago/packageWizard/packagewizard.cpp

@@ -118 +118 @@
     }
 
-    QFile *modInfo = new QFile(modDir+"Mod_Info.cfg");
-
-    if (!modInfo->open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
-        Util::showErrorPopUp("Couldn't create Mod_Info.cfg file.");
-        myLogger->writeString("Couldn't create Mod_Info.cfg file when creating AE Package.");
+    QFile modInfo(modDir+"Mod_Info.cfg");
+
+    if (!modInfo.open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
+        UtilVago::showAndLogErrorPopUp(this->myLogger, "Couldn't create Mod_Info.cfg file when creating AE Package.");
         return;
     }
 
-    QTextStream *modWriteStream = new QTextStream (modInfo);
-    *modWriteStream << "AEInstallVersion -> "+aeVersion+"\n";
-    *modWriteStream << "NameOfMod -> "+modName+"\n";
-    *modWriteStream << "ModVersion -> "+version+"\n";
-    *modWriteStream << "Creator -> "+authors+"\n";
-    *modWriteStream << "Readme -> "+description.replace("\n"," \\n ")+"\n";
+    QTextStream modWriteStream(&modInfo);
+    modWriteStream << "AEInstallVersion -> "+aeVersion+"\n";
+    modWriteStream << "NameOfMod -> "+modName+"\n";
+    modWriteStream << "ModVersion -> "+version+"\n";
+    modWriteStream << "Creator -> "+authors+"\n";
+    modWriteStream << "Readme -> "+description.replace("\n"," \\n ")+"\n";
     if(!incompatiblePackages.isEmpty()){
-        *modWriteStream << "IncompatibleWith -> "+incompatiblePackages+"\n";
+        modWriteStream << "IncompatibleWith -> "+incompatiblePackages+"\n";
     }
     if(!dependentPackages.isEmpty()){
-        *modWriteStream << "DependsOn -> "+dependentPackages+"\n";
+        modWriteStream << "DependsOn -> "+dependentPackages+"\n";
     }
 
     if(bslExist){
         if(bslReplace){
-            *modWriteStream << "HasBsl -> Yes\n";
+            modWriteStream << "HasBsl -> Yes\n";
         }
         else{
-            *modWriteStream << "HasBsl -> Addon\n";
+            modWriteStream << "HasBsl -> Addon\n";
         }
     }
 
     if(!unlockLevels.isEmpty()){
-        *modWriteStream << "UnlockLevel -> "+unlockLevels+"\n";
-    }
-
-    *modWriteStream << "Vago -> "+GlobalVars::AppVersion;
-
-    delete modWriteStream; //it auto closes the files/streams
-    delete modInfo;
-
-    //Create zipped package using PKZIP 2.0 (http://osdab.42cows.org/snippets/zip.php?mode=advanced)
+        modWriteStream << "UnlockLevel -> "+unlockLevels+"\n";
+    }
+
+    modWriteStream << "Vago -> "+GlobalVars::AppVersion;
+
+    modInfo.close();
+
     if(createZip){
-        Zip uz;
-
-        Zip::ErrorCode ec = uz.createArchive(this->packagesLocation+"/"+packageName+".zip");
-        checkForZipError(ec);
-
-        ec=uz.addDirectory(modDir);
-        checkForZipError(ec);
-
-        ec = uz.closeArchive();
-        checkForZipError(ec);
+        if(!JlCompress::compressDir(this->packagesLocation+"/"+packageName+".zip", modDir)){
+            UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred while zipping the package.");
+        }
     }
 
@@ -205 +195 @@
         }
         QDir().mkpath(path); //create path if doesn't exist
-        if(!Util::copyDir(sourceFolder,path+Util::cutName(sourceFolder),false)){//copy contents (creates dest destination automatically if not exists yet)
-            QString errorString="An error occurred while copying the folder/files to the package folder: \n"
-                    "Copying from "+sourceFolder+"\n to "+path+Util::cutName(sourceFolder);
-            Util::showErrorLogPopUp(errorString);
-            this->myLogger->writeString(errorString);
-        }
-    }
-}
-
-/**
-  Convenience function for checking for zipping errors
-  */
-void PackageWizard::checkForZipError(Zip::ErrorCode ec){
-    if (ec != Zip::Ok){
-        const QString error="Error found while zipping the package. Error number = "+QString::number(ec);
-        Util::showErrorPopUp(error);
-        this->myLogger->writeString(error);
-    }
-}
+        if(!Util::copyDir(sourceFolder,path,false)){//copy contents (creates dest destination automatically if not exists yet)
+
+         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error occurred while copying the folder/files to the package folder: \n"
+                                                        "Copying from "+sourceFolder+"\n to "+path);
+        }
+    }
+}

Vago/trunk/Vago/packageWizard/packagewizard.h

@@ -7 +7 @@
 #include "packagepage4.h"
 #include "packagepagefinal.h"
-#include "zip.h"
 
 #include <QLabel>
@@ -16 +15 @@
 #include <QTextStream>
 #include <QSettings>
+#include <JlCompress.h>
 
 class PackageWizard
@@ -26 +26 @@
     void copyPackageFolders(const DropTableWidget *myTable, QString tableDir, QString modDir, bool &bslExist);
     void createPackage(const QWizard &myWizard, PackagePage4 *page4);
-    void checkForZipError(Zip::ErrorCode ec);
 
     Logger *myLogger;

Vago/trunk/Vago/preferences.h

@@ -7 +7 @@
 #include <QMessageBox>
 
-#include "util.h"
+#include "utilvago.h"
 
 namespace Ui {

Vago/trunk/Vago/preferences.ui

@@ -8 +8 @@
     <y>0</y>
     <width>493</width>
-    <height>291</height>
+    <height>258</height>
    </rect>
   </property>

Vago/trunk/Vago/readme.txt

@@ -1 +1 @@
 Readme.txt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Vago GUI v0.9c
+Vago GUI v1.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -39 +39 @@
 
 ----------------------------------
+1.0, 17-09-2016
+- Added feature to save and restore vago projects (plus load recent projects)
+Projects are in XML format and are read with the pugixml library
+- Added keyboard shortchut to the convert button
+- Some code refactoring and started using C++14
+- Fixed zip support for anniversary edition packages, switched to the zip library QuaZIP
+- Fixed the anniversary edition packages creation on Windows {windows-change}
+- Added extra logging
+- Added Windows 7 and above conversions progress in taskbar {windows-change}
+- Upgraded XmlTools from 0.8d to 2.0b
+- Fixed libpng warning: iCCP: known incorrect sRGB profile
+----------------------------------
 0.9c, 02-04-2016
 - Fixed ONI FILES to DAT - Add button does not let to select a folder
-
 - Some minor fixes in the AEI Mod Package Wizard
 ----------------------------------

Vago/trunk/Vago/soundWizard/soundpagefinal.cpp

@@ -19 +19 @@
     ui->lbComplete->setText("<html>The wizard is now complete. The sounds have been converted. "
                             "You can view all converted files clicking <a href=' '>here.</a><br />"
-                            "<br />Click restart to create more sounds from the wizard beggining,"
+                            "<br />Click restart to create more sounds from the wizard beggining, "
                             "otherwise click finish.</html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
 
@@ -148 +148 @@
 
     // Clean tmp dir
-    if(!Util::rmDir(GlobalVars::VagoTemporaryDir)){
-        QString message="Couldn't clean vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir;
-        this->myLogger->writeString(message);
-        Util::showErrorLogPopUp(message);
+    if(!Util::rmDir(GlobalVars::VagoTemporaryDir)){        
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't clean vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir);
         return;
     }
 
     if(!QDir(QDir::tempPath()).mkpath("VagoTemp")){
-        QString message="Couldn't reconstruct vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir;
-        this->myLogger->writeString(message);
-        Util::showErrorLogPopUp(message);
+        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't reconstruct vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir);
     }
 
@@ -167 +163 @@
     QFile::setPermissions(grpFileLocation, QFile::ReadOwner | QFile::WriteOwner);
 
-    (*this->xmlCommands) << "replaceall -element:Priority -value:"+priority+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -element:Flags -value:"+flags.join(" ")+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -element:SphereRadius -value:"+sphereRadious+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -element:Treshold -value:"+treshold+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -element:MinOcclusion -value:"+minOcclusion+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -parelement:ElapsedTime -element:Min -value:"+minElapsedTime+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -parelement:Distance -element:Max -value:"+maxVolumeDistance+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -parelement:Distance -element:Min -value:"+minVolumeDistance+" -filename:"+ambFileLocation+" -nobackups"
-                         << "replaceall -parelement:SoundGroup -element:Volume -value:"+volume+" -filename:"+grpFileLocation+" -nobackups"
-                         << "replaceall -parelement:SoundGroup -element:Pitch -value:"+pitch+" -filename:"+grpFileLocation+" -nobackups"
-                         << "replaceall -parelement:SoundGroup -element:NumberOfChannels -value:"+numberChannels+" -filename:"+grpFileLocation+" -nobackups"
-                         << "replaceall -parelement:Volume -element:Min -value:"+minVolume+" -filename:"+grpFileLocation+" -nobackups"
-                         << "replaceall -parelement:Volume -element:Max -value:"+maxVolume+" -filename:"+grpFileLocation+" -nobackups"
-                         << "replaceall -parelement:Pitch -element:Min -value:"+minPitch+" -filename:"+grpFileLocation+" -nobackups"
-                         << "replaceall -parelement:Pitch -element:Max -value:"+maxPitch+" -filename:"+grpFileLocation+" -nobackups"
-                         << "replaceall -element:Weight -value:"+weight+" -filename:"+grpFileLocation+" -nobackups";
+    (*this->xmlCommands)
+     << "--replace-all-values -e Priority -n "+Util::insertQuotes(priority)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values -e Flags -n "+(flags.join(" ").isEmpty() ? "\" \"" : Util::insertQuotes(flags.join(" ")))+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values -e SphereRadius -n "+Util::insertQuotes(sphereRadious)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values -e Treshold -n "+Util::insertQuotes(treshold)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values -e MinOcclusion -n "+Util::insertQuotes(minOcclusion)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name ElapsedTime -e  Min -n "+Util::insertQuotes(minElapsedTime)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name Distance -e  Max -n "+Util::insertQuotes(maxVolumeDistance)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name Distance -e  Min -n "+Util::insertQuotes(minVolumeDistance)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name SoundGroup -e  Volume -n "+Util::insertQuotes(volume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name SoundGroup -e  Pitch -n "+Util::insertQuotes(pitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name SoundGroup -e  NumberOfChannels -n "+Util::insertQuotes(numberChannels)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name Volume -e  Min -n "+Util::insertQuotes(minVolume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name Volume -e  Max -n "+Util::insertQuotes(maxVolume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name Pitch -e  Min -n "+Util::insertQuotes(minPitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values --parent-element-name Pitch -e  Max -n "+Util::insertQuotes(maxPitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+     << "--replace-all-values -e  Weight -n "+Util::insertQuotes(weight)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose";
 
     if(preventRepeat){
-        (*this->xmlCommands) << "replaceall -parelement:SoundGroup -element:Flags -value:PreventRepeat -filename:"+grpFileLocation+" -nobackups";
+        (*this->xmlCommands) << "--replace-all-values --parent-element-name SoundGroup -e Flags -n PreventRepeat -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose";
     }
 
@@ -206 +203 @@
         QFile::copy(grpFileLocation, currGrpFileLocation);
 
-        (*this->xmlCommands) << "replaceall -element:BaseTrack1 -value:"+currFileName+" -filename:"+currAmbFileLocation+" -nobackups" // process the xml
-                             << "replaceall -element:Sound -value:"+currFileName+" -filename:"+currGrpFileLocation+" -nobackups";
+        (*this->xmlCommands) << "--replace-all-values -e BaseTrack1 -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currAmbFileLocation)+" --no-backups --no-verbose" // process the xml
+                             << "--replace-all-values -e Sound -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currGrpFileLocation)+" --no-backups --no-verbose";
 
         myXmlProcessor->start();
@@ -228 +225 @@
         QString sNumErrors=QString::number(numErrors);
         if(numErrors>1){
-            Util::showErrorLogPopUp(result+"\n This is the last of "+sNumErrors+" Errors.");
+            UtilVago::showErrorPopUpLogButton(result+"\n This is the last of " + sNumErrors + " Errors.");
         }
         else{
-            Util::showErrorLogPopUp(result);
+            UtilVago::showErrorPopUpLogButton(result);
         }
     }

Vago/trunk/Vago/util.cpp

@@ -11 +11 @@
 }
 
-QString insertQuotes(QString path){
-    return "\""+path+"\"";
+QString cutNameWithoutBackSlash(QString path){
+    return cutName(path).remove('/');
+}
+
+QString insertQuotes(const QString &currString){
+    return "\""+currString+"\"";
 }
 
@@ -19 +23 @@
 }
 
-void showPopUp(QString message){
+void showPopUp(const QString &message){
     QMessageBox msgBox;
     msgBox.setIcon(QMessageBox::Information);
@@ -26 +30 @@
 }
 
-void showRichPopUp(QString message){
+void showRichPopUp(const QString &message){
     QMessageBox msgBox;
     msgBox.setTextFormat(Qt::RichText);
@@ -34 +38 @@
 }
 
-void showWarningPopUp(QString message){
+void showWarningPopUp(const QString &message){
     QMessageBox msgBox;
     msgBox.setIcon(QMessageBox::Warning);
@@ -41 +45 @@
 }
 
-void showErrorPopUp(QString message){
+void showErrorPopUp(const QString &message){
     QMessageBox msgBox;
     msgBox.setIcon(QMessageBox::Critical);
@@ -48 +52 @@
 }
 
-//Same of above but allow open log file (doesn't right in log file!!)
-void showErrorLogPopUp(QString message){
-    QMessageBox msgBox;
-    msgBox.setIcon(QMessageBox::Critical);
-    msgBox.setText(message);
-    QPushButton *viewb = msgBox.addButton("View log", QMessageBox::ActionRole);
-    msgBox.setStandardButtons(QMessageBox::Close);
-    msgBox.exec();
-    if(msgBox.clickedButton() == (QAbstractButton*) viewb){
-        openLogFile();
-    }
-}
-
-void showRichErrorPopUp(QString message){
+void showRichErrorPopUp(const QString &message){
     QMessageBox msgBox;
     msgBox.setIcon(QMessageBox::Critical);
@@ -140 +131 @@
 }
 
-// from here: https://gzeki.com/blog/view/Recursive_copy_files_from_one_directory_to_another_in_C++_(Qt_5)
-bool copyDir(QString from_dir, QString to_dir, bool replace_on_conflit)
-{
-    QDir dir;
-    dir.setPath(from_dir);
-
-    from_dir += QDir::separator();
-    to_dir += QDir::separator();
-
-    foreach (QString copy_file, dir.entryList(QDir::Files))
-    {
-        QString from = from_dir + copy_file;
-        QString to = to_dir + copy_file;
-
-        if (QFile::exists(to))
-        {
-            if (replace_on_conflit)
-            {
-                if (QFile::remove(to) == false)
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                continue;
-            }
-        }
-
-        if (QFile::copy(from, to) == false)
-        {
-            return false;
-        }
-    }
-
-    foreach (QString copy_dir, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
-    {
-        QString from = from_dir + copy_dir;
-        QString to = to_dir + copy_dir;
-
-        if (dir.mkpath(to) == false)
-        {
-            return false;
-        }
-
-        if (copyDir(from, to, replace_on_conflit) == false)
-        {
-            return false;
+// Created from scratch
+bool copyDir(const QString &fromPath, QString toPath, const bool isRecursive){
+    QDir fromDir(fromPath);
+    QDir toDir(toPath);
+
+    if(!toDir.mkdir(fromDir.dirName())){ // create the folder in the destination
+        return false;
+    }
+
+    // Update toPath to include the folder from "fromPath"
+    toPath = toPath + "/" + fromDir.dirName();
+    toDir = QDir(toPath);
+
+    for(const QFileInfo &currFileInfo : fromDir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot)){
+
+        if(currFileInfo.isFile()){
+
+            QFile destFile(toPath + "/" + currFileInfo.fileName());
+
+            if(!QFile::copy(currFileInfo.absoluteFilePath(),toPath + "/" + currFileInfo.fileName())){
+                return false;
+            }
+        }
+        else if(isRecursive && currFileInfo.isDir() && currFileInfo.absoluteFilePath() != fromDir.absolutePath()){
+
+            if(!copyDir(currFileInfo.absoluteFilePath(), toPath, isRecursive)){
+                return false;
+            }
         }
     }
@@ -222 +193 @@
 }
 
-void openLogFile(){
-    QDesktopServices::openUrl(QUrl("file:///"+Util::getAppPath()+"/"+GlobalVars::AppLogName));
-}
-
 //Searches for the QString "toSearch" in the "myString" variable backward
 //Returns the index of the first match or -1 if not found
@@ -277 +244 @@
 }
 
-/**
-  Gets application directory. In mac os gets the .app directory
-  **/
-QString getOSIndependentAppPath(){
-#ifdef Q_OS_MAC
-    QDir dir = QDir(QCoreApplication::applicationDirPath());
-    if(dir.absolutePath().contains(".app")){ // include bundle, but we don't want it
-        dir.cdUp();
-        dir.cdUp();
-        dir.cdUp();
-    }
-    return dir.absolutePath();
-#else
-    return  QDir::currentPath();
-#endif
-}
-
-QString getAppPath(){
-    return getOSIndependentAppPath();
-}
-
-QString getOniSplitExeName(){
-
-#ifdef Q_OS_MAC
-    return getMonoExecutablePath() + " " + GlobalVars::OniSplitString;
-#elif
-    return GlobalVars::OniSplitString;
-#endif
-}
-
-QString getXmlToolsExeName(){
-
-#ifdef Q_OS_MAC
-    return getMonoExecutablePath() + " " + GlobalVars::XmlToolsString;
-#elif
-    return GlobalVars::XmlToolsString;
-#endif
-}
-
-#ifdef Q_OS_MAC
-QString getMonoExecutablePath(){
-
-    // Only way that I found to get mono working in 10.11
-    QString possibleMonoDir = "/usr/local/bin/mono";
-    QFileInfo checkFile(possibleMonoDir);
-
-    if (checkFile.exists() && checkFile.isFile()) {
-        return possibleMonoDir;
-    } else {
-        return "mono";
-    }
-
-}
-#endif
-
-}
+}

Vago/trunk/Vago/util.h

@@ -2 +2 @@
 #define UTIL_H
 
+#include <QtGlobal> // for debug macros
+#ifdef QT_DEBUG
+    #include <QDebug>
+#endif
 #include <QString>
 #include <QMessageBox>
@@ -11 +15 @@
 #include <QCoreApplication>
 #include <QDesktopWidget>
-
-namespace GlobalVars{
-
-const QString AppVersion="0.9c";
-const QString OniSplitString="OniSplit.exe";
-const QString XmlToolsString="xmlTools.exe";
-
-#ifdef Q_OS_WIN
-const QString OniExe="Oni.exe";
-#else
-const QString OniExe="Oni.app/Contents/MacOS/Oni";
-#endif
-
-const QString AppLogName="logVago.txt";
-const QString BuiltOniSplitVersion="0.9.96.0";
-const QString BuiltXmlToolsVersion="0.8d";
-const QString ModsDomain="mods.oni2.net";
-#ifdef Q_OS_WIN
-const QString VagoNode = "247";
-#else
-const QString VagoNode = "277";
-#endif
-const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json";
-const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode;
-const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp";
-const QString HelpDir="help";
-const int DefaultWindowWidth=800;
-const int DefaultWindowHeight=600;
-const char OniSplitProcSeparator=';';
-}
+#include <QSettings>
+#include <QXmlStreamReader>
+#include <memory>
 
 /**
@@ -48 +25 @@
 QString normalizePath(QString path);
 QString cutName(QString path);
-QString insertQuotes(QString path);
+QString cutNameWithoutBackSlash(QString path);
+QString insertQuotes(const QString &currString);
 QString normalizeAndQuote(QString path);
 QString fullTrim(QString str);
 QString normalizeDecimalSeparator(QString value);
-QString getOSIndependentAppPath();
-QString getAppPath();
-QString getOniSplitExeName();
-QString getXmlToolsExeName();
-#ifdef Q_OS_MAC
-QString getMonoExecutablePath();
-#endif
+
+inline const char* qStrToCstr(const QString &currentString){
+    return currentString.toUtf8().constData();
+}
+
+inline const char* boolToCstr(bool currentBoolean){
+    return currentBoolean ? "true" : "false";
+}
 
 QStringList multipleDirDialog(QString title);
@@ -69 +48 @@
 bool isStringInteger(QString myString);
 bool isStringDouble(QString myString);
-bool copyDir(QString from_dir, QString to_dir, bool replace_on_conflit);
+bool copyDir(const QString &fromPath, QString toPath, const bool isRecursive = false);
 bool rmDir(const QString &dirPath);
 QRect getScreenResolution();
-void showPopUp(QString message);
-void showRichPopUp(QString message);
-void showWarningPopUp(QString message);
-void showErrorPopUp(QString message);
-void showErrorLogPopUp(QString message);
-void showRichErrorPopUp(QString message);
-void openLogFile();
+void showPopUp(const QString &message);
+void showRichPopUp(const QString &message);
+void showWarningPopUp(const QString &message);
+void showErrorPopUp(const QString &message);
+void showRichErrorPopUp(const QString &message);
 }
 #endif // UTIL_H

Vago/trunk/Vago/xmlprocessor.cpp

@@ -10 +10 @@
 void XmlProcessor::run()
 {
-    QProcess *myProcess = new QProcess();
+    QProcess myProcess;
     QString result = QString();
     QString errorMessage = "";
     int numErrors=0;
 
-    myProcess->setWorkingDirectory(this->AppDir);
+    myProcess.setWorkingDirectory(this->AppDir);
 
     for(int i=0; i<this->commands->size(); i++){
 
-        myProcess->start(Util::getXmlToolsExeName() +" "+this->commands->at(i));
-        myProcess->waitForFinished(-1);
-        result=myProcess->readAllStandardError();
+        myProcess.start(UtilVago::getXmlToolsExeAbsolutePath() +" "+this->commands->at(i));
+        myProcess.waitForFinished(-1);
+        result=myProcess.readAllStandardError();
 
         if(!result.isEmpty()){
@@ -32 +32 @@
     }
 
-    delete myProcess; //delete object and make pointer invalid
     this->commands->clear(); //clean list
 

Vago/trunk/Vago/xmlprocessor.h

@@ -4 +4 @@
 #include <QThread>
 
-#include "logger.h"
-#include "util.h"
+#include "utilvago.h"
 
 class XmlProcessor : public QThread