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 1052 by s10k, Sat Sep 17 13:32:34 2016 UTC vs.
s10k/Vago/mainwindow.h (file contents), Revision 1092 by s10k, Sat Dec 30 13:43:28 2017 UTC

#	Line 7 | Line 7
7		#include "about.h"
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 28 | 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
36	–	#include "libs/pugixml/pugixml.hpp"
37	–	//#include <QDebug>
38	–
41		namespace Ui {
42		class MainWindow;
43		}
#	Line 53 | Line 55 | protected:
55		void closeEvent(QCloseEvent *event);
56
57		private slots:
58	+	void applicationWasLoaded();
59	+
60		void on_actionExit_triggered();
61
62		void on_actionAbout_triggered();
#	Line 191 | Line 195 | private slots:
195
196		void on_actionProject5_triggered();
197
198	+	void on_actionBackground_Image_Wizard_triggered();
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 207 | 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
223	<	Converter *myConverter;
222	>	QStringList listToProccess; //items to proccess
223	>	Converter *myConverter = nullptr;
224		QSettings *vagoSettings;
225		static const QString VagoSettingsName;
226		static constexpr int recentProjectsMaxSize=5;
#	Line 218 | Line 230 | private:
230		QWinTaskbarProgress *win7TaskBarProgress;
231		QWinTaskbarButton *win7TaskBarButton;
232		#endif
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};
#	Line 246 | Line 264 | private:
264		void addNewRecentProject(const QString &filePath);
265		void reloadRecentProjectsMenu();
266		void showEvent(QShowEvent *e);
267	+	void rowsWereChangedInDropTableWidget();
268		QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
269		QString fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
270		QString fileParsingTextures(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
#	Line 263 | Line 282 | private:
282		DropTableWidget *getCurrentTableWidget();
283		DropTableWidget* getTableWidgetByTabName(const QString &tabName);
284		QList<DropTableWidget*> getAllTableWidgets();
285	+	QMessageBox::StandardButton askToSaveCurrentProject();
286
287		signals:
288		void terminateCurrProcess();
289	+	void signalAppIsLoaded();
290		};
291
292		#endif // MAINWINDOW_H

Diff Legend

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