From 54ac0bb970bafef5733fb203bdf122bb5dd4254d Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 8 Jun 2012 20:24:09 +0200 Subject: [PATCH] Restore default output format after tex fonts switch (#8191) --- src/frontends/qt4/GuiDocument.cpp | 9 +++++++++ status.20x | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index e2791bc4a9..b88083aa74 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1644,7 +1644,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); diff --git a/status.20x b/status.20x index a99fe7ff9f..43e44292d6 100644 --- a/status.20x +++ b/status.20x @@ -176,9 +176,12 @@ What's new - Box settings dialog didn't work if you were actually inside the box (bug 8124). -- Mark the document modified when changing type of split index +- Mark the document modified when changing type of split index (bug 8182). +- Do not lose default output format when toggling "Use Non-TeX Fonts" + (bug 8191). + - Fix tooltip for "Use Non-TeX Fonts" (bug 7787). - Fix pasting of LATIN CAPITAL LETTER SHARP S (bug 8057). -- 2.39.5