Le 24/06/2016 16:03, Richard Heck a écrit :
On 06/23/2016 11:02 AM, Guillaume Munch wrote:
Dear list,
I am thinking of adding the "Save transient properties" checkbox
(disabling the save of \origin, \tracking_changes, \output_changes) to
the "document class" panel, for lack of a better place. This panel
already contains other settings unrelated to the document class.
Can you think of a better place? Of a better label? Thank you for any
advice.
No, that looks like the best choice.
After looking more closely, I have decided to add the "Save transient
properties" checkbox to the "Output" panel and to rename "Output" into
"Format".
Attached is a patch, candidate for master and stable. Comments welcome,
especially regarding the three new translatable strings.
Guillaume
>From ef2fff0122345d2e2bf2f85d80c6bf1ca18aaa68 Mon Sep 17 00:00:00 2001
From: Guillaume Munch <g...@lyx.org>
Date: Fri, 8 Jul 2016 16:36:05 +0100
Subject: [PATCH] UI for save_transient_properties
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.
---
src/frontends/qt4/GuiDocument.cpp | 17 ++++++++++---
src/frontends/qt4/ui/OutputUi.ui | 51 ++++++++++++++++++++++++++++++++++++---
2 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index af42fd8..23bc5b0 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
+ // Format
outputModule = new UiWidget<Ui::OutputUi>;
connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
@@ -776,6 +776,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()),
@@ -1424,7 +1427,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
@@ -2839,7 +2842,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());
@@ -2861,6 +2864,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->
@@ -3396,7 +3402,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
@@ -3416,6 +3422,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");
diff --git a/src/frontends/qt4/ui/OutputUi.ui b/src/frontends/qt4/ui/OutputUi.ui
index 717181e..2bcf0f1 100644
--- a/src/frontends/qt4/ui/OutputUi.ui
+++ b/src/frontends/qt4/ui/OutputUi.ui
@@ -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 &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>
--
2.7.4
