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

Revert the change of "Output" into "Format"

Browse Source 
(Partial revert of commit 141d9d34dfb5ee5b642438f76945ee51ab931800.)
This commit is contained in:
Guillaume Munch 2016-07-13 17:44:25 +01:00
parent 9a79548c80
commit 030f4c6d1e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -749,7 +749,7 @@ GuiDocument::GuiDocument(GuiView & lv)
masterChildModule->childrenTW->resizeColumnToContents(2); masterChildModule->childrenTW->resizeColumnToContents(2);
// Format // output
outputModule = new UiWidget<Ui::OutputUi>; outputModule = new UiWidget<Ui::OutputUi>;
connect(outputModule->defaultFormatCO, SIGNAL(activated(int)), connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
@ -1424,7 +1424,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_("Format")); docPS->addPanel(outputModule, N_("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
@ -2839,7 +2839,7 @@ void GuiDocument::applyView()
bp_.listings_params = bp_.listings_params =
InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params(); InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
// Format // output
bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData( bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
outputModule->defaultFormatCO->currentIndex()).toString()); outputModule->defaultFormatCO->currentIndex()).toString());
@ -3395,7 +3395,7 @@ void GuiDocument::paramsToDialog()
fontModule->fontencLE->setText(toqstr(bp_.fontenc)); fontModule->fontencLE->setText(toqstr(bp_.fontenc));
} }
// Format // Output
// 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