Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiWrap.cpp b/src/frontends/qt4/GuiWrap.cpp
index 7b6106bd1765bb8b401f9ea93b860bcb3499ee43..6cc8b54f090a7b24b7518ffab8b38d5384cc0930 100644 (file)
--- a/src/frontends/qt4/GuiWrap.cpp
+++ b/src/frontends/qt4/GuiWrap.cpp
@@ -17,8 +17,6 @@
 #include "Validator.h"
 #include "FuncRequest.h"
 
-#include "insets/InsetWrap.h"
-
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
@@ -40,12 +38,14 @@ GuiWrap::GuiWrap(GuiView & lv)
        connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
 
+       connect(valignCO, SIGNAL(highlighted(QString)),
+               this, SLOT(change_adaptor()));
+       connect(floatCB, SIGNAL(stateChanged(int)),
+               this, SLOT(change_adaptor()));
        connect(widthED, SIGNAL(textChanged(QString)),
                this, SLOT(change_adaptor()));
        connect(widthUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
                this, SLOT(change_adaptor()));
-       connect(valignCO, SIGNAL(highlighted(QString)),
-               this, SLOT(change_adaptor()));
        connect(overhangCB, SIGNAL(stateChanged(int)),
                this, SLOT(change_adaptor()));
        connect(overhangED, SIGNAL(textChanged(QString)),
@@ -68,9 +68,10 @@ GuiWrap::GuiWrap(GuiView & lv)
        bc().setApply(applyPB);
        bc().setCancel(closePB);
 
+       bc().addReadOnly(valignCO);
+       bc().addReadOnly(floatCB);
        bc().addReadOnly(widthED);
        bc().addReadOnly(widthUnitLC);
-       bc().addReadOnly(valignCO);
        bc().addReadOnly(overhangCB);
        bc().addReadOnly(overhangED);
        bc().addReadOnly(overhangUnitLC);
@@ -116,18 +117,33 @@ void GuiWrap::applyView()
                // in InsetWrap.cpp
                params_.lines = 0;
 
+       bool floatOn = false;
+       if (floatCB->checkState() == Qt::Checked)
+               floatOn = true;
        switch (valignCO->currentIndex()) {
        case 0:
-               params_.placement = "o";
+               if (floatOn)
+                       params_.placement = "O";
+               else
+                       params_.placement = "o";
                break;
        case 1:
-               params_.placement = "i";
+               if (floatOn)
+                       params_.placement = "I";
+               else
+                       params_.placement = "i";
                break;
        case 2:
-               params_.placement = "l";
+               if (floatOn)
+                       params_.placement = "L";
+               else
+                       params_.placement = "l";
                break;
        case 3:
-               params_.placement = "r";
+               if (floatOn)
+                       params_.placement = "R";
+               else
+                       params_.placement = "r";
                break;
        }
 }
@@ -156,20 +172,24 @@ void GuiWrap::updateContents()
                linesCB->setCheckState(Qt::Checked);
 
        int item = 0;
-       if (params_.placement == "i")
+       if (params_.placement == "i" || params_.placement == "I")
                item = 1;
-       else if (params_.placement == "l")
+       else if (params_.placement == "l" || params_.placement == "L")
                item = 2;
-       else if (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")
+               floatCB->setCheckState(Qt::Checked);
 }
 
 
 bool GuiWrap::initialiseParams(string const & data)
 {
-       InsetWrapMailer::string2params(data, params_);
+       InsetWrap::string2params(data, params_);
        return true;
 }
 
@@ -182,7 +202,7 @@ void GuiWrap::clearParams()
 
 void GuiWrap::dispatchParams()
 {
-       string const lfun = InsetWrapMailer::params2string(params_);
+       string const lfun = InsetWrap::params2string(params_);
        dispatch(FuncRequest(getLfun(), lfun));
 }