Oops...

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index 0c737dcb96cc2d12e980de3ffb28cdbf62cb2491..e863e929bdf70b17424f5f1681ca01d3a3af9e74 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -27,6 +27,7 @@
 #include "insets/insetfloat.h"
 #include "insets/insetfoot.h"
 #include "insets/insetindex.h"
+#include "insets/insetlabel.h"
 #include "insets/insetmarginal.h"
 #include "insets/insetminipage.h"
 #include "insets/insetnote.h"
@@ -38,6 +39,7 @@
 #include "insets/insettoc.h"
 #include "insets/inseturl.h"
 #include "insets/insetwrap.h"
+
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
@@ -60,9 +62,6 @@ Inset * createInset(FuncRequest const & cmd)
        case LFUN_INSET_ERT:
                return new InsetERT(params);
 
-       case LFUN_INSET_EXTERNAL:
-               return new InsetExternal;
-
        case LFUN_INSET_FOOTNOTE:
                return new InsetFoot(params);
 
@@ -105,13 +104,13 @@ Inset * createInset(FuncRequest const & cmd)
                        cmd.argument;
                icp.setContents(contents);
 
-               string data = InsetCommandMailer::params2string(icp);
+               string data = InsetCommandMailer::params2string("index", icp);
                LyXView * lv = bv->owner();
 
                if (icp.getContents().empty()) {
                        lv->getDialogs().show("index", data, 0);
                } else {
-                       FuncRequest fr(bv, LFUN_INDEX_APPLY, data);
+                       FuncRequest fr(bv, LFUN_INSET_APPLY, data);
                        lv->dispatch(fr);
                }
                return 0;
@@ -150,13 +149,6 @@ Inset * createInset(FuncRequest const & cmd)
                return new InsetParent(
                        InsetCommandParams("lyxparent", cmd.argument), *bv->buffer());
 
-       case LFUN_INSERT_URL:
-       {
-               InsetCommandParams p;
-               p.setFromString(cmd.argument);
-               return new InsetUrl(p);
-       }
-
 #if 0
        case LFUN_INSET_LIST:
                return new InsetList;
@@ -165,57 +157,67 @@ Inset * createInset(FuncRequest const & cmd)
                return new InsetTheorem;
 #endif
 
-       case LFUN_BIBITEM_APPLY: {
-               InsetCommandParams icp;
-               InsetCommandMailer::string2params(cmd.argument, icp);
-               return new InsetBibitem(icp);
-       }
-
-       case LFUN_BIBTEX_APPLY: {
-               InsetCommandParams icp;
-               InsetCommandMailer::string2params(cmd.argument, icp);
-               return new InsetBibtex(icp);
-       }
+       case LFUN_INSET_APPLY: {
+               string const name = cmd.getArg(0);
 
-       case LFUN_CITATION_APPLY: {
-               InsetCommandParams icp;
-               InsetCommandMailer::string2params(cmd.argument, icp);
-               InsetCitation * inset = new InsetCitation(icp);
-               inset->setLoadingBuffer(bv->buffer(), false);
-               return inset;
-       }
+               if (name == "bibitem") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       return new InsetBibitem(icp);
 
-       case LFUN_ERT_APPLY: {
-               InsetERT * inset = new InsetERT(params);
-               InsetERT::ERTStatus s;
-               InsetERTMailer::string2params(cmd.argument, s);
-               inset->status(bv, s);
-               return inset;
-       }
+               } else if (name == "bibtex") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       return new InsetBibtex(icp);
 
-       case LFUN_INDEX_APPLY: {
-               InsetCommandParams icp;
-               InsetCommandMailer::string2params(cmd.argument, icp);
-               return new InsetIndex(icp);
-       }
+               } else if (name == "citation") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       InsetCitation * inset = new InsetCitation(icp);
+                       inset->setLoadingBuffer(bv->buffer(), false);
+                       return inset;
 
-       case LFUN_REF_APPLY: {
-               InsetCommandParams icp;
-               InsetCommandMailer::string2params(cmd.argument, icp);
-               return new InsetRef(icp, *bv->buffer());
-       }
+               } else if (name == "ert") {
+                       InsetERT * inset = new InsetERT(params);
+                       InsetERT::ERTStatus s;
+                       InsetERTMailer::string2params(cmd.argument, s);
+                       inset->status(bv, s);
+                       return inset;
 
-       case LFUN_TOC_APPLY: {
-               InsetCommandParams icp;
-               InsetCommandMailer::string2params(cmd.argument, icp);
-               return new InsetTOC(icp);
-       }
+               } else if (name == "external") {
+                       InsetExternal::Params iep;                      
+                       InsetExternalMailer::string2params(cmd.argument, iep);
+                       InsetExternal * inset = new InsetExternal;
+                       inset->setFromParams(iep);
+                       return inset;
 
-       case LFUN_URL_APPLY: {
-               InsetCommandParams icp;
-               InsetCommandMailer::string2params(cmd.argument, icp);
-               return new InsetUrl(icp);
+               } else if (name == "index") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       return new InsetIndex(icp);
+
+               } else if (name == "label") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       return new InsetLabel(icp);
+
+               } else if (name == "ref") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       return new InsetRef(icp, *bv->buffer());
+
+               } else if (name == "toc") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       return new InsetTOC(icp);
+
+               } else if (name == "url") {
+                       InsetCommandParams icp;
+                       InsetCommandMailer::string2params(cmd.argument, icp);
+                       return new InsetUrl(icp);
+               }
        }
+       break;
 
        default:
                break;