Reduce caption hardcoding

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 4dfbc96448a628fb8e34c1bea7a9fd1cd4fd1d47..35d5f543b8f86e4a0d32fa3799b3192c0ecd48e2 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -189,7 +189,7 @@ void InsetLabel::addToToc(DocIterator const & cpit, bool output_active) const
                                output_active));
                else
                        toc.push_back(TocItem(ref_pit, 1,
-                               static_cast<InsetRef *>(it->first)->screenLabel(),
+                               static_cast<InsetRef *>(it->first)->getTOCString(),
                          output_active));
        }
 }
@@ -200,10 +200,17 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        bool enabled;
        switch (cmd.action()) {
-       case LFUN_LABEL_INSERT_AS_REF:
-       case LFUN_LABEL_COPY_AS_REF:
+       case LFUN_LABEL_INSERT_AS_REFERENCE:
+       case LFUN_LABEL_COPY_AS_REFERENCE:
                enabled = true;
                break;
+       case LFUN_INSET_MODIFY:
+               if (cmd.getArg(0) == "changetype") {
+                       // this is handled by InsetCommand,
+                       // but not by InsetLabel.
+                       enabled = false;
+                       break;
+               }
        default:
                return InsetCommand::getStatus(cur, cmd, status);
        }
@@ -218,6 +225,12 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
+               // the only other option here is "changetype", and we
+               // do not have different types.
+               if (cmd.getArg(0) != "label") {
+                       cur.undispatched();
+                       return;
+               }
                InsetCommandParams p(LABEL_CODE);
                // FIXME UNICODE
                InsetCommand::string2params(to_utf8(cmd.argument()), p);
@@ -233,7 +246,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_LABEL_COPY_AS_REF: {
+       case LFUN_LABEL_COPY_AS_REFERENCE: {
                InsetCommandParams p(REF_CODE, "ref");
                p["reference"] = getParam("name");
                cap::clearSelection();
@@ -241,7 +254,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_LABEL_INSERT_AS_REF: {
+       case LFUN_LABEL_INSERT_AS_REFERENCE: {
                InsetCommandParams p(REF_CODE, "ref");
                p["reference"] = getParam("name");
                string const data = InsetCommand::params2string(p);