The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 1c7646085871bb4667ed39889881a6fbd76d0483 Author: Richard Heck <rgh...@lyx.org> Date: Wed Mar 19 11:04:46 2014 -0400 A a copule comments reminding us where preference formats should be updated. diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py index b2f0485..28194b9 100644 --- a/lib/scripts/prefs2prefs_prefs.py +++ b/lib/scripts/prefs2prefs_prefs.py @@ -63,6 +63,9 @@ # New RC default_otf_view_format # No conversion necessary. +# NOTE: The format should also be updated in LYXRC.cpp and +# in configure.py. + import re ########################################################### diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 07ffef1..bc8260c 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -55,6 +55,8 @@ namespace os = support::os; namespace { +// The format should also be updated in configure.py, and conversion code +// should be added to prefs2prefs_prefs.py. static unsigned int const LYXRC_FILEFORMAT = 14; // spitz: default_otf_view_format // when adding something to this array keep it sorted! commit 1d9d51c4b3f955937622efe95764b9f9198d8c19 Author: Richard Heck <rgh...@lyx.org> Date: Mon Mar 17 21:00:05 2014 -0400 Whitespace. diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp index 92363d4..d9946e8 100644 --- a/src/insets/RenderPreview.cpp +++ b/src/insets/RenderPreview.cpp @@ -148,7 +148,6 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const if (image) { pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(), *image); - } else { int const offset = Inset::TEXT_TO_INSET_OFFSET; commit d44b465efac83c795fd65b9a2fb15d49a561460e Author: Vincent van Ravesteijn <v...@lyx.org> Date: Tue Mar 18 22:32:57 2014 +0100 Do not use QProcess::startDetached on Windows QProcess::startDetached cannot provide environment variables. When the environment variables are set using the latexEnvCmdPrefix, a console window is shown every time a viewer is started. On Windows, this reverts commit 5225821242887ff552b7370df9c830af5f17d3b3. Fixes: #9035. diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp index 0ab7685..c42ed0c 100644 --- a/src/support/Systemcall.cpp +++ b/src/support/Systemcall.cpp @@ -250,17 +250,29 @@ int Systemcall::startscript(Starttype how, string const & what, SystemcallPrivate d(infile, outfile, errfile); - - d.startProcess(cmd, path, how == DontWait); - if (how == DontWait && d.state == SystemcallPrivate::Running) { +#ifdef Q_OS_WIN32 + d.startProcess(cmd, path, false); + if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) { + LYXERR0("Systemcall: '" << cmd << "' did not start!"); + LYXERR0("error " << d.errorMessage()); + return 10; + } + if (how == DontWait) { + d.releaseProcess(); return 0; } +#else + d.startProcess(cmd, path, 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)) { ----------------------------------------------------------------------- Summary of changes: lib/scripts/prefs2prefs_prefs.py | 3 + po/de.gmo | Bin 460845 -> 460978 bytes po/de.po | 405 +++++++++++++++++++------------------- src/LyXRC.cpp | 2 + src/insets/RenderPreview.cpp | 1 - src/support/Systemcall.cpp | 18 ++- 6 files changed, 226 insertions(+), 203 deletions(-) hooks/post-receive -- Repository for new features