X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=8ecdb4bad1394f0d52031fe6617d8016f4430e85;hb=414a11684e77aee713135ae65ec7438cfc4b162f;hp=a4e02903c5b02db738fb7036efd1eca04ed58911;hpb=a9114d0e446fac699ddaa717660a31288f185160;p=lyx.git

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index a4e02903c5..8ecdb4bad1 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>
 
@@ -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()
@@ -399,7 +401,7 @@ void Menu::checkShortcuts() const
 
 void MenuBackend::specialMenu(string const &name)
 {
-	if (hasMenu(name)) 
+	if (hasMenu(name))
 		specialmenu_ = &getMenu(name);
 }
 
@@ -433,13 +435,14 @@ void expandLastfiles(Menu & tomenu, LyXView const * view)
 	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;
@@ -457,7 +460,7 @@ void expandDocuments(Menu & tomenu, LyXView const * view)
 	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);
 	}
 }
@@ -510,10 +513,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();
@@ -604,14 +612,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
 			    && shortcut_count < 9) {
-				if (label.find(tostr(shortcut_count + 1)) != string::npos)
-					label += '|' + tostr(++shortcut_count);
+				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())));
@@ -628,8 +645,8 @@ void expandToc2(Menu & tomenu,
 			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<string>(shortcut_count + 1)) != string::npos)
+					label += '|' + convert<string>(++shortcut_count);
 				}
 			if (new_pos == pos + 1) {
 				tomenu.add(MenuItem(MenuItem::Command,
@@ -654,7 +671,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)),
@@ -662,7 +681,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) {
@@ -680,8 +700,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);
@@ -713,7 +732,7 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view)
 
 	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))));
 	}
 }
 
@@ -723,15 +742,15 @@ 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();
 		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);
@@ -801,7 +820,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 			break;
 
 		case MenuItem::Command:
-			if (!specialmenu_ 
+			if (!specialmenu_
 			    || !specialmenu_->hasFunc(cit->func()))
 				tomenu.add(*cit, view);
 		}