Changeset 998

Timestamp:

Apr 25, 2014, 11:05:54 PM (11 years ago)

Author:

s10k

Message:

Vago 0.9a

Location:

Vago/trunk/Vago

Files:

• Vago.pro (modified) (1 diff)
• droptablewidget.h (modified) (1 diff)
• libs/unzip.cpp (modified) (4 diffs)
• libs/unzip.h (modified) (1 diff)
• libs/zip.cpp (modified) (4 diffs)
• libs/zip.h (modified) (1 diff)
• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (9 diffs)
• mainwindow.h (modified) (3 diffs)
• packageWizard/packagewizard.cpp (modified) (1 diff)
• preferences.cpp (modified) (2 diffs)
• preferences.ui (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• soundWizard/soundwizard.cpp (modified) (1 diff)
• util.cpp (modified) (2 diffs)
• util.h (modified) (3 diffs)

Vago/trunk/Vago/Vago.pro

@@ -8 +8 @@
 QT       += network #network communication
 QT       += script #for json parse
+QT       += widgets
 
+INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
 INCLUDEPATH += ./libs
 INCLUDEPATH += ./packageWizard

Vago/trunk/Vago/droptablewidget.h

@@ -3 +3 @@
 
 #include <QTableWidget>
-#include <QtGui>
+#include <QtWidgets>
 
 #include "util.h"

Vago/trunk/Vago/libs/unzip.cpp

@@ -327 +327 @@
         return UnZip::ReadFailed;
 
-    QString filename = QString::fromAscii(buffer2, szName);
+    QString filename = QString::fromUtf8(buffer2, szName);
     if (filename != path) {
         qDebug() << "Filename in local header mismatches.";
@@ -556 +556 @@
         skipEntry = true;
     } else {
-        filename = QString::fromAscii(buffer2, szName);
+        filename = QString::fromUtf8(buffer2, szName);
     }
 
@@ -611 +611 @@
         }
 
-        h->comment = QString::fromAscii(buffer2, szComment);
+        h->comment = QString::fromUtf8(buffer2, szComment);
     }
 
@@ -1005 +1005 @@
     keys[2] = 878082192L;
 
-    QByteArray pwdBytes = pwd.toAscii();
+    QByteArray pwdBytes = pwd.toUtf8();
     int sz = pwdBytes.size();
     const char* ascii = pwdBytes.data();

Vago/trunk/Vago/libs/unzip.h

@@ -35 +35 @@
 #include <QtCore/QtGlobal>
 
-#include <zlib/zlib.h>
+#include <QtZlib/zlib.h>
 
 class QDir;

Vago/trunk/Vago/libs/zip.cpp

@@ -822 +822 @@
 
         // filename length
-        QByteArray entryNameBytes = entryName.toAscii();
+    QByteArray entryNameBytes = entryName.toUtf8();
         int sz = entryNameBytes.size();
 
@@ -971 +971 @@
         keys[2] = 878082192L;
 
-        QByteArray pwdBytes = password.toAscii();
+    QByteArray pwdBytes = password.toUtf8();
         int sz = pwdBytes.size();
         const char* ascii = pwdBytes.data();
@@ -1192 +1192 @@
 
         // filename
-        QByteArray fileNameBytes = fileName.toAscii();
+    QByteArray fileNameBytes = fileName.toUtf8();
         sz = fileNameBytes.size();
         buffer1[ZIP_CD_OFF_NAMELEN] = sz & 0xFF;
@@ -1267 +1267 @@
 
         // ZIP file comment length
-        QByteArray commentBytes = comment.toAscii();
+    QByteArray commentBytes = comment.toUtf8();
         quint16 commentLength = commentBytes.size();
 

Vago/trunk/Vago/libs/zip.h

@@ -34 +34 @@
 #include <QtCore/QtGlobal>
 
-#include <zlib/zlib.h>
+#include <QtZlib/zlib.h>
 
 class QIODevice;

Vago/trunk/Vago/main.cpp

@@ -6 +6 @@
 #endif
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "mainwindow.h"
 

Vago/trunk/Vago/mainwindow.cpp

@@ -78 +78 @@
         iniChanged=true;
     }
