This optional argument to the InsetCollapsable constructor

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 606474b5d586c4453900fe9c4ab7798389b6beb5..6a3be71a0205118378ba7de4ea5bcb578faf30e3 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -28,9 +28,9 @@
 #include "frontends/alert.h"
 
 #include "support/convert.h"
-#include "support/lyxalgo.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -43,13 +43,13 @@ InsetLabel::InsetLabel(InsetCommandParams const & p)
 {}
 
 
-void InsetLabel::validate()
+void InsetLabel::initView()
 {
-       update(getParam("name"));
+       updateCommand(getParam("name"));
 }
 
 
-void InsetLabel::update(docstring const & new_label)
+void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs)
 {
        docstring const old_label = getParam("name");
        docstring label = new_label;
@@ -63,16 +63,22 @@ void InsetLabel::update(docstring const & new_label)
                // Warn the user that the label has been changed to something else.
                frontend::Alert::warning(_("Label names must be unique!"),
                        bformat(_("The label %1$s already exists,\n"
-                       "it will been changed to %2$s."), new_label, label));
+                       "it will be changed to %2$s."), new_label, label));
        }
 
+       buffer().undo().beginUndoGroup();
        setParam("name", label);
 
-       Buffer::References const & refs = buffer().references(old_label);
-       Buffer::References::const_iterator it = refs.begin();
-       Buffer::References::const_iterator end = refs.end();
-       for (; it != end; ++it)
-               it->first->setParam("reference", label);
+       if (updaterefs) {
+               Buffer::References & refs = buffer().references(old_label);
+               Buffer::References::iterator it = refs.begin();
+               Buffer::References::iterator end = refs.end();
+               for (; it != end; ++it) {
+                       buffer().undo().recordUndo(it->second);
+                       it->first->setParam("reference", label);
+               }
+       }
+       buffer().undo().endUndoGroup();
 
        // We need an update of the Buffer reference cache. This is achieved by
        // updateLabel().
@@ -90,42 +96,39 @@ ParamInfo const & InsetLabel::findInfo(string const & /* cmdName */)
 }
 
 
-void InsetLabel::getLabelList(vector<docstring> & list) const
-{
-       list.push_back(getParam("name"));
-}
-
-
 docstring InsetLabel::screenLabel() const
 {
-       return getParam("name");
+       return screen_label_;
 }
 
 
-void InsetLabel::updateLabels(ParIterator const & it)
+void InsetLabel::updateLabels(ParIterator const &)
 {
        docstring const & label = getParam("name");
-       if (buffer().insetLabel(label))
+       if (buffer().insetLabel(label)) {
                // Problem: We already have an InsetLabel with the same name!
+               screen_label_ = _("DUPLICATE: ") + label;
                return;
+       }
        buffer().setInsetLabel(label, this);
+       screen_label_ = label;
 }
 
 
-void InsetLabel::addToToc(ParConstIterator const & cpit) const
+void InsetLabel::addToToc(DocIterator const & cpit)
 {
        docstring const & label = getParam("name");
        Toc & toc = buffer().tocBackend().toc("label");
        if (buffer().insetLabel(label) != this) {
-               toc.push_back(TocItem(cpit, 0, _("DUPLICATE: ") + label));
+               toc.push_back(TocItem(cpit, 0, screen_label_));
                return;
        }
-       toc.push_back(TocItem(cpit, 0, label));
+       toc.push_back(TocItem(cpit, 0, screen_label_));
        Buffer::References const & refs = buffer().references(label);
        Buffer::References::const_iterator it = refs.begin();
        Buffer::References::const_iterator end = refs.end();
        for (; it != end; ++it) {
-               ParConstIterator const ref_pit(it->second);
+               DocIterator const ref_pit(it->second);
                toc.push_back(TocItem(ref_pit, 1, it->first->screenLabel()));
        }
 }
@@ -138,12 +141,12 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(LABEL_CODE);
                // FIXME UNICODE
-               InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p);
+               InsetCommand::string2params("label", to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
                        cur.noUpdate();
                        break;
                }
-               update(p["name"]);
+               updateCommand(p["name"]);
                break;
        }