The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit a4ea17e0e975827d3d38b41088e5d07f8b1cfd59
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Thu Jun 7 21:27:01 2012 +0200
Restore default output format after tex fonts switch (#8191)
diff --git a/src/frontends/qt4/GuiDocument.cpp
b/src/frontends/qt4/GuiDocument.cpp
index ba55eb2..164fe93 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1761,7 +1761,16 @@ void GuiDocument::osFontsChanged(bool nontexfonts)
{
bool const tex_fonts = !nontexfonts;
updateFontlist();
+ // store default format
+ QString const dformat = outputModule->defaultFormatCO->itemData(
+ outputModule->defaultFormatCO->currentIndex()).toString();
updateDefaultFormat();
+ // try to restore default format
+ int index = outputModule->defaultFormatCO->findData(dformat);
+ // set to default if format is not found
+ if (index == -1)
+ index = 0;
+ outputModule->defaultFormatCO->setCurrentIndex(index);
langModule->encodingCO->setEnabled(tex_fonts &&
!langModule->defaultencodingRB->isChecked());
langModule->defaultencodingRB->setEnabled(tex_fonts);
-----------------------------------------------------------------------
Summary of changes:
src/frontends/qt4/GuiDocument.cpp | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