+#ifdef Q_OS_MAC
+    if(!this->vagoSettings->contains("UseYesButtonClear")){
+        this->vagoSettings->setValue("UseYesButtonClear", false);
+        iniChanged=true;
+    }
+#endif
 
     if(iniChanged){
@@ -90 +96 @@
     this->startedWindowWidth=this->vagoSettings->value("WindowWidth").toInt();
     this->startedWindowHeight=this->vagoSettings->value("WindowHeight").toInt();
+#ifdef Q_OS_MAC
+    this->useYesAsDefaultInClearButton=this->vagoSettings->value("UseYesButtonClear").toBool();
+#endif
 
     //Create our workspace if it doesn't exists yet
@@ -127 +136 @@
     setConverterButtonsSize();
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // setUnifiedTitleAndToolBarOnMac(true); // Qt suggests to use it on mac | http://www.slideshare.net/qtbynokia/how-to-make-your-qt-app-look-native // align on left doesn't work if active
     ui->tbOni->setIcon(QIcon(":/new/icons/oni_icon_mac.png")); // Oni executable on mac have a different icon than windows
@@ -191 +200 @@
         arguments << "-noswitch";
     }
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     else{
         arguments << "-switch"; // only supported on windows. Was added by daodan dll.
@@ -531 +540 @@
             command+=":"+ui->leSpecificFilesLevels->text();
         }
-        command+=" "+myOutputFolder+" "+file;
+
+        if(from=="DAT" && to=="ONI FILES"){ // extract files to a subdir with the files name ex: level0_Final
+            command += " " + myOutputFolder.insert(myOutputFolder.size()-2,QString(Util::cutName(file)).replace(".dat","")) + " " + file;
+        }
+        else{
+            command+=" "+myOutputFolder+" "+file;
+        }
 
     }
@@ -1047 +1062 @@
     int size = myTable->selectionModel()->selectedRows().size();
 
+    QMessageBox::StandardButton defaultButton = QMessageBox::NoButton; // default button for clear asking question, only customizable in mac os
+
     if(size==0){
         Util::showPopUp("Select a row first.");
@@ -1052 +1069 @@
     }
 
