X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=2488f26df2faf54190cd61341318c8f9db8bb000;hb=dcdbeb3b3475d803c0c66e463dca64db0103c10d;hp=206e880174f85e509f08e4cc34d6cadaafd72a0f;hpb=6c3456a115dc1b496f337cda6ee7305aae6a80ed;p=features.git

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 206e880174..2488f26df2 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -24,20 +24,22 @@
 #include "lastfiles.h"
 #include "lyx_main.h" // for lastfiles
 #include "bufferlist.h"
+#include "buffer.h"
 #include "converter.h"
 #include "exporter.h"
 #include "importer.h"
 #include "FloatList.h"
+#include "toc.h"
 #include "support/LAssert.h"
 #include "support/filetools.h"
 #include "support/lyxfunctional.h"
 #include "support/lstrings.h"
 
-extern LyXAction lyxaction;
 extern BufferList bufferlist;
 
 using std::endl;
 using std::vector;
+using std::max;
 using std::pair;
 using std::find_if;
 using std::sort;
@@ -80,10 +82,22 @@ MenuItem::MenuItem(Kind kind, string const & label,
 }
 
 
+MenuItem::MenuItem(Kind kind, string const & label, int action, bool optional)
+	: kind_(kind), label_(label), action_(action), submenuname_(),
+	  optional_(optional)
+{}
+
+
 MenuItem::~MenuItem()
 {}
 
 
+void MenuItem::submenu(Menu * menu)
+{
+	submenu_.reset(menu);
+}
+
+
 string const MenuItem::label() const
 {
 	return token(label_, '|', 0);
@@ -262,6 +276,17 @@ public:
 	}
 };
 
+string const limit_string_length(string const & str)
+{
+	string::size_type const max_item_length = 45;
+
+	if (str.size() > max_item_length)
+		return str.substr(0, max_item_length - 3) + "...";
+	else
+		return str;
+}
+
+
 void expandLastfiles(Menu & tomenu)
 {
 	int ii = 1;
@@ -290,7 +315,7 @@ void expandDocuments(Menu & tomenu)
 				    LFUN_NOACTION));
 		return;
 	}
-	
+
 	int ii = 1;
 	Strings::const_iterator docit = names.begin();
 	Strings::const_iterator end = names.end();
@@ -311,12 +336,12 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
 		tomenu.add(MenuItem(MenuItem::Command,
 				    _("No Documents Open!"), LFUN_NOACTION));
 		return;
-	}				
-			
+	}
+
 	typedef vector<Format const *> Formats;
 	Formats formats;
 	kb_action action;
-	
+
 	switch (kind) {
 	case MenuItem::ImportFormats:
 		formats = Importer::GetImportableFormats();
@@ -348,23 +373,33 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
 		if (label == "EPS" || label == "XPM" || label == "PNG")
 			continue;
 
-		if (kind == MenuItem::ImportFormats)
+		if (kind == MenuItem::ImportFormats) {
 			if ((*fit)->name() == "text")
-				label = _("Ascii text as lines");
+				label = _("ASCII text as lines");
 			else if ((*fit)->name() == "textparagraph")
-				label = _("Ascii text as paragraphs");
+				label = _("ASCII text as paragraphs");
+			label += "...";
+		}
 		if (!(*fit)->shortcut().empty())
-			label += "|" + (*fit)->shortcut();
+			label += '|' + (*fit)->shortcut();
 		int const action2 = lyxaction.
 			getPseudoAction(action,	(*fit)->name());
 		tomenu.add(MenuItem(MenuItem::Command, label, action2));
 	}
 }
 
-void expandFloatListInsert(Menu & tomenu)
+
+void expandFloatListInsert(Menu & tomenu, Buffer const * buf)
 {
-	FloatList::const_iterator cit = floatList.begin();
-	FloatList::const_iterator end = floatList.end();
+	if (!buf) {
+		tomenu.add(MenuItem(MenuItem::Command,
+				    _("No Documents Open!"), LFUN_NOACTION));
+		return;
+	}
+
+	FloatList const & floats = buf->params.getLyXTextClass().floats();
+	FloatList::const_iterator cit = floats.begin();
+	FloatList::const_iterator end = floats.end();
 	for (; cit != end; ++cit) {
 		int const action =  lyxaction
 			.getPseudoAction(LFUN_FLOAT_LIST, cit->second.type());
@@ -374,10 +409,18 @@ void expandFloatListInsert(Menu & tomenu)
 	}
 }
 
-void expandFloatInsert(Menu & tomenu)
+
+void expandFloatInsert(Menu & tomenu, Buffer const * buf)
 {
-	FloatList::const_iterator cit = floatList.begin();
-	FloatList::const_iterator end = floatList.end();
+	if (!buf) {
+		tomenu.add(MenuItem(MenuItem::Command,
+				    _("No Documents Open!"), LFUN_NOACTION));
+		return;
+	}
+
+	FloatList const & floats = buf->params.getLyXTextClass().floats();
+	FloatList::const_iterator cit = floats.begin();
+	FloatList::const_iterator end = floats.end();
 	for (; cit != end; ++cit) {
 		// normal float
 		int const action =
@@ -388,6 +431,98 @@ void expandFloatInsert(Menu & tomenu)
 	}
 }
 
