ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/manualcommands.cpp

Comparing Vago/trunk/Vago/manualcommands.cpp (file contents):
Revision 1035 by s10k, Thu Mar 24 22:28:41 2016 UTC vs.
Revision 1052 by s10k, Sat Sep 17 13:32:34 2016 UTC

#	Line 10 | Line 10 | ManualCommands::ManualCommands(QWidget *
10		this->setAttribute(Qt::WA_DeleteOnClose,true); //destroy itself once finished.
11		this->myProcess = new QProcess();
12		this->myProcess->setProcessChannelMode(QProcess::MergedChannels);
13	<	this->myProcess->setWorkingDirectory(Util::getAppPath());
13	>	this->myProcess->setWorkingDirectory(UtilVago::getAppPath());
14		ui->leManualCommand->installEventFilter(this);
15
16		this->nextInsertHistoryIdx=0;
#	Line 61 | Line 61 | void ManualCommands::executeCommand(){
61		}
62		}
63
64	<	QString var = Util::getOniSplitExeName() +" "+ui->leManualCommand->text();
64	>	QString var = UtilVago::getOniSplitExecutable() +" "+ui->leManualCommand->text();
65
66	<	this->myProcess->start(Util::getOniSplitExeName()+" "+ui->leManualCommand->text());
66	>	this->myProcess->start(UtilVago::getOniSplitExecutable()+" "+ui->leManualCommand->text());
67		this->myProcess->waitForFinished(120000); //wait 2 minutes at maximum
68		ui->ptOutput->appendPlainText("> "+command);
69		ui->ptOutput->appendPlainText(this->myProcess->readAll());

Diff Legend

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