small changes to ButtonController usage

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index a35d9f40d1067e59d7de9aea1c83256e53264077..f4ff0ac0bb7b440a98f6fbd893d9190212b03762 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -14,10 +14,13 @@
 #endif
 
 #include <config.h>
+#include <memory>
+#include "support/LAssert.h"
 #include "MenuBackend.h"
 #include "lyxlex.h"
 #include "LyXAction.h"
 #include "debug.h"
+#include "gettext.h"
 
 extern LyXAction lyxaction;
 
@@ -27,8 +30,9 @@ using std::endl;
 MenuBackend menubackend;
 
 
-MenuItem::MenuItem(Kind kind, string const & label, string const & command) 
-       : kind_(kind), label_(label) 
+MenuItem::MenuItem(Kind kind, string const & label, 
+                  string const & command, bool optional) 
+       : kind_(kind), label_(label), optional_(optional)
 {
        switch(kind) {
        case Separator:
@@ -42,6 +46,9 @@ MenuItem::MenuItem(Kind kind, string const & label, string const & command)
                        lyxerr << "MenuItem(): LyX command `"
                               << command << "' does not exist." << endl; 
                }
+               if (optional_)
+                       lyxerr[Debug::GUI] << "Optional item " 
+                                          << command << endl; 
                break;
        case Submenu:
                submenu_ = command;
@@ -57,13 +64,14 @@ Menu & Menu::add(MenuItem const & i)
 }
 
 
-void Menu::read(LyXLex & lex)
+Menu & Menu::read(LyXLex & lex)
 {
        enum Menutags {
                md_item = 1,
                md_documents,
                md_endmenu,
                md_lastfiles,
+               md_optitem,
                md_submenu,
                md_separator,
                md_last
@@ -74,6 +82,7 @@ void Menu::read(LyXLex & lex)
                { "end", md_endmenu },
                { "item", md_item },
                { "lastfiles", md_lastfiles },
+               { "optitem", md_optitem }, 
                { "separator", md_separator },
                { "submenu", md_submenu }
        };
@@ -83,15 +92,23 @@ void Menu::read(LyXLex & lex)
                lex.printTable(lyxerr);
 
        bool quit = false;
+       bool optional = false;
 
        while (lex.IsOK() && !quit) {
                switch(lex.lex()) {
+               case md_optitem:
+                       optional = true;
+                       // fallback to md_item
                case md_item: {
                        lex.next();
-                       string name = lex.GetString();
+                       char * tmp = strdup(lex.GetString().c_str());
+                       string name = _(tmp);
+                       free(tmp);
                        lex.next();
                        string command = lex.GetString();
-                       add(MenuItem(MenuItem::Command, name, command));
+                       add(MenuItem(MenuItem::Command, name, 
+                                    command, optional));
+                       optional = false;
                        break;
                }
                case md_separator:
@@ -105,7 +122,9 @@ void Menu::read(LyXLex & lex)
                        break;
                case md_submenu: {
                        lex.next();
-                       string mlabel = lex.GetString();
+                       char * tmp = strdup(lex.GetString().c_str());
+                       string mlabel = _(tmp);
+                       free(tmp);
                        lex.next();
                        string mname = lex.GetString();
                        add(MenuItem(MenuItem::Submenu, mlabel, mname));
@@ -121,6 +140,7 @@ void Menu::read(LyXLex & lex)
                }
        }
        lex.popTable();
+       return *this;
 }
 
 
@@ -149,23 +169,29 @@ void MenuBackend::read(LyXLex & lex)
                lex.printTable(lyxerr);
 
        bool quit = false;
+       bool menubar = false;
 
        while (lex.IsOK() && !quit) {
                switch(lex.lex()) {
+               case md_menubar: 
+                       menubar = true;
+                       // fallback to md_menu
                case md_menu: {
                        lex.next();
                        string name = lex.GetString();
-                       Menu menu(name, false);
-                       menu.read(lex);
-                       add(menu);
-                       break;
-               }
-               case md_menubar: {
-                       lex.next();
-                       string name = lex.GetString();
-                       Menu menubar(name, true);
-                       menubar.read(lex);
-                       add(menubar);
+                       if (hasMenu(name)) {
+                               if (getMenu(name).menubar() == menubar) {
+                                       getMenu(name).read(lex);
+                               } else {
+                                       lex.printError("Cannot append to menu `$$Token' unless it is of the same type");
+                                       return;
+                               }
+                       } else {                                
+                               Menu menu(name, menubar);
+                               menu.read(lex);
+                               add(menu);
+                       }
+                       menubar = false;
                        break;
                }
                case md_endmenuset:
@@ -190,10 +216,10 @@ void MenuBackend::defaults()
 
        Menu file("file");
        file
-               .add(MenuItem(MenuItem::Command, "New...|N", "buffer-new"))
-               .add(MenuItem(MenuItem::Command, "Open...|O", "buffer-open"))
-               .add(MenuItem(MenuItem::Submenu, "Import|I", "import"))
-               .add(MenuItem(MenuItem::Command, "Quit|Q", "lyx-quit"))
+               .add(MenuItem(MenuItem::Command, _("New...|N"), "buffer-new"))
+               .add(MenuItem(MenuItem::Command, _("Open...|O"), "buffer-open"))
+               .add(MenuItem(MenuItem::Submenu, _("Import|I"), "import"))
+               .add(MenuItem(MenuItem::Command, _("Quit|Q"), "lyx-quit"))
                .add(MenuItem(MenuItem::Separator))
                .add(MenuItem(MenuItem::Lastfiles));
        add(file);
@@ -201,17 +227,17 @@ void MenuBackend::defaults()
        Menu import("import");
        import
                .add(MenuItem(MenuItem::Command,
-                             "LaTeX...|L", "buffer-import latex"))
+                             _("LaTeX...|L"), "buffer-import latex"))
                .add(MenuItem(MenuItem::Command,
-                             "LinuxDoc...|L", "buffer-import linuxdoc"));
+                             _("LinuxDoc...|L"), "buffer-import linuxdoc"));
        add(import);
  
        Menu edit("edit");
        edit
