timetablegenerateform.cpp (fet-5.47.0.tar.bz2) | : | timetablegenerateform.cpp (fet-5.47.1.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 621 | skipping to change at line 621 | |||
if(terminateCommandAfterSeconds>0) | if(terminateCommandAfterSeconds>0) | |||
QTimer::singleShot(terminateCommandAfterS econds*1000, myProcess, SLOT(terminate())); | QTimer::singleShot(terminateCommandAfterS econds*1000, myProcess, SLOT(terminate())); | |||
if(killCommandAfterSeconds>0) | if(killCommandAfterSeconds>0) | |||
QTimer::singleShot(killCommandAfterSecond s*1000, myProcess, SLOT(kill())); | QTimer::singleShot(killCommandAfterSecond s*1000, myProcess, SLOT(kill())); | |||
//https://www.qtcentre.org/threads/43083-Freeing- a-QProcess-after-it-has-finished-using-deleteLater() | //https://www.qtcentre.org/threads/43083-Freeing- a-QProcess-after-it-has-finished-using-deleteLater() | |||
connect(myProcess, SIGNAL(finished(int)), myProce ss, SLOT(deleteLater())); | connect(myProcess, SIGNAL(finished(int)), myProce ss, SLOT(deleteLater())); | |||
myProcess->start(command, arguments); | myProcess->start(command, arguments); | |||
}*/ | }*/ | |||
//else{ | //else{ | |||
QProcess::startDetached(command, arguments); | QProcess::startDetached(command, arguments); | |||
//} | //} | |||
} | } | |||
} | } | |||
dialog.exec(); | dialog.exec(); | |||
saveFETDialogGeometry(&dialog, settingsName); | saveFETDialogGeometry(&dialog, settingsName); | |||
startPushButton->setEnabled(true); | startPushButton->setEnabled(true); | |||
stopPushButton->setDisabled(true); | stopPushButton->setDisabled(true); | |||
stopHighestPushButton->setDisabled(true); | stopHighestPushButton->setDisabled(true); | |||
skipping to change at line 749 | skipping to change at line 749 | |||
if(terminateCommandAfterSeconds>0) | if(terminateCommandAfterSeconds>0) | |||
QTimer::singleShot(terminateCommandAfterS econds*1000, myProcess, SLOT(terminate())); | QTimer::singleShot(terminateCommandAfterS econds*1000, myProcess, SLOT(terminate())); | |||
if(killCommandAfterSeconds>0) | if(killCommandAfterSeconds>0) | |||
QTimer::singleShot(killCommandAfterSecond s*1000, myProcess, SLOT(kill())); | QTimer::singleShot(killCommandAfterSecond s*1000, myProcess, SLOT(kill())); | |||
//https://www.qtcentre.org/threads/43083-Freeing- a-QProcess-after-it-has-finished-using-deleteLater() | //https://www.qtcentre.org/threads/43083-Freeing- a-QProcess-after-it-has-finished-using-deleteLater() | |||
connect(myProcess, SIGNAL(finished(int)), myProce ss, SLOT(deleteLater())); | connect(myProcess, SIGNAL(finished(int)), myProce ss, SLOT(deleteLater())); | |||
myProcess->start(command, arguments); | myProcess->start(command, arguments); | |||
}*/ | }*/ | |||
//else{ | //else{ | |||
QProcess::startDetached(command, arguments); | QProcess::startDetached(command, arguments); | |||
//} | //} | |||
} | } | |||
} | } | |||
//Trick so that the message box will be silent (the only sound is thus th e beep above). | //Trick so that the message box will be silent (the only sound is thus th e beep above). | |||
QMessageBox msgBox(this); | QMessageBox msgBox(this); | |||
msgBox.setWindowTitle(TimetableGenerateForm::tr("FET information")); | msgBox.setWindowTitle(TimetableGenerateForm::tr("FET information")); | |||
msgBox.setText(s); | msgBox.setText(s); | |||
msgBox.exec(); | msgBox.exec(); | |||
//QMessageBox::information(this, TimetableGenerateForm::tr("FET informati on"), s); | //QMessageBox::information(this, TimetableGenerateForm::tr("FET informati on"), s); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |