Changeset 1058

Timestamp:

Oct 30, 2016, 3:42:39 PM (8 years ago)

Author:

s10k

Message:

Vago 1.2

Location:

Vago/trunk/Vago

Files:

• Vago.pro (modified) (4 diffs)
• about.cpp (modified) (1 diff)
• bgImageWizard/bgimagepage2.cpp (modified) (1 diff)
• bgImageWizard/bgimagepage2.ui (modified) (4 diffs)
• bgImageWizard/bgimagepage3.cpp (modified) (1 diff)
• bgImageWizard/bgimagepagefinal.cpp (modified) (1 diff)
• libs/BasicXMLSyntaxHighlighter (added)
• libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp (added)
• libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h (added)
• libs/LineNumberDisplay (added)
• libs/LineNumberDisplay/LineNumberDisplay.cpp (added)
• libs/LineNumberDisplay/LineNumberDisplay.h (added)
• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (17 diffs)
• mainwindow.h (modified) (5 diffs)
• mainwindow.ui (modified) (7 diffs)
• manualcommands.cpp (modified) (4 diffs)
• manualcommands.ui (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• resources.qrc (modified) (1 diff)
• utilvago.h (modified) (2 diffs)
• xmlToolsInterface (added)
• xmlToolsInterface/xmltoolsinterface.cpp (added)
• xmlToolsInterface/xmltoolsinterface.h (added)
• xmlToolsInterface/xmltoolsinterface.ui (added)
• xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp (added)
• xmlToolsInterface/xmltoolsinterfacecommandpreview.h (added)
• xmlToolsInterface/xmltoolsinterfacecommandpreview.ui (added)
• xmltoolsinterface.pdn (added)
• xmltoolsinterface.png (added)

Vago/trunk/Vago/Vago.pro

@@ -17 +17 @@
 INCLUDEPATH += ./soundWizard
 INCLUDEPATH += ./bgImageWizard
+INCLUDEPATH += ./xmlToolsInterface
 
 # Used this great tutorial to build zlib and quazip:
@@ -70 +71 @@
     bgImageWizard/bgimagepage3.cpp \
     bgImageWizard/bgimagepagefinal.cpp \
+    xmlToolsInterface/xmltoolsinterface.cpp \
+    libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp \
+    libs/LineNumberDisplay/LineNumberDisplay.cpp
 
 HEADERS  += \
@@ -97 +102 @@
     bgImageWizard/bgimagewizard.h \
     bgImageWizard/bgimagepage3.h \
-    bgImageWizard/bgimagepagefinal.h
+    bgImageWizard/bgimagepagefinal.h \
+    xmlToolsInterface/xmltoolsinterface.h \
+    libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.h \
+    libs/LineNumberDisplay/LineNumberDisplay.h
 
 FORMS    += \
@@ -116 +125 @@
     bgImageWizard/bgimagepage3.ui \
     bgImageWizard/bgimagepagefinal.ui \
+    xmlToolsInterface/xmltoolsinterface.ui \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.ui
 
 RESOURCES += \

Vago/trunk/Vago/about.cpp

@@ -33 +33 @@
                          "smashingmagazine for the folder icon :)<br />"
                          "Freepik and Flaticon by the background image wizard icon<br />"
+                         "qtiplot authors for line numbers in QTextEdit<br />"
+                         "d1vanov for basic-xml-syntax-highlighter class <br />"
                          "<center>"
                          "Visit us at:<br />"

Vago/trunk/Vago/bgImageWizard/bgimagepage2.cpp

@@ -106 +106 @@
 
     // Update image information
-    ui->lbImageName->setText(myImageFileInfo.baseName().replace("." + myImageFileInfo.suffix(), ""));
+    QString imageName = myImageFileInfo.baseName().replace("." + myImageFileInfo.suffix(), "");
+
+    ui->lbImageName->setToolTip(imageName);
+
+    if(imageName.length() > 30){
+        imageName = imageName.mid(0,27) + "...";
+    }
+
+    ui->lbImageName->setText(imageName);
     ui->lbImageWidth->setText(QString::number(image.width()));
     ui->lbImageHeight->setText(QString::number(image.height()));

Vago/trunk/Vago/bgImageWizard/bgimagepage2.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>404</width>
-    <height>286</height>
+    <width>558</width>
+    <height>323</height>
    </rect>
   </property>
@@ -50 +50 @@
      <property name="minimumSize">
       <size>
-       <width>380</width>
+       <width>500</width>
        <height>230</height>
       </size>
@@ -60 +60 @@
       <item>
        <widget class="QGroupBox" name="groupBox_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>128</height>
+         </size>
+        </property>
         <property name="title">
          <string>Preview</string>
@@ -76 +88 @@
       <item>
        <widget class="QGroupBox" name="groupBox_3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>128</height>
+         </size>
+        </property>
         <property name="title">
          <string>Details</string>

Vago/trunk/Vago/bgImageWizard/bgimagepage3.cpp

@@ -85 +85 @@
         backgroundName = "TXMPother";
         txmbName = "TXMBother";
+        ui->leLevelId->clear();
+        ui->leLevelId->setEnabled(false);
     }
     else if(type == "Intro Screen"){
         backgroundName = "TXMPlevel" + levelNumber + "_intro_";
         txmbName = "TXMBintro_splash_screen";
+        ui->leLevelId->setEnabled(true);
     }
     else if(type == "Win Screen"){
         backgroundName = "TXMPlevel" + levelNumber + "_win_";
         txmbName = "TXMBwin_splash_screen";
+        ui->leLevelId->setEnabled(true);
     }
     else if(type == "Loose Screen"){
         backgroundName = "TXMPfail01_";
         txmbName = "TXMBfail_splash_screen";
+        ui->leLevelId->clear();
+        ui->leLevelId->setEnabled(false);
     }
     else if(type == "Main Menu Screen"){
         backgroundName = "TXMPOni_startup_";
         txmbName = "TXMBpict_mainmenu";
+        ui->leLevelId->clear();
+        ui->leLevelId->setEnabled(false);
     }
     else if(type == "Options Menu Screen"){
         backgroundName = "TXMPoptions_";
         txmbName = "TXMBpict_options_background";
+        ui->leLevelId->clear();
+        ui->leLevelId->setEnabled(false);
     }
     else if(type == "Load Level Screen"){
         backgroundName = "TXMPoni_kanji_";
         txmbName = "TXMBpict_loadgame_background";
+        ui->leLevelId->clear();
+        ui->leLevelId->setEnabled(false);
     }
 

