mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-21 17:51:03 +00:00
Revert the change of "Output" into "Format"
(Partial revert of commit 141d9d34dfb5ee5b642438f76945ee51ab931800.)
This commit is contained in:
parent
9a79548c80
commit
030f4c6d1e
@ -749,7 +749,7 @@ GuiDocument::GuiDocument(GuiView & lv)
|
||||
masterChildModule->childrenTW->resizeColumnToContents(2);
|
||||
|
||||
|
||||
// Format
|
||||
// output
|
||||
outputModule = new UiWidget<Ui::OutputUi>;
|
||||
|
||||
connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
|
||||
@ -1424,7 +1424,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_("Format"));
|
||||
docPS->addPanel(outputModule, N_("Output"));
|
||||
docPS->addPanel(preambleModule, N_("LaTeX Preamble"));
|
||||
docPS->setCurrentPanel("Document Class");
|
||||
// FIXME: hack to work around resizing bug in Qt >= 4.2
|
||||
@ -2839,7 +2839,7 @@ void GuiDocument::applyView()
|
||||
bp_.listings_params =
|
||||
InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
|
||||
|
||||
// Format
|
||||
// output
|
||||
bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
|
||||
outputModule->defaultFormatCO->currentIndex()).toString());
|
||||
|
||||
@ -3395,7 +3395,7 @@ void GuiDocument::paramsToDialog()
|
||||
fontModule->fontencLE->setText(toqstr(bp_.fontenc));
|
||||
}
|
||||
|
||||
// Format
|
||||
// Output
|
||||
// This must be set _after_ fonts since updateDefaultFormat()
|
||||
// checks osFontsCB settings.
|
||||
// update combobox with formats
|
||||
|
Loading…
Reference in New Issue
Block a user