Index: s10k/Vago/bgImageWizard/bgimagepage2.cpp =================================================================== --- s10k/Vago/bgImageWizard/bgimagepage2.cpp (revision 1092) +++ s10k/Vago/bgImageWizard/bgimagepage2.cpp (revision 1093) @@ -2,10 +2,9 @@ #include "ui_bgimagepage2.h" -BGImagePage2::BGImagePage2(Logger *myLogger, QWidget *parent) : +BGImagePage2::BGImagePage2(QWidget *parent) : QWizardPage(parent), ui(new Ui::BGImagePage2) { ui->setupUi(this); - this->myLogger = myLogger; this->setTitle("Image to use as background"); @@ -46,5 +45,5 @@ bool BGImagePage2::validateField(QString &field){ if(field.isEmpty()){ - Util::showErrorPopUp("You need to choose an image."); + Util::Dialogs::showError("You need to choose an image."); return false; } @@ -66,10 +65,10 @@ QImage myImage; if(!myImage.load(selectedImage)){ - UtilVago::showAndLogErrorPopUp(this->myLogger,"Couldn't load image '" + Util::cutNameWithoutBackSlash(selectedImage) + "'. Is the image corrupt?"); + UtilVago::showAndLogErrorPopUp("Couldn't load image '" + Util::FileSystem::cutNameWithoutBackSlash(selectedImage) + "'. Is the image corrupt?"); return; } if(myImage.width() < 256 || myImage.height() < 256){ - UtilVago::showAndLogErrorPopUp(this->myLogger,"Image '" + Util::cutNameWithoutBackSlash(selectedImage) + + UtilVago::showAndLogErrorPopUp("Image '" + Util::FileSystem::cutNameWithoutBackSlash(selectedImage) + "' does not have a width and height >= 256."); return; Index: s10k/Vago/bgImageWizard/bgimagepage2.h =================================================================== --- s10k/Vago/bgImageWizard/bgimagepage2.h (revision 1092) +++ s10k/Vago/bgImageWizard/bgimagepage2.h (revision 1093) @@ -4,7 +4,7 @@ #include #include +#include #include "utilvago.h" -#include "logger.h" namespace Ui { @@ -17,5 +17,5 @@ public: - explicit BGImagePage2(Logger *myLogger, QWidget *parent = 0); + explicit BGImagePage2(QWidget *parent = 0); ~BGImagePage2(); @@ -24,5 +24,4 @@ private: - Logger *myLogger; Ui::BGImagePage2 *ui; Index: s10k/Vago/bgImageWizard/bgimagepage3.cpp =================================================================== --- s10k/Vago/bgImageWizard/bgimagepage3.cpp (revision 1092) +++ s10k/Vago/bgImageWizard/bgimagepage3.cpp (revision 1093) @@ -52,6 +52,6 @@ void BGImagePage3::on_leLevelId_textChanged(const QString &arg1) { - if(!arg1.isEmpty() && !Util::isStringInteger(arg1)){ - Util::showErrorPopUp("Level id must be a number."); + if(!arg1.isEmpty() && !Util::Validation::isStringInteger(arg1)){ + Util::Dialogs::showError("Level id must be a number."); ui->leLevelId->clear(); return; @@ -136,10 +136,10 @@ if(ui->leImageName->text().trimmed().isEmpty()){ - Util::showErrorPopUp("You need to input a name to the image!"); + Util::Dialogs::showError("You need to input a name to the image!"); return false; } if(ui->cbCreateTXMB->isChecked() && ui->leTXMBName->text().trimmed().isEmpty()){ - Util::showErrorPopUp("You need to input a name to the TXMB file!"); + Util::Dialogs::showError("You need to input a name to the TXMB file!"); return false; } Index: s10k/Vago/bgImageWizard/bgimagepagefinal.cpp =================================================================== --- s10k/Vago/bgImageWizard/bgimagepagefinal.cpp (revision 1092) +++ s10k/Vago/bgImageWizard/bgimagepagefinal.cpp (revision 1093) @@ -2,5 +2,5 @@ #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) @@ -8,8 +8,7 @@ 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. " @@ -65,5 +64,5 @@ 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)); } @@ -77,5 +76,5 @@ if(txmbXmlFile.isEmpty()) { - UtilVago::showAndLogErrorPopUp(this->myLogger, "Couldn't create TXMB xml file!"); + UtilVago::showAndLogErrorPopUp("Couldn't create TXMB xml file!"); return; } @@ -83,5 +82,5 @@ // 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(); @@ -109,10 +108,10 @@ { QFileInfo currImageFile(currSplittedImage); - texturesNode.append_child("Link").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(currImageFile.baseName())); - } - - txmbNode.append_attribute("id").set_value(Util::qStrToCstr(levelId)); - - if(!doc.save_file(Util::qStrToCstr(filePath))){ + 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(QSTR_TO_CSTR(levelId)); + + if(!doc.save_file(QSTR_TO_CSTR(filePath))){ return ""; } @@ -148,5 +147,5 @@ 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(); } Index: s10k/Vago/bgImageWizard/bgimagepagefinal.h =================================================================== --- s10k/Vago/bgImageWizard/bgimagepagefinal.h (revision 1092) +++ s10k/Vago/bgImageWizard/bgimagepagefinal.h (revision 1093) @@ -4,5 +4,5 @@ #include #include -#include +#include #include "utilvago.h" @@ -18,5 +18,5 @@ public: - explicit BGImagePageFinal(QString appDir, Logger *myLogger, QString bgImagesLocation, QWidget *parent = 0); + explicit BGImagePageFinal(QString appDir, QString bgImagesLocation, QWidget *parent = 0); ~BGImagePageFinal(); @@ -25,5 +25,4 @@ QString appDir; QString bgImagesLocation; - Logger *myLogger; Converter *myOniSplitConverter; QStringList *oniSplitCommands; Index: s10k/Vago/bgImageWizard/bgimagewizard.cpp =================================================================== --- s10k/Vago/bgImageWizard/bgimagewizard.cpp (revision 1092) +++ s10k/Vago/bgImageWizard/bgimagewizard.cpp (revision 1093) @@ -1,11 +1,10 @@ #include "bgimagewizard.h" -BGImageWizard::BGImageWizard(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger) -:AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, true) +BGImageWizard::BGImageWizard(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings) +:AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, true) { this->appDir = appDir; this->workspaceWizardLocation=workspaceWizardLocation; this->vagoSettings=vagoSettings; - this->myLogger=myLogger; this->bgImagesLocation=this->workspaceWizardLocation+"/BGImages"; } @@ -13,7 +12,7 @@ void BGImageWizard::exec(){ - BGImagePage2 *page2 = new BGImagePage2(this->myLogger); + BGImagePage2 *page2 = new BGImagePage2(); BGImagePage3 *page3 = new BGImagePage3(); - BGImagePageFinal *pageFinal = new BGImagePageFinal(this->appDir, this->myLogger, this->bgImagesLocation); + BGImagePageFinal *pageFinal = new BGImagePageFinal(this->appDir, this->bgImagesLocation); this->myWizard.addPage Index: s10k/Vago/bgImageWizard/bgimagewizard.h =================================================================== --- s10k/Vago/bgImageWizard/bgimagewizard.h (revision 1092) +++ s10k/Vago/bgImageWizard/bgimagewizard.h (revision 1093) @@ -11,5 +11,5 @@ { protected: - BGImageWizard(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger); + BGImageWizard(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings); void exec(); private: