[LyX/master] Allow 'module in child not used in master' warning to be disabled.
commit 92ccf0a1a20e73a1ecf8d335ad2a2ef90ec9a89b
Author: Richard Kimberly Heck
Date: Thu Sep 27 21:56:29 2018 -0400
Allow 'module in child not used in master' warning to be disabled.
---
src/insets/InsetInclude.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 2d91f62..8d1a4a8 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -769,7 +769,7 @@ void InsetInclude::latex(otexstream & os, OutputParams
const & runparams) const
"uses module `%2$s'\n"
"which is not used in parent
file."),
included_file.displayName(),
from_utf8(module));
- Alert::warning(_("Module not found"),
text);
+ Alert::warning(_("Module not found"),
text, true);
}
}
}
[LyX/2.3.x] Allow 'module in child not used in master' warning to be disabled.
commit 07ae4942a858f192beff5d52b0264c1464cd9548
Author: Richard Kimberly Heck
Date: Thu Sep 27 21:56:29 2018 -0400
Allow 'module in child not used in master' warning to be disabled.
(cherry picked from commit 92ccf0a1a20e73a1ecf8d335ad2a2ef90ec9a89b)
---
src/insets/InsetInclude.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 89f2533..437e0ea 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -762,7 +762,7 @@ void InsetInclude::latex(otexstream & os, OutputParams
const & runparams) const
"uses module `%2$s'\n"
"which is not used in parent
file."),
included_file.displayName(),
from_utf8(module));
- Alert::warning(_("Module not found"),
text);
+ Alert::warning(_("Module not found"),
text, true);
}
}
}
[LyX/2.3.x] Status for last commit.
commit 1e26864c0a9d1eba0f2ede5e48abc7458447c2fa Author: Richard Kimberly Heck Date: Thu Sep 27 22:14:44 2018 -0400 Status for last commit. --- status.23x |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/status.23x b/status.23x index 9e67c10..7b3d5af 100644 --- a/status.23x +++ b/status.23x @@ -63,6 +63,8 @@ What's new - Handle properly branches with a space in their name (bug 11108). +- Allow the 'module in child not used in master' warning to be disabled. + * DOCUMENTATION AND LOCALIZATION
[LyX/2.3.x] No suffixes for binaries now.
commit 79c695806c45957e25e419e0075601164271ba56
Author: Richard Kimberly Heck
Date: Thu Sep 27 14:53:05 2018 -0400
No suffixes for binaries now.
---
.../packaging/installer/include/declarations.nsh |2 +-
.../Win32/packaging/installer/include/filelist.nsh |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/development/Win32/packaging/installer/include/declarations.nsh
b/development/Win32/packaging/installer/include/declarations.nsh
index 547bfe5..2e96869 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -57,7 +57,7 @@ Configuration of LyX installer
!define APP_SETUPTYPE "Standard"
!endif
-!define BIN_LYX "LyX${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.exe"
+!define BIN_LYX "LyX.exe"
!define APP_RUN "bin\${BIN_LYX}"
!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220"
diff --git a/development/Win32/packaging/installer/include/filelist.nsh
b/development/Win32/packaging/installer/include/filelist.nsh
index 0ac3904..5447db0 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -11,7 +11,7 @@ Lists of files to include in the installer
!macro FileListLyXBin COMMAND DIRECTORY
${FILE}${BIN_LYX}"
- ${FILE}tex2lyx${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.exe"
+ ${FILE}tex2lyx.exe"
!macroend
[LyX/master] Added some char styles to sk/menus.bind
commit 676318115aacad6037ae99f39ea6a7aeb50159b4 Author: Kornel Benko Date: Thu Sep 27 08:36:55 2018 +0200 Added some char styles to sk/menus.bind --- lib/bind/sk/menus.bind | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/lib/bind/sk/menus.bind b/lib/bind/sk/menus.bind index ccd8267..eb9d5c0 100644 --- a/lib/bind/sk/menus.bind +++ b/lib/bind/sk/menus.bind @@ -132,6 +132,20 @@ Format 4 \bind "M-o S-Return""environment-split outer" # +# Character style menu +# + +\bind "M-c n" "font-noun" +\bind "M-c e" "font-emph" +\bind "M-c b" "font-bold" +\bind "M-c r" "font-roman" +\bind "M-c s" "font-sans" +\bind "M-c f" "font-frak" +\bind "M-c i" "font-ital" +\bind "M-c t" "font-typewriter" +\bind "M-c space" "font-default" + +# # Clashes #
[LyX/2.3.x] Fix build script for Windows: No suffixes.
commit 98cfd22fb71ee96caff7722a6bd4708a6c3ff329 Author: Richard Kimberly Heck Date: Thu Sep 27 14:53:41 2018 -0400 Fix build script for Windows: No suffixes. --- development/cmake/scripts/cmingw |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/development/cmake/scripts/cmingw b/development/cmake/scripts/cmingw index ec4a963..851eb27 100644 --- a/development/cmake/scripts/cmingw +++ b/development/cmake/scripts/cmingw @@ -23,7 +23,8 @@ while getopts ":dDh" opt; do done $CMAKE $LYXSRC \ - -DCMAKE_VERBOSE_MAKEFILE=1 \ +-DLYX_PROGRAM_SUFFIX=0 \ +-DCMAKE_VERBOSE_MAKEFILE=1 \ -DLYX_CPACK=1 $DEVEL \ -DLYX_XMINGW=$MINGW \ -DLYX_USE_QT=QT5 \
[LyX/2.3.x] Fix bug #11210
commit 804ed1bffb3ad13904a8e8838d63c7adc6e542e7
Author: Enrico Forestieri
Date: Thu Sep 27 21:32:24 2018 +0200
Fix bug #11210
On Windows, start viewers in detached processes in order to avoid
a crash of the QProcess destructor when their thread terminates.
The opening of a console window is avoided by redirecting to the
null device all standard I/O channels.
---
src/support/Systemcall.cpp | 27 +--
status.23x |2 ++
2 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 2dbbba7..d4f71ff 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -252,23 +252,6 @@ int Systemcall::startscript(Starttype how, string const &
what,
SystemcallPrivate d(infile, outfile, errfile);
-#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) {
- d.releaseProcess();
- return 0;
- }
-#else
d.startProcess(cmd, path, lpath, how == DontWait);
if (how == DontWait && d.state == SystemcallPrivate::Running)
return 0;
@@ -279,7 +262,6 @@ int Systemcall::startscript(Starttype how, string const &
what,
LYXERR0("error " << d.errorMessage());
return 10;
}
-#endif
if (!d.waitWhile(SystemcallPrivate::Running, process_events,
os::timeout_min() * 60 * 1000)) {
@@ -370,6 +352,15 @@ void SystemcallPrivate::startProcess(QString const & cmd,
string const & path,
cmd_ = cmd;
if (detached) {
state = SystemcallPrivate::Running;
+#ifdef Q_OS_WIN32
+ // Avoid opening a console window when a viewer is started
+ if (in_file_.empty())
+ process_->setStandardInputFile(QProcess::nullDevice());
+ if (out_file_.empty())
+ process_->setStandardOutputFile(QProcess::nullDevice());
+ if (err_file_.empty())
+ process_->setStandardErrorFile(QProcess::nullDevice());
+#endif
if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path,
lpath)) + cmd_)) {
state = SystemcallPrivate::Error;
return;
diff --git a/status.23x b/status.23x
index 8ff974a..9e67c10 100644
--- a/status.23x
+++ b/status.23x
@@ -113,6 +113,8 @@ What's new
- Avoid crash when cursor is outside of work area (bug 11296).
+- Fix crash on Windows when closing external viewers (bug 11210).
+
* USER INTERFACE
[LyX/master] Fix bug #11210
commit 83fc0f924cf30551615ed65c34941d0114e67a4f
Author: Enrico Forestieri
Date: Thu Sep 27 21:21:49 2018 +0200
Fix bug #11210
On Windows, start viewers in detached processes in order to avoid
a crash of the QProcess destructor when their thread terminates.
The opening of a console window is avoided by redirecting to the
null device all standard I/O channels.
---
src/support/Systemcall.cpp | 32 +---
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index e658f91..ae224cb 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -258,28 +258,6 @@ int Systemcall::startscript(Starttype how, string const &
what,
SystemcallPrivate d(infile, outfile, errfile);
bool do_events = process_events || how == WaitLoop;
-#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, do_events, -1)) {
- if (d.state == SystemcallPrivate::Error) {
- LYXERR0("Systemcall: '" << cmd << "' did not start!");
- LYXERR0("error " << d.errorMessage());
- return NOSTART;
- } else if (d.state == SystemcallPrivate::Killed) {
- LYXERR0("Killed: " << cmd);
- return KILLED;
- }
- }
- if (how == DontWait) {
- d.releaseProcess();
- return OK;
- }
-#else
d.startProcess(cmd, path, lpath, how == DontWait);
if (how == DontWait && d.state == SystemcallPrivate::Running)
return OK;
@@ -295,7 +273,6 @@ int Systemcall::startscript(Starttype how, string const &
what,
return KILLED;
}
}
-#endif
if (!d.waitWhile(SystemcallPrivate::Running, do_events,
os::timeout_min() * 60 * 1000)) {
@@ -393,6 +370,15 @@ void SystemcallPrivate::startProcess(QString const & cmd,
string const & path,
cmd_ = cmd;
if (detached) {
state = SystemcallPrivate::Running;
+#ifdef Q_OS_WIN32
+ // Avoid opening a console window when a viewer is started
+ if (in_file_.empty())
+ process_->setStandardInputFile(QProcess::nullDevice());
+ if (out_file_.empty())
+ process_->setStandardOutputFile(QProcess::nullDevice());
+ if (err_file_.empty())
+ process_->setStandardErrorFile(QProcess::nullDevice());
+#endif
if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path,
lpath)) + cmd_)) {
state = SystemcallPrivate::Error;
return;
