Changeset 1052 for Vago/trunk

Timestamp:

Sep 17, 2016, 3:32:34 PM (8 years ago)

Author:

s10k

Message:

Fixes for MacOS and minor bugfix

Location:

Vago/trunk/Vago

Files:

• Vago.pro (modified) (1 diff)
• converter.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (4 diffs)
• mainwindow.h (modified) (1 diff)
• manualcommands.cpp (modified) (1 diff)
• utilvago.cpp (modified) (1 diff)
• utilvago.h (modified) (1 diff)
• xmlprocessor.cpp (modified) (1 diff)

Vago/trunk/Vago/Vago.pro

@@ -20 +20 @@
 # 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
+LIBS += -L../Libs/zlib-1.2.8 -lz
 INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
+win32 {
 LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
+}
+macx {
+LIBS += -L../Libs/quazip-0.7.2/quazip -lquazip
+}
 
 macx {

Vago/trunk/Vago/converter.cpp

@@ -62 +62 @@
 
             commandToExec=commands.mid(currentIndex,(nextIndex-currentIndex));
-            this->myProcess->start(UtilVago::getOniSplitExeAbsolutePath() + " " + commandToExec);
+            this->myProcess->start(UtilVago::getOniSplitExecutable() + " " + commandToExec);
             this->myProcess->waitForFinished(-1);
 

Vago/trunk/Vago/mainwindow.cpp

@@ -17 +17 @@
     setVagoWindowTitle();
 
-    if(!QFile::exists(UtilVago::getOniSplitExeAbsolutePath())){
+    if(!QFile::exists(UtilVago::getOniSplitExecutableAbsolutePath())){
         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(UtilVago::getXmlToolsExeAbsolutePath())){
+    if(!QFile::exists(UtilVago::getXmlToolsExecutableAbsolutePath())){
         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);
@@ -1216 +1216 @@
     QProcess myProcess;
     myProcess.setWorkingDirectory(UtilVago::getAppPath());
-    myProcess.start(UtilVago::getOniSplitExeAbsolutePath()+" -version");
+    myProcess.start(UtilVago::getOniSplitExecutable()+" -version");
     myProcess.waitForFinished();
 
@@ -1228 +1228 @@
     QProcess myProcess;
     myProcess.setWorkingDirectory(UtilVago::getAppPath());
-    myProcess.start(UtilVago::getXmlToolsExeAbsolutePath()+" --version");
+    myProcess.start(UtilVago::getXmlToolsExecutable()+" --version");
     myProcess.waitForFinished();
     QString result=myProcess.readLine();
@@ -1696 +1696 @@
 
     setVagoWindowTitle();
+
+    showSuccessStatusMessage("Project saved sucessfully.");
 }
 

Vago/trunk/Vago/mainwindow.h

@@ -29 +29 @@
 #include <QScriptEngine>
 #include <QScriptValueIterator>
+#ifdef Q_OS_WIN
 #include <QWinTaskbarProgress>
 #include <QWinTaskbarButton>
+#endif
 
 #include "libs/pugixml/pugixml.hpp"

Vago/trunk/Vago/manualcommands.cpp

@@ -62 +62 @@
     }
 
-    QString var = UtilVago::getOniSplitExeAbsolutePath() +" "+ui->leManualCommand->text();
+    QString var = UtilVago::getOniSplitExecutable() +" "+ui->leManualCommand->text();
 
-    this->myProcess->start(UtilVago::getOniSplitExeAbsolutePath()+" "+ui->leManualCommand->text());
+    this->myProcess->start(UtilVago::getOniSplitExecutable()+" "+ui->leManualCommand->text());
     this->myProcess->waitForFinished(120000); //wait 2 minutes at maximum
     ui->ptOutput->appendPlainText("> "+command);

Vago/trunk/Vago/utilvago.cpp

@@ -67 +67 @@
 }
 
-QString getOniSplitExeAbsolutePath(){
+// Absolute paths
+QString getOniSplitExecutableAbsolutePath(){
+    return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString;
+}
+
+QString getXmlToolsExecutableAbsolutePath(){
+    return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString;
+}
+
+// Executables (includes mono if necessary)
+QString getOniSplitExecutable(){
 
 #ifdef Q_OS_MAC
-    return getMonoExecutablePath() + " " + getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString;
+    return getMonoExecutablePath() + " " + getOniSplitExecutableAbsolutePath();
 #else
-    return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString;
+    return getOniSplitExecutableAbsolutePath();
 #endif
 }
 
-QString getXmlToolsExeAbsolutePath(){
-    return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString;
+QString getXmlToolsExecutable(){
+    return getXmlToolsExecutableAbsolutePath();
 }
 

Vago/trunk/Vago/utilvago.h

@@ -51 +51 @@
 QString getOSIndependentAppPath();
 QString getAppPath();
-QString getOniSplitExeAbsolutePath();
-QString getXmlToolsExeAbsolutePath();
+QString getOniSplitExecutableAbsolutePath();
+QString getXmlToolsExecutableAbsolutePath();
+QString getOniSplitExecutable();
+QString getXmlToolsExecutable();
 #ifdef Q_OS_MAC
 QString getMonoExecutablePath();

Vago/trunk/Vago/xmlprocessor.cpp

@@ -19 +19 @@
     for(int i=0; i<this->commands->size(); i++){
 
-        myProcess.start(UtilVago::getXmlToolsExeAbsolutePath() +" "+this->commands->at(i));
+        myProcess.start(UtilVago::getXmlToolsExecutable() +" "+this->commands->at(i));
         myProcess.waitForFinished(-1);
         result=myProcess.readAllStandardError();