--- s10k/Vago/bgImageWizard/bgimagepagefinal.cpp 2017/12/30 13:43:28 1092
+++ s10k/Vago/bgImageWizard/bgimagepagefinal.cpp 2017/12/30 13:57:32 1093
@@ -1,16 +1,15 @@
#include "BGImagePageFinal.h"
#include "ui_BGImagePageFinal.h"
-BGImagePageFinal::BGImagePageFinal(QString appDir, Logger *myLogger, QString bgImagesLocation, QWidget *parent) :
+BGImagePageFinal::BGImagePageFinal(QString appDir, QString bgImagesLocation, QWidget *parent) :
QWizardPage(parent),
ui(new Ui::BGImagePageFinal)
{
ui->setupUi(this);
this->appDir = appDir;
- this->myLogger = myLogger;
this->bgImagesLocation = bgImagesLocation;
this->oniSplitCommands = new QStringList();
- this->myOniSplitConverter = new Converter(this->appDir, this->myLogger, this->oniSplitCommands);
+ this->myOniSplitConverter = new Converter(this->appDir, this->oniSplitCommands);
ui->lbComplete->setText("The wizard is now complete. The images have been created. "
"You can view all created files clicking here.
"
@@ -64,7 +63,7 @@ void BGImagePageFinal::startProcessing()
this->oniSplitCommands->clear();
for(const QString ¤tFile : imagesSplitted){
- this->oniSplitCommands->append("-create:txmp " + Util::insertQuotes(this->bgImagesLocation) + " -format:bgr32 " + Util::insertQuotes(currentFile));
+ this->oniSplitCommands->append("-create:txmp " + Util::String::insertQuotes(this->bgImagesLocation) + " -format:bgr32 " + Util::String::insertQuotes(currentFile));
}
this->myOniSplitConverter->start(); // finally process the onisplit commands
@@ -76,13 +75,13 @@ void BGImagePageFinal::startProcessing()
if(txmbXmlFile.isEmpty())
{
- UtilVago::showAndLogErrorPopUp(this->myLogger, "Couldn't create TXMB xml file!");
+ UtilVago::showAndLogErrorPopUp("Couldn't create TXMB xml file!");
return;
}
// Create TXMB oni files
this->oniSplitCommands->clear();
- this->oniSplitCommands->append("-create " + Util::insertQuotes(this->bgImagesLocation) + " " + Util::insertQuotes(txmbXmlFile));
+ this->oniSplitCommands->append("-create " + Util::String::insertQuotes(this->bgImagesLocation) + " " + Util::String::insertQuotes(txmbXmlFile));
this->myOniSplitConverter->start();
this->myOniSplitConverter->wait();
}
@@ -108,12 +107,12 @@ QString BGImagePageFinal::createTxmbXmlF
for(const QString &currSplittedImage : imagesSplitted)
{
QFileInfo currImageFile(currSplittedImage);
- texturesNode.append_child("Link").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(currImageFile.baseName()));
+ texturesNode.append_child("Link").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(currImageFile.baseName()));
}
- txmbNode.append_attribute("id").set_value(Util::qStrToCstr(levelId));
+ txmbNode.append_attribute("id").set_value(QSTR_TO_CSTR(levelId));
- if(!doc.save_file(Util::qStrToCstr(filePath))){
+ if(!doc.save_file(QSTR_TO_CSTR(filePath))){
return "";
}
@@ -147,7 +146,7 @@ QList BGImagePageFinal::splitIn
QString imageDestinationPath = this->bgImagesLocation + "/" + imageName + currentImageId + "." + imageType;
if(!dividedImage.save(imageDestinationPath)){
- UtilVago::showAndLogErrorPopUp(this->myLogger, "Couldn't save image " + imageDestinationPath + "! Files weren't created correctly.");
+ UtilVago::showAndLogErrorPopUp("Couldn't save image " + imageDestinationPath + "! Files weren't created correctly.");
return QList();
}