#include <config.h>
#include "MenuBackend.h"
-#include "lyxlex.h"
-#include "LyXAction.h"
+
+#include "BranchList.h"
+#include "buffer.h"
+#include "bufferlist.h"
+#include "bufferparams.h"
+#include "CutAndPaste.h"
#include "debug.h"
+#include "exporter.h"
+#include "Floating.h"
+#include "FloatList.h"
+#include "format.h"
#include "gettext.h"
+#include "importer.h"
#include "kbmap.h"
#include "lastfiles.h"
-#include "lyxfunc.h"
+#include "LyXAction.h"
#include "lyx_main.h" // for lastfiles
-#include "bufferlist.h"
-#include "buffer.h"
-#include "format.h"
-#include "exporter.h"
-#include "importer.h"
-#include "Floating.h"
-#include "FloatList.h"
+#include "lyxfunc.h"
+#include "lyxlex.h"
#include "toc.h"
-#include "CutAndPaste.h"
+
#include "frontends/LyXView.h"
-#include "support/LAssert.h"
+
#include "support/filetools.h"
#include "support/lyxfunctional.h"
#include "support/lstrings.h"
#include <algorithm>
-extern BufferList bufferlist;
-extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
-
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::MakeDisplayPath;
+using lyx::support::token;
using std::endl;
-using std::vector;
-using std::max;
-using std::pair;
using std::find_if;
+using std::max;
using std::sort;
+using std::string;
+using std::vector;
+
+
+extern BufferList bufferlist;
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
// This is the global menu definition
MenuBackend menubackend;
+MenuItem::MenuItem(Kind kind)
+ : kind_(kind), optional_(false)
+{}
+
+
MenuItem::MenuItem(Kind kind, string const & label,
- string const & command, bool optional)
- : kind_(kind), label_(label), optional_(optional)
+ string const & submenu, bool optional)
+ : kind_(kind), label_(label),
+ submenuname_(submenu), optional_(optional)
{
- switch (kind) {
- case Separator:
- case Documents:
- case Lastfiles:
- case Toc:
- case ViewFormats:
- case UpdateFormats:
- case ExportFormats:
- case ImportFormats:
- case FloatListInsert:
- case FloatInsert:
- case PasteRecent:
- case Branches:
- break;
- case Command:
- action_ = lyxaction.LookupFunc(command);
-
- if (action_ == LFUN_UNKNOWN_ACTION) {
- lyxerr << "MenuItem(): LyX command `"
- << command << "' does not exist." << endl;
- }
- if (optional_)
- lyxerr[Debug::GUI] << "Optional item "
- << command << endl;
- break;
- case Submenu:
- submenuname_ = command;
- break;
- }
+ BOOST_ASSERT(kind == Submenu);
}
-MenuItem::MenuItem(Kind kind, string const & label, int action, bool optional)
- : kind_(kind), label_(label), action_(action), submenuname_(),
- optional_(optional)
+MenuItem::MenuItem(Kind kind, string const & label,
+ FuncRequest const & func, bool optional)
+ : kind_(kind), label_(label), func_(func), optional_(optional)
{}
return token(label_, '|', 1);
}
+
string const MenuItem::binding() const
{
if (kind_ != Command)
// Get the keys bound to this action, but keep only the
// first one later
- string bindings = toplevel_keymap->findbinding(action_);
+ string bindings = toplevel_keymap->findbinding(func_);
if (!bindings.empty()) {
return bindings.substr(1, bindings.find(']') - 1);
- } else
+ } else {
+ lyxerr[Debug::KBMAP]
+ << "No bindings for "
+ << lyxaction.getActionName(func_.action)
+ << '(' << func_.argument << ')' << endl;
return string();
+ }
+
}
case MenuItem::Command:
{
FuncStatus status =
- view->getLyXFunc().getStatus(i.action());
+ view->getLyXFunc().getStatus(i.func());
if (status.unknown()
|| (status.disabled() && i.optional()))
break;
string const name = _(lex.getString());
lex.next(true);
string const command = lex.getString();
- add(MenuItem(MenuItem::Command, name,
- command, optional));
+ FuncRequest func = lyxaction.lookupFunc(command);
+ add(MenuItem(MenuItem::Command, name, func, optional));
optional = false;
break;
}
string const label = tostr(ii) + ". "
+ MakeDisplayPath((*lfit), 30)
+ '|' + tostr(ii);
- int const action = lyxaction.
- getPseudoAction(LFUN_FILE_OPEN,
- (*lfit));
- tomenu.add(MenuItem(MenuItem::Command, label, action), view);
+ tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view);
}
}
if (names.empty()) {
tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"),
- LFUN_NOACTION), view);
+ FuncRequest(LFUN_NOACTION)), view);
return;
}
Strings::const_iterator docit = names.begin();
Strings::const_iterator end = names.end();
for (; docit != end; ++docit, ++ii) {
- int const action =
- lyxaction.getPseudoAction(LFUN_SWITCHBUFFER, *docit);
string label = MakeDisplayPath(*docit, 20);
if (ii < 10)
label = tostr(ii) + ". " + label + '|' + tostr(ii);
- tomenu.add(MenuItem(MenuItem::Command, label, action), view);
+ tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view);
}
}
{
if (!view->buffer() && kind != MenuItem::ImportFormats) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"), LFUN_NOACTION),
+ _("No Documents Open!"),
+ FuncRequest(LFUN_NOACTION)),
view);
return;
}
}
if (!(*fit)->shortcut().empty())
label += '|' + (*fit)->shortcut();
- int const action2 = lyxaction.
- getPseudoAction(action, (*fit)->name());
- tomenu.add(MenuItem(MenuItem::Command, label, action2),
+
+ tomenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(action, (*fit)->name())),
view);
}
}
{
if (!view->buffer()) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"), LFUN_NOACTION),
+ _("No Documents Open!"),
+ FuncRequest(LFUN_NOACTION)),
view);
return;
}
FloatList const & floats =
- view->buffer()->params.getLyXTextClass().floats();
+ view->buffer()->params().getLyXTextClass().floats();
FloatList::const_iterator cit = floats.begin();
FloatList::const_iterator end = floats.end();
for (; cit != end; ++cit) {
- int const action = lyxaction
- .getPseudoAction(LFUN_FLOAT_LIST, cit->second.type());
tomenu.add(MenuItem(MenuItem::Command,
- _(cit->second.listName()), action),
+ _(cit->second.listName()),
+ FuncRequest(LFUN_FLOAT_LIST,
+ cit->second.type())),
view);
}
}
{
if (!view->buffer()) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"), LFUN_NOACTION),
+ _("No Documents Open!"),
+ FuncRequest(LFUN_NOACTION)),
view);
return;
}
FloatList const & floats =
- view->buffer()->params.getLyXTextClass().floats();
+ view->buffer()->params().getLyXTextClass().floats();
FloatList::const_iterator cit = floats.begin();
FloatList::const_iterator end = floats.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),
+ tomenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(LFUN_INSET_FLOAT,
+ cit->second.type())),
view);
}
}
int shortcut_count = 0;
if (to - from <= max_number_of_items) {
for (lyx::toc::Toc::size_type i = from; i < to; ++i) {
- int const action = toc_list[i].action();
string label(4 * max(0, toc_list[i].depth - depth),' ');
label += limit_string_length(toc_list[i].str);
if (toc_list[i].depth == depth
&& ++shortcut_count <= 9) {
label += '|' + tostr(shortcut_count);
}
- tomenu.add(MenuItem(MenuItem::Command, label, action));
+ tomenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(toc_list[i].action())));
}
} else {
lyx::toc::Toc::size_type pos = from;
toc_list[new_pos].depth > depth)
++new_pos;
- int const action = toc_list[pos].action();
string label(4 * max(0, toc_list[pos].depth - depth), ' ');
label += limit_string_length(toc_list[pos].str);
if (toc_list[pos].depth == depth &&
if (new_pos == pos + 1) {
tomenu.add(MenuItem(MenuItem::Command,
- label, action));
+ label, FuncRequest(toc_list[pos].action())));
} else {
MenuItem item(MenuItem::Submenu, label);
item.submenu(new Menu);
if (!view->buffer()) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"), LFUN_NOACTION),
+ _("No Documents Open!"),
+ FuncRequest(LFUN_NOACTION)),
view);
return;
}
for (; ccit != eend; ++ccit) {
string const label = limit_string_length(ccit->str);
menu->add(MenuItem(MenuItem::Command,
- label, ccit->action()));
+ label,
+ FuncRequest(ccit->action())));
}
string const & floatName = cit->first;
// Is the _(...) really needed here? (Lgb)
cit = toc_list.find("TOC");
if (cit == end) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Table of contents")),
+ _("No Table of contents"),
+ FuncRequest()),
view);
} else {
expandToc2(tomenu, cit->second, 0, cit->second.size(), 0);
vector<string>::const_iterator end = selL.end();
for (unsigned int index = 0; cit != end; ++cit, ++index) {
- int const action = lyxaction.getPseudoAction(LFUN_PASTE,
- tostr(index));
- tomenu.add(MenuItem(MenuItem::Command, *cit, action));
+ tomenu.add(MenuItem(MenuItem::Command, *cit,
+ FuncRequest(LFUN_PASTE, tostr(index))));
}
}
if (!view || !view->buffer())
return;
- BufferParams const & params = view->buffer()->params;
+ BufferParams const & params = view->buffer()->params();
- std::list<Branch>::const_iterator cit = params.branchlist.begin();
- std::list<Branch>::const_iterator end = params.branchlist.end();
+ std::list<Branch>::const_iterator cit = params.branchlist().begin();
+ std::list<Branch>::const_iterator end = params.branchlist().end();
for (int ii = 1; cit != end; ++cit, ++ii) {
string label = cit->getBranch();
- int const action = lyxaction.
- getPseudoAction(LFUN_INSERT_BRANCH,
- (cit->getBranch()));
if (ii < 10)
label = tostr(ii) + ". " + label + "|" + tostr(ii);
- tomenu.add(MenuItem(MenuItem::Command, label, action), view);
+ tomenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(LFUN_INSERT_BRANCH,
+ cit->getBranch())), view);
}
}
lyx::compare_memfun(&Menu::name, name));
if (cit == end())
lyxerr << "No submenu named " << name << endl;
- Assert(cit != end());
+ BOOST_ASSERT(cit != end());
return (*cit);
}
MenuList::iterator it =
find_if(menulist_.begin(), menulist_.end(),
lyx::compare_memfun(&Menu::name, name));
- Assert(it != menulist_.end());
+ BOOST_ASSERT(it != menulist_.end());
return (*it);
}
projects / lyx.git / blobdiff