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.
Revision 1058 by s10k, Sun Oct 30 14:42:39 2016 UTC

#	Line 7 | Line 7
7		#include "about.h"
8		#include "packagewizard.h"
9		#include "soundwizard.h"
10	+	#include "bgimagewizard.h"
11		#include "converter.h"
12		#include "droptablewidget.h"
13	+	#include "xmltoolsinterface.h"
14
15		#include <QMainWindow>
16		#include <QMessageBox>
#	Line 34 | Line 36
36		#endif
37
38		#include "libs/pugixml/pugixml.hpp"
37	–	//#include <QDebug>
39
40		namespace Ui {
41		class MainWindow;
#	Line 53 | Line 54 | protected:
54		void closeEvent(QCloseEvent *event);
55
56		private slots:
57	+	void applicationWasLoaded();
58	+
59		void on_actionExit_triggered();
60
61		void on_actionAbout_triggered();
#	Line 191 | Line 194 | private slots:
194
195		void on_actionProject5_triggered();
196
197	+	void on_actionBackground_Image_Wizard_triggered();
198	+
199	+	void on_actionNew_Project_triggered();
200	+
201	+	void on_tbXmlToolsInterface_clicked();
202	+
203		private:
204		Ui::MainWindow *ui;
205		Logger *myLogger;
#	Line 207 | 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
220	<	Converter *myConverter;
219	>	QStringList listToProccess; //items to proccess
220	>	Converter *myConverter = nullptr;
221		QSettings *vagoSettings;
222		static const QString VagoSettingsName;
223		static constexpr int recentProjectsMaxSize=5;
#	Line 218 | Line 227 | private:
227		QWinTaskbarProgress *win7TaskBarProgress;
228		QWinTaskbarButton *win7TaskBarButton;
229		#endif
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};
#	Line 246 | Line 261 | private:
261		void addNewRecentProject(const QString &filePath);
262		void reloadRecentProjectsMenu();
263		void showEvent(QShowEvent *e);
264	+	void rowsWereChangedInDropTableWidget();
265		QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
266		QString fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
267		QString fileParsingTextures(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
#	Line 263 | Line 279 | private:
279		DropTableWidget *getCurrentTableWidget();
280		DropTableWidget* getTableWidgetByTabName(const QString &tabName);
281		QList<DropTableWidget*> getAllTableWidgets();
282	+	QMessageBox::StandardButton askToSaveCurrentProject();
283
284		signals:
285		void terminateCurrProcess();
286	+	void signalAppIsLoaded();
287		};
288
289		#endif // MAINWINDOW_H

Diff Legend

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