Changeset 1093 for s10k/Vago/xmlToolsInterface

Timestamp:

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

Author:

s10k

Message:

Vago 1.4

Location:

s10k/Vago/xmlToolsInterface

Files:

• xmltoolsinterface.cpp (modified) (10 diffs)
• xmltoolsinterface.h (modified) (2 diffs)
• xmltoolsinterfacecommandpreview.cpp (modified) (2 diffs)
• xmltoolsinterfacecommandpreview.h (modified) (2 diffs)

s10k/Vago/xmlToolsInterface/xmltoolsinterface.cpp

@@ -2 +2 @@
 #include "ui_xmltoolsinterface.h"
 
-XmlToolsInterface::XmlToolsInterface(Logger *myLogger, QWidget *parent) :
+XmlToolsInterface::XmlToolsInterface(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::XmlToolsInterface),
@@ -9 +9 @@
     ui->setupUi(this);
     this->setAttribute(Qt::WA_DeleteOnClose, true); //destroy itself once finished.
-    this->myLogger = myLogger;
-    this->xmlProcessor = new XmlProcessor(UtilVago::getAppPath(), this->myLogger, &this->listToProccess);
+    this->xmlProcessor = new XmlProcessor(UtilVago::getAppPath(), &this->listToProccess);
 
     // setup the correct input options for the current selection
