--- Vago/trunk/Vago/soundWizard/soundwizard.cpp	2013/03/31 19:02:16	771
+++ Vago/trunk/Vago/soundWizard/soundwizard.cpp	2013/04/13 13:44:29	815
@@ -1,7 +1,8 @@
 #include "soundwizard.h"
 
-SoundWizard::SoundWizard(QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
+SoundWizard::SoundWizard(QString AppDir, QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
 {
+    this->appLocation=AppDir;
     this->workspaceWizardLocation=workspaceWizardLocation;
     this->myLogger=myLogger;
     this->soundsLocation=this->workspaceWizardLocation+"/Sounds";
@@ -21,16 +22,21 @@ 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
     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
+    // because the components on mac use more space
+#endif
     QRect position = this->myWizard->frameGeometry();
     position.moveCenter(QDesktopWidget().availableGeometry().center());
     this->myWizard->move(position.topLeft());
     //
 
-    SoundPage2 *page2 = new SoundPage2();
+    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);
@@ -73,7 +79,9 @@ void SoundWizard::pageChanged(int pageId
     // Last page?
     if(pageId==4){
         this->myWizard->setOption(QWizard::HaveCustomButton1, true); // set visible
+        this->myWizard->button(QWizard::BackButton)->setEnabled(false); // disable back button, use restart if needed
         return;
     }
     this->myWizard->setOption(QWizard::HaveCustomButton1, false); // set invisible
+    this->myWizard->button(QWizard::BackButton)->setEnabled(true); // set enable back button
 }