void expandFloatListInsert(Buffer const * buf);
void expandFloatInsert(Buffer const * buf);
void expandFlexInsert(Buffer const * buf, InsetLayout::InsetLyXType type);
- void expandToc2(Toc const & toc_list, size_t from, size_t to, int depth);
+ void expandToc2(Toc const & toc_list, size_t from, size_t to, int depth, string toc_type);
void expandToc(Buffer const * buf);
void expandPasteRecent(Buffer const * buf);
void expandToolbars();
cit != i.submenu().end(); ++cit) {
// Only these kind of items affect the status of the submenu
if ((cit->kind() == MenuItem::Command
- || cit->kind() == MenuItem::Submenu
- || cit->kind() == MenuItem::Help)) {
+ || cit->kind() == MenuItem::Submenu
+ || cit->kind() == MenuItem::Help)
+ && cit->status().enabled()) {
enabled = true;
break;
}
QString limitStringLength(docstring const & str)
{
size_t const max_item_length = 45;
-
- if (str.size() > max_item_length)
- return toqstr(str.substr(0, max_item_length - 3) + "...");
-
- return toqstr(str);
+ docstring ret = str.substr(0, max_item_length + 1);
+ support::truncateWithEllipsis(ret, max_item_length);
+ return toqstr(ret);
}
}
+// Threshold before we stop displaying sub-items alongside items
+// (for display purposes). Ideally this should fit on a screen.
size_t const max_number_of_items = 30;
+// Size limit for the menu. This is for performance purposes,
+// because qt already displays a scrollable menu when necessary.
+// Ideally this should be the menu size from which scrollable
+// menus become unpractical.
+size_t const menu_size_limit = 80;
void MenuDefinition::expandToc2(Toc const & toc_list,
- size_t from, size_t to, int depth)
+ size_t from, size_t to, int depth,
+ string toc_type)
{
int shortcut_count = 0;
}
} else {
size_t pos = from;
+ size_t size = 1;
while (pos < to) {
size_t new_pos = pos + 1;
while (new_pos < to && toc_list[new_pos].depth() > depth)
label += QString::number(++shortcut_count);
}
}
+ if (size >= menu_size_limit) {
+ FuncRequest f(LFUN_DIALOG_SHOW, "toc " + toc_type);
+ add(MenuItem(MenuItem::Command, "...", f));
+ break;
+ }
if (new_pos == pos + 1) {
add(MenuItem(MenuItem::Command,
label, FuncRequest(toc_list[pos].action())));
} else {
MenuDefinition sub;
- sub.expandToc2(toc_list, pos, new_pos, depth + 1);
+ sub.expandToc2(toc_list, pos, new_pos, depth + 1, toc_type);
MenuItem item(MenuItem::Submenu, label);
item.setSubmenu(sub);
add(item);
}
+ ++size;
pos = new_pos;
}
}
MenuDefinition submenu;
// "Open outliner..." entry
FuncRequest f(LFUN_DIALOG_SHOW, "toc " + cit->first);
- submenu.add(MenuItem(MenuItem::Command, qt_("Open outliner..."), f));
+ submenu.add(MenuItem(MenuItem::Command, qt_("Open Outliner..."), f));
submenu.add(MenuItem(MenuItem::Separator));
// add entries
- submenu.expandToc2(* cit->second, 0, cit->second->size(), 0);
+ submenu.expandToc2(*cit->second, 0, cit->second->size(), 0, cit->first);
MenuItem item(MenuItem::Submenu, guiName(cit->first, buf->params()));
item.setSubmenu(submenu);
// deserves to be in the main menu?
LYXERR(Debug::GUI, "No table of contents.");
else {
if (!cit->second->empty())
- expandToc2(* cit->second, 0, cit->second->size(), 0);
+ expandToc2(*cit->second, 0, cit->second->size(), 0,
+ "tableofcontents");
else
add(MenuItem(MenuItem::Info, qt_("(Empty Table of Contents)")));
}
else if (m->kind() == MenuItem::Submenu) {
QMenu * subMenu = qMenu.addMenu(label(*m));
populate(*subMenu, m->submenu());
- subMenu->setEnabled(m->status().enabled());
+ subMenu->setEnabled(!subMenu->isEmpty());
} else {
// we have a MenuItem::Command
qMenu.addAction(new Action(QIcon(), label(*m),