From 9ddfa717f273fdbc47b8e01ca719c5641344ae78 Mon Sep 17 00:00:00 2001 From: Guillaume Munch Date: Sun, 28 Aug 2016 16:51:15 +0100 Subject: [PATCH] Change "Output" into "Formats" This reverts commit 030f4c6d1e56f94122d5e4fae08ac6a2f2b4c5cf. The plural form seems more appropriate and the tag [[output]] is added for disambiguation (e.g. for the French translation). --- lib/doc/UserGuide.lyx | 29 ++++++++++++++++++++++++----- src/frontends/qt4/GuiDocument.cpp | 8 ++++---- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index ca7b29aa20..2960cf2a06 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -140,6 +140,7 @@ enumitem \html_css_as_file 0 \html_be_strict true \author 1414654397 "Richard Heck" +\author 2047637253 "Guillaume Munch" \end_header \begin_body @@ -16125,7 +16126,7 @@ reference "sec:File-Formats" \begin_inset CommandInset ref LatexCommand ref -reference "sec:Doc-Output" +reference "sec:Doc-Formats" \end_inset @@ -37596,7 +37597,7 @@ Format \begin_inset CommandInset ref LatexCommand ref -reference "sec:Doc-Output" +reference "sec:Doc-Formats" \end_inset @@ -37863,7 +37864,7 @@ Format \begin_inset CommandInset ref LatexCommand ref -reference "sec:Doc-Output" +reference "sec:Doc-Formats" \end_inset @@ -37960,7 +37961,7 @@ Format \begin_inset CommandInset ref LatexCommand ref -reference "sec:Doc-Output" +reference "sec:Doc-Formats" \end_inset @@ -42755,10 +42756,16 @@ reference "sec:Branches" \end_layout \begin_layout Section + +\change_deleted 2047637253 1472399758 Output +\change_inserted 2047637253 1472400015 +Formats +\change_unchanged + \begin_inset CommandInset label LatexCommand label -name "sec:Doc-Output" +name "sec:Doc-Formats" \end_inset @@ -42949,15 +42956,27 @@ Save transient properties controls whether document settings that are frequently switched or that are specific to the user are saved with the document. The properties that are affected by option are currently +\change_inserted 2047637253 1472400492 +: +\change_unchanged + \end_layout \begin_deeper \begin_layout Itemize the activation of change tracking +\change_inserted 2047637253 1472400062 +, +\change_unchanged + \end_layout \begin_layout Itemize the output of tracked changes +\change_inserted 2047637253 1472400062 +, +\change_unchanged + \end_layout \begin_layout Itemize diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index aad62014e5..382aa969c3 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -750,7 +750,7 @@ GuiDocument::GuiDocument(GuiView & lv) masterChildModule->childrenTW->resizeColumnToContents(2); - // output + // Formats outputModule = new UiWidget; connect(outputModule->defaultFormatCO, SIGNAL(activated(int)), @@ -1425,7 +1425,7 @@ GuiDocument::GuiDocument(GuiView & lv) docPS->addPanel(listingsModule, N_("Listings[[inset]]")); docPS->addPanel(bulletsModule, N_("Bullets")); docPS->addPanel(branchesModule, N_("Branches")); - docPS->addPanel(outputModule, N_("Output")); + docPS->addPanel(outputModule, N_("Formats[[output]]")); docPS->addPanel(preambleModule, N_("LaTeX Preamble")); docPS->setCurrentPanel("Document Class"); // FIXME: hack to work around resizing bug in Qt >= 4.2 @@ -2840,7 +2840,7 @@ void GuiDocument::applyView() bp_.listings_params = InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params(); - // output + // Formats bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData( outputModule->defaultFormatCO->currentIndex()).toString()); @@ -3396,7 +3396,7 @@ void GuiDocument::paramsToDialog() fontModule->fontencLE->setText(toqstr(bp_.fontenc)); } - // Output + // Formats // This must be set _after_ fonts since updateDefaultFormat() // checks osFontsCB settings. // update combobox with formats