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

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index d5cee41364..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;
@@ -74,12 +76,28 @@ MenuItem::MenuItem(Kind kind, string const & label,
 					   << command << endl;
 		break;
 	case Submenu:
-		submenu_ = command;
+		submenuname_ = command;
 		break;
 	}
 }
 
 
+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);
@@ -258,165 +276,295 @@ public:
 	}
 };
 
-} // namespace anon
+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 Menu::expand(Menu & tomenu, Buffer * buf) const
+
+void expandLastfiles(Menu & tomenu)
 {
-	for (const_iterator cit = begin();
-	     cit != end() ; ++cit) {
-		switch (cit->kind()) {
-		case MenuItem::Lastfiles: {
-			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);
-				int const action = lyxaction.
-					getPseudoAction(LFUN_FILE_OPEN,
-							(*lfit));
-				tomenu.add(MenuItem(MenuItem::Command,
-						    label, action));
-			}
-		}
+	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);
+		int const action = lyxaction.
+			getPseudoAction(LFUN_FILE_OPEN,
+					(*lfit));
+		tomenu.add(MenuItem(MenuItem::Command,
+				    label, action));
+	}
+}
+
+void expandDocuments(Menu & tomenu)
+{
+	typedef vector<string> Strings;
+	Strings const names = bufferlist.getFileNames();
+
+	if (names.empty()) {
+		tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"),
+				    LFUN_NOACTION));
+		return;
+	}
+
+	int ii = 1;
+	Strings::const_iterator docit = names.begin();
+	Strings::const_iterator end = names.end();
+	for (; docit != end; ++docit, ++ii) {
+		int const action =
+			lyxaction.getPseudoAction(LFUN_SWITCHBUFFER, *docit);
+		string label = MakeDisplayPath(*docit, 30);
+		if (ii < 10)
+			label = tostr(ii) + ". " + label + '|' + tostr(ii);
+		tomenu.add(MenuItem(MenuItem::Command, label, action));
+	}
+}
+
+
+void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
+{
+	if (!buf && kind != MenuItem::ImportFormats) {
+		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();
+		action = LFUN_IMPORT;
+		break;
+	case MenuItem::ViewFormats:
+		formats = Exporter::GetExportableFormats(buf, true);
+		action = LFUN_PREVIEW;
 		break;
+	case MenuItem::UpdateFormats:
+		formats = Exporter::GetExportableFormats(buf, true);
+		action = LFUN_UPDATE;
+		break;
+	default:
+		formats = Exporter::GetExportableFormats(buf, false);
+		action = LFUN_EXPORT;
+	}
+	sort(formats.begin(), formats.end(), compare_format());
 
-		case MenuItem::Documents: {
-			typedef vector<string> Strings;
+	Formats::const_iterator fit = formats.begin();
+	Formats::const_iterator end = formats.end();
+	for (; fit != end ; ++fit) {
+		if ((*fit)->dummy())
+			continue;
+		string label = (*fit)->prettyname();
+		// we need to hide the default graphic export formats
+		// from the external menu, because we need them only
+		// for the internal lyx-view and external latex run
+		if (label == "EPS" || label == "XPM" || label == "PNG")
+			continue;
 
-			Strings const names = bufferlist.getFileNames();
+		if (kind == MenuItem::ImportFormats) {
+			if ((*fit)->name() == "text")
+				label = _("ASCII text as lines");
+			else if ((*fit)->name() == "textparagraph")
+				label = _("ASCII text as paragraphs");
+			label += "...";
+		}
+		if (!(*fit)->shortcut().empty())
+			label += '|' + (*fit)->shortcut();
+		int const action2 = lyxaction.
+			getPseudoAction(action,	(*fit)->name());
+		tomenu.add(MenuItem(MenuItem::Command, label, action2));
+	}
+}
 
-			if (names.empty()) {
-				tomenu.add(MenuItem(MenuItem::Command,
-						    _("No Documents Open!"),
-						    LFUN_NOACTION));
-				break;
-			}
 
-			int ii = 1;
-			Strings::const_iterator docit = names.begin();
-			Strings::const_iterator end = names.end();
-			for (; docit != end; ++docit, ++ii) {
-				int const action = lyxaction
-					.getPseudoAction(LFUN_SWITCHBUFFER,
-							 *docit);
-				string label = MakeDisplayPath(*docit, 30);
-				if (ii < 10)
-					label = tostr(ii) + ". "
-						+ label + '|' + tostr(ii);
+void expandFloatListInsert(Menu & tomenu, Buffer const * buf)
+{
+	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());
+		tomenu.add(MenuItem(MenuItem::Command,
+				    _(cit->second.listName()),
+				    action));
+	}
+}
+
+
+void expandFloatInsert(Menu & tomenu, Buffer const * buf)
+{
+	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 =
+			lyxaction.getPseudoAction(LFUN_INSET_FLOAT,
+						  cit->second.type());
+		string const label = _(cit->second.name());
+		tomenu.add(MenuItem(MenuItem::Command, label, action));
+	}
+}
+
+
+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;
 		}
