--- Vago/trunk/Vago/soundWizard/soundpagefinal.cpp 2013/03/31 19:02:16 771 +++ Vago/trunk/Vago/soundWizard/soundpagefinal.cpp 2016/03/24 22:28:41 1035 @@ -1,7 +1,7 @@ #include "soundpagefinal.h" #include "ui_soundpagefinal.h" -SoundPageFinal::SoundPageFinal(QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash *commandMap, QWidget *parent) : +SoundPageFinal::SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash *commandMap, QWidget *parent) : QWizardPage(parent), ui(new Ui::soundpagefinal) { @@ -13,8 +13,13 @@ SoundPageFinal::SoundPageFinal(QString s this->xmlCommands = new QStringList(); this->oniSplitCommands = new QStringList(); - this->myXmlProcessor = new XmlProcessor(this->myLogger,this->xmlCommands); - this->myConverter = new Converter(this->myLogger,this->oniSplitCommands); + this->myXmlProcessor = new XmlProcessor(AppDir, this->myLogger,this->xmlCommands); + this->myConverter = new Converter(AppDir, this->myLogger,this->oniSplitCommands); + + ui->lbComplete->setText("The wizard is now complete. The sounds have been converted. " + "You can view all converted files clicking here.
" + "
Click restart to create more sounds from the wizard beggining," + "otherwise click finish."); // Don't use rich text in qtdesigner because it generates platform dependent code connectSlots(); } @@ -191,7 +196,7 @@ void SoundPageFinal::startProcessing(){ for(int i=0; ipage2Table->rowCount(); i++){ - (*this->oniSplitCommands) << this->commandMap->value("general->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(this->page2Table->item(i,1)->text()); // add location of sound file to convert + (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(this->page2Table->item(i,1)->text()); // add location of sound file to convert currFileName=this->page2Table->item(i,0)->text(); // get current file name currAmbFileLocation = QString(ambFileLocation).replace("sample_file",currFileName); // get the new files, filenames @@ -207,7 +212,7 @@ void SoundPageFinal::startProcessing(){ myXmlProcessor->wait(); // Wait until all xml is edited } - (*this->oniSplitCommands) << this->commandMap->value("general->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(GlobalVars::VagoTemporaryDir+"/*.xml"); + (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(GlobalVars::VagoTemporaryDir+"/*.xml"); this->myConverter->start(); // finally process the onisplit commands this->myConverter->wait(); // wait for it to complete