#include "gettext.h"
#include "importer.h"
#include "kbmap.h"
-#include "lastfiles.h"
+#include "session.h"
#include "LyXAction.h"
#include "lyx_main.h" // for lastfiles
#include "lyxfunc.h"
#include "lyxlex.h"
-#include "toc.h"
-
-#include "frontends/LyXView.h"
+#include "paragraph.h"
+#include "TocBackend.h"
+#include "ToolbarBackend.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::compare_ascii_no_case;
-using lyx::support::contains;
-using lyx::support::MakeDisplayPath;
-using lyx::support::token;
+
+namespace lyx {
+
+using support::compare_no_case;
+using support::compare_ascii_no_case;
+using support::contains;
+using support::makeDisplayPath;
+using support::token;
+using support::uppercase;
+
+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::vector;
-extern BufferList bufferlist;
-extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
+namespace {
+
+class MenuNamesEqual : public std::unary_function<Menu, bool> {
+public:
+ MenuNamesEqual(docstring const & name)
+ : name_(name) {}
+ bool operator()(Menu const & menu) const
+ {
+ return menu.name() == name_;
+ }
+private:
+ docstring name_;
+};
+
+} // namespace anon
+
// This is the global menu definition
MenuBackend menubackend;
{}
-MenuItem::MenuItem(Kind kind, string const & label,
- string const & submenu, bool optional)
+MenuItem::MenuItem(Kind kind, docstring const & label,
+ docstring const & submenu, bool optional)
: kind_(kind), label_(label),
submenuname_(submenu), optional_(optional)
{
}
-MenuItem::MenuItem(Kind kind, string const & label,
+MenuItem::MenuItem(Kind kind, docstring const & label,
FuncRequest const & func, bool optional)
: kind_(kind), label_(label), func_(func), optional_(optional)
-{}
+{
+ func_.origin = FuncRequest::MENU;
+}
MenuItem::~MenuItem()
}
-string const MenuItem::label() const
+docstring const MenuItem::label() const
{
- return token(label_, '|', 0);
+ return token(label_, char_type('|'), 0);
}
-string const MenuItem::shortcut() const
+docstring const MenuItem::shortcut() const
{
- return token(label_, '|', 1);
+ return token(label_, char_type('|'), 1);
}
-string const MenuItem::binding() const
+docstring const MenuItem::binding(bool forgui) const
{
if (kind_ != Command)
- return string();
+ return docstring();
// Get the keys bound to this action, but keep only the
// first one later
- string bindings = toplevel_keymap->findbinding(func_);
+ kb_keymap::Bindings bindings = theTopLevelKeymap().findbindings(func_);
- if (!bindings.empty()) {
- return bindings.substr(1, bindings.find(']') - 1);
+ if (bindings.size()) {
+ return bindings.begin()->print(forgui);
} else {
lyxerr[Debug::KBMAP]
- << "No bindings for "
+ << "No binding for "
<< lyxaction.getActionName(func_.action)
- << '(' << func_.argument << ')' << endl;
- return string();
+ << '(' << to_utf8(func_.argument()) << ')' << endl;
+ return docstring();
}
}
-Menu & Menu::add(MenuItem const & i, LyXView const * view)
+Menu & Menu::add(MenuItem const & i)
{
- if (!view) {
- items_.push_back(i);
- return *this;
- }
+ items_.push_back(i);
+ return *this;
+}
+
+Menu & Menu::addWithStatusCheck(MenuItem const & i)
+{
switch (i.kind()) {
- case MenuItem::Command:
- {
- FuncStatus status =
- view->getLyXFunc().getStatus(i.func());
- if (status.unknown()
- || (status.disabled() && i.optional()))
+
+ case MenuItem::Command: {
+ FuncStatus status = lyx::getStatus(i.func());
+ if (status.unknown() || (!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_bookmarks,
+ md_charstyles,
md_endmenu,
md_exportformats,
md_importformats,
md_floatlistinsert,
md_floatinsert,
md_pasterecent,
+ md_toolbars,
md_last
};
struct keyword_item menutags[md_last - 1] = {
+ { "bookmarks", md_bookmarks },
{ "branches", md_branches },
+ { "charstyles", md_charstyles },
{ "documents", md_documents },
{ "end", md_endmenu },
{ "exportformats", md_exportformats },
{ "separator", md_separator },
{ "submenu", md_submenu },
{ "toc", md_toc },
+ { "toolbars", md_toolbars },
{ "updateformats", md_updateformats },
{ "viewformats", md_viewformats }
};
// fallback to md_item
case md_item: {
lex.next(true);
- string const name = _(lex.getString());
+ docstring const name = translateIfPossible(lex.getDocString());
lex.next(true);
string const command = lex.getString();
FuncRequest func = lyxaction.lookupFunc(command);
add(MenuItem(MenuItem::Lastfiles));
break;
+ case md_charstyles:
+ add(MenuItem(MenuItem::CharStyles));
+ break;
+
case md_documents:
add(MenuItem(MenuItem::Documents));
break;
+ case md_bookmarks:
+ add(MenuItem(MenuItem::Bookmarks));
+ break;
+
case md_toc:
add(MenuItem(MenuItem::Toc));
break;
add(MenuItem(MenuItem::PasteRecent));
break;
+ case md_toolbars:
+ add(MenuItem(MenuItem::Toolbars));
+ break;
+
case md_branches:
add(MenuItem(MenuItem::Branches));
break;
// fallback to md_submenu
case md_submenu: {
lex.next(true);
- string const mlabel = _(lex.getString());
+ docstring const mlabel = translateIfPossible(lex.getDocString());
lex.next(true);
- string const mname = lex.getString();
+ docstring const mname = lex.getDocString();
add(MenuItem(MenuItem::Submenu, mlabel, mname,
optional));
optional = false;
}
+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
// menus are short enough
for (const_iterator it1 = begin(); it1 != end(); ++it1) {
- string shortcut = it1->shortcut();
+ docstring shortcut = it1->shortcut();
if (shortcut.empty())
continue;
if (!contains(it1->label(), shortcut))
lyxerr << "Menu warning: menu entry \""
- << it1->label()
+ << to_utf8(it1->label())
<< "\" does not contain shortcut `"
- << shortcut << "'." << endl;
+ << to_utf8(shortcut) << "'." << endl;
for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
- if (!compare_ascii_no_case(it2->shortcut(), shortcut)) {
+ if (!compare_no_case(it2->shortcut(), shortcut)) {
lyxerr << "Menu warning: menu entries "
- << '"' << it1->fulllabel()
- << "\" and \"" << it2->fulllabel()
+ << '"' << to_utf8(it1->fulllabel())
+ << "\" and \"" << to_utf8(it2->fulllabel())
<< "\" share the same shortcut."
<< endl;
}
}
+void MenuBackend::specialMenu(Menu const & menu)
+{
+ specialmenu_ = menu;
+}
+
+
namespace {
class compare_format {
}
};
-string const limit_string_length(string const & str)
+docstring const limit_string_length(docstring const & str)
{
- string::size_type const max_item_length = 45;
+ docstring::size_type const max_item_length = 45;
if (str.size() > max_item_length)
return str.substr(0, max_item_length - 3) + "...";
}
-void expandLastfiles(Menu & tomenu, LyXView const * view)
+void expandLastfiles(Menu & tomenu)
{
- LastFiles const & lastfiles = LyX::cref().lastfiles();
+ lyx::LastFilesSection::LastFiles const & lf = LyX::cref().session().lastFiles().lastFiles();
+ lyx::LastFilesSection::LastFiles::const_iterator lfit = lf.begin();
int ii = 1;
- LastFiles::const_iterator lfit = lastfiles.begin();
- LastFiles::const_iterator end = lastfiles.end();
- for (; lfit != end && ii < 10; ++lfit, ++ii) {
- string const label = tostr(ii) + ". "
- + MakeDisplayPath((*lfit), 30)
- + '|' + tostr(ii);
- tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view);
+ for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) {
+ string const file = lfit->absFilename();
+ docstring const label = convert<docstring>(ii) + ". "
+ + makeDisplayPath(file, 30)
+ + char_type('|') + convert<docstring>(ii);
+ tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, file)));
}
}
-void expandDocuments(Menu & tomenu, LyXView const * view)
+
+void expandDocuments(Menu & tomenu)
{
typedef vector<string> Strings;
- Strings const names = bufferlist.getFileNames();
+ Strings const names = theBufferList().getFileNames();
if (names.empty()) {
tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"),
- FuncRequest(LFUN_NOACTION)), view);
+ FuncRequest(LFUN_NOACTION)));
return;
}
Strings::const_iterator docit = names.begin();
Strings::const_iterator end = names.end();
for (; docit != end; ++docit, ++ii) {
- string label = MakeDisplayPath(*docit, 20);
+ docstring label = makeDisplayPath(*docit, 20);
if (ii < 10)
- label = tostr(ii) + ". " + label + '|' + tostr(ii);
- tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view);
+ label = convert<docstring>(ii) + ". " + label + char_type('|') + convert<docstring>(ii);
+ tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)));
+ }
+}
+
+
+void expandBookmarks(Menu & tomenu)
+{
+ lyx::BookmarksSection const & bm = LyX::cref().session().bookmarks();
+
+ for (size_t i = 1; i <= bm.size(); ++i) {
+ if (bm.isValid(i)) {
+ docstring const label = convert<docstring>(i) + ". "
+ + makeDisplayPath(bm.bookmark(i).filename.absFilename(), 20)
+ + char_type('|') + convert<docstring>(i);
+ tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BOOKMARK_GOTO,
+ convert<docstring>(i))));
+ }
}
}
-void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
+void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
{
- if (!view->buffer() && kind != MenuItem::ImportFormats) {
+ if (!buf && kind != MenuItem::ImportFormats) {
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"),
- FuncRequest(LFUN_NOACTION)),
- view);
+ FuncRequest(LFUN_NOACTION)));
return;
}
switch (kind) {
case MenuItem::ImportFormats:
formats = Importer::GetImportableFormats();
- action = LFUN_IMPORT;
+ action = LFUN_BUFFER_IMPORT;
break;
case MenuItem::ViewFormats:
- formats = Exporter::GetExportableFormats(*view->buffer(), true);
- action = LFUN_PREVIEW;
+ formats = Exporter::getExportableFormats(*buf, true);
+ action = LFUN_BUFFER_VIEW;
break;
case MenuItem::UpdateFormats:
- formats = Exporter::GetExportableFormats(*view->buffer(), true);
- action = LFUN_UPDATE;
+ formats = Exporter::getExportableFormats(*buf, true);
+ action = LFUN_BUFFER_UPDATE;
break;
default:
- formats = Exporter::GetExportableFormats(*view->buffer(), false);
- action = LFUN_EXPORT;
+ formats = Exporter::getExportableFormats(*buf, false);
+ action = LFUN_BUFFER_EXPORT;
}
sort(formats.begin(), formats.end(), compare_format());
for (; fit != end ; ++fit) {
if ((*fit)->dummy())
continue;
- string label = (*fit)->prettyname();
- // we need to hide the default graphic export formats
- // from the external menu, because we need them only
- // for the internal lyx-view and external latex run
- if (label == "EPS" || label == "XPM" || label == "PNG")
- continue;
+ docstring label = from_utf8((*fit)->prettyname());
- if (kind == MenuItem::ImportFormats) {
+ switch (kind) {
+ case MenuItem::ImportFormats:
if ((*fit)->name() == "text")
- label = _("ASCII text as lines");
+ label = _("Plain Text");
else if ((*fit)->name() == "textparagraph")
- label = _("ASCII text as paragraphs");
+ label = _("Plain Text, Join Lines");
label += "...";
+ break;
+ case MenuItem::ViewFormats:
+ case MenuItem::ExportFormats:
+ case MenuItem::UpdateFormats:
+ if (!(*fit)->documentFormat())
+ continue;
+ break;
+ default:
+ BOOST_ASSERT(false);
+ break;
}
if (!(*fit)->shortcut().empty())
- label += '|' + (*fit)->shortcut();
+ label += char_type('|') + from_utf8((*fit)->shortcut());
- tomenu.add(MenuItem(MenuItem::Command, label,
- FuncRequest(action, (*fit)->name())),
- view);
+ if (buf)
+ tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
+ FuncRequest(action, (*fit)->name())));
+ else
+ tomenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(action, (*fit)->name())));
}
}
-void expandFloatListInsert(Menu & tomenu, LyXView const * view)
+void expandFloatListInsert(Menu & tomenu, Buffer const * buf)
{
- if (!view->buffer()) {
+ if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"),
- FuncRequest(LFUN_NOACTION)),
- view);
+ FuncRequest(LFUN_NOACTION)));
return;
}
FloatList const & floats =
- view->buffer()->params().getLyXTextClass().floats();
+ buf->params().getLyXTextClass().floats();
FloatList::const_iterator cit = floats.begin();
FloatList::const_iterator end = floats.end();
for (; cit != end; ++cit) {
- tomenu.add(MenuItem(MenuItem::Command,
+ tomenu.addWithStatusCheck(MenuItem(MenuItem::Command,
_(cit->second.listName()),
FuncRequest(LFUN_FLOAT_LIST,
- cit->second.type())),
- view);
+ cit->second.type())));
}
}
-void expandFloatInsert(Menu & tomenu, LyXView const * view)
+void expandFloatInsert(Menu & tomenu, Buffer const * buf)
{
- if (!view->buffer()) {
+ if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"),
- FuncRequest(LFUN_NOACTION)),
- view);
+ FuncRequest(LFUN_NOACTION)));
return;
}
FloatList const & floats =
- view->buffer()->params().getLyXTextClass().floats();
+ buf->params().getLyXTextClass().floats();
FloatList::const_iterator cit = floats.begin();
FloatList::const_iterator end = floats.end();
for (; cit != end; ++cit) {
// normal float
- string const label = _(cit->second.name());
- tomenu.add(MenuItem(MenuItem::Command, label,
- FuncRequest(LFUN_INSET_FLOAT,
- cit->second.type())),
- view);
+ docstring const label = _(cit->second.name());
+ tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
+ FuncRequest(LFUN_FLOAT_INSERT,
+ cit->second.type())));
+ }
+}
+
+
+void expandCharStyleInsert(Menu & tomenu, Buffer const * buf)
+{
+ if (!buf) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Documents Open!"),
+ FuncRequest(LFUN_NOACTION)));
+ return;
+ }
+ CharStyles & charstyles =
+ buf->params().getLyXTextClass().charstyles();
+ CharStyles::iterator cit = charstyles.begin();
+ CharStyles::iterator end = charstyles.end();
+ for (; cit != end; ++cit) {
+ docstring const label = from_utf8(cit->name);
+ tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
+ FuncRequest(LFUN_CHARSTYLE_INSERT,
+ label)));
}
}
Menu::size_type const max_number_of_items = 25;
void expandToc2(Menu & tomenu,
- lyx::toc::Toc const & toc_list,
- lyx::toc::Toc::size_type from,
- lyx::toc::Toc::size_type to, int depth)
+ Toc const & toc_list,
+ Toc::size_type from,
+ 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 (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
+ for (Toc::size_type i = from; i < to; ++i) {
+ docstring label(4 * max(0, toc_list[i].depth() - depth), char_type(' '));
+ label += limit_string_length(toc_list[i].str());
+ if (toc_list[i].depth() == depth
&& shortcut_count < 9) {
- if (label.find(tostr(shortcut_count + 1)) != string::npos)
- label += '|' + tostr(++shortcut_count);
+ if (label.find(convert<docstring>(shortcut_count + 1)) != docstring::npos)
+ label += char_type('|') + convert<docstring>(++shortcut_count);
}
tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(toc_list[i].action())));
}
} else {
- lyx::toc::Toc::size_type pos = from;
+ Toc::size_type pos = from;
while (pos < to) {
- lyx::toc::Toc::size_type new_pos = pos + 1;
+ Toc::size_type new_pos = pos + 1;
while (new_pos < to &&
- toc_list[new_pos].depth > depth)
+ toc_list[new_pos].depth() > depth)
++new_pos;
- string label(4 * max(0, toc_list[pos].depth - depth), ' ');
- label += limit_string_length(toc_list[pos].str);
- if (toc_list[pos].depth == depth &&
+ docstring 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) {
- if (label.find(tostr(shortcut_count + 1)) != string::npos)
- label += '|' + tostr(++shortcut_count);
- }
+ if (label.find(convert<docstring>(shortcut_count + 1)) != docstring::npos)
+ label += char_type('|') + convert<docstring>(++shortcut_count);
+ }
if (new_pos == pos + 1) {
tomenu.add(MenuItem(MenuItem::Command,
label, FuncRequest(toc_list[pos].action())));
}
-void expandToc(Menu & tomenu, LyXView const * view)
+void expandToc(Menu & tomenu, Buffer const * buf)
{
- // To make things very cleanly, we would have to pass view to
+ // To make things very cleanly, we would have to pass buf to
// all MenuItem constructors and to expandToc2. However, we
// know that all the entries in a TOC will be have status_ ==
// OK, so we avoid this unnecessary overhead (JMarc)
- if (!view->buffer()) {
+ if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"),
- FuncRequest(LFUN_NOACTION)),
- view);
+ FuncRequest(LFUN_NOACTION)));
return;
}
- lyx::toc::TocList toc_list = lyx::toc::getTocList(*view->buffer());
- lyx::toc::TocList::const_iterator cit = toc_list.begin();
- lyx::toc::TocList::const_iterator end = toc_list.end();
+ // Add an entry for the master doc if this is a child doc
+ Buffer const * const master = buf->getMasterBuffer();
+ if (buf != master) {
+ ParIterator const pit = par_iterator_begin(master->inset());
+ string const arg = convert<string>(pit->id());
+ FuncRequest f(LFUN_PARAGRAPH_GOTO, arg);
+ tomenu.add(MenuItem(MenuItem::Command, _("Master Document"), f));
+ }
+
+ FloatList const & floatlist = buf->params().getLyXTextClass().floats();
+ TocList const & toc_list = buf->tocBackend().tocs();
+ TocList::const_iterator cit = toc_list.begin();
+ TocList::const_iterator end = toc_list.end();
for (; cit != end; ++cit) {
// Handle this later
- if (cit->first == "TOC")
+ if (cit->first == "tableofcontents")
continue;
// All the rest is for floats
auto_ptr<Menu> menu(new Menu);
- lyx::toc::Toc::const_iterator ccit = cit->second.begin();
- lyx::toc::Toc::const_iterator eend = cit->second.end();
+ TocIterator ccit = cit->second.begin();
+ TocIterator eend = cit->second.end();
for (; ccit != eend; ++ccit) {
- string const label = limit_string_length(ccit->str);
+ docstring const label = limit_string_length(ccit->str());
menu->add(MenuItem(MenuItem::Command,
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.release());
tomenu.add(item);
}
// Handle normal TOC
- cit = toc_list.find("TOC");
+ cit = toc_list.find("tableofcontents");
if (cit == end) {
- tomenu.add(MenuItem(MenuItem::Command,
+ tomenu.addWithStatusCheck(MenuItem(MenuItem::Command,
_("No Table of contents"),
- FuncRequest()),
- view);
+ FuncRequest()));
} else {
expandToc2(tomenu, cit->second, 0, cit->second.size(), 0);
}
}
-void expandPasteRecent(Menu & tomenu, LyXView const * view)
+void expandPasteRecent(Menu & tomenu, Buffer const * buf)
{
- if (!view || !view->buffer())
+ if (!buf)
return;
- vector<string> const selL =
- CutAndPaste::availableSelections(*view->buffer());
+ vector<docstring> const sel =
+ cap::availableSelections(*buf);
- vector<string>::const_iterator cit = selL.begin();
- vector<string>::const_iterator end = selL.end();
+ vector<docstring>::const_iterator cit = sel.begin();
+ vector<docstring>::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))));
+ }
+}
+
+
+void expandToolbars(Menu & tomenu)
+{
+ //
+ // extracts the toolbars from the backend
+ ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
+ ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
+
+ for (; cit != end; ++cit) {
+ docstring label = _(cit->gui_name);
+ // frontends are not supposed to turn on/off toolbars, if they cannot
+ // update ToolbarBackend::flags. That is to say, ToolbarsBackend::flags
+ // should reflect the true state of toolbars.
+ //
+ // menu is displayed as
+ // on/off review
+ // and
+ // review (auto)
+ // in the case of auto.
+ if (cit->flags & ToolbarBackend::AUTO)
+ label += _(" (auto)");
+ tomenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, cit->name)));
}
}
-void expandBranches(Menu & tomenu, LyXView const * view)
+void expandBranches(Menu & tomenu, Buffer const * buf)
{
- if (!view || !view->buffer())
+ if (!buf)
return;
- BufferParams const & params = view->buffer()->params();
+ BufferParams const & params = buf->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();
+ docstring label = cit->getBranch();
if (ii < 10)
- label = tostr(ii) + ". " + label + "|" + tostr(ii);
- tomenu.add(MenuItem(MenuItem::Command, label,
- FuncRequest(LFUN_INSERT_BRANCH,
- cit->getBranch())), view);
+ label = convert<docstring>(ii) + ". " + label + char_type('|') + convert<docstring>(ii);
+ tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
+ FuncRequest(LFUN_BRANCH_INSERT,
+ cit->getBranch())));
}
}
void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
- LyXView const * view) const
+ Buffer const * buf) const
{
+ if (!tomenu.empty())
+ tomenu.clear();
+
for (Menu::const_iterator cit = frommenu.begin();
cit != frommenu.end() ; ++cit) {
switch (cit->kind()) {
case MenuItem::Lastfiles:
- expandLastfiles(tomenu, view);
+ expandLastfiles(tomenu);
break;
case MenuItem::Documents:
- expandDocuments(tomenu, view);
+ expandDocuments(tomenu);
+ break;
+
+ case MenuItem::Bookmarks:
+ expandBookmarks(tomenu);
break;
case MenuItem::ImportFormats:
case MenuItem::ViewFormats:
case MenuItem::UpdateFormats:
case MenuItem::ExportFormats:
- expandFormats(cit->kind(), tomenu, view);
+ expandFormats(cit->kind(), tomenu, buf);
+ break;
+
+ case MenuItem::CharStyles:
+ expandCharStyleInsert(tomenu, buf);
break;
case MenuItem::FloatListInsert:
- expandFloatListInsert(tomenu, view);
+ expandFloatListInsert(tomenu, buf);
break;
case MenuItem::FloatInsert:
- expandFloatInsert(tomenu, view);
+ expandFloatInsert(tomenu, buf);
break;
case MenuItem::PasteRecent:
- expandPasteRecent(tomenu, view);
+ expandPasteRecent(tomenu, buf);
+ break;
+
+ case MenuItem::Toolbars:
+ expandToolbars(tomenu);
break;
case MenuItem::Branches:
- expandBranches(tomenu, view);
+ expandBranches(tomenu, buf);
break;
case MenuItem::Toc:
- expandToc(tomenu, view);
+ expandToc(tomenu, buf);
break;
case MenuItem::Submenu: {
MenuItem item(*cit);
item.submenu(new Menu(cit->submenuname()));
expand(getMenu(cit->submenuname()),
- *item.submenu(), view);
- tomenu.add(item, view);
+ *item.submenu(), buf);
+ tomenu.addWithStatusCheck(item);
}
break;
- default:
- tomenu.add(*cit, view);
+ case MenuItem::Separator:
+ tomenu.addWithStatusCheck(*cit);
+ break;
+
+ case MenuItem::Command:
+ if (!specialmenu_.hasFunc(cit->func()))
+ tomenu.addWithStatusCheck(*cit);
}
}
}
-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 {
break;
case md_menu: {
lex.next(true);
- string const name = lex.getString();
+ docstring const name = lex.getDocString();
if (hasMenu(name)) {
getMenu(name).read(lex);
} else {
}
-bool MenuBackend::hasMenu(string const & name) const
+bool MenuBackend::hasMenu(docstring 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
+Menu const & MenuBackend::getMenu(docstring 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;
+ lyxerr << "No submenu named " << to_utf8(name) << endl;
BOOST_ASSERT(cit != end());
return (*cit);
}
-Menu & MenuBackend::getMenu(string const & name)
+Menu & MenuBackend::getMenu(docstring 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 " << to_utf8(name) << endl;
+ BOOST_ASSERT(it != end());
return (*it);
}
{
return menubar_;
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff