--- s10k/Vago/mainwindow.h	2017/12/30 13:43:28	1092
+++ s10k/Vago/mainwindow.h	2017/12/30 13:57:32	1093
@@ -12,6 +12,7 @@
 #include "converter.h"
 #include "xmltoolsinterface.h"
 #include "wizardfactory.h"
+#include "xmlParsers/projectfilevago.h"
 
 #include <QMainWindow>
 #include <QMessageBox>
@@ -32,7 +33,7 @@
 #include <QScriptEngine>
 #include <QScriptValueIterator>
 #include <droptablewidget.h>
-#include <pugixml.hpp>
+#include <pugixml/pugixml.hpp>
 #ifdef Q_OS_WIN
 #include <QWinTaskbarProgress>
 #include <QWinTaskbarButton>
@@ -169,8 +170,6 @@ private slots:
 
     void on_cbWithTRBS_ONCC_toggled(bool checked);
 
-    void on_cbWithAnimation_toggled(bool checked);
-
     void on_cbFromXML_currentIndexChanged(const QString &arg1);
 
     void on_cbSpecificFilesLevels_toggled(bool checked);
@@ -203,9 +202,10 @@ private slots:
 
     void on_actionWindow_Messages_Wizard_triggered();
 
+    void on_cbWithAnimation_toggled(bool checked);
+
 private:
     Ui::MainWindow *ui;
-    Logger *myLogger;
     QString workspaceLocation; //Workspace location
     QString workspaceWizardsLocation; //Workspace wizard location
     QString outputFolder; //Output folder
@@ -240,9 +240,8 @@ private:
     // anonymous enum
     enum {XMLTabIndex, TexturesTabIndex, CharactersTabIndex, ObjectsTabIndex, LevelsTabIndex, MiscTabIndex};
 
+private:
     void connectSlots();
-    void showErrStatusMessage(QString message);
-    void showSuccessStatusMessage(QString message);
     void mapCommands();
     void addRowTable(DropTableWidget *myTable, QString file, QString fromTo, QString command, bool isToDisabled=false);
     void clearTableContents(DropTableWidget *myTable);
@@ -255,10 +254,8 @@ private:
     void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
     void setConverterButtonsSize();
     void saveProjectState(const QString &filePath);
-    void saveProjectWidget(pugi::xml_node &rootNode, DropTableWidget* table);
     void loadProjectState(const QString &filePath);
     void setVagoWindowTitle();
-    void loadProjectWidget(pugi::xml_document &doc, DropTableWidget* table);
     void saveRecentProjects();
     void loadRecentProjects();
     void addNewRecentProject(const QString &filePath);
@@ -283,6 +280,7 @@ private:
     DropTableWidget* getTableWidgetByTabName(const QString &tabName);
     QList<DropTableWidget*> getAllTableWidgets();
     QMessageBox::StandardButton askToSaveCurrentProject();
+    ProjectFileVago::ProjectData fetchCurrentProjectData();
 
 signals:
     void terminateCurrProcess();