set<string>::const_iterator it = grp.begin();
set<string>::const_iterator end = grp.end();
add(MenuItem(MenuItem::Command, qt_("No Group"),
- FuncRequest(LFUN_SET_GRAPHICS_GROUP)));
+ FuncRequest(LFUN_GRAPHICS_SET_GROUP)));
for (; it != end; ++it) {
addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(*it) + '|',
- FuncRequest(LFUN_SET_GRAPHICS_GROUP, *it)));
+ FuncRequest(LFUN_GRAPHICS_SET_GROUP, *it)));
}
}
if (languages_buffer.size() < 2)
return;
- std::set<Language const *, sortLanguageByName> languages;
+ std::set<Language const *, sortLanguageByName> langs;
std::set<Language const *>::const_iterator const beg =
languages_buffer.begin();
for (std::set<Language const *>::const_iterator cit = beg;
cit != languages_buffer.end(); ++cit) {
- languages.insert(*cit);
+ langs.insert(*cit);
}
MenuItem item(MenuItem::Submenu, qt_("Language|L"));
QStringList accelerators;
if (morelangs.contains('|'))
accelerators.append(morelangs.section('|', -1));
- std::set<Language const *, sortLanguageByName>::const_iterator const begin = languages.begin();
+ std::set<Language const *, sortLanguageByName>::const_iterator const begin = langs.begin();
for (std::set<Language const *, sortLanguageByName>::const_iterator cit = begin;
- cit != languages.end(); ++cit) {
+ cit != langs.end(); ++cit) {
QString label = qt_((*cit)->display());
// try to add an accelerator
bool success = false;
add(MenuItem(MenuItem::Command, toqstr(lbl), FuncRequest(action)));
continue;
}
- // fall through
+ break;
case MenuItem::ExportFormats:
if (!f->inExportMenu())
continue;
for (int ii = 1; cit != end; ++cit, ++ii) {
docstring label = cit->second;
- CitationStyle cs = citeStyleList[ii - 1];
- cs.forceUpperCase &= force;
- cs.hasStarredVersion &= star;
+ CitationStyle ccs = citeStyleList[ii - 1];
+ ccs.forceUpperCase &= force;
+ ccs.hasStarredVersion &= star;
addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_INSET_MODIFY,
- "changetype " + from_utf8(citationStyleToString(cs)))));
+ "changetype " + from_utf8(citationStyleToString(ccs)))));
}
if (cs.hasStarredVersion) {
if (amps > 0) {
if (amps > 1)
starred = subst(starred, from_ascii("&&"), from_ascii("<:amp:>"));
- size_t n = starred.find('&');
+ size_t nn = starred.find('&');
char_type accel = char_type();
- if (n != docstring::npos && n < starred.size() - 1)
- accel = starred[n + 1];
+ if (nn != docstring::npos && nn < starred.size() - 1)
+ accel = starred[nn + 1];
starred = subst(starred, from_ascii("&"), from_ascii(""));
if (amps > 1)
starred = subst(starred, from_ascii("<:amp:>"), from_ascii("&&"));
return;
pit_type pit = bv->cursor().selBegin().pit();
- pos_type pos = bv->cursor().selBegin().pos();
Paragraph const & par = text->getPar(pit);
docstring const curlayout = par.layout().name();
docstring outerlayout;
add(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_ENVIRONMENT_SPLIT,
from_ascii("before"))));
- if (!par.layout().keepempty || pos > 0 || !text->isFirstInSequence(pit)) {
- label = contextmenu ?
- bformat(_("Insert Separated %1$s Below"),
- translateIfPossible(curlayout)):
- bformat(_("Separated %1$s Below"),
- translateIfPossible(curlayout));
+ label = contextmenu ?
+ bformat(_("Insert Separated %1$s Below"),
+ translateIfPossible(curlayout)):
+ bformat(_("Separated %1$s Below"),
+ translateIfPossible(curlayout));
+ // We use command-alternatives here since this is how the binding is defined
+ // (otherwise, the binding is not displayed in the menu)
+ if (getStatus(FuncRequest(LFUN_ENVIRONMENT_SPLIT)).enabled())
add(MenuItem(MenuItem::Command, toqstr(label),
- FuncRequest(LFUN_ENVIRONMENT_SPLIT)));
- }
+ FuncRequest(LFUN_COMMAND_ALTERNATIVES,
+ from_ascii("environment-split ; environment-split previous"))));
}
else if (!prevlayout.empty()) {
docstring const label = contextmenu ?
translateIfPossible(prevlayout)) :
bformat(_("Separated %1$s Below"),
translateIfPossible(prevlayout));
- add(MenuItem(MenuItem::Command, toqstr(label),
- FuncRequest(LFUN_ENVIRONMENT_SPLIT,
- from_ascii("previous"))));
+ // We use command-alternatives here since this is how the binding is defined
+ // (otherwise, the binding is not displayed in the menu)
+ if (getStatus(FuncRequest(LFUN_ENVIRONMENT_SPLIT)).enabled())
+ add(MenuItem(MenuItem::Command, toqstr(label),
+ FuncRequest(LFUN_COMMAND_ALTERNATIVES,
+ from_ascii("environment-split ; environment-split previous"))));
}
if (!outerlayout.empty()) {
docstring label;
continue;
}
- Menu * menu = new Menu(view, m->submenuname(), true);
- menu->setTitle(label(*m));
+ Menu * menuptr = new Menu(view, m->submenuname(), true);
+ menuptr->setTitle(label(*m));
#if defined(Q_OS_MAC) && (defined(QT_MAC_USE_COCOA) || (QT_VERSION >= 0x050000))
// On Mac OS with QT/cocoa, the menu is not displayed if there is no action
// so we create a temporary one here
- QAction * action = new QAction(menu);
- menu->addAction(action);
+ QAction * action = new QAction(menuptr);
+ menuptr->addAction(action);
#endif
- qmb->addMenu(menu);
+ qmb->addMenu(menuptr);
- d->name_map_[view][name] = menu;
+ d->name_map_[view][name] = menuptr;
}
}