* remove various xforms relicts, in particular:

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 18dd074323bf063bbb3c0367938d5baa22af08d9..aeb5162691fce7df53c093dc7a1673d66c1b0bbf 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -460,7 +460,7 @@ void expandDocuments(Menu & tomenu, LyXView const * view)
                string label = makeDisplayPath(*docit, 20);
                if (ii < 10)
                        label = convert<string>(ii) + ". " + label + '|' + convert<string>(ii);
-               tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view);
+               tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)), view);
        }
 }
 
@@ -482,19 +482,19 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
        switch (kind) {
        case MenuItem::ImportFormats:
                formats = Importer::GetImportableFormats();
-               action = LFUN_IMPORT;
+               action = LFUN_BUFFER_IMPORT;
                break;
        case MenuItem::ViewFormats:
                formats = Exporter::getExportableFormats(*view->buffer(), true);
-               action = LFUN_PREVIEW;
+               action = LFUN_BUFFER_VIEW;
                break;
        case MenuItem::UpdateFormats:
                formats = Exporter::getExportableFormats(*view->buffer(), true);
-               action = LFUN_UPDATE;
+               action = LFUN_BUFFER_UPDATE;
                break;
        default:
                formats = Exporter::getExportableFormats(*view->buffer(), false);
-               action = LFUN_EXPORT;
+               action = LFUN_BUFFER_EXPORT;
        }
        sort(formats.begin(), formats.end(), compare_format());
 
@@ -504,23 +504,24 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
                if ((*fit)->dummy())
                        continue;
                string label = (*fit)->prettyname();
-               // we need to hide the default graphic export formats
-               // from the external menu, because we need them only
-               // for the internal lyx-view and external latex run
-               if (label == "EPS" || label == "XPM" || label == "PNG")
-                       continue;
 
-               if (kind == MenuItem::ImportFormats) {
+               switch (kind) {
+               case MenuItem::ImportFormats:
                        if ((*fit)->name() == "text")
                                label = _("Plain Text as Lines");
                        else if ((*fit)->name() == "textparagraph")
                                label = _("Plain Text as Paragraphs");
                        label += "...";
-               } else if (kind == MenuItem::ExportFormats) {
-                       // exporting to LyX does not make sense
-                       // FIXME: Introduce noexport flag
-                       if ((*fit)->name() == "lyx")
+                       break;
+               case MenuItem::ViewFormats:
+               case MenuItem::ExportFormats:
+               case MenuItem::UpdateFormats:
+                       if (!(*fit)->documentFormat())
                                continue;
+                       break;
+               default:
+                       BOOST_ASSERT(false);
+                       break;
                }
                if (!(*fit)->shortcut().empty())
                        label += '|' + (*fit)->shortcut();
@@ -574,7 +575,7 @@ void expandFloatInsert(Menu & tomenu, LyXView const * view)
                // normal float
                string const label = _(cit->second.name());
                tomenu.add(MenuItem(MenuItem::Command, label,
-                                   FuncRequest(LFUN_INSET_FLOAT,
+                                   FuncRequest(LFUN_FLOAT_INSERT,
                                                cit->second.type())),
                           view);
        }
@@ -597,7 +598,7 @@ void expandCharStyleInsert(Menu & tomenu, LyXView const * view)
        for (; cit != end; ++cit) {
                string const label = cit->name;
                tomenu.add(MenuItem(MenuItem::Command, label,
-                                   FuncRequest(LFUN_INSERT_CHARSTYLE,
+                                   FuncRequest(LFUN_CHARSTYLE_INSERT,
                                                cit->name)), view);
        }
 }
@@ -751,7 +752,7 @@ void expandBranches(Menu & tomenu, LyXView const * view)
                if (ii < 10)
                        label = convert<string>(ii) + ". " + label + "|" + convert<string>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label,
-                                   FuncRequest(LFUN_INSERT_BRANCH,
+                                   FuncRequest(LFUN_BRANCH_INSERT,
                                                cit->getBranch())), view);
        }
 }