anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 02:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change "Output" into "Formats"

Browse Source 
This reverts commit 030f4c6d1e.

The plural form seems more appropriate and the tag [[output]] is added for
disambiguation (e.g. for the French translation).
This commit is contained in:
Guillaume Munch 2016-08-28 16:51:15 +01:00
parent 60bef140b5
commit ef7e344318
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/doc/UserGuide.lyx
View File

@ -134,11 +134,12 @@ enumitem
\papercolumns 1 \papercolumns 1
\papersides 2 \papersides 2
\paperpagestyle default \paperpagestyle default
\tracking_changes false \tracking_changes true
\output_changes false \output_changes false
\html_math_output 0 \html_math_output 0
\html_css_as_file 0 \html_css_as_file 0
\html_be_strict true \html_be_strict true
\author 2047637253 "Guillaume Munch"
\end_header \end_header
\begin_body \begin_body
@ -16118,7 +16119,7 @@ reference "sec:File-Formats"
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "sec:Doc-Output" reference "sec:Doc-Formats"
\end_inset \end_inset
@ -37589,7 +37590,7 @@ Format
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "sec:Doc-Output" reference "sec:Doc-Formats"
\end_inset \end_inset
@ -37856,7 +37857,7 @@ Format
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "sec:Doc-Output" reference "sec:Doc-Formats"
\end_inset \end_inset
@ -37953,7 +37954,7 @@ Format
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "sec:Doc-Output" reference "sec:Doc-Formats"
\end_inset \end_inset
@ -42748,10 +42749,16 @@ reference "sec:Branches"
\end_layout \end_layout
\begin_layout Section \begin_layout Section
\change_deleted 2047637253 1472399758
Output Output
\change_inserted 2047637253 1472400015
Formats
\change_unchanged
\begin_inset CommandInset label \begin_inset CommandInset label
LatexCommand label LatexCommand label
name "sec:Doc-Output" name "sec:Doc-Formats"
\end_inset \end_inset
@ -42942,15 +42949,27 @@ Save transient properties
controls whether document settings that are frequently switched or that controls whether document settings that are frequently switched or that
are specific to the user are saved with the document. are specific to the user are saved with the document.
The properties that are affected by option are currently The properties that are affected by option are currently
\change_inserted 2047637253 1472400492
:
\change_unchanged
\end_layout \end_layout
\begin_deeper \begin_deeper
\begin_layout Itemize \begin_layout Itemize
the activation of change tracking the activation of change tracking
\change_inserted 2047637253 1472400062
,
\change_unchanged
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
the output of tracked changes the output of tracked changes
\change_inserted 2047637253 1472400062
,
\change_unchanged
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize

8
src/frontends/qt4/GuiDocument.cpp
View File

@ -750,7 +750,7 @@ GuiDocument::GuiDocument(GuiView & lv)
masterChildModule->childrenTW->resizeColumnToContents(2); masterChildModule->childrenTW->resizeColumnToContents(2);
// output // Formats
outputModule = new UiWidget<Ui::OutputUi>; outputModule = new UiWidget<Ui::OutputUi>;
connect(outputModule->defaultFormatCO, SIGNAL(activated(int)), connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
@ -1425,7 +1425,7 @@ GuiDocument::GuiDocument(GuiView & lv)
docPS->addPanel(listingsModule, N_("Listings[[inset]]")); docPS->addPanel(listingsModule, N_("Listings[[inset]]"));
docPS->addPanel(bulletsModule, N_("Bullets")); docPS->addPanel(bulletsModule, N_("Bullets"));
docPS->addPanel(branchesModule, N_("Branches")); docPS->addPanel(branchesModule, N_("Branches"));
docPS->addPanel(outputModule, N_("Output")); docPS->addPanel(outputModule, N_("Formats[[output]]"));
docPS->addPanel(preambleModule, N_("LaTeX Preamble")); docPS->addPanel(preambleModule, N_("LaTeX Preamble"));
docPS->setCurrentPanel("Document Class"); docPS->setCurrentPanel("Document Class");
// FIXME: hack to work around resizing bug in Qt >= 4.2 // FIXME: hack to work around resizing bug in Qt >= 4.2
@ -2840,7 +2840,7 @@ void GuiDocument::applyView()
bp_.listings_params = bp_.listings_params =
InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params(); InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
// output // Formats
bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData( bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
outputModule->defaultFormatCO->currentIndex()).toString()); outputModule->defaultFormatCO->currentIndex()).toString());
@ -3396,7 +3396,7 @@ void GuiDocument::paramsToDialog()
fontModule->fontencLE->setText(toqstr(bp_.fontenc)); fontModule->fontencLE->setText(toqstr(bp_.fontenc));
} }
// Output // Formats
// This must be set _after_ fonts since updateDefaultFormat() // This must be set _after_ fonts since updateDefaultFormat()
// checks osFontsCB settings. // checks osFontsCB settings.
// update combobox with formats // update combobox with formats