ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/Vago/mainwindow.h
(Generate patch)

Comparing Vago/trunk/Vago/mainwindow.h (file contents):
Revision 1054 by s10k, Wed Oct 12 21:35:13 2016 UTC vs.
Revision 1061 by s10k, Fri Dec 9 19:04:18 2016 UTC

# Line 8 | Line 8
8   #include "packagewizard.h"
9   #include "soundwizard.h"
10   #include "bgimagewizard.h"
11 + #include "wmwizard.h"
12   #include "converter.h"
13 < #include "droptablewidget.h"
13 > #include "xmltoolsinterface.h"
14 > #include "wizardfactory.h"
15  
16   #include <QMainWindow>
17   #include <QMessageBox>
# Line 29 | Line 31
31   #include <QCloseEvent>
32   #include <QScriptEngine>
33   #include <QScriptValueIterator>
34 + #include <droptablewidget.h>
35 + #include <pugixml.hpp>
36   #ifdef Q_OS_WIN
37   #include <QWinTaskbarProgress>
38   #include <QWinTaskbarButton>
39   #endif
40  
37 – #include "libs/pugixml/pugixml.hpp"
38 – //#include <QDebug>
39 –
41   namespace Ui {
42   class MainWindow;
43   }
# Line 198 | Line 199 | private slots:
199  
200      void on_actionNew_Project_triggered();
201  
202 +    void on_tbXmlToolsInterface_clicked();
203 +
204 +    void on_actionWindow_Messages_Wizard_triggered();
205 +
206   private:
207      Ui::MainWindow *ui;
208      Logger *myLogger;
# Line 214 | Line 219 | private:
219      QLabel *itemsLoaded;
220      QProgressBar *myBar; //Progress Bar
221      QHash<QString, QString> commandMap; //Map the commands for fast retreive
222 <    QStringList *listToProccess; //items to proccess
222 >    QStringList listToProccess; //items to proccess
223      Converter *myConverter = nullptr;
224      QSettings *vagoSettings;
225      static const QString VagoSettingsName;
# Line 228 | Line 233 | private:
233      bool unsavedChangesExist = false;
234      // Indicates that the application is fully loaded which includes painting the main window
235      bool applicationIsFullyLoaded = false;
236 +    // This variable indicates that we have a project being loaded. It should only be set by MainWindow thread.
237 +    // It allow us to ignore certain gui slots like when checking checkbox that ask the user for input
238 +    bool projectIsLoading = false;
239  
240      // anonymous enum
241      enum {XMLTabIndex, TexturesTabIndex, CharactersTabIndex, ObjectsTabIndex, LevelsTabIndex, MiscTabIndex};

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)