Changeset 1093 for s10k/Vago/packageWizard

Timestamp:

Dec 30, 2017, 2:57:32 PM (7 years ago)

Author:

s10k

Message:

Vago 1.4

Location:

s10k/Vago/packageWizard

Files:

• packagepage2.cpp (modified) (9 diffs)
• packagepage2.h (modified) (2 diffs)
• packagepage3.cpp (modified) (2 diffs)
• packagepage4.cpp (modified) (6 diffs)
• packagewizard.cpp (modified) (6 diffs)
• packagewizard.h (modified) (1 diff)

s10k/Vago/packageWizard/packagepage2.cpp

@@ -6 +6 @@
 const QString PackagePage2::CacheFile = "nodes.json";
 
-PackagePage2::PackagePage2(Logger *myLogger, QWidget *parent) :
+PackagePage2::PackagePage2(QWidget *parent) :
     QWizardPage(parent),
     ui(new Ui::PackagePage2)
 {
     ui->setupUi(this);
-    this->myLogger=myLogger;
+
     this->setTitle("Mandatory Fields");
 
@@ -38 +38 @@
     QString number=ui->lePackageNumber->text();
 
-    bool emptyContent=Util::checkEmptySpaces(QStringList()<<modName<<authors<<version<<description<<number);
+    bool emptyContent=Util::Validation::checkEmptySpaces(QStringList()<<modName<<authors<<version<<description<<number);
 
 
     if(emptyContent){
-        Util::showErrorPopUp("You need to fill all fields first!");
+        Util::Dialogs::showError("You need to fill all fields first!");
         return false;
     }
 
     if(number.size()!=5){
-        Util::showErrorPopUp("Invalid number format. It should contain 5 numbers.");
+        Util::Dialogs::showError("Invalid number format. It should contain 5 numbers.");
         return false;
     }
 
-    if(!Util::isStringInteger(number)){
-        Util::showErrorPopUp("Number is not numeric.");
+    if(!Util::Validation::isStringInteger(number)){
+        Util::Dialogs::showError("Number is not numeric.");
         return false;
     }
@@ -68 +68 @@
     QString number = ui->lePackageNumber->text();
 
-    if(Util::checkEmptySpaces(QStringList(number))){
-        Util::showErrorPopUp("Number is empty. Please fill it first.");
+    if(Util::Validation::checkEmptySpaces(QStringList(number))){
+        Util::Dialogs::showError("Number is empty. Please fill it first.");
         return;
     }
 
     if(number.size()!=5){
-        Util::showErrorPopUp("Invalid number format. It should contain 5 numeric characters.");
+        Util::Dialogs::showError("Invalid number format. It should contain 5 numeric characters.");
         return;
     }
 
-    if(Util::isStringInteger(number)){
+    if(Util::Validation::isStringInteger(number)){
 
         bool necessaryToRedownload=false;
@@ -108 +108 @@
     }
     else{
-        Util::showErrorPopUp("Number is not numeric.");
+        Util::Dialogs::showError("Number is not numeric.");
     }
 }
@@ -124 +124 @@
 
         if(!file.open(QIODevice::WriteOnly)){
-            UtilVago::showAndLogErrorPopUp(this->myLogger, "Error fetching package data: creating cache file.");
+            UtilVago::showAndLogErrorPopUp("Error fetching package data: creating cache file.");
             return;
         }
@@ -132 +132 @@
         //Let's extract the cache data
         if(JlCompress::extractFile(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile, "/"+this->CacheFile ,GlobalVars::VagoTemporaryDir+"/"+this->CacheFile).isEmpty()){
-            UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred while unzipping the package data.");
+            UtilVago::showAndLogErrorPopUp("An error occurred while unzipping the package data.");
         }
 
@@ -139 +139 @@
     }
     else{
-        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error occurred checking number availability:\n\n"+result->errorString());
+        UtilVago::showAndLogErrorPopUpLogButton("An error occurred checking number availability:\n\n"+result->errorString());
     }
 
@@ -150 +150 @@
     QFile file(GlobalVars::VagoTemporaryDir+"/"+this->CacheFile); //let's read the chache unzipped
     if(!file.open(QIODevice::ReadOnly)){
-        UtilVago::showAndLogErrorPopUp(this->myLogger, "Error reading downloaded package cache data.");
+        UtilVago::showAndLogErrorPopUp("Error reading downloaded package cache data.");
         return;
     }
@@ -177 +177 @@
 
     if(!existingModName.isEmpty()){
-        Util::showRichErrorPopUp("Package "+packageNumber+" is already being used by the following mod:<br/><br/>"+
+        Util::Dialogs::showRichError("Package "+packageNumber+" is already being used by the following mod:<br/><br/>"+
                                  existingModName+"<br/><br/>"+
                                  "More information <a href='"+existingModUrl+"'>here</a>.");
     }
     else{
-        Util::showPopUp("It seems that the package number " + packageNumber + " is not being used yet! :)");
+        Util::Dialogs::showInfo("It seems that the package number " + packageNumber + " is not being used yet! :)");
     }
 }

s10k/Vago/packageWizard/packagepage2.h

@@ -21 +21 @@
     
 public:
-    explicit PackagePage2(Logger *myLogger, QWidget *parent = 0);
+    explicit PackagePage2(QWidget *parent = 0);
 
     ~PackagePage2();
@@ -34 +34 @@
 private:
     Ui::PackagePage2 *ui;
-    Logger *myLogger;
     static const QString ZipCacheFile;
     static const QString CacheFile;

s10k/Vago/packageWizard/packagepage3.cpp

@@ -33 +33 @@
     if(!field.isEmpty()){
 
-        QStringList list =Util::substring(field,",");
+        QStringList list =Util::String::substring(field,",");
 
         for(int i=0; i<list.size(); i++){
 
             if(list.at(i).isEmpty()){
-                Util::showErrorPopUp("There are commas without numbers in their sides.");
+                Util::Dialogs::showError("There are commas without numbers in their sides.");
                 return false;
             }
 
-            if(!Util::isStringInteger(list.at(i))){
-                Util::showErrorPopUp("Number is not numeric.");
+            if(!Util::Validation::isStringInteger(list.at(i))){
+                Util::Dialogs::showError("Number is not numeric.");
                 return false;
             }
@@ -49 +49 @@
             if(!isLevels){
                 if(list.at(i).size()!=5){
-                    Util::showErrorPopUp("You have invalid packages numbers. Each number must have 5 digits.");
+                    Util::Dialogs::showError("You have invalid packages numbers. Each number must have 5 digits.");
                     return false;
                 }

s10k/Vago/packageWizard/packagepage4.cpp

@@ -69 +69 @@
 
     //Pre-processing (check if received only folders)
-    foreach(QString myFile, resources){
+    for(const QString &myFile : resources){
         if(!QDir(myFile).exists()){
-            Util::showErrorPopUp("Only folders are allowed for this operation.");
+            Util::Dialogs::showError("Only folders are allowed for this operation.");
             return;
         }
@@ -78 +78 @@
     QString type=ui->pbSwitchFiles->text().replace(" files","");
 
-    foreach(QString currentFolder, resources){
+    for(QString currentFolder: resources){
 
-        currentFolder=Util::normalizePath(currentFolder); //normalize path
+        currentFolder=Util::FileSystem::normalizePath(currentFolder); //normalize path
 
         //Get actual number rows
@@ -89 +89 @@
 
         //Add to table and list to
-        QTableWidgetItem *newFolder = new QTableWidgetItem(Util::cutName(currentFolder));
+        QTableWidgetItem *newFolder = new QTableWidgetItem(Util::FileSystem::cutName(currentFolder));
         QTableWidgetItem *newType = new QTableWidgetItem(type);
         QTableWidgetItem *newFullPath = new QTableWidgetItem(currentFolder);
@@ -139 +139 @@
 void PackagePage4::addTableContents(DropTableWidget *myTable){
     if(ui->pbSwitchFiles->text()==".oni files"){
-        addResourcesPackage(myTable,Util::multipleDirDialog("Choose folders with .oni files..."));
+        addResourcesPackage(myTable,Util::Dialogs::multipleDirSelection("Choose folders with .oni files..."));
     }
     else if(ui->pbSwitchFiles->text()==".bsl files"){
-        addResourcesPackage(myTable,Util::multipleDirDialog("Choose folders with .bsl files..."));
+        addResourcesPackage(myTable,Util::Dialogs::multipleDirSelection("Choose folders with .bsl files..."));
     }
     else{
-        addResourcesPackage(myTable,Util::multipleDirDialog("Choose folders with .oni-patch files..."));
+        addResourcesPackage(myTable,Util::Dialogs::multipleDirSelection("Choose folders with .oni-patch files..."));
     }
 }
@@ -153 +153 @@
 
     if(size==0){
-        Util::showPopUp("Select a row first.");
+        Util::Dialogs::showInfo("Select a row first.");
         return;
     }
 
-    if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?")){
+    if(Util::Dialogs::showQuestion(this,"Are you sure you want to delete the selected rows?")){
         for(int i=0; i<size; i++){
             myTable->removeRow(myTable->selectionModel()->selectedRows().at(size-i-1).row());
@@ -166 +166 @@
 bool PackagePage4::validatePage(){
     if(ui->twCommon->rowCount()==0 && ui->twWindows->rowCount()==0 && ui->twMac->rowCount()==0){
-        Util::showErrorPopUp("You need to add some folders with resources first!");
+        Util::Dialogs::showError("You need to add some folders with resources first!");
         return false;
     }

s10k/Vago/packageWizard/packagewizard.cpp

@@ -1 +1 @@
 #include "packagewizard.h"
 
-PackageWizard::PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger)
-    :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, false)
+PackageWizard::PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings)
+    :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, false)
 {
     this->packagesLocation=this->workspaceWizardLocation+"/Packages";
@@ -8 +8 @@
 
 void PackageWizard::exec(){
-    PackagePage2 *page2 = new PackagePage2(this->myLogger);
+    PackagePage2 *page2 = new PackagePage2();
     PackagePage3 *page3 = new PackagePage3();
     PackagePage4 *page4 = new PackagePage4();
@@ -58 +58 @@
     this->vagoSettings->setValue("PackageCreator/CreateZip",createZip);
 
-    const QString packageName=packageNumber+Util::fullTrim(modName);
+    const QString packageName=packageNumber+Util::String::fullTrim(modName);
 
     // Start package creation...
@@ -88 +88 @@
 
     if (!modInfo.open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
-        UtilVago::showAndLogErrorPopUp(this->myLogger, "Couldn't create Mod_Info.cfg file when creating AE Package.");
+        UtilVago::showAndLogErrorPopUp("Couldn't create Mod_Info.cfg file when creating AE Package.");
         return;
     }
@@ -124 +124 @@
     if(createZip){
         if(!JlCompress::compressDir(this->packagesLocation+"/"+packageName+".zip", modDir)){
-            UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred while zipping the package.");
+            UtilVago::showAndLogErrorPopUp("An error occurred while zipping the package.");
         }
     }
@@ -162 +162 @@
         }
         QDir().mkpath(path); //create path if doesn't exist
-        if(!Util::copyDir(sourceFolder,path,false)){//copy contents (creates dest destination automatically if not exists yet)
+        if(!Util::FileSystem::copyDir(sourceFolder,path,false)){//copy contents (creates dest destination automatically if not exists yet)
 
-         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error occurred while copying the folder/files to the package folder: \n"
+         UtilVago::showAndLogErrorPopUpLogButton("An error occurred while copying the folder/files to the package folder: \n"
                                                         "Copying from "+sourceFolder+"\n to "+path);
         }

s10k/Vago/packageWizard/packagewizard.h

@@ -20 +20 @@
     void beforeClose(QDialog::DialogCode resultStatus);
 protected:
-    PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger);
+    PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings);
     void exec();
 };