-    if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?")){
+#ifdef Q_OS_MAC
+    if(this->useYesAsDefaultInClearButton){
+        defaultButton = QMessageBox::Yes;
+    }
+    else{
+        defaultButton = QMessageBox::No;
+    }
+#endif
+
+
+    if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?",defaultButton)){
         for(int i=0; i<size; i++){
             //myTable->removeRow(myTable->selectedItems().at(size-i-1)->row());
@@ -1171 +1198 @@
 /**
   Update items loaded
-  **/
-void MainWindow::on_tabWidget_selected(const QString &arg1)
-{
-    if(arg1.compare("General",Qt::CaseSensitive)==0){ //case sentive is faster
+**/
+void MainWindow::on_tabWidget_currentChanged(int index)
+{
+    QString tabtext = ui->tabWidget->tabText(index);
+
+    if(tabtext.compare("XML",Qt::CaseSensitive)==0){ //case sentive is faster
         updateItemsLoaded(ui->twSourcesXML);
     }
-    else if(arg1.compare("Textures",Qt::CaseSensitive)==0){
+    else if(tabtext.compare("Textures",Qt::CaseSensitive)==0){
         updateItemsLoaded(ui->twSourcesTextures);
     }
-    else if(arg1.compare("Objects",Qt::CaseSensitive)==0){
+    else if(tabtext.compare("Characters",Qt::CaseSensitive)==0){
+        updateItemsLoaded(ui->twSourcesCharacters);
+    }
+    else if(tabtext.compare("Objects",Qt::CaseSensitive)==0){
         updateItemsLoaded(ui->twSourcesObjects);
     }
-    else if(arg1.compare("Levels",Qt::CaseSensitive)==0){
+    else if(tabtext.compare("Levels",Qt::CaseSensitive)==0){
         updateItemsLoaded(ui->twSourcesLevels);
     }
@@ -1533 +1565 @@
   **/
 QString MainWindow::getOSIndependentAppPath(){
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     QDir dir = QDir::current();
     if(dir.absolutePath().contains(".app")){ // include bundle, but we don't want it

Vago/trunk/Vago/mainwindow.h

@@ -137 +137 @@
     void dtContextMenu(DropTableWidget* myTable, QContextMenuEvent *event); //Context menu options for table widgets
 
-    void on_tabWidget_selected(const QString &arg1);
-
     void checkVagoLastVersion(QNetworkReply *result); //check vago last version
 
@@ -180 +178 @@
 
     void on_tbAbortConversion_clicked();
+
+    void on_tabWidget_currentChanged(int index);
 
 private:
@@ -191 +191 @@
     int startedWindowWidth;
     int startedWindowHeight;
+#ifdef Q_OS_MAC
+    bool useYesAsDefaultInClearButton;
+#endif
     QLabel *itemsLoaded;
     QProgressBar *myBar; //Progress Bar

Vago/trunk/Vago/packageWizard/packagewizard.cpp

@@ -15 +15 @@
 
     //Center and resize QWizard (http://www.thedazzlersinc.com/source/2012/06/04/qt-center-window-in-screen/)
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     myWizard.resize(640,480);
 #else

Vago/trunk/Vago/preferences.cpp

@@ -18 +18 @@
     ui->cbSeparate->setChecked(this->vagoSettings->value("SeparateInWorkspace").toBool());
     ui->cbVagoExit->setChecked(this->vagoSettings->value("ConfirmExit").toBool());
+
+#ifdef Q_OS_WIN
+    ui->cbClearButtonYes->hide(); // don't display this mac os only option in windows
+#endif
 
 }
@@ -61 +65 @@
     this->vagoSettings->setValue("SeparateInWorkspace",ui->cbSeparate->isChecked());
     this->vagoSettings->setValue("ConfirmExit",ui->cbVagoExit->isChecked());
+#ifdef Q_OS_MAC
+    this->vagoSettings->setValue("UseYesButtonClear",ui->cbClearButtonYes->isChecked());
+#endif
+
 
     Util::showPopUp("You need to restart the application to all changes take effect.");

Vago/trunk/Vago/preferences.ui

@@ -139 +139 @@
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="cbClearButtonYes">
+        <property name="text">
+         <string>Use Yes button as default for Clear items</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>

Vago/trunk/Vago/readme.txt

@@ -1 +1 @@
 Readme.txt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Vago GUI v0.9
+Vago GUI v0.9a
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -37 +37 @@
 ----------------------------------
 Change Log:
+----------------------------------
+0.9a, 25-04-2014
+-Upgraded Qt libraries to version 5
+-Updated OniSplit to 0.9.96.0 version
+-Fixed the bug where the items loaded counter in status bar wasn't updated 
+when changing tabs
+-Now levels->dat - oni files get extracted to a subfolder with the level's
+extracted name (requested by paradox)
+-Now in Mac OS is possible to choose Yes button by default when clearing the 
+files contents (requested by edt)
 ----------------------------------
 0.9, 08-01-2014

Vago/trunk/Vago/soundWizard/soundwizard.cpp

@@ -23 +23 @@
 
     //Center and resize QWizard (http://www.thedazzlersinc.com/source/2012/06/04/qt-center-window-in-screen/)
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     this->myWizard->resize(640,480);
 #else

Vago/trunk/Vago/util.cpp

@@ -68 +68 @@
 }
 
-bool showQuestionPopUp(QWidget * parent, QString message){
-    return QMessageBox::question (parent, "Are you sure?", message, QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes;
+bool showQuestionPopUp(QWidget * parent, QString message, QMessageBox::StandardButton standardButton){
+    return QMessageBox::question (parent, "Are you sure?", message, QMessageBox::Yes | QMessageBox::No, standardButton)==QMessageBox::Yes;
 }
 
@@ -162 +162 @@
             }
         } else {
-            qDebug("Unhandled item" + info.filePath().toAscii() + "in cpDir");
+            qDebug("Unhandled item" + info.filePath().toUtf8() + "in cpDir");
         }
     }

Vago/trunk/Vago/util.h

@@ -13 +13 @@
 
 namespace GlobalVars{
-const QString AppVersion="0.9";
+const QString AppVersion="0.9a";
 const QString OniSplitString="OniSplit.exe";
 const QString XmlToolsString="xmlTools.exe";
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 const QString OniExe="Oni.exe";
 const QString OniSplitExeName=OniSplitString;
@@ -28 +28 @@
 
 const QString AppLogName="logVago.txt";
-const QString BuiltOniSplitVersion="0.9.94.0";
+const QString BuiltOniSplitVersion="0.9.96.0";
 const QString BuiltXmlToolsVersion="0.8d";
 const QString ModsDomain="mods.oni2.net";
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 const QString VagoNode = "247";
 #else
@@ -59 +59 @@
 QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive);
 int indexOfBackward(QString myString, QString toSearch, int from = -1);
-bool showQuestionPopUp(QWidget * parent, QString message);
+bool showQuestionPopUp(QWidget * parent, QString message, QMessageBox::StandardButton standardButton=QMessageBox::NoButton);
 bool checkEmptySpaces(QStringList toCheck);
 bool checkIfIntegers(QStringList toCheck);