Vago/trunk/Vago/bgImageWizard/bgimagepagefinal.cpp

@@ -164 +164 @@
 }
 
-/*
-QVector<int> BGImagePageFinal::getSplitSizes(int imageSideSize)
-{
-    int currNumber = 256;
-    int remainingSideSize = imageSideSize;
-
-    QVector<int> splitSizes;
-
-    while(currNumber > 8){
-        if(remainingSideSize-currNumber >= 0){
-            splitSizes.append(currNumber);
-            remainingSideSize -= currNumber;
-        }
-        else{
-            currNumber /= 2;
-        }
-    }
-
-    if(remainingSideSize != 0)
-    {
-        splitSizes.clear();
-    }
-
-    return splitSizes;
-}
-*/
-
 QVector<int> BGImagePageFinal::getSplitSizes(int imageSideSize)
 {

Vago/trunk/Vago/main.cpp

@@ -11 +11 @@
     a.setStyleSheet("QStatusBar::item { border: 0px; }"); //hide QLabels border in status bar //http://qt-project.org/forums/viewthread/18743
 
+//    XmlToolsInterface *xmlToolsWindow = new XmlToolsInterface(new Logger(UtilVago::getAppPath(), GlobalVars::AppLogName));
+//    xmlToolsWindow->show(); //it destroys itself when finished.
+
     return a.exec();
 }

Vago/trunk/Vago/mainwindow.cpp

@@ -129 +129 @@
     ui->statusBar->addPermanentWidget(ui->tbAbortConversion);
 
-    //Initialize list pointers
-    this->listToProccess = new QStringList;
-
     // User interface
     ui->mainToolBar->addWidget(ui->tbAE); //add ae installer launch button
