--- Vago/trunk/Vago/manualcommands.cpp 2016/09/17 13:32:34 1052 +++ Vago/trunk/Vago/manualcommands.cpp 2016/10/30 14:42:39 1058 @@ -1,13 +1,12 @@ #include "manualcommands.h" #include "ui_manualcommands.h" -#include ManualCommands::ManualCommands(QWidget *parent) : QMainWindow(parent), ui(new Ui::ManualCommands) { ui->setupUi(this); - this->setAttribute(Qt::WA_DeleteOnClose,true); //destroy itself once finished. + this->setAttribute(Qt::WA_DeleteOnClose, true); //destroy itself once finished. this->myProcess = new QProcess(); this->myProcess->setProcessChannelMode(QProcess::MergedChannels); this->myProcess->setWorkingDirectory(UtilVago::getAppPath()); @@ -33,6 +32,15 @@ void ManualCommands::on_pbInput_clicked( void ManualCommands::executeCommand(){ + QString toolExecutable; + + if(ui->cbTargetTool->currentText() == "OniSplit"){ + toolExecutable = UtilVago::getOniSplitExecutable(); + } + else{ + toolExecutable = UtilVago::getXmlToolsExecutable(); + } + QString command=ui->leManualCommand->text().trimmed(); if(command.isEmpty()){ @@ -61,11 +69,9 @@ void ManualCommands::executeCommand(){ } } - QString var = UtilVago::getOniSplitExecutable() +" "+ui->leManualCommand->text(); - - this->myProcess->start(UtilVago::getOniSplitExecutable()+" "+ui->leManualCommand->text()); + this->myProcess->start(toolExecutable+" "+ui->leManualCommand->text()); this->myProcess->waitForFinished(120000); //wait 2 minutes at maximum - ui->ptOutput->appendPlainText("> "+command); + ui->ptOutput->appendPlainText("> " + ui->cbTargetTool->currentText() + " " + command); ui->ptOutput->appendPlainText(this->myProcess->readAll()); ui->ptOutput->ensureCursorVisible(); ui->ptOutput->verticalScrollBar()->setValue( ui->ptOutput->verticalScrollBar()->maximum() );