InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

[lyx.git] / src / insets / InsetFloat.cpp

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 99175fd64b57797cf0a1c6ed8d38906619899536..421b106a69984e1b19fe39b4d0ffad6ca8e0974c 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -39,6 +39,7 @@
 #include "frontends/Application.h"
 
 using namespace std;
+using namespace lyx::support;
 
 
 namespace lyx {
@@ -111,17 +112,16 @@ namespace lyx {
 // Lgb
 
 //FIXME: why do we set in stone the type here?
-InsetFloat::InsetFloat(Buffer * buf, string const & type)
-       : InsetCollapsable(buf), name_(from_utf8(type))
+InsetFloat::InsetFloat(Buffer * buf, string params_str)
+       : InsetCollapsable(buf)
 {
-       setLabel(_("float: ") + floatName(type));
-       params_.type = type;
+       string2params(params_str, params_);
 }
 
 
 docstring InsetFloat::name() const 
 { 
-       return "Float:" + name_; 
+       return "Float:" + from_utf8(params_.type);
 }
 
 
@@ -137,7 +137,7 @@ docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
 
 void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                InsetFloatParams params;
@@ -149,8 +149,14 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
                        params_.wide      = params.wide;
                        params_.sideways  = params.sideways;
                }
-
                setNewLabel();
+               if (params_.type != params.type) {
+                       params_.type = params.type;
+                       cur.forceBufferUpdate();
+               }
+               // what we really want here is a TOC update, but that means
+               // a full buffer update
+               cur.forceBufferUpdate();
                break;
        }
 
@@ -169,7 +175,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
        case LFUN_INSET_DIALOG_UPDATE:
@@ -189,7 +195,7 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype)
+void InsetFloat::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        Counters & cnts =
                buffer().masterBuffer()->params().documentClass().counters();
@@ -211,7 +217,7 @@ void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype)
        cnts.current_float(params().type);
        cnts.isSubfloat(subflt);
 
-       InsetCollapsable::updateLabels(it, utype);
+       InsetCollapsable::updateBuffer(it, utype);
 
        //reset afterwards
        cnts.current_float(saveflt);
@@ -243,6 +249,7 @@ void InsetFloatParams::write(ostream & os) const
 void InsetFloatParams::read(Lexer & lex)
 {
        lex.setContext("InsetFloatParams::read");
+       lex >> type;
        if (lex.checkFor("placement"))
                lex >> placement;
        lex >> "wide" >> wide;
@@ -262,6 +269,11 @@ void InsetFloat::read(Lexer & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(lex);
+       // check if the float type exists
+       if (buffer().params().documentClass().floats().typeExist(params_.type))
+               setLabel(_("float: ") + floatName(params_.type));
+       else
+               setLabel(bformat(_("ERROR: Unknown float type: %1$s"), from_utf8(params_.type)));
 }
 
 
@@ -418,14 +430,6 @@ bool InsetFloat::insetAllowed(InsetCode code) const
 }
 
 
-bool InsetFloat::showInsetDialog(BufferView * bv) const
-{
-       if (!InsetText::showInsetDialog(bv))
-               bv->showDialog("float");
-       return true;
-}
-
-
 void InsetFloat::setWide(bool w, bool update_label)
 {
        params_.wide = w;
@@ -497,7 +501,6 @@ void InsetFloat::string2params(string const & in, InsetFloatParams & params)
        Lexer lex;
        lex.setStream(data);
        lex.setContext("InsetFloat::string2params");
-       lex >> params.type; // We have to read the type here!
        params.read(lex);
 }