More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 0289bf8928732951f51c5c18dcc30cd69b18901e..1196dbaf2c23aeb7fc1b906dc3136d837d93cffd 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -25,6 +25,7 @@
 #include "bufferlist.h"
 #include "converter.h"
 #include "exporter.h"
+#include "importer.h"
 #include "support/filetools.h"
 #include "support/lyxfunctional.h"
 
@@ -46,7 +47,7 @@ MenuItem::MenuItem(Kind kind, string const & label,
                   string const & command, bool optional) 
        : kind_(kind), label_(label), optional_(optional)
 {
-       switch(kind) {
+       switch (kind) {
        case Separator:
        case Documents:
        case Lastfiles:
@@ -55,6 +56,7 @@ MenuItem::MenuItem(Kind kind, string const & label,
        case ViewFormats:
        case UpdateFormats:
        case ExportFormats:
+       case ImportFormats:
                break;
        case Command:
                action_ = lyxaction.LookupFunc(command);
@@ -88,6 +90,7 @@ Menu & Menu::read(LyXLex & lex)
                md_documents,
                md_endmenu,
                md_exportformats,
+               md_importformats,
                md_lastfiles,
                md_optitem,
                md_references,
@@ -103,6 +106,7 @@ Menu & Menu::read(LyXLex & lex)
                { "documents", md_documents },
                { "end", md_endmenu },
                { "exportformats", md_exportformats },
+               { "importformats", md_importformats },
                { "item", md_item },
                { "lastfiles", md_lastfiles },
                { "optitem", md_optitem }, 
@@ -122,7 +126,7 @@ Menu & Menu::read(LyXLex & lex)
        bool optional = false;
 
        while (lex.IsOK() && !quit) {
-               switch(lex.lex()) {
+               switch (lex.lex()) {
                case md_optitem:
                        optional = true;
                        // fallback to md_item
@@ -169,6 +173,10 @@ Menu & Menu::read(LyXLex & lex)
                        add(MenuItem(MenuItem::ExportFormats));
                        break;
 
+               case md_importformats:
+                       add(MenuItem(MenuItem::ImportFormats));
+                       break;
+
                case md_submenu: {
                        lex.next();
                        string mlabel = _(lex.GetString());
@@ -192,11 +200,6 @@ Menu & Menu::read(LyXLex & lex)
        return *this;
 }
 
-struct compare_formatpair {
-       bool operator()(FormatPair const & a, FormatPair const & b) {
-               return a.format->prettyname < b.format->prettyname; 
-       }
-};
 
 void Menu::checkShortcuts() const
 {
@@ -266,51 +269,50 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
                }
                break;
 
+               case MenuItem::ImportFormats:
                case MenuItem::ViewFormats:
                case MenuItem::UpdateFormats:
                case MenuItem::ExportFormats: {
-                       vector<FormatPair> names;
+                       vector<Format const *> formats;
                        kb_action action;
-                       if ((*cit).kind() == MenuItem::ViewFormats) {
-                               names = Exporter::GetViewableFormats(buf);
+                       switch ((*cit).kind()) {
+                       case MenuItem::ImportFormats:
+                               formats = Importer::GetImportableFormats();
+                               action = LFUN_IMPORT;
+                               break;
+                       case MenuItem::ViewFormats:
+                               formats = Exporter::GetExportableFormats(buf, true); 
                                action = LFUN_PREVIEW;
-                       } else if ((*cit).kind() == MenuItem::UpdateFormats) {
-                               names = Exporter::GetViewableFormats(buf);
+                               break;
+                       case MenuItem::UpdateFormats:
+                               formats = Exporter::GetExportableFormats(buf, true); 
                                action = LFUN_UPDATE;
-                       } else {
-                               names = Exporter::GetExportableFormats(buf);
+                               break;
+                       default:
+                               formats = Exporter::GetExportableFormats(buf, false); 
                                action = LFUN_EXPORT;
                        }
-                       sort(names.begin(), names.end(), compare_formatpair());
-
-                       for (vector<FormatPair>::const_iterator fit = names.begin();
-                            fit != names.end() ; ++fit) {
-                               string fmt = (*fit).format->name;
-                               string label = (*fit).format->prettyname;
-                               bool same_before = 
-                                       fit != names.begin() &&
-                                       (*fit).format == (*(fit-1)).format;
-                               bool same_after = 
-                                       fit+1 != names.end() &&
-                                       (*fit).format == (*(fit+1)).format;
-                               if ((*fit).from &&
-                                   (same_before || same_after)) {
-                                       fmt += ":" + (*fit).from->name;
-                                       string head;
-                                       split((*fit).command, head, ' ');
-                                       label += _(" (using ") + head + ")";
-                                       if (!(*fit).format->shortcut.empty() &&
-                                           !same_before)
-                                               label += "|" + (*fit).format->shortcut;
-                               } else if (!(*fit).format->shortcut.empty())
-                                       label += "|" + (*fit).format->shortcut;
-                               int action2 = lyxaction.getPseudoAction(action, fmt);
+                       sort(formats.begin(), formats.end());
+
+                       for (vector<Format const *>::const_iterator fit = formats.begin();
+                            fit != formats.end() ; ++fit) {
+                               if ((*fit)->dummy())
+                                       continue;
+                               string label = (*fit)->prettyname();
+                               if ((*cit).kind() == MenuItem::ImportFormats)
+                                       if ((*fit)->name() == "text")
+                                               label = _("Ascii text as lines");
+                                       else if ((*fit)->name() == "textparagraph")
+                                               label = _("Ascii text as paragraphs");
+                               if (!(*fit)->shortcut().empty())
+                                       label += "|" + (*fit)->shortcut();
+                               int action2 = lyxaction.
+                                       getPseudoAction(action, (*fit)->name());
                                tomenu.add(MenuItem(MenuItem::Command,
                                                    label, action2));
                        }
                }
                break;
-
                        
                default:
                        tomenu.add(*cit);
@@ -322,6 +324,12 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
                checkShortcuts();
 }
 
+bool Menu::hasSubmenu(string const & name) const
+{
+       return find_if(begin(), end(),
+                      compare_memfun(&MenuItem::submenu, name)) != end();
+}
+
 
 void MenuBackend::read(LyXLex & lex)
 {
@@ -351,7 +359,7 @@ void MenuBackend::read(LyXLex & lex)
        bool menubar = false;
 
        while (lex.IsOK() && !quit) {
-               switch(lex.lex()) {
+               switch (lex.lex()) {
                case md_menubar: 
                        menubar = true;
                        // fallback to md_menu
@@ -436,7 +444,7 @@ void MenuBackend::defaults()
        add(main_nobuffer);
 
        if (lyxerr.debugging(Debug::GUI)) {
-               for(const_iterator cit = begin();
+               for (const_iterator cit = begin();
                    cit != end() ; ++cit)
                        lyxerr << "Menu name: " << cit->name() 
                               << ", Menubar: " << cit->menubar()