ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/soundWizard/soundwizard.cpp

Comparing Vago/trunk/Vago/soundWizard/soundwizard.cpp (file contents):
Revision 801 by s10k, Sun Apr 7 15:36:17 2013 UTC vs.
Revision 998 by s10k, Fri Apr 25 21:05:54 2014 UTC

#	Line 1 | Line 1
1		#include "soundwizard.h"
2
3	<	SoundWizard::SoundWizard(QString appLocation, QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
3	>	SoundWizard::SoundWizard(QString AppDir, QString workspaceWizardLocation, Logger *myLogger, QHash<QString, QString> *commandMap)
4		{
5	<	this->appLocation=appLocation;
5	>	this->appLocation=AppDir;
6		this->workspaceWizardLocation=workspaceWizardLocation;
7		this->myLogger=myLogger;
8		this->soundsLocation=this->workspaceWizardLocation+"/Sounds";
#	Line 22 | Line 22 | int SoundWizard::exec(){
22		this->myWizard->setWindowIcon(QIcon(":/new/icons/sound.png"));
23
24		//Center and resize QWizard (http://www.thedazzlersinc.com/source/2012/06/04/qt-center-window-in-screen/)
25	<	#ifdef Q_WS_WIN
25	>	#ifdef Q_OS_WIN
26		this->myWizard->resize(640,480);
27		#else
28		this->myWizard->resize(800,600); // Mac OS pcs should be able to render this resolution without any problem. It's also better
#	Line 36 | Line 36 | int SoundWizard::exec(){
36		SoundPage2 *page2 = new SoundPage2(this->appLocation);
37		SoundPage3 *page3 = new SoundPage3();
38		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);
40
41		this->myWizard->addPage(createIntroPage());
42		this->myWizard->addPage(page2);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)