ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/mainwindow.cpp

Comparing Vago/trunk/Vago/mainwindow.cpp (file contents):
Revision 1058 by s10k, Sun Oct 30 14:42:39 2016 UTC vs.
Revision 1061 by s10k, Fri Dec 9 19:04:18 2016 UTC

#	Line 241 | Line 241 | void MainWindow::on_actionAbout_triggere
241
242		void MainWindow::on_actionAE_Package_Creator_triggered()
243		{
244	<	PackageWizard myWizard = PackageWizard(this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
245	<	myWizard.exec();
244	>	// it deletes itself once closed
245	>	WizardFactory<PackageWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
246		}
247
248		void MainWindow::on_actionSound_Wizard_triggered()
249		{
250	<	SoundWizard myWizard (UtilVago::getAppPath(), this->workspaceWizardsLocation, this->myLogger, &this->commandMap);
251	<	myWizard.exec();
250	>	// it deletes itself once closed
251	>	WizardFactory<SoundWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger, &this->commandMap);
252		}
253
254		void MainWindow::on_actionBackground_Image_Wizard_triggered()
255		{
256	<	BGImageWizard myWizard (UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
257	<	myWizard.exec();
256	>	// it deletes itself once closed
257	>	WizardFactory<BGImageWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
258	>	}
259	>
260	>	void MainWindow::on_actionWindow_Messages_Wizard_triggered()
261	>	{
262	>	// it deletes itself once closed
263	>	WizardFactory<WmWizard>::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
264		}
265
266		void MainWindow::on_tbOni_clicked()
#	Line 556 | Line 562 | QString MainWindow::fileParsingObjects(Q
562
563		QString command=this->commandMap.value(tabTitle+"->"+from+"->"+to)+" "+myOutputFolder;
564
559	–	//TODO: This can be optimized. When some are not enable others are.
565		if(ui->cbTexture->isChecked()){
566		if(ui->leTextureName->text().isEmpty()){
567		showErrStatusMessage("Checkbox '"+ui->cbTexture->text()+"' is selected. The file source cannot be empty.");
#	Line 978 | Line 983 | void MainWindow::updateComboBox(const QS
983		ui->cbCellShading->setChecked(false);
984		ui->cbNormals->setEnabled(false);
985		ui->cbNormals->setChecked(false);
986	<
986	>	//#error add drag and drop to Extract TRAM with TRBS/ONCC
987		if(QString::compare(arg1,"TRAM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
988		ui->cbWithTRBS_ONCC->setEnabled(true);
989		}

Diff Legend

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