--- Vago/trunk/Vago/mainwindow.h	2013/04/07 15:36:17	801
+++ Vago/trunk/Vago/mainwindow.h	2014/04/26 12:40:47	999
@@ -7,6 +7,8 @@
 #include "about.h"
 #include "packagewizard.h"
 #include "soundwizard.h"
+#include "converter.h"
+#include "droptablewidget.h"
 
 #include <QMainWindow>
 #include <QSettings>
@@ -19,17 +21,15 @@
 #include <QDesktopServices>
 #include <QErrorMessage>
 #include <QTextCodec>
-#include <converter.h>
 #include <QProgressBar>
-#include <droptablewidget.h>
 #include <QComboBox>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
-#include <QDebug>
 #include <QCloseEvent>
 #include <QScriptEngine>
 #include <QScriptValueIterator>
+//#include <QDebug>
 
 namespace Ui {
 class MainWindow;
@@ -64,9 +64,9 @@ private slots:
 
     void on_actionCheck_For_Updates_triggered();
 
-    void on_pbAddSourceGeneral_clicked();
+    void on_pbAddSourceXML_clicked();
 
-    void on_pbConvertGeneral_clicked();
+    void on_pbConvertXML_clicked();
 
     void TsetupProgressBar(int max);
 
@@ -74,15 +74,15 @@ private slots:
 
     void TresultConversion(QString result, int numErrors);
 
-    void on_cbFromGeneral_currentIndexChanged(const QString &arg1);
+    void TconversionAborted();
 
     void on_actionWindows_triggered();
 
     void on_actionMac_Windows_demo_triggered();
 
-    void on_pbClearSourcesGeneral_clicked();
+    void on_pbClearSourcesXML_clicked();
 
-    void on_pbRemoveSourceGeneral_clicked();
+    void on_pbRemoveSourceXML_clicked();
 
     void on_pbAddSourceTextures_clicked();
 
@@ -92,13 +92,13 @@ private slots:
 
     void on_cbFromTextures_currentIndexChanged(const QString &arg1);
 
-    void on_cbFromModels_currentIndexChanged(const QString &arg1);
+    void on_cbFromObjects_currentIndexChanged(const QString &arg1);
 
     void on_cbFromLevels_currentIndexChanged(const QString &arg1);
 
     void on_cbFromMisc_currentIndexChanged(const QString &arg1);
 
-    void on_pbAddSourceModels_clicked();
+    void on_pbAddSourceObjects_clicked();
 
     void on_pbAddSourceLevels_clicked();
 
@@ -106,19 +106,19 @@ private slots:
 
     void on_pbConvertTextures_clicked();
 
-    void on_pbConvertModels_clicked();
+    void on_pbConvertObjects_clicked();
 
     void on_pbConvertLevels_clicked();
 
     void on_pbConvertMisc_clicked();
 
-    void on_pbRemoveSourceModels_clicked();
+    void on_pbRemoveSourceObjects_clicked();
 
     void on_pbRemoveSourceLevels_clicked();
 
     void on_pbRemoveSourceMisc_clicked();
 
-    void on_pbClearSourcesModels_clicked();
+    void on_pbClearSourcesObjects_clicked();
 
     void on_pbClearSourcesLevels_clicked();
 
@@ -126,12 +126,8 @@ private slots:
 
     void on_actionPreferences_triggered();
 
-    void on_cbToGeneral_currentIndexChanged(const QString &arg1);
-
     void on_cbToLevels_currentIndexChanged(const QString &arg1);
 
-    void on_cbDatGeneral_toggled(bool checked);
-
     void on_cbDatLevels_toggled(bool checked);
 
     void on_actionCheck_OniSplit_version_triggered();
@@ -140,10 +136,6 @@ private slots:
 
     void dtContextMenu(DropTableWidget* myTable, QContextMenuEvent *event); //Context menu options for table widgets
 
-    void on_cbTRAMGeneral_toggled(bool checked);
-
-    void on_tabWidget_selected(const QString &arg1);
-
     void checkVagoLastVersion(QNetworkReply *result); //check vago last version
 
     void on_cbBnvLevels_toggled(bool checked);
@@ -158,29 +150,35 @@ private slots:
 
     void on_actionView_log_triggered();
 
-    void on_cbToModels_currentIndexChanged(const QString &arg1);
+    void on_actionAE_Package_Creator_triggered();
 
-    void on_cbWithAnimation_toggled(bool checked);
+    void on_cbFromCharacters_currentIndexChanged(const QString &arg1);
 
-    void on_actionAE_Package_Creator_triggered();
+    void on_pbConvertCharacters_clicked();
+
+    void on_pbAddSourceCharacters_clicked();
 
-    void on_cbFromAnimations_currentIndexChanged(const QString &arg1);
+    void on_pbRemoveSourceCharacters_clicked();
 
-    void on_cbCamera_toggled(bool checked);
+    void on_pbClearSourcesCharacters_clicked();
 
-    void on_cbGeometry_toggled(bool checked);
+    void on_actionSound_Wizard_triggered();
 
-    void on_pbConvertAnimations_clicked();
+    void on_actionCheck_xmlTools_version_triggered();
 
-    void on_pbAddSourceAnimations_clicked();
+    void on_actionOpen_AE_folder_triggered();
 
-    void on_pbRemoveSourceAnimations_clicked();
+    void on_cbWithTRBS_ONCC_toggled(bool checked);
 
-    void on_pbClearSourcesAnimations_clicked();
+    void on_cbWithAnimation_toggled(bool checked);
 
-    void on_actionSound_Wizard_triggered();
+    void on_cbFromXML_currentIndexChanged(const QString &arg1);
 
-    void on_actionCheck_xmlTools_version_triggered();
+    void on_cbSpecificFilesLevels_toggled(bool checked);
+
+    void on_tbAbortConversion_clicked();
+
+    void on_tabWidget_currentChanged(int index);
 
 private:
     Ui::MainWindow *ui;
@@ -190,6 +188,11 @@ private:
     QString workspaceWizardsLocation; //Workspace wizard location
     QString outputFolder; //Output folder
     QString AeLocation; //Workspace location
+    int startedWindowWidth;
+    int startedWindowHeight;
+#ifdef Q_OS_MAC
+    bool useYesAsDefaultWhenRemovingItems;
+#endif
     QLabel *itemsLoaded;
     QProgressBar *myBar; //Progress Bar
     QHash<QString, QString> commandMap; //Map the commands for fast retreive
@@ -205,22 +208,25 @@ private:
     void addRowTable(DropTableWidget *myTable,QString file, QString fromTo, QString command);
     void clearTableContents(DropTableWidget *myTable);
     void removeTableContents(DropTableWidget *myTable);
-    void updateComboBox(const QString &arg1, QComboBox *comboBox, const QString &identifier);
+    void updateComboBox(const QString &arg1, QComboBox *comboBox);
     void startConversion(DropTableWidget *myTable);
     void updateItemsLoaded(DropTableWidget *currentTable);
     void changeToCurrentSettings(QList<int> rows, DropTableWidget* myTable); //change some rows to the current settings
     void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
     void setConverterButtonsSize();
     QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
-    QString fileParsingGeneral(QString myOutputFolder, QString from, QString to , QString file);
-    QString fileParsingTextures(QString myOutputFolder, QString from, QString to , QString file);
-    QString fileParsingModels(QString myOutputFolder, QString from, QString to , QString file);
-    QString fileParsingAnimations(QString myOutputFolder, QString from, QString to , QString file);
-    QString fileParsingLevels(QString myOutputFolder, QString from, QString to , QString file);
+    QString fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+    QString fileParsingTextures(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+    QString fileParsingObjects(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+    QString fileParsingCharacters(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+    QString fileParsingLevels(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
     QString fileParsingMisc(QString myOutputFolder, QString from, QString to , QString file);
     QString getCommand(DropTableWidget* myTable, QString myOutputFolder, QString from, QString to , QString file);
     QString getTypeConversion(DropTableWidget *myTable); //get the current type for a table
     QString getOSIndependentAppPath();
+
+signals:
+    void terminateCurrProcess();
 };
 
 #endif // MAINWINDOW_H