@@ -139 +136 @@
     ui->mainToolBar->addWidget(ui->tbCommand); //add option to manual onisplit commands
     ui->mainToolBar->addWidget(ui->emptySpacerLabel3); //same as before
+    ui->mainToolBar->addWidget(ui->tbXmlToolsInterface); //add option to manual onisplit commands
+    ui->mainToolBar->addWidget(ui->emptySpacerLabel4); //same as before
     ui->mainToolBar->addWidget(ui->tbOpenFolder); //add option to open folder with files converted etc
 
@@ -208 +207 @@
 
     //Create a thread for do the conversion in background
-    this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, this->listToProccess, this->win7TaskBarProgress);
+    this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, &this->listToProccess, this->win7TaskBarProgress);
 #else
-    this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, this->listToProccess);
+    this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, &this->listToProccess);
 #endif
 
@@ -291 +290 @@
 {
     QDesktopServices::openUrl(QUrl("file:///"+this->outputFolder));
+}
+
+
+void MainWindow::on_tbXmlToolsInterface_clicked()
+{
+    //We pass no parent because we want to have an independent window for XmlToolsInterface,
+    //so we can minimize it or maximize indepently from the MainWindow
+    XmlToolsInterface *xmlToolsWindow = new XmlToolsInterface(this->myLogger);
+    xmlToolsWindow->show(); //it destroys itself when finished.
 }
 
@@ -742 +750 @@
         //Only process enabled items
         if(currTable->item(i,2)->background()!=currTable->disabledBackStyle){
-            this->listToProccess->append(currTable->item(i,2)->text());
+            this->listToProccess.append(currTable->item(i,2)->text());
         }
     }
@@ -1187 +1195 @@
         if(result == QMessageBox::StandardButton::Cancel){
             event->ignore();
-        }
-    }
+            return;
+        }
+    }
+
+    // Exit application (this will also close all other windows which don't have parent, for instance ManualCommands)
+    QApplication::quit();
 }
 
@@ -1225 +1237 @@
     ui->cbGridsLevels->setEnabled(checked);
     ui->cbGridsLevels->setChecked(checked);
-    if(checked){
+    if(checked && !projectIsLoading){
         QString file=QFileDialog::getOpenFileName(this,"Choose the BNV.dae file...","./" , "All Files (*.*)");
         if(!file.isEmpty()){
@@ -1237 +1249 @@
     ui->leAdditSourcesLevels->setEnabled(checked);
 
-    if(checked){
+    if(checked && !projectIsLoading){
         QStringList filesSelected=QFileDialog::getOpenFileNames(this,"Choose the additional .dae files...","./" , "All Files (*.*)");
         QString filesJoined;
@@ -1306 +1318 @@
 void MainWindow::on_tbCommand_clicked()
 {
-    //Show preferences
-    ManualCommands *commandsWindow = new ManualCommands(this);
+    //We pass no parent because we want to have an independent window for ManualCommands,
+    //so we can minimize it or maximize indepently from the MainWindow
+    ManualCommands *commandsWindow = new ManualCommands();
     commandsWindow->show(); //it destroys itself when finished.
 }
@@ -2002 +2015 @@
 {
 
+    this->projectIsLoading = true;
+
     if(this->vagoSettings->value("AskSaveProject").toBool() && this->unsavedChangesExist){
         QMessageBox::StandardButton result = askToSaveCurrentProject();
         if(result == QMessageBox::StandardButton::Cancel){
+            this->projectIsLoading = false;
             return;
         }
@@ -2018 +2034 @@
         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error ocurred while loading project file.\n" + QString(result.description()));
         showErrStatusMessage(statusError);
+        this->projectIsLoading = false;
         return;
     }
@@ -2025 +2042 @@
         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, QString(doc.root().name()) + "The file opened is not a valid VagoProject file. Load aborted.");
         showErrStatusMessage(statusError);
+        this->projectIsLoading = false;
         return;
     }
@@ -2037 +2055 @@
         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't find the vagoVersion of the current project. Load aborted.\n" + QString(e.what()));
         showErrStatusMessage(statusError);
+        this->projectIsLoading = false;
         return;
     }
@@ -2043 +2062 @@
         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "The project that you are trying to load seems it is not compatible with your Vago Version. Please update Vago and try again.");
         showErrStatusMessage(statusError);
+        this->projectIsLoading = false;
         return;
     }
@@ -2058 +2078 @@
         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't load the vago project. Error: " + QString(e.what()));
         showErrStatusMessage(statusError);
+        this->projectIsLoading = false;
         return;
     }
