Changeset 815


Ignore:
Timestamp:
Apr 13, 2013, 3:44:29 PM (12 years ago)
Author:
s10k
Message:

Vago: Some more app dir mac fixes

Location:
Vago/trunk/Vago
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • Vago/trunk/Vago/converter.cpp

    r771 r815  
    11#include "converter.h"
    22
    3 Converter::Converter(Logger *myLogger, QStringList *myData)
     3Converter::Converter(QString AppDir, Logger *myLogger, QStringList *myData)
    44{
     5    this->AppDir=AppDir;
    56    this->myLogger=myLogger;
    67    this->myData=myData;
    … …  
    1314    QString errorMessage = "";
    1415    int numErrors=0;
     16
     17    myProcess->setWorkingDirectory(this->AppDir);
    1518
    1619    if(this->myData->size()!=1){

  • Vago/trunk/Vago/converter.h

    r811 r815  
    1313     Q_OBJECT
    1414public:
    15     Converter(Logger *myLogger, QStringList *myData);
     15    Converter(QString AppDir, Logger *myLogger, QStringList *myData);
    1616private:
     17    QString AppDir;
    1718    Logger *myLogger;
    1819    QStringList *myData;

  • Vago/trunk/Vago/mainwindow.cpp

    r803 r815  
    100100
    101101    //Create a thread for do the conversion in background
    102     this->myConverter = new Converter(this->myLogger,this->listToProccess);
     102    this->myConverter = new Converter(this->AppDir,this->myLogger,this->listToProccess);
    103103
    104104    // User interface
    … …  
    11361136{
    11371137    QProcess *myProcess = new QProcess();
     1138    myProcess->setWorkingDirectory(this->AppDir);
    11381139    myProcess->start(GlobalVars::OniSplitExeName+" -version");
    11391140    myProcess->waitForFinished(-1);
    … …  
    11461147{
    11471148    QProcess *myProcess = new QProcess();
     1149    myProcess->setWorkingDirectory(this->AppDir);
    11481150    myProcess->start(GlobalVars::XmlToolsExeName+" version");
    11491151    myProcess->waitForFinished(-1);

  • Vago/trunk/Vago/soundWizard/soundpagefinal.cpp

    r790 r815  
    22#include "ui_soundpagefinal.h"
    33
    4 SoundPageFinal::SoundPageFinal(QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash<QString, QString> *commandMap, QWidget *parent) :
     4SoundPageFinal::SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash<QString, QString> *commandMap, QWidget *parent) :
    55    QWizardPage(parent),
    66    ui(new Ui::soundpagefinal)
    … …  
    1414    this->xmlCommands = new QStringList();
    1515    this->oniSplitCommands = new QStringList();
    16     this->myXmlProcessor = new XmlProcessor(this->myLogger,this->xmlCommands);
    17     this->myConverter = new Converter(this->myLogger,this->oniSplitCommands);
     16    this->myXmlProcessor = new XmlProcessor(AppDir, this->myLogger,this->xmlCommands);
     17    this->myConverter = new Converter(AppDir, this->myLogger,this->oniSplitCommands);
    1818
    1919    ui->lbComplete->setText("<html>The wizard is now complete. The sounds have been converted. "

  • Vago/trunk/Vago/soundWizard/soundpagefinal.h

    r771 r815  
    2020   
    2121public:
    22     explicit SoundPageFinal(QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash<QString, QString> *commandMap, QWidget *parent = 0);
     22    explicit SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash<QString, QString> *commandMap, QWidget *parent = 0);
    2323    ~SoundPageFinal();
    2424   

  • Vago/trunk/Vago/soundWizard/soundwizard.cpp

    r801 r815  
    11#include "soundwizard.h"
    22
    3 SoundWizard::SoundWizard(QString appLocation, QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
     3SoundWizard::SoundWizard(QString AppDir, QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
    44{
    5     this->appLocation=appLocation;
     5    this->appLocation=AppDir;
    66    this->workspaceWizardLocation=workspaceWizardLocation;
    77    this->myLogger=myLogger;
    … …  
    3737    SoundPage3 *page3 = new SoundPage3();
    3838    SoundPage4 *page4 = new SoundPage4();
    39     SoundPageFinal *pageFinal = new SoundPageFinal(this->soundsLocation,page2->soundTable,this->myLogger, this->commandMap);
     39    SoundPageFinal *pageFinal = new SoundPageFinal(this->appLocation, this->soundsLocation,page2->soundTable,this->myLogger, this->commandMap);
    4040
    4141    this->myWizard->addPage(createIntroPage());

  • Vago/trunk/Vago/xmlprocessor.cpp

    r771 r815  
    11#include "xmlprocessor.h"
    22
    3 XmlProcessor::XmlProcessor(Logger *myLogger, QStringList *commands)
     3XmlProcessor::XmlProcessor(QString AppDir, Logger *myLogger, QStringList *commands)
    44{
     5    this->AppDir=AppDir;
    56    this->myLogger=myLogger;
    67    this->commands=commands;
    … …  
    1314    QString errorMessage = "";
    1415    int numErrors=0;
     16
     17    myProcess->setWorkingDirectory(this->AppDir);
    1518
    1619    for(int i=0; i<this->commands->size(); i++){

  • Vago/trunk/Vago/xmlprocessor.h

    r811 r815  
    1111     Q_OBJECT
    1212public:
    13     XmlProcessor(Logger *myLogger, QStringList *commands);
     13    XmlProcessor(QString AppDir, Logger *myLogger, QStringList *commands);
    1414private:
     15    QString AppDir;
    1516    Logger *myLogger;
    1617    QStringList *commands;
Note: See TracChangeset for help on using the changeset viewer.