ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/mainwindow.h

Comparing Vago/trunk/Vago/mainwindow.h (file contents):
Revision 1054 by s10k, Wed Oct 12 21:35:13 2016 UTC vs.
Revision 1058 by s10k, Sun Oct 30 14:42:39 2016 UTC

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

Diff Legend

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