--- Vago/trunk/Vago/windowMessagesWizard/wmfinalpage.cpp 2016/12/09 19:04:18 1061 +++ s10k/Vago/windowMessagesWizard/wmfinalpage.cpp 2017/12/30 13:57:32 1093 @@ -1,15 +1,14 @@ #include "wmfinalpage.h" #include "ui_wmfinalpage.h" -WmFinalPage::WmFinalPage(QString AppDir, QString wmLocation, Logger *myLogger, QList > &pages, QWidget *parent) : +WmFinalPage::WmFinalPage(QString AppDir, QString wmLocation, QList > &pages, QWidget *parent) : QWizardPage(parent), ui(new Ui::wmfinalpage), pages(pages) { ui->setupUi(this); this->wmLocation=wmLocation; - this->myLogger=myLogger; this->oniSplitCommands = new QStringList(); - this->myConverter = new Converter(AppDir, this->myLogger,this->oniSplitCommands); + this->myConverter = new Converter(AppDir, this->oniSplitCommands); ui->lbComplete->setText("The wizard is now complete. The window messages have been converted. " "You can view all converted files clicking here.
" @@ -54,62 +53,62 @@ void WmFinalPage::startProcessing(){ { typeNode = rootNode.append_child("OPge"); typeNode.append_attribute("id").set_value(++globalSectionCounter); - typeNode.append_child("LevelNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(field("leLevelId").toString())); - typeNode.append_child("Pages").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(QString("#") + QString::number(++globalSectionCounter))); + typeNode.append_child("LevelNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(field("leLevelId").toString())); + typeNode.append_child("Pages").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(QString("#") + QString::number(++globalSectionCounter))); pugi::xml_node igpaNode = rootNode.append_child("IGPA"); igpaNode.append_attribute("id").set_value(globalSectionCounter); pugi::xml_node pagesNode = igpaNode.append_child("Pages"); currentIGPGId = globalSectionCounter; for(int i=0; ipages.size(); i++){ - pagesNode.append_child("Link").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr("#" + QString::number(++globalSectionCounter))); + pagesNode.append_child("Link").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); } break; } case WINDOW_TYPE::DIARY: typeNode = rootNode.append_child("DPge"); typeNode.append_attribute("id").set_value(++globalSectionCounter); - typeNode.append_child("LevelNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(field("leLevelId").toString())); - typeNode.append_child("PageNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(field("lePageNumber").toString())); - typeNode.append_child("IsLearnedMove").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(QString::number(static_cast(field("cbIsLearnedMove").toBool())))); + typeNode.append_child("LevelNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(field("leLevelId").toString())); + typeNode.append_child("PageNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(field("lePageNumber").toString())); + typeNode.append_child("IsLearnedMove").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(QString::number(static_cast(field("cbIsLearnedMove").toBool())))); currentIGPGId = globalSectionCounter; - typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr("#" + QString::number(++globalSectionCounter))); + typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); break; case WINDOW_TYPE::HELP: typeNode = rootNode.append_child("HPge"); typeNode.append_attribute("id").set_value(++globalSectionCounter); currentIGPGId = globalSectionCounter; - typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr("#" + QString::number(++globalSectionCounter))); + typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); break; case WINDOW_TYPE::TEXT_CONSOLE: { typeNode = rootNode.append_child("TxtC"); typeNode.append_attribute("id").set_value(++globalSectionCounter); - typeNode.append_child("Pages").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(Util::qStrToCstr("#" + QString::number(++globalSectionCounter)))); + typeNode.append_child("Pages").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); pugi::xml_node igpaNode = rootNode.append_child("IGPA"); igpaNode.append_attribute("id").set_value(globalSectionCounter); currentIGPGId = globalSectionCounter; pugi::xml_node pagesNode = igpaNode.append_child("Pages"); for(int i=0; ipages.size(); i++){ - pagesNode.append_child("Link").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr("#" + QString::number(++globalSectionCounter))); + pagesNode.append_child("Link").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); } break; } case WINDOW_TYPE::WEAPON: typeNode = rootNode.append_child("WPge"); typeNode.append_attribute("id").set_value(++globalSectionCounter); - typeNode.append_child("WeaponClass").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(field("leWeaponClassName").toString())); + typeNode.append_child("WeaponClass").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(field("leWeaponClassName").toString())); currentIGPGId = globalSectionCounter; - typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(Util::qStrToCstr("#" + QString::number(++globalSectionCounter)))); + typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); break; case WINDOW_TYPE::ITEM: typeNode = rootNode.append_child("IPge"); typeNode.append_attribute("id").set_value(++globalSectionCounter); - typeNode.append_child("PageNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(field("lePageNumber").toString())); + typeNode.append_child("PageNumber").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(field("lePageNumber").toString())); currentIGPGId = globalSectionCounter; - typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(Util::qStrToCstr("#" + QString::number(++globalSectionCounter)))); + typeNode.append_child("Page").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); break; case WINDOW_TYPE::ENUM_END: - UtilVago::showAndLogErrorPopUp(this->myLogger, "An error ocurred: WmFinalPage::startProcessing invalid WINDOW_TYPE"); + UtilVago::showAndLogErrorPopUp("An error ocurred: WmFinalPage::startProcessing invalid WINDOW_TYPE"); break; } @@ -131,7 +130,7 @@ void WmFinalPage::startProcessing(){ imageTXMPName = "TXMP" + QFileInfo(imageLocation).baseName(); this->oniSplitCommands->clear(); - this->oniSplitCommands->append("-create:txmp " + Util::insertQuotes(this->wmLocation) + " -format:bgr32 " + Util::insertQuotes(imageLocation)); + this->oniSplitCommands->append("-create:txmp " + Util::String::insertQuotes(this->wmLocation) + " -format:bgr32 " + Util::String::insertQuotes(imageLocation)); this->myConverter->start(); // finally process the onisplit commands this->myConverter->wait(); // wait for it to complete @@ -151,9 +150,9 @@ void WmFinalPage::startProcessing(){ currentIGSAId = globalSectionCounter; - igpgNode.append_child("Image").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr(imageTXMPName)); - igpgNode.append_child("Text1").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr("#" + QString::number(++globalSectionCounter))); - igpgNode.append_child("Text2").append_child(pugi::xml_node_type::node_pcdata).set_value(Util::qStrToCstr("#" + QString::number(++globalSectionCounter))); + igpgNode.append_child("Image").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR(imageTXMPName)); + igpgNode.append_child("Text1").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); + igpgNode.append_child("Text2").append_child(pugi::xml_node_type::node_pcdata).set_value(QSTR_TO_CSTR("#" + QString::number(++globalSectionCounter))); // IGSA @@ -165,7 +164,7 @@ void WmFinalPage::startProcessing(){ currentIGSTId = globalSectionCounter; for(int i=0; i ) + currentIGStNode.append_child(pugi::xml_node_type::node_pcdata).set_value(" "); + currentIGStNode.append_attribute("xml:space").set_value("preserve"); + } } }; @@ -219,14 +229,14 @@ void WmFinalPage::startProcessing(){ setIGStXmlSection(footerText, footerTextNumberOfRows); } - if(!doc.save_file(Util::qStrToCstr(filePath))){ - UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't create " + filePath + " file!"); + if(!doc.save_file(QSTR_TO_CSTR(filePath))){ + UtilVago::showAndLogErrorPopUpLogButton("Couldn't create " + filePath + " file!"); return; } // Convert XML file to Oni this->oniSplitCommands->clear(); - this->oniSplitCommands->append("-create " + Util::insertQuotes(this->wmLocation) + " " + Util::insertQuotes(filePath)); + this->oniSplitCommands->append("-create " + Util::String::insertQuotes(this->wmLocation) + " " + Util::String::insertQuotes(filePath)); this->myConverter->start(); // finally process the onisplit commands this->myConverter->wait(); // wait for it to complete