--- Vago/trunk/Vago/mainwindow.h 2016/10/12 21:35:13 1054 +++ s10k/Vago/mainwindow.h 2017/12/30 13:43:28 1092 @@ -8,8 +8,10 @@ #include "packagewizard.h" #include "soundwizard.h" #include "bgimagewizard.h" +#include "wmwizard.h" #include "converter.h" -#include "droptablewidget.h" +#include "xmltoolsinterface.h" +#include "wizardfactory.h" #include #include @@ -29,14 +31,13 @@ #include #include #include +#include +#include #ifdef Q_OS_WIN #include #include #endif -#include "libs/pugixml/pugixml.hpp" -//#include - namespace Ui { class MainWindow; } @@ -198,6 +199,10 @@ private slots: void on_actionNew_Project_triggered(); + void on_tbXmlToolsInterface_clicked(); + + void on_actionWindow_Messages_Wizard_triggered(); + private: Ui::MainWindow *ui; Logger *myLogger; @@ -214,7 +219,7 @@ private: QLabel *itemsLoaded; QProgressBar *myBar; //Progress Bar QHash commandMap; //Map the commands for fast retreive - QStringList *listToProccess; //items to proccess + QStringList listToProccess; //items to proccess Converter *myConverter = nullptr; QSettings *vagoSettings; static const QString VagoSettingsName; @@ -228,6 +233,9 @@ private: bool unsavedChangesExist = false; // 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 enum {XMLTabIndex, TexturesTabIndex, CharactersTabIndex, ObjectsTabIndex, LevelsTabIndex, MiscTabIndex};