X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=7e82f9a3b073756f4eadaed6ebc4bc702f9ed9d7;hb=fa8dae4201fc25da685a21de0f8968678df8f119;hp=e6ad5962d523d3850bd8025645c3c15b855d694b;hpb=21514ad5129df123605cc11b1dc04d525ce4a295;p=lyx.git diff --git a/src/Format.cpp b/src/Format.cpp index e6ad5962d5..7e82f9a3b0 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -259,6 +259,27 @@ void Formats::setEditor(string const & name, string const & command) } +bool Formats::viewURL(docstring const & url) { + Format const * format = getFormat("html"); + if (!format) + return false; + + string command = libScriptSearch(format->viewer()); + + if (!contains(command, token_from_format)) + command += ' ' + token_from_format; + command = subst(command, token_from_format, quoteName(to_utf8(url))); + + LYXERR(Debug::FILES, "Executing command: " << command); + + Systemcall one; + one.startscript(Systemcall::DontWait, command); + + // we can't report any sort of error, since we aren't waiting + return true; +} + + bool Formats::view(Buffer const & buffer, FileName const & filename, string const & format_name) const { @@ -318,14 +339,9 @@ bool Formats::view(Buffer const & buffer, FileName const & filename, buffer.message(_("Executing command: ") + from_utf8(command)); Systemcall one; - int const res = one.startscript(Systemcall::DontWait, command); + one.startscript(Systemcall::DontWait, command); - if (res) { - Alert::error(_("Cannot view file"), - bformat(_("An error occurred whilst running %1$s"), - makeDisplayPath(command, 50))); - return false; - } + // we can't report any sort of error, since we aren't waiting return true; } @@ -390,14 +406,9 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename, buffer.message(_("Executing command: ") + from_utf8(command)); Systemcall one; - int const res = one.startscript(Systemcall::DontWait, command); + one.startscript(Systemcall::DontWait, command); - if (res) { - Alert::error(_("Cannot edit file"), - bformat(_("An error occurred whilst running %1$s"), - makeDisplayPath(command, 50))); - return false; - } + // we can't report any sort of error, since we aren't waiting return true; }