#include "frontends/LyXView.h"
#include "support/filetools.h"
-#include "support/lyxfunctional.h"
#include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
+
+#include <boost/bind.hpp>
#include <algorithm>
using lyx::support::MakeDisplayPath;
using lyx::support::token;
+using boost::bind;
+
+using std::auto_ptr;
using std::endl;
+using std::equal_to;
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;
+namespace {
+
+class MenuNamesEqual : public std::unary_function<Menu, bool> {
+public:
+ MenuNamesEqual(string const & name)
+ : name_(name) {}
+ bool operator()(Menu const & menu) const
+ {
+ return menu.name() == name_;
+ }
+private:
+ string name_;
+};
+
+} // namespace anon
+
+
// This is the global menu definition
MenuBackend menubackend;
MenuItem::MenuItem(Kind kind, string const & label,
FuncRequest const & func, bool optional)
: kind_(kind), label_(label), func_(func), optional_(optional)
-{}
+{
+ func_.origin = FuncRequest::UI;
+}
MenuItem::~MenuItem()
// Get the keys bound to this action, but keep only the
// first one later
- string bindings = toplevel_keymap->findbinding(func_.action);
+ kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_);
- if (!bindings.empty()) {
- return bindings.substr(1, bindings.find(']') - 1);
- } else
+ if (bindings.size()) {
+ return bindings.begin()->print();
+ } else {
+ lyxerr[Debug::KBMAP]
+ << "No binding for "
+ << lyxaction.getActionName(func_.action)
+ << '(' << func_.argument << ')' << endl;
return string();
+ }
+
}
}
switch (i.kind()) {
- case MenuItem::Command:
- {
+
+ case MenuItem::Command: {
FuncStatus status =
view->getLyXFunc().getStatus(i.func());
if (status.unknown()
- || (status.disabled() && i.optional()))
+ || (!status.enabled() && i.optional()))
break;
items_.push_back(i);
items_.back().status(status);
break;
}
- case MenuItem::Submenu:
- {
+
+ case MenuItem::Submenu: {
if (i.submenu()) {
- bool disabled = true;
+ bool enabled = false;
for (const_iterator cit = i.submenu()->begin();
cit != i.submenu()->end(); ++cit) {
if ((cit->kind() == MenuItem::Command
|| cit->kind() == MenuItem::Submenu)
- && !cit->status().disabled()) {
- disabled = false;
+ && cit->status().enabled()) {
+ enabled = true;
break;
}
}
- if (!disabled || !i.optional()) {
+ if (enabled || !i.optional()) {
items_.push_back(i);
- items_.back().status().disabled(disabled);
+ items_.back().status().enabled(enabled);
}
}
else
items_.push_back(i);
break;
}
+
case MenuItem::Separator:
if (!items_.empty()
&& items_.back().kind() != MenuItem::Separator)
items_.push_back(i);
break;
+
default:
items_.push_back(i);
}
md_item = 1,
md_branches,
md_documents,
+ md_charstyles,
md_endmenu,
md_exportformats,
md_importformats,
struct keyword_item menutags[md_last - 1] = {
{ "branches", md_branches },
+ { "charstyles", md_charstyles },
{ "documents", md_documents },
{ "end", md_endmenu },
{ "exportformats", md_exportformats },
string const name = _(lex.getString());
lex.next(true);
string const command = lex.getString();
- string::size_type sp = command.find(' ');
- if (sp != string::npos) {
- string const cmd = command.substr(0, sp);
- string const arg =command.substr(sp + 1,
- string::npos);
- kb_action act = lyxaction.LookupFunc(cmd);
- add(MenuItem(MenuItem::Command, name,
- FuncRequest(act, arg), optional));
- } else {
- kb_action act = lyxaction.LookupFunc(command);
- add(MenuItem(MenuItem::Command, name,
- FuncRequest(act), optional));
- }
-
+ FuncRequest func = lyxaction.lookupFunc(command);
+ add(MenuItem(MenuItem::Command, name, func, optional));
optional = false;
break;
}
add(MenuItem(MenuItem::Lastfiles));
break;
+ case md_charstyles:
+ add(MenuItem(MenuItem::CharStyles));
+ break;
+
case md_documents:
add(MenuItem(MenuItem::Documents));
break;
}
+MenuItem const & Menu::operator[](size_type i) const
+{
+ return items_[i];
+}
+
+
+bool Menu::hasFunc(FuncRequest const & func) const
+{
+ return find_if(begin(), end(),
+ bind(std::equal_to<FuncRequest>(),
+ bind(&MenuItem::func, _1),
+ func)) != end();
+}
+
void Menu::checkShortcuts() const
{
// This is a quadratic algorithm, but we do not care because
}
+void MenuBackend::specialMenu(string const &name)
+{
+ if (hasMenu(name))
+ specialmenu_ = &getMenu(name);
+}
+
+
namespace {
class compare_format {
void expandLastfiles(Menu & tomenu, LyXView const * view)
{
+ LastFiles const & lastfiles = LyX::cref().lastfiles();
+
int ii = 1;
- LastFiles::const_iterator lfit = lastfiles->begin();
- LastFiles::const_iterator end = lastfiles->end();
+ LastFiles::const_iterator lfit = lastfiles.begin();
+ LastFiles::const_iterator end = lastfiles.end();
for (; lfit != end && ii < 10; ++lfit, ++ii) {
- string const label = tostr(ii) + ". "
+ string const label = convert<string>(ii) + ". "
+ MakeDisplayPath((*lfit), 30)
- + '|' + tostr(ii);
+ + '|' + convert<string>(ii);
tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view);
}
}
+
void expandDocuments(Menu & tomenu, LyXView const * view)
{
typedef vector<string> Strings;
for (; docit != end; ++docit, ++ii) {
string label = MakeDisplayPath(*docit, 20);
if (ii < 10)
- label = tostr(ii) + ". " + label + '|' + tostr(ii);
+ label = convert<string>(ii) + ". " + label + '|' + convert<string>(ii);
tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view);
}
}
if (kind == MenuItem::ImportFormats) {
if ((*fit)->name() == "text")
- label = _("ASCII text as lines");
+ label = _("Plain Text as Lines");
else if ((*fit)->name() == "textparagraph")
- label = _("ASCII text as paragraphs");
+ label = _("Plain Text as Paragraphs");
label += "...";
}
if (!(*fit)->shortcut().empty())
}
+void expandCharStyleInsert(Menu & tomenu, LyXView const * view)
+{
+ if (!view->buffer()) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Documents Open!"),
+ FuncRequest(LFUN_NOACTION)),
+ view);
+ return;
+ }
+ CharStyles & charstyles =
+ view->buffer()->params().getLyXTextClass().charstyles();
+ CharStyles::iterator cit = charstyles.begin();
+ CharStyles::iterator end = charstyles.end();
+ for (; cit != end; ++cit) {
+ string const label = cit->name;
+ tomenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(LFUN_INSERT_CHARSTYLE,
+ cit->name)), view);
+ }
+}
+
+
Menu::size_type const max_number_of_items = 25;
void expandToc2(Menu & tomenu,
lyx::toc::Toc::size_type to, int depth)
{
int shortcut_count = 0;
+
+ // check whether depth is smaller than the smallest depth in toc.
+ int min_depth = 1000;
+ for (lyx::toc::Toc::size_type i = from; i < to; ++i)
+ min_depth = std::min(min_depth, toc_list[i].depth);
+ if (min_depth > depth)
+ depth = min_depth;
+
+
if (to - from <= max_number_of_items) {
for (lyx::toc::Toc::size_type i = from; i < to; ++i) {
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);
+ && shortcut_count < 9) {
+ if (label.find(convert<string>(shortcut_count + 1)) != string::npos)
+ label += '|' + convert<string>(++shortcut_count);
}
tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(toc_list[i].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 &&
- ++shortcut_count <= 9)
- label += '|' + tostr(shortcut_count);
-
+ shortcut_count < 9) {
+ if (label.find(convert<string>(shortcut_count + 1)) != string::npos)
+ label += '|' + convert<string>(++shortcut_count);
+ }
if (new_pos == pos + 1) {
tomenu.add(MenuItem(MenuItem::Command,
label, FuncRequest(toc_list[pos].action())));
// know that all the entries in a TOC will be have status_ ==
// OK, so we avoid this unnecessary overhead (JMarc)
- if (!view->buffer()) {
+
+ Buffer const * buf = view->buffer();
+ if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"),
FuncRequest(LFUN_NOACTION)),
return;
}
- lyx::toc::TocList toc_list = lyx::toc::getTocList(*view->buffer());
+ FloatList const & floatlist = buf->params().getLyXTextClass().floats();
+ lyx::toc::TocList toc_list = lyx::toc::getTocList(*buf);
lyx::toc::TocList::const_iterator cit = toc_list.begin();
lyx::toc::TocList::const_iterator end = toc_list.end();
for (; cit != end; ++cit) {
continue;
// All the rest is for floats
- Menu * menu = new Menu;
+ auto_ptr<Menu> menu(new Menu);
lyx::toc::Toc::const_iterator ccit = cit->second.begin();
lyx::toc::Toc::const_iterator eend = cit->second.end();
for (; ccit != eend; ++ccit) {
label,
FuncRequest(ccit->action())));
}
- string const & floatName = cit->first;
- // Is the _(...) really needed here? (Lgb)
+ string const & floatName = floatlist.getType(cit->first).listName();
MenuItem item(MenuItem::Submenu, _(floatName));
- item.submenu(menu);
+ item.submenu(menu.release());
tomenu.add(item);
}
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);
if (!view || !view->buffer())
return;
- vector<string> const selL =
- CutAndPaste::availableSelections(*view->buffer());
+ vector<string> const sel =
+ lyx::cap::availableSelections(*view->buffer());
- vector<string>::const_iterator cit = selL.begin();
- vector<string>::const_iterator end = selL.end();
+ vector<string>::const_iterator cit = sel.begin();
+ vector<string>::const_iterator end = sel.end();
for (unsigned int index = 0; cit != end; ++cit, ++index) {
tomenu.add(MenuItem(MenuItem::Command, *cit,
- FuncRequest(LFUN_PASTE, tostr(index))));
+ FuncRequest(LFUN_PASTE, convert<string>(index))));
}
}
if (!view || !view->buffer())
return;
- BufferParams const & params = view->buffer()->params();
+ BufferParams const & params = view->buffer()->getMasterBuffer()->params();
- std::list<Branch>::const_iterator cit = params.branchlist().begin();
- std::list<Branch>::const_iterator end = params.branchlist().end();
+ BranchList::const_iterator cit = params.branchlist().begin();
+ BranchList::const_iterator end = params.branchlist().end();
for (int ii = 1; cit != end; ++cit, ++ii) {
string label = cit->getBranch();
if (ii < 10)
- label = tostr(ii) + ". " + label + "|" + tostr(ii);
+ label = convert<string>(ii) + ". " + label + "|" + convert<string>(ii);
tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(LFUN_INSERT_BRANCH,
cit->getBranch())), view);
expandFormats(cit->kind(), tomenu, view);
break;
+ case MenuItem::CharStyles:
+ expandCharStyleInsert(tomenu, view);
+ break;
+
case MenuItem::FloatListInsert:
expandFloatListInsert(tomenu, view);
break;
}
break;
- default:
+ case MenuItem::Separator:
tomenu.add(*cit, view);
+ break;
+
+ case MenuItem::Command:
+ if (!specialmenu_
+ || !specialmenu_->hasFunc(cit->func()))
+ tomenu.add(*cit, view);
}
}
}
-bool Menu::hasSubmenu(string const & name) const
-{
- return find_if(begin(), end(),
- lyx::compare_memfun(&MenuItem::submenuname,
- name)) != end();
-}
-
-
void MenuBackend::read(LyXLex & lex)
{
enum Menutags {
bool MenuBackend::hasMenu(string const & name) const
{
- return find_if(begin(), end(),
- lyx::compare_memfun(&Menu::name, name)) != end();
+ return find_if(begin(), end(), MenuNamesEqual(name)) != end();
}
Menu const & MenuBackend::getMenu(string const & name) const
{
- const_iterator cit = find_if(begin(), end(),
- lyx::compare_memfun(&Menu::name, name));
+ const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name));
if (cit == end())
lyxerr << "No submenu named " << name << endl;
BOOST_ASSERT(cit != end());
Menu & MenuBackend::getMenu(string const & name)
{
- MenuList::iterator it =
- find_if(menulist_.begin(), menulist_.end(),
- lyx::compare_memfun(&Menu::name, name));
- BOOST_ASSERT(it != menulist_.end());
+ iterator it = find_if(begin(), end(), MenuNamesEqual(name));
+ if (it == end())
+ lyxerr << "No submenu named " << name << endl;
+ BOOST_ASSERT(it != end());
return (*it);
}
projects / lyx.git / blobdiff