-		break;
+	}
+}
+
+
+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
+
+
+void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
+			 Buffer const * buf) const
+{
+	for (Menu::const_iterator cit = frommenu.begin();
+	     cit != frommenu.end() ; ++cit) {
+		switch (cit->kind()) {
+		case MenuItem::Lastfiles:
+			expandLastfiles(tomenu);
+			break;
+
+		case MenuItem::Documents:
+			expandDocuments(tomenu);
+			break;
 
 		case MenuItem::ImportFormats:
 		case MenuItem::ViewFormats:
 		case MenuItem::UpdateFormats:
-		case MenuItem::ExportFormats: {
-
-			if (!buf && cit->kind() != MenuItem::ImportFormats) {
-				tomenu.add(MenuItem(MenuItem::Command,
-						    _("No Documents Open!"),
-						    LFUN_NOACTION));
-				continue;
-			}				
-			
-			typedef vector<Format const *> Formats;
-
-			Formats formats;
-
-			kb_action action;
-			switch (cit->kind()) {
-			case MenuItem::ImportFormats:
-				formats = Importer::GetImportableFormats();
-				action = LFUN_IMPORT;
-				break;
-			case MenuItem::ViewFormats:
-				formats = Exporter::GetExportableFormats(buf, true);
-				action = LFUN_PREVIEW;
-				break;
-			case MenuItem::UpdateFormats:
-				formats = Exporter::GetExportableFormats(buf, true);
-				action = LFUN_UPDATE;
-				break;
-			default:
-				formats = Exporter::GetExportableFormats(buf, false);
-				action = LFUN_EXPORT;
-			}
-			sort(formats.begin(), formats.end(), compare_format());
-
-			Formats::const_iterator fit = formats.begin();
-			Formats::const_iterator end = formats.end();
-
-			for (; fit != end ; ++fit) {
-				if ((*fit)->dummy())
-					continue;
-				string label = (*fit)->prettyname();
-				// we need to hide the default graphic export
-				// formats from the external menu, because we
-				// need them only for the internal lyx-view and
-				// external latex run
-				if (label == "EPS" ||
-				    label == "XPM" ||
-				    label == "PNG")
-					continue;
-
-				if (cit->kind() == MenuItem::ImportFormats)
-					if ((*fit)->name() == "text")
-						label = _("Ascii text as lines");
-					else if ((*fit)->name() == "textparagraph")
-						label = _("Ascii text as paragraphs");
-				if (!(*fit)->shortcut().empty())
-					label += "|" + (*fit)->shortcut();
-				int const action2 = lyxaction.
-					getPseudoAction(action,
-							(*fit)->name());
-				tomenu.add(MenuItem(MenuItem::Command,
-						    label, action2));
-			}
-		}
-		break;
+		case MenuItem::ExportFormats:
+			expandFormats(cit->kind(), tomenu, buf);
+			break;
 
 		case MenuItem::FloatListInsert:
-		{
-			FloatList::const_iterator cit = floatList.begin();
-			FloatList::const_iterator end = floatList.end();
-			for (; cit != end; ++cit) {
-				int const action =  lyxaction
-					.getPseudoAction(LFUN_FLOAT_LIST,
-							 cit->second.type());
-				tomenu.add(MenuItem(MenuItem::Command,
-						    _(cit->second.listName()),
-						    action));
-			}
-		}
-		break;
+			expandFloatListInsert(tomenu, buf);
+			break;
 
 		case MenuItem::FloatInsert:
-		{
-			FloatList::const_iterator cit = floatList.begin();
-			FloatList::const_iterator end = floatList.end();
-			for (; cit != end; ++cit) {
-				// normal float
-				int const action = lyxaction
-					.getPseudoAction(LFUN_INSET_FLOAT,
-							 cit->second.type());
-				string const label = _(cit->second.name());
-				tomenu.add(MenuItem(MenuItem::Command,
-						    label, action));
+			expandFloatInsert(tomenu, buf);
+			break;
 
-				// and the wide version
-				int const action2 = lyxaction
-					.getPseudoAction(LFUN_INSET_WIDE_FLOAT,
-							 cit->second.type());
-				string const label2 = label + _(" (wide)");
-				tomenu.add(MenuItem(MenuItem::Command,
-						    label2, action2));
-			}
+		case MenuItem::Toc:
+			expandToc(tomenu, buf);
+			break;
+
+		case MenuItem::Submenu: {
+			MenuItem item(*cit);
+			item.submenu(new Menu(cit->submenuname()));
+			expand(getMenu(cit->submenuname()),
+			       *item.submenu(), buf);
+			tomenu.add(item);
 		}
 		break;
 
@@ -427,14 +575,15 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
 
 	// Check whether the shortcuts are unique
 	if (lyxerr.debugging(Debug::GUI))
-		checkShortcuts();
+		tomenu.checkShortcuts();
 }
 
 
 bool Menu::hasSubmenu(string const & name) const
 {
 	return find_if(begin(), end(),
-		       lyx::compare_memfun(&MenuItem::submenu, name)) != end();
+		       lyx::compare_memfun(&MenuItem::submenuname,
+					   name)) != end();
 }
 
 
@@ -557,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);
 }