-               .add(MenuItem(MenuItem::Command, "Cut", "cut"))
-               .add(MenuItem(MenuItem::Command, "Copy", "copy"))
-               .add(MenuItem(MenuItem::Command, "Paste", "paste"))
-               .add(MenuItem(MenuItem::Command, "Emphasize", "font-emph"));
+               .add(MenuItem(MenuItem::Command, _("Cut"), "cut"))
+               .add(MenuItem(MenuItem::Command, _("Copy"), "copy"))
+               .add(MenuItem(MenuItem::Command, _("Paste"), "paste"))
+               .add(MenuItem(MenuItem::Command, _("Emphasize"), "font-emph"));
        add(edit);
 
        Menu documents("documents");
@@ -220,14 +246,14 @@ void MenuBackend::defaults()
 
        Menu main("main", true);
        main
-               .add(MenuItem(MenuItem::Submenu, "File|F", "file"))
-               .add(MenuItem(MenuItem::Submenu, "Edit|E", "edit"))
-               .add(MenuItem(MenuItem::Submenu, 
-                             "Documents|D", "documents"));
+               .add(MenuItem(MenuItem::Submenu, _("File|F"), "file"))
+               .add(MenuItem(MenuItem::Submenu, _("Edit|E"), "edit"))
+               .add(MenuItem(MenuItem::Submenu,
+                             _("Documents|D"), "documents"));
        add(main);
 
        Menu main_nobuffer("main_nobuffer", true);
-       main_nobuffer.add(MenuItem(MenuItem::Submenu, "File|F", "file"));
+       main_nobuffer.add(MenuItem(MenuItem::Submenu, _("File|F"), "file"));
        add(main_nobuffer);
 
        if (lyxerr.debugging(Debug::GUI)) {
@@ -248,7 +274,8 @@ void MenuBackend::add(Menu const & menu)
 
 bool MenuBackend::hasMenu(string const & name) const
 {
-       for (const_iterator cit = begin(); cit != end(); ++cit) {
+       const_iterator mend = end();
+       for (const_iterator cit = begin(); cit != mend; ++cit) {
                if ((*cit).name() == name)
                        return true;
        }
@@ -258,10 +285,25 @@ bool MenuBackend::hasMenu(string const & name) const
 
 Menu const & MenuBackend::getMenu(string const & name) const
 {
-       for (const_iterator cit = begin(); cit != end(); ++cit) {
+       const_iterator mend = end();
+       for (const_iterator cit = begin(); cit != mend; ++cit) {
+               if ((*cit).name() == name)
+                       return (*cit);
+       }
+       Assert(false); // we actually require the name to exist.
+       return menulist_.front();
+}
+
+
+Menu & MenuBackend::getMenu(string const & name)
+{
+       MenuList::iterator end = menulist_.end();
+       for (MenuList::iterator cit = menulist_.begin(); 
+            cit != end; ++cit) {
                if ((*cit).name() == name)
                        return (*cit);
        }
        Assert(false); // we actually require the name to exist.
        return menulist_.front();
 }
+