+
+Menu::size_type const max_number_of_items = 25;
+
+void expandToc2(Menu & tomenu, toc::Toc const & toc_list,
+		toc::Toc::size_type from, toc::Toc::size_type to, int depth)
+{
+	int shortcut_count = 0;
+	if (to - from <= max_number_of_items) {
+		for (toc::Toc::size_type i = from; i < to; ++i) {
+			int const action = toc_list[i].action();
+			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) {
+				label += '|' + tostr(shortcut_count);
+			}
+			tomenu.add(MenuItem(MenuItem::Command, label, action));
+		}
+	} else {
+		toc::Toc::size_type pos = from;
+		while (pos < to) {
+			toc::Toc::size_type new_pos = pos + 1;
+			while (new_pos < to &&
+			       toc_list[new_pos].depth > depth)
+				++new_pos;
+
+			int const action = toc_list[pos].action();
+			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)
+				label += '|' + tostr(shortcut_count);
+
+			if (new_pos == pos + 1) {
+				tomenu.add(MenuItem(MenuItem::Command,
+						    label, action));
+			} else {
+				MenuItem item(MenuItem::Submenu, label);
+				item.submenu(new Menu);
+				expandToc2(*item.submenu(),
+					   toc_list, pos, new_pos, depth + 1);
+				tomenu.add(item);
+			}
+			pos = new_pos;
+		}
+	}
+}
+
+
+void expandToc(Menu & tomenu, Buffer const * buf)
+{
+	if (!buf) {
+		tomenu.add(MenuItem(MenuItem::Command,
+				    _("No Documents Open!"), LFUN_NOACTION));
+		return;
+	}
+
+	toc::TocList toc_list = toc::getTocList(buf);
+	toc::TocList::const_iterator cit = toc_list.begin();
+	toc::TocList::const_iterator end = toc_list.end();
+	for (; cit != end; ++cit) {
+		// Handle this later
+		if (cit->first == "TOC")
+			continue;
+
+		// All the rest is for floats
+		Menu * menu = new Menu;
+		toc::Toc::const_iterator ccit = cit->second.begin();
+		toc::Toc::const_iterator eend = cit->second.end();
+		for (; ccit != eend; ++ccit) {
+			string const label = limit_string_length(ccit->str);
+			menu->add(MenuItem(MenuItem::Command,
+					   label, ccit->action()));
+		}
+		string const & floatName = cit->first;
+		// Is the _(...) really needed here? (Lgb)
+		MenuItem item(MenuItem::Submenu, _(floatName));
+		item.submenu(menu);
+		tomenu.add(item);
+	}
+
+	// Handle normal TOC
+	cit = toc_list.find("TOC");
+	if (cit == end) {
+		tomenu.add(MenuItem(MenuItem::Command,
+				    _("No Table of contents")));
+	} else {
+		expandToc2(tomenu, cit->second, 0, cit->second.size(), 0);
+	}
+}
+
+
 } // namespace anon
 
 
@@ -397,7 +532,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 	for (Menu::const_iterator cit = frommenu.begin();
 	     cit != frommenu.end() ; ++cit) {
 		switch (cit->kind()) {
-		case MenuItem::Lastfiles: 
+		case MenuItem::Lastfiles:
 			expandLastfiles(tomenu);
 			break;
 
@@ -413,22 +548,26 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 			break;
 
 		case MenuItem::FloatListInsert:
-			expandFloatListInsert(tomenu);
+			expandFloatListInsert(tomenu, buf);
 			break;
 
 		case MenuItem::FloatInsert:
-			expandFloatInsert(tomenu);
+			expandFloatInsert(tomenu, buf);
+			break;
+
+		case MenuItem::Toc:
+			expandToc(tomenu, buf);
 			break;
 
 		case MenuItem::Submenu: {
 			MenuItem item(*cit);
-			item.submenu_.reset(new Menu(cit->submenuname_));
-			expand(getMenu(cit->submenuname_),
-			       *item.submenu_, buf);
+			item.submenu(new Menu(cit->submenuname()));
+			expand(getMenu(cit->submenuname()),
+			       *item.submenu(), buf);
 			tomenu.add(item);
 		}
 		break;
-			
+
 		default:
 			tomenu.add(*cit);
 		}
@@ -567,6 +706,8 @@ Menu const & MenuBackend::getMenu(string const & name) const
 {
 	const_iterator cit = find_if(begin(), end(),
 				     lyx::compare_memfun(&Menu::name, name));
+	if (cit == end())
+		lyxerr << "No submenu named " << name << endl;
 	lyx::Assert(cit != end());
 	return (*cit);
 }