X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=89101d55e66943ca0ef604845eae7eea5bf32f96;hb=e2cd4d4c44f7c604a45dd9de9c9ade0d7c09eefc;hp=d57a1292a101483075c5cafa9afb59584e111643;hpb=6a55be9506b112110826cf63bc21786044569f1d;p=lyx.git

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index d57a1292a1..89101d55e6 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -41,7 +41,7 @@
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 
@@ -513,9 +513,9 @@ 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 += "...";
 		}
 		if (!(*fit)->shortcut().empty())
@@ -607,6 +607,15 @@ 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),' ');
@@ -657,7 +666,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)),
@@ -665,7 +676,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 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) {
@@ -683,8 +695,7 @@ void expandToc(Menu & tomenu, LyXView const * view)
 					   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);
@@ -726,10 +737,10 @@ 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<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();