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 1047 by s10k, Fri Sep 16 22:51:26 2016 UTC vs.
s10k/Vago/mainwindow.h (file contents), Revision 1093 by s10k, Sat Dec 30 13:57:32 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	>	#include "xmlParsers/projectfilevago.h"
16
17		#include <QMainWindow>
18		#include <QMessageBox>
#	Line 28 | Line 32
32		#include <QCloseEvent>
33		#include <QScriptEngine>
34		#include <QScriptValueIterator>
35	+	#include <droptablewidget.h>
36	+	#include <pugixml/pugixml.hpp>
37	+	#ifdef Q_OS_WIN
38		#include <QWinTaskbarProgress>
39		#include <QWinTaskbarButton>
40	<
34	<	#include "libs/pugixml/pugixml.hpp"
35	<	//#include <QDebug>
40	>	#endif
41
42		namespace Ui {
43		class MainWindow;
#	Line 51 | Line 56 | protected:
56		void closeEvent(QCloseEvent *event);
57
58		private slots:
59	+	void applicationWasLoaded();
60	+
61		void on_actionExit_triggered();
62
63		void on_actionAbout_triggered();
#	Line 163 | Line 170 | private slots:
170
171		void on_cbWithTRBS_ONCC_toggled(bool checked);
172
166	–	void on_cbWithAnimation_toggled(bool checked);
167	–
173		void on_cbFromXML_currentIndexChanged(const QString &arg1);
174
175		void on_cbSpecificFilesLevels_toggled(bool checked);
#	Line 189 | 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	+	void on_actionWindow_Messages_Wizard_triggered();
204	+
205	+	void on_cbWithAnimation_toggled(bool checked);
206	+
207		private:
208		Ui::MainWindow *ui;
194	–	Logger *myLogger;
209		QString workspaceLocation; //Workspace location
210		QString workspaceWizardsLocation; //Workspace wizard location
211		QString outputFolder; //Output folder
#	Line 205 | 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 216 | 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};
242
243	+	private:
244		void connectSlots();
224	–	void showErrStatusMessage(QString message);
225	–	void showSuccessStatusMessage(QString message);
245		void mapCommands();
246		void addRowTable(DropTableWidget *myTable, QString file, QString fromTo, QString command, bool isToDisabled=false);
247		void clearTableContents(DropTableWidget *myTable);
#	Line 235 | Line 254 | private:
254		void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
255		void setConverterButtonsSize();
256		void saveProjectState(const QString &filePath);
238	–	void saveProjectWidget(pugi::xml_node &rootNode, DropTableWidget* table);
257		void loadProjectState(const QString &filePath);
258		void setVagoWindowTitle();
241	–	void loadProjectWidget(pugi::xml_document &doc, DropTableWidget* table);
259		void saveRecentProjects();
260		void loadRecentProjects();
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 261 | Line 279 | private:
279		DropTableWidget *getCurrentTableWidget();
280		DropTableWidget* getTableWidgetByTabName(const QString &tabName);
281		QList<DropTableWidget*> getAllTableWidgets();
282	+	QMessageBox::StandardButton askToSaveCurrentProject();
283	+	ProjectFileVago::ProjectData fetchCurrentProjectData();
284
285		signals:
286		void terminateCurrProcess();
287	+	void signalAppIsLoaded();
288		};
289
290		#endif // MAINWINDOW_H

Diff Legend

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