@@ -2069 +2090 @@
 
     setVagoWindowTitle();
+
+    this->projectIsLoading = false;
 
     showSuccessStatusMessage("Project loaded sucessfully.");
@@ -2132 +2155 @@
         ui->cbGridsLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@generateGrids")).attribute().as_bool());
         ui->cbAdditionalSourcesLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@additionalSources")).attribute().as_bool());
-        ui->leAdditSourcesLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@bnvSource")).attribute().value()));
+        ui->leAdditSourcesLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@additionalSourcesValue")).attribute().value()));
     }
     else{

Vago/trunk/Vago/mainwindow.h

@@ -11 +11 @@
 #include "converter.h"
 #include "droptablewidget.h"
+#include "xmltoolsinterface.h"
 
 #include <QMainWindow>
@@ -36 +37 @@
 
 #include "libs/pugixml/pugixml.hpp"
-//#include <QDebug>
 
 namespace Ui {
@@ -198 +198 @@
 
     void on_actionNew_Project_triggered();
+
+    void on_tbXmlToolsInterface_clicked();
 
 private:
@@ -215 +217 @@
     QProgressBar *myBar; //Progress Bar
     QHash<QString, QString> commandMap; //Map the commands for fast retreive
-    QStringList *listToProccess; //items to proccess
+    QStringList listToProccess; //items to proccess
     Converter *myConverter = nullptr;
     QSettings *vagoSettings;
@@ -229 +231 @@
     // Indicates that the application is fully loaded which includes painting the main window
     bool applicationIsFullyLoaded = false;
+    // This variable indicates that we have a project being loaded. It should only be set by MainWindow thread.
+    // It allow us to ignore certain gui slots like when checking checkbox that ask the user for input
+    bool projectIsLoading = false;
 
     // anonymous enum

Vago/trunk/Vago/mainwindow.ui

@@ -21 +21 @@
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
       <item>
        <widget class="QToolButton" name="tbAbortConversion">
@@ -50 +50 @@
          <iconset resource="resources.qrc">
           <normaloff>:/new/icons/folder_icon.png</normaloff>:/new/icons/folder_icon.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="emptySpacerLabel2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>20</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="baseSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="tbXmlToolsInterface">
+        <property name="toolTip">
+         <string>XmlTools Interface</string>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="icon">
+         <iconset resource="resources.qrc">
+          <normaloff>:/new/icons/xmltoolsinterface.png</normaloff>:/new/icons/xmltoolsinterface.png</iconset>
         </property>
        </widget>
@@ -75 +114 @@
        <widget class="QToolButton" name="tbCommand">
         <property name="toolTip">
-         <string>Manual OniSplit Commands</string>
+         <string>Manual Tools Commands</string>
         </property>
         <property name="text">
@@ -87 +126 @@
       </item>
       <item>
-       <widget class="QLabel" name="emptySpacerLabel2">
+       <widget class="QLabel" name="emptySpacerLabel4">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -97 +136 @@
          <size>
           <width>20</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="baseSize">
-         <size>
-          <width>0</width>
           <height>0</height>
          </size>
@@ -1431 +1464 @@
     <addaction name="actionSound_Wizard"/>
     <addaction name="actionBackground_Image_Wizard"/>
+    <addaction name="separator"/>
    </widget>
    <addaction name="menuFile"/>
@@ -1636 +1670 @@
    </property>
   </action>
+  <action name="actionXmlTools_Interface">
+   <property name="icon">
+    <iconset resource="resources.qrc">
+     <normaloff>:/new/icons/xmltoolsinterface.png</normaloff>:/new/icons/xmltoolsinterface.png</iconset>
+   </property>
+   <property name="text">
+    <string>XmlTools Interface</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>

Vago/trunk/Vago/manualcommands.cpp

@@ -1 +1 @@
 #include "manualcommands.h"
 #include "ui_manualcommands.h"
-#include <QDebug>
 
 ManualCommands::ManualCommands(QWidget *parent) :
@@ -8 +7 @@
 {
     ui->setupUi(this);
-    this->setAttribute(Qt::WA_DeleteOnClose,true); //destroy itself once finished.
+    this->setAttribute(Qt::WA_DeleteOnClose, true); //destroy itself once finished.
     this->myProcess = new QProcess();
     this->myProcess->setProcessChannelMode(QProcess::MergedChannels);
@@ -33 +32 @@
 
 void ManualCommands::executeCommand(){
+
+    QString toolExecutable;
+
+    if(ui->cbTargetTool->currentText() == "OniSplit"){
+        toolExecutable = UtilVago::getOniSplitExecutable();
+    }
+    else{
+        toolExecutable = UtilVago::getXmlToolsExecutable();
+    }
 
     QString command=ui->leManualCommand->text().trimmed();
@@ -62 +70 @@
     }
 
-    QString var = UtilVago::getOniSplitExecutable() +" "+ui->leManualCommand->text();
-
-    this->myProcess->start(UtilVago::getOniSplitExecutable()+" "+ui->leManualCommand->text());
+    this->myProcess->start(toolExecutable+" "+ui->leManualCommand->text());
     this->myProcess->waitForFinished(120000); //wait 2 minutes at maximum
-    ui->ptOutput->appendPlainText("> "+command);
+    ui->ptOutput->appendPlainText("> " + ui->cbTargetTool->currentText() + " " + command);
     ui->ptOutput->appendPlainText(this->myProcess->readAll());
     ui->ptOutput->ensureCursorVisible();

Vago/trunk/Vago/manualcommands.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>460</width>
-    <height>300</height>
+    <width>640</width>
+    <height>480</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Manual OniSplit Commands</string>
+   <string>Manual Tools Commands</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/new/icons/command_icon.png</normaloff>:/new/icons/command_icon.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -22 +26 @@
       </property>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Target Tool:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="cbTargetTool">
+         <item>
+          <property name="text">
+           <string>OniSplit</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>XmlTools</string>
+          </property>
+         </item>
+        </widget>
+       </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
@@ -134 +159 @@
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
  <connections>
   <connection>

Vago/trunk/Vago/readme.txt

@@ -1 +1 @@
 Readme.txt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Vago GUI v1.1
+Vago GUI v1.2
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -37 +37 @@
 ----------------------------------
 Change Log:
+----------------------------------
+1.2, 30-10-2016
+- Upgraded to XmlTools 2.0c
+- Added a XmlTools interface. Click in the XML icon in the main window.
+- Now in manual commands you can choose if you want to call OniSplit or XmlTools
+- Now manual commands behaves likes an independent window
+- Fixed additional sources in levels tab when loading project
+- Interface was asking user for additional sources and bnv source files when this 
+options were checked in levels tab when a project was loading. This was fixed.
+- Fixed background image page 2 layout when the image name is large
 ----------------------------------
 1.1, 12-10-2016

Vago/trunk/Vago/resources.qrc

@@ -16 +16 @@
         <file>abort.png</file>
         <file>background_image.png</file>
+        <file>xmltoolsinterface.png</file>
     </qresource>
     <qresource prefix="/new/about">

Vago/trunk/Vago/utilvago.h

@@ -7 +7 @@
 namespace GlobalVars{
 
-const QString AppVersion="1.1";
+const QString AppVersion="1.2";
 const QString LastCompatibleVersion = "1.0";
 const QString ToolsFolder = "tools";
@@ -25 +25 @@
 const QString AppLogName="logVago.txt";
 const QString BuiltOniSplitVersion="0.9.96.0";
-const QString BuiltXmlToolsVersion="2.0b";
+const QString BuiltXmlToolsVersion="2.0c";
 const QString ModsDomain="mods.oni2.net";
 #ifdef Q_OS_WIN