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 811 by s10k, Sat Apr 13 12:15:20 2013 UTC vs.
Revision 897 by s10k, Wed Jan 8 11:32:55 2014 UTC

#	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	–
139		void on_tabWidget_selected(const QString &arg1);
140
141		void checkVagoLastVersion(QNetworkReply *result); //check vago last version
#	Line 158 | Line 152 | private slots:
152
153		void on_actionView_log_triggered();
154
155	<	void on_cbToModels_currentIndexChanged(const QString &arg1);
155	>	void on_actionAE_Package_Creator_triggered();
156
157	<	void on_cbWithAnimation_toggled(bool checked);
157	>	void on_cbFromCharacters_currentIndexChanged(const QString &arg1);
158
159	<	void on_actionAE_Package_Creator_triggered();
159	>	void on_pbConvertCharacters_clicked();
160	>
161	>	void on_pbAddSourceCharacters_clicked();
162
163	<	void on_cbFromAnimations_currentIndexChanged(const QString &arg1);
163	>	void on_pbRemoveSourceCharacters_clicked();
164
165	<	void on_cbCamera_toggled(bool checked);
165	>	void on_pbClearSourcesCharacters_clicked();
166
167	<	void on_cbGeometry_toggled(bool checked);
167	>	void on_actionSound_Wizard_triggered();
168
169	<	void on_pbConvertAnimations_clicked();
169	>	void on_actionCheck_xmlTools_version_triggered();
170
171	<	void on_pbAddSourceAnimations_clicked();
171	>	void on_actionOpen_AE_folder_triggered();
172
173	<	void on_pbRemoveSourceAnimations_clicked();
173	>	void on_cbWithTRBS_ONCC_toggled(bool checked);
174
175	<	void on_pbClearSourcesAnimations_clicked();
175	>	void on_cbWithAnimation_toggled(bool checked);
176
177	<	void on_actionSound_Wizard_triggered();
177	>	void on_cbFromXML_currentIndexChanged(const QString &arg1);
178
179	<	void on_actionCheck_xmlTools_version_triggered();
179	>	void on_cbSpecificFilesLevels_toggled(bool checked);
180	>
181	>	void on_tbAbortConversion_clicked();
182
183		private:
184		Ui::MainWindow *ui;
#	Line 190 | Line 188 | private:
188		QString workspaceWizardsLocation; //Workspace wizard location
189		QString outputFolder; //Output folder
190		QString AeLocation; //Workspace location
191	+	int startedWindowWidth;
192	+	int startedWindowHeight;
193		QLabel *itemsLoaded;
194		QProgressBar *myBar; //Progress Bar
195		QHash<QString, QString> commandMap; //Map the commands for fast retreive
#	Line 205 | Line 205 | private:
205		void addRowTable(DropTableWidget *myTable,QString file, QString fromTo, QString command);
206		void clearTableContents(DropTableWidget *myTable);
207		void removeTableContents(DropTableWidget *myTable);
208	<	void updateComboBox(const QString &arg1, QComboBox *comboBox, const QString &identifier);
208	>	void updateComboBox(const QString &arg1, QComboBox *comboBox);
209		void startConversion(DropTableWidget *myTable);
210		void updateItemsLoaded(DropTableWidget *currentTable);
211		void changeToCurrentSettings(QList<int> rows, DropTableWidget* myTable); //change some rows to the current settings
212		void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
213		void setConverterButtonsSize();
214		QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
215	<	QString fileParsingGeneral(QString myOutputFolder, QString from, QString to , QString file);
216	<	QString fileParsingTextures(QString myOutputFolder, QString from, QString to , QString file);
217	<	QString fileParsingModels(QString myOutputFolder, QString from, QString to , QString file);
218	<	QString fileParsingAnimations(QString myOutputFolder, QString from, QString to , QString file);
219	<	QString fileParsingLevels(QString myOutputFolder, QString from, QString to , QString file);
215	>	QString fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
216	>	QString fileParsingTextures(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
217	>	QString fileParsingObjects(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
218	>	QString fileParsingCharacters(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
219	>	QString fileParsingLevels(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
220		QString fileParsingMisc(QString myOutputFolder, QString from, QString to , QString file);
221		QString getCommand(DropTableWidget* myTable, QString myOutputFolder, QString from, QString to , QString file);
222		QString getTypeConversion(DropTableWidget *myTable); //get the current type for a table
223		QString getOSIndependentAppPath();
224	+
225	+	signals:
226	+	void terminateCurrProcess();
227		};
228
229		#endif // MAINWINDOW_H

Diff Legend

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