X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=3c334aadf1529a85955195797285ebac9b82c1e5;hb=da65e2b7fbe29c5bca2812a56d5bbdb7efb702e5;hp=89101d55e66943ca0ef604845eae7eea5bf32f96;hpb=409037f1bbc600bad048902cedc53471bf150465;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 89101d55e6..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" @@ -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; @@ -428,15 +428,14 @@ 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) { + for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) { string const label = convert(ii) + ". " - + MakeDisplayPath((*lfit), 30) + + makeDisplayPath((*lfit), 30) + '|' + convert(ii); tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view); } @@ -458,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 = convert(ii) + ". " + label + '|' + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)), view); } } @@ -483,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()); @@ -517,6 +516,11 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) else if ((*fit)->name() == "textparagraph") 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(); @@ -570,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); } @@ -593,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); } } @@ -611,16 +615,16 @@ void expandToc2(Menu & tomenu, // 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); + 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(convert(shortcut_count + 1)) != string::npos) label += '|' + convert(++shortcut_count); @@ -633,12 +637,12 @@ 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(convert(shortcut_count + 1)) != string::npos) label += '|' + convert(++shortcut_count); @@ -677,7 +681,7 @@ void expandToc(Menu & tomenu, LyXView const * view) } FloatList const & floatlist = buf->params().getLyXTextClass().floats(); - lyx::toc::TocList toc_list = lyx::toc::getTocList(*buf); + 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) { @@ -690,7 +694,7 @@ 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()))); @@ -747,7 +751,7 @@ void expandBranches(Menu & tomenu, LyXView const * view) if (ii < 10) label = convert(ii) + ". " + label + "|" + convert(ii); tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_INSERT_BRANCH, + FuncRequest(LFUN_BRANCH_INSERT, cit->getBranch())), view); } } @@ -759,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()) {