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 771 by s10k, Sun Mar 31 19:02:16 2013 UTC vs.
Revision 999 by s10k, Sat Apr 26 12:40:47 2014 UTC

#	Line 7 | Line 7
7		#include "about.h"
8		#include "packagewizard.h"
9		#include "soundwizard.h"
10	+	#include "converter.h"
11	+	#include "droptablewidget.h"
12
13		#include <QMainWindow>
14		#include <QSettings>
#	Line 19 | Line 21
21		#include <QDesktopServices>
22		#include <QErrorMessage>
23		#include <QTextCodec>
22	–	#include <converter.h>
24		#include <QProgressBar>
24	–	#include <droptablewidget.h>
25		#include <QComboBox>
26		#include <QtNetwork/QNetworkAccessManager>
27		#include <QtNetwork/QNetworkRequest>
28		#include <QtNetwork/QNetworkReply>
29	–	#include <QDebug>
29		#include <QCloseEvent>
30		#include <QScriptEngine>
31		#include <QScriptValueIterator>
32	+	//#include <QDebug>
33
34		namespace Ui {
35		class MainWindow;
#	Line 45 | Line 45 | public:
45		~MainWindow();
46
47		protected:
48	<	void closeEvent(QCloseEvent *event);
48	>	void closeEvent(QCloseEvent *event);
49
50		private slots:
51		void on_actionExit_triggered();
#	Line 64 | Line 64 | private slots:
64
65		void on_actionCheck_For_Updates_triggered();
66
67	<	void on_pbAddSourceGeneral_clicked();
67	>	void on_pbAddSourceXML_clicked();
68
69	<	void on_pbConvertGeneral_clicked();
69	>	void on_pbConvertXML_clicked();
70
71		void TsetupProgressBar(int max);
72
#	Line 74 | Line 74 | private slots:
74
75		void TresultConversion(QString result, int numErrors);
76
77	<	void on_cbFromGeneral_currentIndexChanged(const QString &arg1);
77	>	void TconversionAborted();
78
79		void on_actionWindows_triggered();
80
81		void on_actionMac_Windows_demo_triggered();
82
83	<	void on_pbClearSourcesGeneral_clicked();
83	>	void on_pbClearSourcesXML_clicked();
84
85	<	void on_pbRemoveSourceGeneral_clicked();
85	>	void on_pbRemoveSourceXML_clicked();
86
87		void on_pbAddSourceTextures_clicked();
88
#	Line 92 | Line 92 | private slots:
92
93		void on_cbFromTextures_currentIndexChanged(const QString &arg1);
94
95	<	void on_cbFromModels_currentIndexChanged(const QString &arg1);
95	>	void on_cbFromObjects_currentIndexChanged(const QString &arg1);
96
97		void on_cbFromLevels_currentIndexChanged(const QString &arg1);
98
99		void on_cbFromMisc_currentIndexChanged(const QString &arg1);
100
101	<	void on_pbAddSourceModels_clicked();
101	>	void on_pbAddSourceObjects_clicked();
102
103		void on_pbAddSourceLevels_clicked();
104
#	Line 106 | Line 106 | private slots:
106
107		void on_pbConvertTextures_clicked();
108
109	<	void on_pbConvertModels_clicked();
109	>	void on_pbConvertObjects_clicked();
110
111		void on_pbConvertLevels_clicked();
112
113		void on_pbConvertMisc_clicked();
114
115	<	void on_pbRemoveSourceModels_clicked();
115	>	void on_pbRemoveSourceObjects_clicked();
116
117		void on_pbRemoveSourceLevels_clicked();
118
119		void on_pbRemoveSourceMisc_clicked();
120
121	<	void on_pbClearSourcesModels_clicked();
121	>	void on_pbClearSourcesObjects_clicked();
122
123		void on_pbClearSourcesLevels_clicked();
124
#	Line 126 | Line 126 | private slots:
126
127		void on_actionPreferences_triggered();
128
129	–	void on_cbToGeneral_currentIndexChanged(const QString &arg1);
130	–
129		void on_cbToLevels_currentIndexChanged(const QString &arg1);
130
133	–	void on_cbDatGeneral_toggled(bool checked);
134	–
131		void on_cbDatLevels_toggled(bool checked);
132
133		void on_actionCheck_OniSplit_version_triggered();
#	Line 140 | Line 136 | private slots:
136
137		void dtContextMenu(DropTableWidget* myTable, QContextMenuEvent *event); //Context menu options for table widgets
138
143	–	void on_cbTRAMGeneral_toggled(bool checked);
144	–
145	–	void on_tabWidget_selected(const QString &arg1);
146	–
139		void checkVagoLastVersion(QNetworkReply *result); //check vago last version
140
141		void on_cbBnvLevels_toggled(bool checked);
#	Line 158 | Line 150 | private slots:
150
151		void on_actionView_log_triggered();
152
153	<	void on_cbToModels_currentIndexChanged(const QString &arg1);
153	>	void on_actionAE_Package_Creator_triggered();
154
155	<	void on_cbWithAnimation_toggled(bool checked);
155	>	void on_cbFromCharacters_currentIndexChanged(const QString &arg1);
156
157	<	void on_actionAE_Package_Creator_triggered();
157	>	void on_pbConvertCharacters_clicked();
158	>
159	>	void on_pbAddSourceCharacters_clicked();
160
161	<	void on_cbFromAnimations_currentIndexChanged(const QString &arg1);
161	>	void on_pbRemoveSourceCharacters_clicked();
162
163	<	void on_cbCamera_toggled(bool checked);
163	>	void on_pbClearSourcesCharacters_clicked();
164
165	<	void on_cbGeometry_toggled(bool checked);
165	>	void on_actionSound_Wizard_triggered();
166
167	<	void on_pbConvertAnimations_clicked();
167	>	void on_actionCheck_xmlTools_version_triggered();
168
169	<	void on_pbAddSourceAnimations_clicked();
169	>	void on_actionOpen_AE_folder_triggered();
170
171	<	void on_pbRemoveSourceAnimations_clicked();
171	>	void on_cbWithTRBS_ONCC_toggled(bool checked);
172
173	<	void on_pbClearSourcesAnimations_clicked();
173	>	void on_cbWithAnimation_toggled(bool checked);
174
175	<	void on_actionSound_Wizard_triggered();
175	>	void on_cbFromXML_currentIndexChanged(const QString &arg1);
176
177	<	void on_actionCheck_xmlTools_version_triggered();
177	>	void on_cbSpecificFilesLevels_toggled(bool checked);
178	>
179	>	void on_tbAbortConversion_clicked();
180	>
181	>	void on_tabWidget_currentChanged(int index);
182
183		private:
184		Ui::MainWindow *ui;
185		Logger *myLogger;
186	+	QString AppDir;
187		QString workspaceLocation; //Workspace location
188		QString workspaceWizardsLocation; //Workspace wizard location
189		QString outputFolder; //Output folder
190		QString AeLocation; //Workspace location
191	+	int startedWindowWidth;
192	+	int startedWindowHeight;
193	+	#ifdef Q_OS_MAC
194	+	bool useYesAsDefaultWhenRemovingItems;
195	+	#endif
196		QLabel *itemsLoaded;
197		QProgressBar *myBar; //Progress Bar
198		QHash<QString, QString> commandMap; //Map the commands for fast retreive
#	Line 204 | Line 208 | private:
208		void addRowTable(DropTableWidget *myTable,QString file, QString fromTo, QString command);
209		void clearTableContents(DropTableWidget *myTable);
210		void removeTableContents(DropTableWidget *myTable);
211	<	void updateComboBox(const QString &arg1, QComboBox *comboBox, const QString &identifier);
211	>	void updateComboBox(const QString &arg1, QComboBox *comboBox);
212		void startConversion(DropTableWidget *myTable);
213		void updateItemsLoaded(DropTableWidget *currentTable);
214		void changeToCurrentSettings(QList<int> rows, DropTableWidget* myTable); //change some rows to the current settings
215		void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
216	+	void setConverterButtonsSize();
217		QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
218	<	QString fileParsingGeneral(QString myOutputFolder, QString from, QString to , QString file);
219	<	QString fileParsingTextures(QString myOutputFolder, QString from, QString to , QString file);
220	<	QString fileParsingModels(QString myOutputFolder, QString from, QString to , QString file);
221	<	QString fileParsingAnimations(QString myOutputFolder, QString from, QString to , QString file);
222	<	QString fileParsingLevels(QString myOutputFolder, QString from, QString to , QString file);
218	>	QString fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
219	>	QString fileParsingTextures(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
220	>	QString fileParsingObjects(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
221	>	QString fileParsingCharacters(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
222	>	QString fileParsingLevels(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
223		QString fileParsingMisc(QString myOutputFolder, QString from, QString to , QString file);
224		QString getCommand(DropTableWidget* myTable, QString myOutputFolder, QString from, QString to , QString file);
225		QString getTypeConversion(DropTableWidget *myTable); //get the current type for a table
226	+	QString getOSIndependentAppPath();
227	+
228	+	signals:
229	+	void terminateCurrProcess();
230		};
231
232		#endif // MAINWINDOW_H

Diff Legend

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