@@ -162 +161 @@
     if(oldFile.exists()){
         if(!oldFile.remove()){
-            UtilVago::showAndLogErrorPopUpLogButton(this->myLogger,
-                                                    "Couldn't remove old temporary file to preview XML patch! Existing file:\n"
+            UtilVago::showAndLogErrorPopUpLogButton("Couldn't remove old temporary file to preview XML patch! Existing file:\n"
                                                     + previewFileLocation
                                                     );
@@ -170 +168 @@
 
     if(!QFile::copy(currentFileLocation, previewFileLocation)){
-        UtilVago::showAndLogErrorPopUpLogButton(this->myLogger,
-                                                "Couldn't create temporary file to preview the XML patch!\nFrom: " +
+        UtilVago::showAndLogErrorPopUpLogButton("Couldn't create temporary file to preview the XML patch!\nFrom: " +
                                                 currentFileLocation +
                                                 "\nTo: " + previewFileLocation
@@ -204 +201 @@
 
     if(ui->leInputInputFiles->text().trimmed().isEmpty()){
-        Util::showErrorPopUp("You must provide an Input File!");
+        Util::Dialogs::showError("You must provide an Input File!");
         return false;
     }
 
     if(ui->rbFilterRelativeElements->isChecked() && ui->leFilterElement->text().trimmed().isEmpty()){
-        Util::showErrorPopUp("With Relative Elements checked you must provide a Element Name!");
+        Util::Dialogs::showError("With Relative Elements checked you must provide a Element Name!");
         return false;
     }
 
     if(ui->cbFilterParentElement->isChecked() && ui->leFilterParentElement->text().trimmed().isEmpty()){
-        Util::showErrorPopUp("Parent Element is checked but none was provided!");
+        Util::Dialogs::showError("Parent Element is checked but none was provided!");
         return false;
     }
@@ -221 +218 @@
         if(ui->leFilterAttributeName->text().trimmed().isEmpty())
         {
-            Util::showErrorPopUp("Attribute Name is checked but none was provided!");
+            Util::Dialogs::showError("Attribute Name is checked but none was provided!");
             return false;
         }
@@ -227 +224 @@
         if(ui->leFilterAttributeValue->text().trimmed().isEmpty())
         {
-            Util::showErrorPopUp("With Attribute Name checked you must provide a Attribute Value!");
+            Util::Dialogs::showError("With Attribute Name checked you must provide a Attribute Value!");
             return false;
         }
@@ -234 +231 @@
     if(ui->rbFilterXPathExpression->isChecked() && ui->leFilterXPathExpression->text().trimmed().isEmpty())
     {
-        Util::showErrorPopUp("X-Path Expression is checked but none was provided!");
+        Util::Dialogs::showError("X-Path Expression is checked but none was provided!");
         return false;
     }
 
     if(ui->cbXmlToolsOperation->currentText() == "Add Values" && ui->leInputNewValues->text().isEmpty()){
-        Util::showErrorPopUp(R"|(With "Add Values" operation selected you must provide the "New Value(s)" to be added.)|");
+        Util::Dialogs::showError(R"|(With "Add Values" operation selected you must provide the "New Value(s)" to be added.)|");
         return false;
     }
 
     if(ui->cbXmlToolsOperation->currentText() == "Remove Values" && ui->leInputCurrentValues->text().isEmpty()){
-        Util::showErrorPopUp(R"|(With "Remove Value" operation selected you must provide the "Current Value(s)" to be removed.)|");
+        Util::Dialogs::showError(R"|(With "Remove Value" operation selected you must provide the "Current Value(s)" to be removed.)|");
         return false;
     }
@@ -269 +266 @@
         // if there's a preview in progress don't display the message below
         if(!this->previewInProgress){
-            Util::showPopUp("File(s) processed with sucess!");
+            Util::Dialogs::showInfo("File(s) processed with sucess!");
         }
     }
@@ -305 +302 @@
 
     if(ui->leInputNewValues->isEnabled()){
-        currCommand += "--new-val " + Util::insertQuotes(ui->leInputNewValues->text()) + " ";
+        currCommand += "--new-val " + Util::String::insertQuotes(ui->leInputNewValues->text()) + " ";
     }
 
     if(ui->leInputCurrentValues->isEnabled()){
-        currCommand += "--current-val " + Util::insertQuotes(ui->leInputCurrentValues->text()) + " ";
+        currCommand += "--current-val " + Util::String::insertQuotes(ui->leInputCurrentValues->text()) + " ";
     }
 
     if(ui->leInputPositions->isEnabled() && !ui->leInputPositions->text().trimmed().isEmpty()){
-        currCommand += "--positions " + Util::insertQuotes(ui->leInputPositions->text()) + " ";
+        currCommand += "--positions " + Util::String::insertQuotes(ui->leInputPositions->text()) + " ";
     }
 
     if(ui->leInputDiffOldNewValue->isEnabled()){
-        currCommand += "--diff-old-new-val " + Util::insertQuotes(ui->leInputDiffOldNewValue->text()) + " ";
+        currCommand += "--diff-old-new-val " + Util::String::insertQuotes(ui->leInputDiffOldNewValue->text()) + " ";
     }
 
     if(ui->rbFilterRelativeElements->isChecked()){
         if(ui->leFilterElement->isEnabled()){
-            currCommand += "--element-name " + Util::insertQuotes(ui->leFilterElement->text()) + " ";
+            currCommand += "--element-name " + Util::String::insertQuotes(ui->leFilterElement->text()) + " ";
         }
         if(ui->leFilterParentElement->isEnabled()){
-            currCommand += "--parent-element-name " + Util::insertQuotes(ui->leFilterParentElement->text()) + " ";
+            currCommand += "--parent-element-name " + Util::String::insertQuotes(ui->leFilterParentElement->text()) + " ";
         }
         if(ui->leFilterAttributeName->isEnabled()){
-            currCommand += "--attribute-name " + Util::insertQuotes(ui->leFilterAttributeName->text()) + " ";
-            currCommand += "--attribute-value " + Util::insertQuotes(ui->leFilterAttributeValue->text()) + " ";
+            currCommand += "--attribute-name " + Util::String::insertQuotes(ui->leFilterAttributeName->text()) + " ";
+            currCommand += "--attribute-value " + Util::String::insertQuotes(ui->leFilterAttributeValue->text()) + " ";
         }
     }
     else{
         if(ui->leFilterXPathExpression->isEnabled()){
-            currCommand += "--xpath-expression " + Util::insertQuotes(ui->leFilterXPathExpression->text()) + " ";
+            currCommand += "--xpath-expression " + Util::String::insertQuotes(ui->leFilterXPathExpression->text()) + " ";
         }
     }
 
     if(alternativeFileLocation.isEmpty()){
-        currCommand += "--files " + Util::insertQuotes(ui->leInputInputFiles->text());
+        currCommand += "--files " + Util::String::insertQuotes(ui->leInputInputFiles->text());
     }
     else{
-        currCommand += "--files " + Util::insertQuotes(alternativeFileLocation);
+        currCommand += "--files " + Util::String::insertQuotes(alternativeFileLocation);
     }
 

s10k/Vago/xmlToolsInterface/xmltoolsinterface.h

@@ -24 +24 @@
     
 public:
-    explicit XmlToolsInterface(Logger *myLogger, QWidget *parent = 0);
+    explicit XmlToolsInterface(QWidget *parent = 0);
     ~XmlToolsInterface();
 
@@ -73 +73 @@
 private:
     Ui::XmlToolsInterface *ui;
-    Logger *myLogger = nullptr;
     QStringList listToProccess; //commands to execute
     XmlProcessor *xmlProcessor = nullptr;

s10k/Vago/xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp

@@ -23 +23 @@
     ui->tePreviewFileText->setText(this->previewText);
 
-    highlighterCurrentFile = new BasicXMLSyntaxHighlighter(ui->teCurrentFileText);
-    highlighterPreviewFile = new BasicXMLSyntaxHighlighter(ui->tePreviewFileText);
+    highlighterCurrentFile.setDocument(ui->teCurrentFileText->document());
+    highlighterPreviewFile.setDocument(ui->tePreviewFileText->document());
 
     previewFile.close();
@@ -172 +172 @@
     }
 
-    highlighterPreviewFile->rehighlight();
-    highlighterCurrentFile->rehighlight();
+    highlighterPreviewFile.rehighlight();
+    highlighterCurrentFile.rehighlight();
 }
 
 XmlToolsInterfaceCommandPreview::~XmlToolsInterfaceCommandPreview()
 {
-    delete this->highlighterCurrentFile;
-    delete this->highlighterPreviewFile;
     delete this->lineNumberDisplayCurrentFile;
     delete this->lineNumberDisplayPreviewFile;

s10k/Vago/xmlToolsInterface/xmltoolsinterfacecommandpreview.h

@@ -6 +6 @@
 #include <QScrollBar>
 
-#include "../libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h"
-#include "../libs/LineNumberDisplay/LineNumberDisplay.h"
+#include <BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h>
+#include <LineNumberDisplay/LineNumberDisplay.h>
 #include "util.h"
 
@@ -24 +24 @@
 private:
     Ui::XmlToolsInterfaceCommandPreview *ui;
-    BasicXMLSyntaxHighlighter *highlighterCurrentFile;
-    BasicXMLSyntaxHighlighter *highlighterPreviewFile;
+    BasicXMLSyntaxHighlighter highlighterCurrentFile;
+    BasicXMLSyntaxHighlighter highlighterPreviewFile;
     LineNumberDisplay *lineNumberDisplayCurrentFile;
     LineNumberDisplay *lineNumberDisplayPreviewFile;