void warning(QString const &, QString const &) {}
void toggleWarning(QString const &, QString const &, QString const &) {}
- void error(QString const &, QString const &) {}
+ void error(QString const &, QString const &, QString const &) {}
void information(QString const &, QString const &) {}
int prompt(docstring const &, docstring const &, int default_but, int,
docstring const &, docstring const &) { return default_but; }
};
-static ProgressInterface* progress_instance = 0;
+static ProgressInterface * progress_instance = 0;
void ProgressInterface::setInstance(ProgressInterface* p)
{
}
-ProgressInterface* ProgressInterface::instance()
+ProgressInterface * ProgressInterface::instance()
{
if (!progress_instance) {
static ProgressDummy dummy;
// Reuse of instance
#ifndef USE_QPROCESS
int Systemcall::startscript(Starttype how, string const & what,
- std::string const & path, bool /*process_events*/)
+ string const & path, string const & lpath,
+ bool /*process_events*/)
{
- string const python_call = "python -tt";
- string command = to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path)));
-
- if (prefixIs(what, python_call))
- command += os::python() + what.substr(python_call.length());
- else
- command += what;
+ string command =
+ to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path, lpath)))
+ + commandPrep(what);
if (how == DontWait) {
switch (os::shell()) {
int Systemcall::startscript(Starttype how, string const & what,
- string const & path, bool process_events)
+ string const & path, string const & lpath,
+ bool process_events)
{
- lyxerr << "\nRunning: " << what << endl;
+ string const what_ss = commandPrep(what);
+ LYXERR(Debug::INFO,"Running: " << what_ss);
string infile;
string outfile;
string errfile;
- QString cmd = QString::fromLocal8Bit(
- parsecmd(what, infile, outfile, errfile).c_str());
+ QString const cmd = QString::fromLocal8Bit(
+ parsecmd(what_ss, infile, outfile, errfile).c_str());
SystemcallPrivate d(infile, outfile, errfile);
-
- d.startProcess(cmd, path);
+#ifdef Q_OS_WIN32
+ // QProcess::startDetached cannot provide environment variables. When the
+ // environment variables are set using the latexEnvCmdPrefix and the process
+ // is started with QProcess::startDetached, a console window is shown every
+ // time a viewer is started. To avoid this, we fall back on Windows to the
+ // original implementation that creates a QProcess object.
+ d.startProcess(cmd, path, lpath, false);
if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
LYXERR0("Systemcall: '" << cmd << "' did not start!");
LYXERR0("error " << d.errorMessage());
return 10;
}
-
if (how == DontWait) {
- QProcess* released = d.releaseProcess();
- (void) released; // TODO who deletes it?
+ d.releaseProcess();
return 0;
}
+#else
+ d.startProcess(cmd, path, lpath, how == DontWait);
+ if (how == DontWait && d.state == SystemcallPrivate::Running)
+ return 0;
+
+ if (d.state == SystemcallPrivate::Error
+ || !d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
+ LYXERR0("Systemcall: '" << cmd << "' did not start!");
+ LYXERR0("error " << d.errorMessage());
+ return 10;
+ }
+#endif
if (!d.waitWhile(SystemcallPrivate::Running, process_events,
os::timeout_min() * 60 * 1000)) {
connect(process_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut()));
connect(process_, SIGNAL(readyReadStandardError()), SLOT(stdErr()));
+#if QT_VERSION >= 0x050600
+ connect(process_, SIGNAL(errorOccurred(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+#else
connect(process_, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+#endif
connect(process_, SIGNAL(started()), this, SLOT(processStarted()));
connect(process_, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
}
-void SystemcallPrivate::startProcess(QString const & cmd, string const & path)
+void SystemcallPrivate::startProcess(QString const & cmd, string const & path,
+ string const & lpath, bool detached)
{
cmd_ = cmd;
- if (process_) {
+ if (detached) {
+ state = SystemcallPrivate::Running;
+ if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_)) {
+ state = SystemcallPrivate::Error;
+ return;
+ }
+ QProcess* released = releaseProcess();
+ delete released;
+ } else if (process_) {
state = SystemcallPrivate::Starting;
- process_->start(toqstr(latexEnvCmdPrefix(path)) + cmd_);
+ process_->start(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_);
}
}
void SystemcallPrivate::processEvents()
{
- if(process_events_) {
+ if (process_events_) {
QCoreApplication::processEvents(/*QEventLoop::ExcludeUserInputEvents*/);
}
}
return state != Error;
}
- // process events while waiting whith timeout
+ // process events while waiting with timeout
QTime timer;
timer.start();
while (state == waitwhile && state != Error && !timedout) {
break;
case QProcess::UnknownError:
default:
- message = "An unknown error occured.";
+ message = "An unknown error occurred.";
break;
}
return message;
int SystemcallPrivate::exitCode()
{
- if (!process_)
+ // From Qt's documentation, in regards to QProcess::exitCode(),
+ // "This value is not valid unless exitStatus() returns NormalExit"
+ if (!process_ || process_->exitStatus() != QProcess::NormalExit)
return -1;
return process_->exitCode();