From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Thu, 23 May 2019 01:32:32 +0000 (-0400)
Subject: Change how branches are displayed on the menus.
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fbb4014e399b6555fba3a98561bd1753523289eb;p=features.git

Change how branches are displayed on the menus.

Show this document's branches first in the menu, and then show the
master document's branches on a sub-menu.
---

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 08e2ad628d..dc6a2fd961 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1446,7 +1446,7 @@ void MenuDefinition::expandBranches(Buffer const * buf)
 	}
 
 	int ii = 1;
-	for (auto const & b : master_list) {
+	for (auto const & b : child_list) {
 		docstring const & bname = b.branch();
 		// NUM. Branch Name + "|", which triggers an empty shortcut in
 		// case that character should be in the branch name
@@ -1463,22 +1463,30 @@ void MenuDefinition::expandBranches(Buffer const * buf)
 	if (buf == buf->masterBuffer())
 		return;
 
-	MenuDefinition child_branches;
+	// FIXME
+	// We should probably consider all parent branches, up the line.
+	// I.e., parents, grandparents, etc.
+	MenuDefinition master_branches;
 	ii = 1;
-	for (auto const & b : child_list) {
+	for (auto const & b : master_list) {
 		docstring const & bname = b.branch();
+		// do not add to child list if the branch already exists
+		// in the child document.
+		if (child_list.find(bname))
+			continue;
+
 		docstring label = convert<docstring>(ii) + ". " + bname + char_type('|');
 		if (ii < 10) {
 			label += convert<docstring>(ii);
 		}
-		child_branches.addWithStatusCheck(MenuItem(MenuItem::Command,
+		master_branches.addWithStatusCheck(MenuItem(MenuItem::Command,
 			toqstr(label), FuncRequest(LFUN_BRANCH_INSERT, bname)));
 		++ii;
 	}
 
-	if (!child_branches.empty()) {
-		MenuItem item(MenuItem::Submenu, qt_("Child Document"));
-		item.setSubmenu(child_branches);
+	if (!master_branches.empty()) {
+		MenuItem item(MenuItem::Submenu, qt_("Master Document"));
+		item.setSubmenu(master_branches);
 		add(item);
 	}
 }