anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-23 16:52:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change how branches are displayed on the menus.

Browse Source 
Show this document's branches first in the menu, and then show the
master document's branches on a sub-menu.
This commit is contained in:
Richard Kimberly Heck 2019-05-22 21:32:32 -04:00
parent 24fefaf23d
commit 1842a11b3b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/frontends/qt4/Menus.cpp
View File

@ -1446,7 +1446,7 @@ void MenuDefinition::expandBranches(Buffer const * buf)
} }
int ii = 1; int ii = 1;
for (auto const & b : master_list) { for (auto const & b : child_list) {
docstring const & bname = b.branch(); docstring const & bname = b.branch();
// NUM. Branch Name + "|", which triggers an empty shortcut in // NUM. Branch Name + "|", which triggers an empty shortcut in
// case that character should be in the branch name // case that character should be in the branch name
@ -1463,22 +1463,30 @@ void MenuDefinition::expandBranches(Buffer const * buf)
if (buf == buf->masterBuffer()) if (buf == buf->masterBuffer())
return; 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; ii = 1;
for (auto const & b : child_list) { for (auto const & b : master_list) {
docstring const & bname = b.branch(); 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('|'); docstring label = convert<docstring>(ii) + ". " + bname + char_type('|');
if (ii < 10) { if (ii < 10) {
label += convert<docstring>(ii); label += convert<docstring>(ii);
} }
child_branches.addWithStatusCheck(MenuItem(MenuItem::Command, master_branches.addWithStatusCheck(MenuItem(MenuItem::Command,
toqstr(label), FuncRequest(LFUN_BRANCH_INSERT, bname))); toqstr(label), FuncRequest(LFUN_BRANCH_INSERT, bname)));
++ii; ++ii;
} }
if (!child_branches.empty()) { if (!master_branches.empty()) {
MenuItem item(MenuItem::Submenu, qt_("Child Document")); MenuItem item(MenuItem::Submenu, qt_("Master Document"));
item.setSubmenu(child_branches); item.setSubmenu(master_branches);
add(item); add(item);
} }
} }