Fix readability

[lyx.git] / src / frontends / qt / GuiDocument.cpp

diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index a45216848711253af879e766051c3935908d4629..b16e8923bc8ef36a7d3f336f32e21f4889a6802a 100644 (file)
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -1272,7 +1272,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 
        // margins
        marginsModule = new UiWidget<Ui::MarginsUi>(this);
-       connect(marginsModule->marginCB, SIGNAL(toggled(bool)),
+       connect(marginsModule->marginCB, SIGNAL(clicked(bool)),
                this, SLOT(setCustomMargins(bool)));
        connect(marginsModule->marginCB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
@@ -2218,38 +2218,95 @@ void GuiDocument::setColSep()
 }
 
 
-void GuiDocument::setCustomMargins(bool custom)
-{
-       marginsModule->topL->setEnabled(!custom);
-       marginsModule->topLE->setEnabled(!custom);
-       marginsModule->topUnit->setEnabled(!custom);
-
-       marginsModule->bottomL->setEnabled(!custom);
-       marginsModule->bottomLE->setEnabled(!custom);
-       marginsModule->bottomUnit->setEnabled(!custom);
-
-       marginsModule->innerL->setEnabled(!custom);
-       marginsModule->innerLE->setEnabled(!custom);
-       marginsModule->innerUnit->setEnabled(!custom);
-
-       marginsModule->outerL->setEnabled(!custom);
-       marginsModule->outerLE->setEnabled(!custom);
-       marginsModule->outerUnit->setEnabled(!custom);
-
-       marginsModule->headheightL->setEnabled(!custom);
-       marginsModule->headheightLE->setEnabled(!custom);
-       marginsModule->headheightUnit->setEnabled(!custom);
-
-       marginsModule->headsepL->setEnabled(!custom);
-       marginsModule->headsepLE->setEnabled(!custom);
-       marginsModule->headsepUnit->setEnabled(!custom);
-
-       marginsModule->footskipL->setEnabled(!custom);
-       marginsModule->footskipLE->setEnabled(!custom);
-       marginsModule->footskipUnit->setEnabled(!custom);
-
-       bool const enableColSep = !custom &&
-                       textLayoutModule->twoColumnCB->checkState() == Qt::Checked;
+void GuiDocument::setCustomMargins(bool cb_checked)
+{
+       bool const custom_margins = !cb_checked;
+       if (custom_margins) {
+               Length::UNIT const default_unit = Length::defaultUnit();
+               // fill with chached values
+               lengthToWidgets(marginsModule->topLE,
+                               marginsModule->topUnit,
+                               tmp_topmargin_, default_unit);
+               lengthToWidgets(marginsModule->bottomLE,
+                               marginsModule->bottomUnit,
+                               tmp_bottommargin_, default_unit);
+               lengthToWidgets(marginsModule->innerLE,
+                               marginsModule->innerUnit,
+                               tmp_leftmargin_, default_unit);
+               lengthToWidgets(marginsModule->outerLE,
+                               marginsModule->outerUnit,
+                               tmp_rightmargin_, default_unit);
+               lengthToWidgets(marginsModule->headheightLE,
+                               marginsModule->headheightUnit,
+                               tmp_headheight_, default_unit);
+               lengthToWidgets(marginsModule->headsepLE,
+                               marginsModule->headsepUnit,
+                               tmp_headsep_, default_unit);
+               lengthToWidgets(marginsModule->footskipLE,
+                               marginsModule->footskipUnit,
+                               tmp_footskip_, default_unit);
+               lengthToWidgets(marginsModule->columnsepLE,
+                               marginsModule->columnsepUnit,
+                               tmp_columnsep_, default_unit);
+       } else { // default margins
+               // Cache current values
+               tmp_leftmargin_ = widgetsToLength(marginsModule->innerLE,
+                                                 marginsModule->innerUnit);
+               tmp_topmargin_ = widgetsToLength(marginsModule->topLE,
+                                                marginsModule->topUnit);
+               tmp_rightmargin_ = widgetsToLength(marginsModule->outerLE,
+                                                  marginsModule->outerUnit);
+               tmp_bottommargin_ = widgetsToLength(marginsModule->bottomLE,
+                                                   marginsModule->bottomUnit);
+               tmp_headheight_ = widgetsToLength(marginsModule->headheightLE,
+                                                 marginsModule->headheightUnit);
+               tmp_headsep_ = widgetsToLength(marginsModule->headsepLE,
+                                              marginsModule->headsepUnit);
+               tmp_footskip_ = widgetsToLength(marginsModule->footskipLE,
+                                               marginsModule->footskipUnit);
+               tmp_columnsep_ = widgetsToLength(marginsModule->columnsepLE,
+                                                marginsModule->columnsepUnit);
+               // clear widgets
+               marginsModule->topLE->clear();
+               marginsModule->bottomLE->clear();
+               marginsModule->innerLE->clear();
+               marginsModule->outerLE->clear();
+               marginsModule->headheightLE->clear();
+               marginsModule->headsepLE->clear();
+               marginsModule->footskipLE->clear();
+               marginsModule->columnsepLE->clear();
+       }
+
+       marginsModule->topL->setEnabled(custom_margins);
+       marginsModule->topLE->setEnabled(custom_margins);
+       marginsModule->topUnit->setEnabled(custom_margins);
+
+       marginsModule->bottomL->setEnabled(custom_margins);
+       marginsModule->bottomLE->setEnabled(custom_margins);
+       marginsModule->bottomUnit->setEnabled(custom_margins);
+
+       marginsModule->innerL->setEnabled(custom_margins);
+       marginsModule->innerLE->setEnabled(custom_margins);
+       marginsModule->innerUnit->setEnabled(custom_margins);
+
+       marginsModule->outerL->setEnabled(custom_margins);
+       marginsModule->outerLE->setEnabled(custom_margins);
+       marginsModule->outerUnit->setEnabled(custom_margins);
+
+       marginsModule->headheightL->setEnabled(custom_margins);
+       marginsModule->headheightLE->setEnabled(custom_margins);
+       marginsModule->headheightUnit->setEnabled(custom_margins);
+
+       marginsModule->headsepL->setEnabled(custom_margins);
+       marginsModule->headsepLE->setEnabled(custom_margins);
+       marginsModule->headsepUnit->setEnabled(custom_margins);
+
+       marginsModule->footskipL->setEnabled(custom_margins);
+       marginsModule->footskipLE->setEnabled(custom_margins);
+       marginsModule->footskipUnit->setEnabled(custom_margins);
+
+       bool const enableColSep = custom_margins &&
+                       textLayoutModule->twoColumnCB->isChecked();
        marginsModule->columnsepL->setEnabled(enableColSep);
        marginsModule->columnsepLE->setEnabled(enableColSep);
        marginsModule->columnsepUnit->setEnabled(enableColSep);
@@ -3989,14 +4046,16 @@ void GuiDocument::applyView()
 
        Ui::MarginsUi const * m = marginsModule;
 
-       bp_.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
-       bp_.topmargin = widgetsToLength(m->topLE, m->topUnit);
-       bp_.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
-       bp_.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
-       bp_.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
-       bp_.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
-       bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
-       bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
+       if (bp_.use_geometry) {
+               bp_.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
+               bp_.topmargin = widgetsToLength(m->topLE, m->topUnit);
+               bp_.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
+               bp_.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
+               bp_.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
+               bp_.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
+               bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
+               bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
+       }
 
        // branches
        branchesModule->apply(bp_);
@@ -4586,32 +4645,34 @@ void GuiDocument::paramsToDialog()
        // margins
        Ui::MarginsUi * m = marginsModule;
 
-       setMargins();
+       tmp_leftmargin_ = bp_.leftmargin;
+       tmp_topmargin_ = bp_.topmargin;
+       tmp_rightmargin_ = bp_.rightmargin;
+       tmp_bottommargin_ = bp_.bottommargin;
+       tmp_headheight_ = bp_.headheight;
+       tmp_headsep_ = bp_.headsep;
+       tmp_footskip_ = bp_.footskip;
+       tmp_columnsep_ = bp_.columnsep;
 
        lengthToWidgets(m->topLE, m->topUnit,
                bp_.topmargin, default_unit);
-
        lengthToWidgets(m->bottomLE, m->bottomUnit,
                bp_.bottommargin, default_unit);
-
        lengthToWidgets(m->innerLE, m->innerUnit,
                bp_.leftmargin, default_unit);
-
        lengthToWidgets(m->outerLE, m->outerUnit,
                bp_.rightmargin, default_unit);
-
        lengthToWidgets(m->headheightLE, m->headheightUnit,
                bp_.headheight, default_unit);
-
        lengthToWidgets(m->headsepLE, m->headsepUnit,
                bp_.headsep, default_unit);
-
        lengthToWidgets(m->footskipLE, m->footskipUnit,
                bp_.footskip, default_unit);
-
        lengthToWidgets(m->columnsepLE, m->columnsepUnit,
                bp_.columnsep, default_unit);
 
+       setMargins();
+
        // branches
        updateUnknownBranches();
        branchesModule->update(bp_);