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 1058 by s10k, Sun Oct 30 14:42:39 2016 UTC vs.
s10k/Vago/mainwindow.h (file contents), Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 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"
12	–	#include "droptablewidget.h"
13		#include "xmltoolsinterface.h"
14	+	#include "wizardfactory.h"
15	+	#include "xmlParsers/projectfilevago.h"
16
17		#include <QMainWindow>
18		#include <QMessageBox>
#	Line 30 | 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		#endif
41
38	–	#include "libs/pugixml/pugixml.hpp"
39	–
42		namespace Ui {
43		class MainWindow;
44		}
#	Line 168 | Line 170 | private slots:
170
171		void on_cbWithTRBS_ONCC_toggled(bool checked);
172
171	–	void on_cbWithAnimation_toggled(bool checked);
172	–
173		void on_cbFromXML_currentIndexChanged(const QString &arg1);
174
175		void on_cbSpecificFilesLevels_toggled(bool checked);
#	Line 200 | Line 200 | private slots:
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;
205	–	Logger *myLogger;
209		QString workspaceLocation; //Workspace location
210		QString workspaceWizardsLocation; //Workspace wizard location
211		QString outputFolder; //Output folder
#	Line 237 | Line 240 | private:
240		// anonymous enum
241		enum {XMLTabIndex, TexturesTabIndex, CharactersTabIndex, ObjectsTabIndex, LevelsTabIndex, MiscTabIndex};
242
243	+	private:
244		void connectSlots();
241	–	void showErrStatusMessage(QString message);
242	–	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 252 | Line 254 | private:
254		void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
255		void setConverterButtonsSize();
256		void saveProjectState(const QString &filePath);
255	–	void saveProjectWidget(pugi::xml_node &rootNode, DropTableWidget* table);
257		void loadProjectState(const QString &filePath);
258		void setVagoWindowTitle();
258	–	void loadProjectWidget(pugi::xml_document &doc, DropTableWidget* table);
259		void saveRecentProjects();
260		void loadRecentProjects();
261		void addNewRecentProject(const QString &filePath);
#	Line 280 | Line 280 | private:
280		DropTableWidget* getTableWidgetByTabName(const QString &tabName);
281		QList<DropTableWidget*> getAllTableWidgets();
282		QMessageBox::StandardButton askToSaveCurrentProject();
283	+	ProjectFileVago::ProjectData fetchCurrentProjectData();
284
285		signals:
286		void terminateCurrProcess();

Diff Legend

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