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 801 by s10k, Sun Apr 7 15:36:17 2013 UTC vs.
Revision 815 by s10k, Sat Apr 13 13:44:29 2013 UTC

#	Line 11 | Line 11 | MainWindow::MainWindow(QWidget *parent)
11
12		this->AppDir=getOSIndependentAppPath();
13
14	+	this->myLogger = new Logger(this->AppDir); //start logger
15	+
16	+	this->myLogger->writeString("Detected AppDir: "+this->AppDir);
17	+	this->myLogger->writeString("True app dir: "+QDir::currentPath());
18	+
19		this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
20
21		if(!QFile::exists(this->AppDir+"/"+GlobalVars::OniSplitString)){
#	Line 90 | Line 95 | MainWindow::MainWindow(QWidget *parent)
95
96		ui->statusBar->addPermanentWidget(myBar); //this adds automatically in right
97
93	–	this->myLogger = new Logger(); //start logger
94	–
98		//Initialize list pointers
99		this->listToProccess = new QStringList;
100
101		//Create a thread for do the conversion in background
102	<	this->myConverter = new Converter(this->myLogger,this->listToProccess);
102	>	this->myConverter = new Converter(this->AppDir,this->myLogger,this->listToProccess);
103
104		// User interface
105		ui->mainToolBar->addWidget(ui->tbAE); //add ae installer launch button
#	Line 1132 | Line 1135 | void MainWindow::on_cbAdditionalSourcesL
1135		void MainWindow::on_actionCheck_OniSplit_version_triggered()
1136		{
1137		QProcess *myProcess = new QProcess();
1138	+	myProcess->setWorkingDirectory(this->AppDir);
1139		myProcess->start(GlobalVars::OniSplitExeName+" -version");
1140		myProcess->waitForFinished(-1);
1141		QString result=myProcess->readAllStandardOutput();
#	Line 1142 | Line 1146 | void MainWindow::on_actionCheck_OniSplit
1146		void MainWindow::on_actionCheck_xmlTools_version_triggered()
1147		{
1148		QProcess *myProcess = new QProcess();
1149	+	myProcess->setWorkingDirectory(this->AppDir);
1150		myProcess->start(GlobalVars::XmlToolsExeName+" version");
1151		myProcess->waitForFinished(-1);
1152		QString result=myProcess->readLine();
#	Line 1510 | Line 1515 | QString MainWindow::getOSIndependentAppP
1515		if(dir.absolutePath().contains(".app")){ // include bundle, but we don't want it
1516		dir.cdUp();
1517		dir.cdUp();
1518	+	dir.cdUp();
1519		}
1520		return dir.absolutePath();
1521		#else

Diff Legend

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