--- Vago/trunk/Vago/soundWizard/soundwizard.cpp 2013/04/07 15:36:17 801 +++ Vago/trunk/Vago/soundWizard/soundwizard.cpp 2014/04/25 21:05:54 998 @@ -1,8 +1,8 @@ #include "soundwizard.h" -SoundWizard::SoundWizard(QString appLocation, QString workspaceWizardLocation, Logger *myLogger, QHash *commandMap) +SoundWizard::SoundWizard(QString AppDir, QString workspaceWizardLocation, Logger *myLogger, QHash *commandMap) { - this->appLocation=appLocation; + this->appLocation=AppDir; this->workspaceWizardLocation=workspaceWizardLocation; this->myLogger=myLogger; this->soundsLocation=this->workspaceWizardLocation+"/Sounds"; @@ -22,7 +22,7 @@ int SoundWizard::exec(){ this->myWizard->setWindowIcon(QIcon(":/new/icons/sound.png")); //Center and resize QWizard (http://www.thedazzlersinc.com/source/2012/06/04/qt-center-window-in-screen/) -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN this->myWizard->resize(640,480); #else this->myWizard->resize(800,600); // Mac OS pcs should be able to render this resolution without any problem. It's also better @@ -36,7 +36,7 @@ int SoundWizard::exec(){ SoundPage2 *page2 = new SoundPage2(this->appLocation); SoundPage3 *page3 = new SoundPage3(); SoundPage4 *page4 = new SoundPage4(); - SoundPageFinal *pageFinal = new SoundPageFinal(this->soundsLocation,page2->soundTable,this->myLogger, this->commandMap); + SoundPageFinal *pageFinal = new SoundPageFinal(this->appLocation, this->soundsLocation,page2->soundTable,this->myLogger, this->commandMap); this->myWizard->addPage(createIntroPage()); this->myWizard->addPage(page2);