#pragma implementation
#endif
+#include <algorithm>
#include "MenuBackend.h"
#include "lyxlex.h"
#include "LyXAction.h"
#include "support/LAssert.h"
#include "support/filetools.h"
#include "support/lyxfunctional.h"
+#include "support/lstrings.h"
extern LyXAction lyxaction;
extern LastFiles * lastfiles;
}
}
+string const MenuItem::label() const
+{
+ return token(label_, '|', 0);
+}
+
+string const MenuItem::shortcut() const
+{
+ return token(label_, '|', 1);
+}
+
Menu & Menu::add(MenuItem const & i)
{
bool quit = false;
bool optional = false;
- while (lex.IsOK() && !quit) {
+ while (lex.isOK() && !quit) {
switch (lex.lex()) {
case md_optitem:
optional = true;
// fallback to md_item
case md_item: {
- lex.next();
- string const name = _(lex.GetString());
- lex.next();
- string const command = lex.GetString();
+ lex.next(true);
+ string const name = _(lex.getString());
+ lex.next(true);
+ string const command = lex.getString();
add(MenuItem(MenuItem::Command, name,
command, optional));
optional = false;
break;
case md_submenu: {
- lex.next();
- string mlabel = _(lex.GetString());
- lex.next();
- string mname = lex.GetString();
+ lex.next(true);
+ string const mlabel = _(lex.getString());
+ lex.next(true);
+ string const mname = lex.getString();
add(MenuItem(MenuItem::Submenu, mlabel, mname));
break;
}
}
}
-
namespace {
class compare_format {
{
for (const_iterator cit = begin();
cit != end() ; ++cit) {
- switch ((*cit).kind()) {
+ switch (cit->kind()) {
case MenuItem::Lastfiles: {
int ii = 1;
LastFiles::const_iterator lfit = lastfiles->begin();
Formats formats;
kb_action action;
- switch ((*cit).kind()) {
+ switch (cit->kind()) {
case MenuItem::ImportFormats:
formats = Importer::GetImportableFormats();
action = LFUN_IMPORT;
if ((*fit)->dummy())
continue;
string label = (*fit)->prettyname();
- if ((*cit).kind() == MenuItem::ImportFormats)
+ if (cit->kind() == MenuItem::ImportFormats)
if ((*fit)->name() == "text")
label = _("Ascii text as lines");
else if ((*fit)->name() == "textparagraph")
int const action = lyxaction
.getPseudoAction(LFUN_FLOAT_LIST,
cit->second.type());
- string label = "List of ";
- label += cit->second.name();
+ string const label = cit->second.name() + _(" List");
tomenu.add(MenuItem(MenuItem::Command,
label, action));
}
FloatList::const_iterator cit = floatList.begin();
FloatList::const_iterator end = floatList.end();
for (; cit != end; ++cit) {
+ // normal float
int const action = lyxaction
.getPseudoAction(LFUN_INSET_FLOAT,
cit->second.type());
string const label = cit->second.name();
tomenu.add(MenuItem(MenuItem::Command,
label, action));
+
+ // and the wide version
+ int const action2 = lyxaction
+ .getPseudoAction(LFUN_INSET_WIDE_FLOAT,
+ cit->second.type());
+ string const label2 = _("Wide ") + label;
+ tomenu.add(MenuItem(MenuItem::Command,
+ label2, action2));
}
}
break;
};
//consistency check
- if (compare_no_case(lex.GetString(), "menuset"))
+ if (compare_no_case(lex.getString(), "menuset")) {
lyxerr << "Menubackend::read: ERROR wrong token:`"
- << lex.GetString() << '\'' << endl;
+ << lex.getString() << '\'' << endl;
+ }
lex.pushTable(menutags, md_last - 1);
if (lyxerr.debugging(Debug::PARSER))
bool quit = false;
bool menubar = false;
- while (lex.IsOK() && !quit) {
+ 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();
+ lex.next(true);
+ string const name = lex.getString();
if (hasMenu(name)) {
if (getMenu(name).menubar() == menubar) {
getMenu(name).read(lex);