QDialogButtonBox for the remaining dialogs.

[lyx.git] / src / frontends / qt4 / GuiWrap.cpp

diff --git a/src/frontends/qt4/GuiWrap.cpp b/src/frontends/qt4/GuiWrap.cpp
index 6cc8b54f090a7b24b7518ffab8b38d5384cc0930..e22be0898c2e97f599dc76aa8d8f332f3af41446 100644 (file)
--- a/src/frontends/qt4/GuiWrap.cpp
+++ b/src/frontends/qt4/GuiWrap.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -33,10 +33,8 @@ GuiWrap::GuiWrap(GuiView & lv)
 {
        setupUi(this);
 
-       connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
-       connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-       connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
-       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
 
        connect(valignCO, SIGNAL(highlighted(QString)),
                this, SLOT(change_adaptor()));
@@ -63,10 +61,10 @@ GuiWrap::GuiWrap(GuiView & lv)
        overhangED->setValidator(unsignedLengthValidator(overhangED));
 
        bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
-       bc().setRestore(restorePB);
-       bc().setOK(okPB);
-       bc().setApply(applyPB);
-       bc().setCancel(closePB);
+       bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
+       bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
 
        bc().addReadOnly(valignCO);
        bc().addReadOnly(floatCB);
@@ -100,7 +98,7 @@ void GuiWrap::applyView()
        Length::UNIT overhangUnit = overhangUnitLC->currentLengthItem();
        if (overhangED->text().isEmpty())
                overhangUnit = Length::UNIT_NONE;
-       
+
        params_.width = Length(width_value, widthUnit);
 
        if (overhangCB->checkState() == Qt::Checked)
@@ -149,15 +147,15 @@ void GuiWrap::applyView()
 }
 
 
-void GuiWrap::updateContents()
+void GuiWrap::paramsToDialog(InsetWrapParams const & params)
 {
        // 0pt is a legal width now, it yields a
        // wrapfloat just wide enough for the contents.
-       Length len_w = params_.width;
+       Length len_w = params.width;
        widthED->setText(QString::number(len_w.value()));
        widthUnitLC->setCurrentItem(len_w.unit());
 
-       Length len_o(params_.overhang);
+       Length len_o(params.overhang);
        overhangED->setText(QString::number(len_o.value()));
        overhangUnitLC->setCurrentItem(len_o.unit());
        if (len_o.value() == 0)
@@ -165,31 +163,32 @@ void GuiWrap::updateContents()
        else
                overhangCB->setCheckState(Qt::Checked);
 
-       linesSB->setValue(params_.lines);
-       if (params_.lines == 0)
+       linesSB->setValue(params.lines);
+       if (params.lines == 0)
                linesCB->setCheckState(Qt::Unchecked);
        else
                linesCB->setCheckState(Qt::Checked);
 
        int item = 0;
-       if (params_.placement == "i" || params_.placement == "I")
+       if (params.placement == "i" || params.placement == "I")
                item = 1;
-       else if (params_.placement == "l" || params_.placement == "L")
+       else if (params.placement == "l" || params.placement == "L")
                item = 2;
-       else if (params_.placement == "r" || params_.placement == "R")
+       else if (params.placement == "r" || params.placement == "R")
                item = 3;
 
        valignCO->setCurrentIndex(item);
 
-       if (params_.placement == "O" || params_.placement == "I"
-               || params_.placement == "L" || params_.placement == "R")
+       if (params.placement == "O" || params.placement == "I"
+               || params.placement == "L" || params.placement == "R")
                floatCB->setCheckState(Qt::Checked);
 }
 
 
-bool GuiWrap::initialiseParams(string const & data)
+bool GuiWrap::initialiseParams(string const & sdata)
 {
-       InsetWrap::string2params(data, params_);
+       InsetWrap::string2params(sdata, params_);
+       paramsToDialog(params_);
        return true;
 }
 
@@ -214,4 +213,4 @@ Dialog * createGuiWrap(GuiView & lv) { return new GuiWrap(lv); }
 } // namespace lyx
 
 
-#include "GuiWrap_moc.cpp"
+#include "moc_GuiWrap.cpp"