X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=3c334aadf1529a85955195797285ebac9b82c1e5;hb=da65e2b7fbe29c5bca2812a56d5bbdb7efb702e5;hp=180a98fbb93f41c2917dddb46fd6d909fb74dbc3;hpb=b634b3eb3b5cc1c47fd3bc63294e16536d4f7664;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 180a98fbb9..3c334aadf1 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -30,7 +30,7 @@ #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" @@ -41,7 +41,7 @@ #include "support/filetools.h" #include "support/lstrings.h" -#include "support/tostr.h" +#include "support/convert.h" #include @@ -49,7 +49,7 @@ using lyx::support::compare_ascii_no_case; using lyx::support::contains; -using lyx::support::MakeDisplayPath; +using lyx::support::makeDisplayPath; using lyx::support::token; using boost::bind; @@ -105,7 +105,9 @@ MenuItem::MenuItem(Kind kind, string const & label, 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() @@ -137,13 +139,13 @@ string const MenuItem::binding() const // Get the keys bound to this action, but keep only the // first one later - string bindings = toplevel_keymap->findbinding(func_); + kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_); - if (!bindings.empty()) { - return bindings.substr(1, bindings.find(']') - 1); + if (bindings.size()) { + return bindings.begin()->print(); } else { lyxerr[Debug::KBMAP] - << "No bindings for " + << "No binding for " << lyxaction.getActionName(func_.action) << '(' << func_.argument << ')' << endl; return string(); @@ -357,6 +359,20 @@ Menu & Menu::read(LyXLex & lex) } +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(), + bind(&MenuItem::func, _1), + func)) != end(); +} + void Menu::checkShortcuts() const { // This is a quadratic algorithm, but we do not care because @@ -383,6 +399,13 @@ void Menu::checkShortcuts() const } +void MenuBackend::specialMenu(string const &name) +{ + if (hasMenu(name)) + specialmenu_ = &getMenu(name); +} + + namespace { class compare_format { @@ -405,20 +428,20 @@ string const limit_string_length(string const & str) void expandLastfiles(Menu & tomenu, LyXView const * view) { - LastFiles const & lastfiles = LyX::cref().lastfiles(); + lyx::Session::LastFiles const & lf = LyX::cref().session().lastFiles(); + lyx::Session::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); + for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) { + string const label = convert(ii) + ". " + + makeDisplayPath((*lfit), 30) + + '|' + convert(ii); tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view); } } + void expandDocuments(Menu & tomenu, LyXView const * view) { typedef vector Strings; @@ -434,10 +457,10 @@ void expandDocuments(Menu & tomenu, LyXView const * view) Strings::const_iterator docit = names.begin(); Strings::const_iterator end = names.end(); for (; docit != end; ++docit, ++ii) { - string label = MakeDisplayPath(*docit, 20); + string 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(ii) + ". " + label + '|' + convert(ii); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)), view); } } @@ -459,19 +482,19 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) 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(*view->buffer(), true); + action = LFUN_BUFFER_VIEW; break; case MenuItem::UpdateFormats: - formats = Exporter::GetExportableFormats(*view->buffer(), true); - action = LFUN_UPDATE; + formats = Exporter::getExportableFormats(*view->buffer(), true); + action = LFUN_BUFFER_UPDATE; break; default: - formats = Exporter::GetExportableFormats(*view->buffer(), false); - action = LFUN_EXPORT; + formats = Exporter::getExportableFormats(*view->buffer(), false); + action = LFUN_BUFFER_EXPORT; } sort(formats.begin(), formats.end(), compare_format()); @@ -489,10 +512,15 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * 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 += "..."; + } else if (kind == MenuItem::ExportFormats) { + // exporting to LyX does not make sense + // FIXME: Introduce noexport flag + if ((*fit)->name() == "lyx") + continue; } if (!(*fit)->shortcut().empty()) label += '|' + (*fit)->shortcut(); @@ -546,7 +574,7 @@ void expandFloatInsert(Menu & tomenu, LyXView const * view) // normal float string const label = _(cit->second.name()); tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_INSET_FLOAT, + FuncRequest(LFUN_FLOAT_INSERT, cit->second.type())), view); } @@ -569,7 +597,7 @@ void expandCharStyleInsert(Menu & tomenu, LyXView const * view) for (; cit != end; ++cit) { string const label = cit->name; tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_INSERT_CHARSTYLE, + FuncRequest(LFUN_CHARSTYLE_INSERT, cit->name)), view); } } @@ -583,14 +611,23 @@ 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 + 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) { - if (label.find(tostr(shortcut_count + 1)) != string::npos) - label += '|' + tostr(++shortcut_count); + if (label.find(convert(shortcut_count + 1)) != string::npos) + label += '|' + convert(++shortcut_count); } tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(toc_list[i].action()))); @@ -600,15 +637,15 @@ void expandToc2(Menu & tomenu, while (pos < to) { lyx::toc::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 && + 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) { - if (label.find(tostr(shortcut_count + 1)) != string::npos) - label += '|' + tostr(++shortcut_count); + if (label.find(convert(shortcut_count + 1)) != string::npos) + label += '|' + convert(++shortcut_count); } if (new_pos == pos + 1) { tomenu.add(MenuItem(MenuItem::Command, @@ -633,7 +670,9 @@ void expandToc(Menu & tomenu, LyXView const * view) // 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)), @@ -641,7 +680,8 @@ void expandToc(Menu & tomenu, LyXView const * view) return; } - lyx::toc::TocList toc_list = lyx::toc::getTocList(*view->buffer()); + FloatList const & floatlist = buf->params().getLyXTextClass().floats(); + lyx::toc::TocList const & 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) { @@ -654,13 +694,12 @@ void expandToc(Menu & tomenu, LyXView const * view) lyx::toc::Toc::const_iterator ccit = cit->second.begin(); lyx::toc::Toc::const_iterator eend = cit->second.end(); for (; ccit != eend; ++ccit) { - string const label = limit_string_length(ccit->str); + string 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); @@ -684,15 +723,15 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view) if (!view || !view->buffer()) return; - vector const selL = - CutAndPaste::availableSelections(*view->buffer()); + vector const sel = + lyx::cap::availableSelections(*view->buffer()); - vector::const_iterator cit = selL.begin(); - vector::const_iterator end = selL.end(); + vector::const_iterator cit = sel.begin(); + vector::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(index)))); } } @@ -702,17 +741,17 @@ void expandBranches(Menu & tomenu, LyXView const * view) if (!view || !view->buffer()) return; - BufferParams const & params = view->buffer()->params(); + BufferParams const & params = view->buffer()->getMasterBuffer()->params(); - std::list::const_iterator cit = params.branchlist().begin(); - std::list::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(ii) + ". " + label + "|" + convert(ii); tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_INSERT_BRANCH, + FuncRequest(LFUN_BRANCH_INSERT, cit->getBranch())), view); } } @@ -724,6 +763,9 @@ void expandBranches(Menu & tomenu, LyXView const * view) void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, LyXView const * view) const { + if (!tomenu.empty()) + tomenu.clear(); + for (Menu::const_iterator cit = frommenu.begin(); cit != frommenu.end() ; ++cit) { switch (cit->kind()) { @@ -775,8 +817,14 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, } break; - default: + case MenuItem::Separator: tomenu.add(*cit, view); + break; + + case MenuItem::Command: + if (!specialmenu_ + || !specialmenu_->hasFunc(cit->func())) + tomenu.add(*cit, view); } } @@ -790,27 +838,6 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, } -bool Menu::hasSubmenu(string const & name) const -{ -#if 1 - return find_if(begin(), end(), - bind(std::equal_to(), - bind(&MenuItem::submenuname, _1), - name)) != end(); -#else - // I would have prefered this, but I am not sure if it - // makes a difference. (Lgb) - return find_if( - make_transform_iterator(begin(), - bind(&MenuItem::submenuname, _1)), - make_transform_iterator(end(), - bind(&MenuItem::submenuname, _1)), - name - ).base() != end(); -#endif -} - - void MenuBackend::read(LyXLex & lex) { enum Menutags {