Fix GRAPHICS_EDIT of InsetGraphics

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 251ca14b3c955b7f01116f5ce1101d2bdde76371..3c577eb2c4002f048520a70be8f1acb7c6b778cf 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -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, bool updaterefs)
+void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs)
 {
        docstring const old_label = getParam("name");
        docstring label = new_label;
@@ -63,15 +63,15 @@ void InsetLabel::update(docstring const & new_label, bool updaterefs)
                // 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));
        }
 
        setParam("name", label);
 
        if (updaterefs) {
-               Buffer::References const & refs = buffer().references(old_label);
-               Buffer::References::const_iterator it = refs.begin();
-               Buffer::References::const_iterator end = refs.end();
+               Buffer::References & refs = buffer().references(old_label);
+               Buffer::References::iterator it = refs.begin();
+               Buffer::References::iterator end = refs.end();
                for (; it != end; ++it)
                        it->first->setParam("reference", label);
        }
@@ -92,25 +92,22 @@ 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 &)
 {
        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;
 }
 
 
@@ -119,10 +116,10 @@ void InsetLabel::addToToc(ParConstIterator const & cpit) const
        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();
@@ -145,11 +142,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                        cur.noUpdate();
                        break;
                }
-               docstring old_name = params()["name"];
-               update(p["name"]);
-               if (params()["name"] != old_name)
-                       cur.bv().buffer().changeRefsIfUnique(old_name,
-                               params()["name"], REF_CODE);
+               updateCommand(p["name"]);
                break;
        }