anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI for save_transient_properties

Browse Source 
Add a new checkbox "Save transient properties" to the "Output" panel in the
document properties dialog (now renamed as "Format").

This provides the front-end for the change at 5c2d04999.

(cherry picked from commit 5d292fce2d)
This commit is contained in:
Guillaume Munch 2016-07-08 16:36:05 +01:00
parent e1315930d4
commit 141d9d34df
2 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -749,7 +749,7 @@ GuiDocument::GuiDocument(GuiView & lv)
masterChildModule->childrenTW->resizeColumnToContents(2);
// output
// Format
outputModule = new UiWidget<Ui::OutputUi>;
connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
@ -775,6 +775,9 @@ GuiDocument::GuiDocument(GuiView & lv)
outputModule->synccustomCB->setValidator(new NoNewLineValidator(
outputModule->synccustomCB));
connect(outputModule->saveTransientPropertiesCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
// fonts
fontModule = new FontModule;
connect(fontModule->osFontsCB, SIGNAL(clicked()),
@ -1421,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_("Output"));
docPS->addPanel(outputModule, N_("Format"));
docPS->addPanel(preambleModule, N_("LaTeX Preamble"));
docPS->setCurrentPanel("Document Class");
// FIXME: hack to work around resizing bug in Qt >= 4.2
@ -2836,7 +2839,7 @@ void GuiDocument::applyView()
bp_.listings_params =
InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
// output
// Format
bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
outputModule->defaultFormatCO->currentIndex()).toString());
@ -2858,6 +2861,9 @@ void GuiDocument::applyView()
bp_.html_math_img_scale = outputModule->mathimgSB->value();
bp_.display_pixel_ratio = theGuiApp()->pixelRatio();
bp_.save_transient_properties =
outputModule->saveTransientPropertiesCB->isChecked();
// fonts
bp_.fonts_roman[nontexfonts] =
fromqstr(fontModule->fontsRomanCO->
@ -3389,7 +3395,7 @@ void GuiDocument::paramsToDialog()
fontModule->fontencLE->setText(toqstr(bp_.fontenc));
}
// Output
// Format
// This must be set _after_ fonts since updateDefaultFormat()
// checks osFontsCB settings.
// update combobox with formats
@ -3409,6 +3415,9 @@ void GuiDocument::paramsToDialog()
outputModule->strictCB->setChecked(bp_.html_be_strict);
outputModule->cssCB->setChecked(bp_.html_css_as_file);
outputModule->saveTransientPropertiesCB
->setChecked(bp_.save_transient_properties);
// paper
bool const extern_geometry =
documentClass().provides("geometry");

51
src/frontends/qt4/ui/OutputUi.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>388</width>
<height>334</height>
<height>413</height>
</rect>
</property>
<property name="windowTitle">
@ -23,7 +23,16 @@
<bool>true</bool>
</property>
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
@ -34,7 +43,16 @@
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -62,6 +80,31 @@
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QGroupBox" name="savingGB">
<property name="title">
<string>LyX Format</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="saveTransientPropertiesCB">
<property name="toolTip">
<string>Save all parameters in the LyX file, including ones that are frequently switched or that are specific to the user (such as the output of the tracked changes, or the document directory path). Disabling this option plays nicer in collaborative settings and with version control systems.</string>
</property>
<property name="text">
<string>Save &amp;transient properties</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="outputsyncCB">
<property name="toolTip">
@ -226,7 +269,7 @@
</layout>
</widget>
</item>
<item row="3" column="0">
<item row="5" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>