Changeset 801

Timestamp:

Apr 7, 2013, 5:36:17 PM (12 years ago)

Author:

s10k

Message:

Vago: tried to fix the main directory in mac. I don't want to get the
bundle one.

Location:

Vago/trunk/Vago

Files:

• mainwindow.cpp (modified) (4 diffs)
• mainwindow.h (modified) (3 diffs)
• soundWizard/soundpage2.cpp (modified) (2 diffs)
• soundWizard/soundpage2.h (modified) (2 diffs)
• soundWizard/soundwizard.cpp (modified) (2 diffs)
• soundWizard/soundwizard.h (modified) (2 diffs)
• util.h (modified) (4 diffs)

Vago/trunk/Vago/mainwindow.cpp

@@ -10 +10 @@
     ui->setupUi(this);
 
+    this->AppDir=getOSIndependentAppPath();
+
     this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
 
-    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitString)){
+    if(!QFile::exists(this->AppDir+"/"+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.");
         exit(1);
     }
 
-    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlToolsString)){
+    if(!QFile::exists(this->AppDir+"/"+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.");
         exit(1);
     }
 
-    this->vagoSettings = new QSettings(QDir::currentPath() + "/" + this->VagoSettingsName, QSettings::IniFormat);
+    this->vagoSettings = new QSettings(this->AppDir + "/" + this->VagoSettingsName, QSettings::IniFormat);
 
     //First Execution? Old configuration? Settings missed?
@@ -31 +33 @@
     }
     if(!this->vagoSettings->contains("Workspace")){
-        this->vagoSettings->setValue("Workspace", QDir::currentPath()+"/VagoWorkspace");
+        this->vagoSettings->setValue("Workspace", this->AppDir+"/VagoWorkspace");
         iniChanged=true;
     }
@@ -161 +163 @@
 void MainWindow::on_actionSound_Wizard_triggered()
 {
-    SoundWizard myWizard (this->workspaceWizardsLocation, this->myLogger, &this->commandMap);
+    SoundWizard myWizard (this->AppDir, this->workspaceWizardsLocation, this->myLogger, &this->commandMap);
     myWizard.exec();
 }
@@ -1500 +1502 @@
 }
 
+/**
+  Gets application directory. In mac os gets the .app directory
+  **/
+QString MainWindow::getOSIndependentAppPath(){
+#ifdef Q_WS_MAC
+    QDir dir = QDir::current();
+    if(dir.absolutePath().contains(".app")){ // include bundle, but we don't want it
+        dir.cdUp();
+        dir.cdUp();
+    }
+    return dir.absolutePath();
+#else
+    return  QDir::currentPath();
+#endif
+}
+
 void MainWindow::connectSlots(){
 

Vago/trunk/Vago/mainwindow.h

@@ -46 +46 @@
 
 protected:
-     void closeEvent(QCloseEvent *event);
+    void closeEvent(QCloseEvent *event);
     
 private slots:
@@ -186 +186 @@
     Ui::MainWindow *ui;
     Logger *myLogger;
+    QString AppDir;
     QString workspaceLocation; //Workspace location
     QString workspaceWizardsLocation; //Workspace wizard location
@@ -220 +221 @@
     QString getCommand(DropTableWidget* myTable, QString myOutputFolder, QString from, QString to , QString file);
     QString getTypeConversion(DropTableWidget *myTable); //get the current type for a table
+    QString getOSIndependentAppPath();
 };
 

Vago/trunk/Vago/soundWizard/soundpage2.cpp

@@ -3 +3 @@
 
 const QStringList SoundPage2::allowedFiles = QStringList() << "*.wav" <<  "*.aif" <<  "*.aifc" << "*.afc";
-const QString SoundPage2::codecLocalHelpFile=GlobalVars::HelpLocation + "/XMLSNDD.html#Source_file_creation";
 
-SoundPage2::SoundPage2(QWidget *parent) :
+SoundPage2::SoundPage2(QString appLocation, QWidget *parent) :
     QWizardPage(parent),
     ui(new Ui::soundpage2)
@@ -11 +10 @@
     ui->setupUi(this);
     this->soundTable=ui->twSoundFiles;
+    this->codecLocalHelpFile=appLocation+"/"+GlobalVars::HelpDir + "/XMLSNDD.html#Source_file_creation";
     ui->twSoundFiles->removeColumn(2); // Only two columns
 

Vago/trunk/Vago/soundWizard/soundpage2.h

@@ -18 +18 @@
     DropTableWidget *soundTable;
 
-    explicit SoundPage2(QWidget *parent = 0);
+    explicit SoundPage2(QString appLocation, QWidget *parent = 0);
     ~SoundPage2();
     
@@ -37 +37 @@
     Ui::soundpage2 *ui;
     static const QStringList allowedFiles;
-    static const QString codecLocalHelpFile;
+    QString codecLocalHelpFile;
 
     bool validatePage();

Vago/trunk/Vago/soundWizard/soundwizard.cpp

@@ -1 +1 @@
 #include "soundwizard.h"
 
-SoundWizard::SoundWizard(QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
+SoundWizard::SoundWizard(QString appLocation, QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
 {
+    this->appLocation=appLocation;
     this->workspaceWizardLocation=workspaceWizardLocation;
     this->myLogger=myLogger;
@@ -33 +34 @@
     //
 
-    SoundPage2 *page2 = new SoundPage2();
+    SoundPage2 *page2 = new SoundPage2(this->appLocation);
     SoundPage3 *page3 = new SoundPage3();
     SoundPage4 *page4 = new SoundPage4();

Vago/trunk/Vago/soundWizard/soundwizard.h

@@ -23 +23 @@
     Q_OBJECT // for signals and slots
 public:
-    SoundWizard(QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap);
+    SoundWizard(QString appLocation, QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap);
     int exec();
 private:
@@ -30 +30 @@
     QString workspaceWizardLocation;
     QString soundsLocation;
+    QString appLocation;
     Logger *myLogger;
     QWizard *myWizard;

Vago/trunk/Vago/util.h

@@ -9 +9 @@
 #include <QDesktopServices>
 #include <QUrl>
-
+#include <QCoreApplication>
 
 namespace GlobalVars{
@@ -34 +34 @@
 const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode;
 const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp";
-const QString HelpLocation=QDir::currentPath() + "/help";
+const QString HelpDir="help";
 const char OniSplitProcSeparator=';';
 }
@@ -48 +48 @@
 QString fullTrim(QString str);
 QString normalizeDecimalSeparator(QString value);
+
 QStringList multipleDirDialog(QString title);
 QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive);
@@ -66 +67 @@
 void showRichErrorPopUp(QString message);
 void openLogFile();
-
 }