#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;
// This is the global menu definition
MenuBackend menubackend;
-MenuItem::MenuItem(MenuItem const & m)
- : kind_(m.kind_), label_(m.label_), action_(m.action_), submenu_(m.submenu_)
-{}
-
-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:
lyxerr << "MenuItem(): LyX command `"
<< command << "' does not exist." << endl;
}
+ if (optional_)
+ lyxerr[Debug::GUI] << "Optional item "
+ << command << endl;
break;
case Submenu:
submenu_ = command;
}
}
-void Menu::add(MenuItem const & i)
+
+Menu & Menu::add(MenuItem const & i)
{
items_.push_back(i);
+ return *this;
}
-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
{ "end", md_endmenu },
{ "item", md_item },
{ "lastfiles", md_lastfiles },
+ { "optitem", md_optitem },
{ "separator", md_separator },
{ "submenu", md_submenu }
};
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
- string mlabel, mname;
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:
break;
case md_submenu: {
lex.next();
- mlabel = lex.GetString();
+ char * tmp = strdup(lex.GetString().c_str());
+ string mlabel = _(tmp);
+ free(tmp);
lex.next();
- mname = lex.GetString();
+ string mname = lex.GetString();
add(MenuItem(MenuItem::Submenu, mlabel, mname));
break;
}
}
}
lex.popTable();
+ return *this;
}
md_last
};
- struct keyword_item menutags[md_last-1] = {
+ struct keyword_item menutags[md_last - 1] = {
{ "end", md_endmenuset },
{ "menu", md_menu },
{ "menubar", md_menubar }
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
- string mlabel, mname;
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:
lex.popTable();
}
+
void MenuBackend::defaults()
{
- if (menulist_.size() > 0)
- menulist_.clear();
+ menulist_.clear();
lyxerr[Debug::GUI] << "MenuBackend::defaults: using default values"
<< endl;
Menu file("file");
- file.add(MenuItem(MenuItem::Command,
- "New...|N", "buffer-new"));
- file.add(MenuItem(MenuItem::Command,
- "Open...|O", "buffer-open"));
- file.add(MenuItem(MenuItem::Submenu,
- "Import|I", "import"));
- file.add(MenuItem(MenuItem::Command,
- "Quit|Q", "lyx-quit"));
- file.add(MenuItem(MenuItem::Separator));
- file.add(MenuItem(MenuItem::Lastfiles));
+ 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::Separator))
+ .add(MenuItem(MenuItem::Lastfiles));
add(file);
Menu import("import");
- import.add(MenuItem(MenuItem::Command,
- "LaTeX...|L", "buffer-import latex"));
- import.add(MenuItem(MenuItem::Command,
- "LinuxDoc...|L", "buffer-import linuxdoc"));
+ import
+ .add(MenuItem(MenuItem::Command,
+ _("LaTeX...|L"), "buffer-import latex"))
+ .add(MenuItem(MenuItem::Command,
+ _("LinuxDoc...|L"), "buffer-import linuxdoc"));
add(import);
Menu edit("edit");
- edit.add(MenuItem(MenuItem::Command,
- "Cut", "cut"));
- edit.add(MenuItem(MenuItem::Command,
- "Copy", "copy"));
- edit.add(MenuItem(MenuItem::Command,
- "Paste", "paste"));
- edit.add(MenuItem(MenuItem::Command,
- "Emphasize", "font-emph"));
+ 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(edit);
Menu documents("documents");
add(documents);
Menu main("main", true);
- main.add(MenuItem(MenuItem::Submenu, "File|F", "file"));
- main.add(MenuItem(MenuItem::Submenu, "Edit|E", "edit"));
- main.add(MenuItem(MenuItem::Submenu,
- "Documents|D", "documents"));
+ main
+ .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)) {
}
}
-void MenuBackend::add(Menu const &menu)
+
+void MenuBackend::add(Menu const & menu)
{
menulist_.push_back(menu);
}
-bool MenuBackend::hasMenu(string const &name) const
+
+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;
}
return false;
}
-Menu const & MenuBackend::getMenu(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();
+}
+
projects / lyx.git / blobdiff