#include "LyXRC.h"
#include "lyxfind.h"
#include "Paragraph.h"
+#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "Session.h"
#include "SpellChecker.h"
#include "TextClass.h"
+#include "Text.h"
#include "TocBackend.h"
#include "Toolbars.h"
#include "WordLangTuple.h"
for insertion into the current layout. */
Arguments,
/** This is the list of arguments available
- for in the InsetArgument context menu. */
- SwitchArguments
+ in the InsetArgument context menu. */
+ SwitchArguments,
+ /** This is the list of captions available
+ in the current layout. */
+ Captions,
+ /** This is the list of captions available
+ in the InsetCaption context menu. */
+ SwitchCaptions,
+ /** Commands to separate environments. */
+ EnvironmentSeparators
};
explicit MenuItem(Kind kind) : kind_(kind), optional_(false) {}
: kind_(kind), label_(label), submenuname_(submenu),
tooltip_(tooltip), optional_(optional)
{
- LASSERT(kind == Submenu || kind == Help || kind == Info, /**/);
+ LATTEST(kind == Submenu || kind == Help || kind == Info);
}
MenuItem(Kind kind,
void expandSpellingSuggestions(BufferView const *);
void expandLanguageSelector(Buffer const * buf);
void expandArguments(BufferView const *, bool switcharg = false);
+ void expandCaptions(Buffer const * buf, bool switchcap = false);
+ void expandEnvironmentSeparators(BufferView const *);
///
ItemList items_;
///
md_spellingsuggestions,
md_languageselector,
md_arguments,
- md_switcharguments
+ md_switcharguments,
+ md_captions,
+ md_switchcaptions,
+ md_env_separators
};
LexerKeyword menutags[] = {
{ "arguments", md_arguments },
{ "bookmarks", md_bookmarks },
{ "branches", md_branches },
+ { "captions", md_captions },
{ "charstyles", md_charstyles },
{ "citestyles", md_citestyles },
{ "custom", md_custom },
{ "documents", md_documents },
{ "elements", md_elements },
{ "end", md_endmenu },
+ { "environmentseparators", md_env_separators },
{ "exportformats", md_exportformats },
{ "floatinsert", md_floatinsert },
{ "floatlistinsert", md_floatlistinsert },
{ "spellingsuggestions", md_spellingsuggestions },
{ "submenu", md_submenu },
{ "switcharguments", md_switcharguments },
+ { "switchcaptions", md_switchcaptions },
{ "toc", md_toc },
{ "toolbars", md_toolbars },
{ "updateformats", md_updateformats },
lex.pushTable(menutags);
lex.setContext("MenuDefinition::read: ");
- bool quit = false;
- bool optional = false;
-
- while (lex.isOK() && !quit) {
- switch (lex.lex()) {
+ int md_type = 0;
+ while (lex.isOK() && md_type != md_endmenu) {
+ switch (md_type = lex.lex()) {
case md_optitem:
- optional = true;
- // fallback to md_item
case md_item: {
lex.next(true);
docstring const name = translateIfPossible(lex.getDocString());
FuncRequest::Origin origin = FuncRequest::MENU;
if (name_.startsWith("context-toc-"))
origin = FuncRequest::TOC;
+ bool const optional = (md_type == md_optitem);
add(MenuItem(MenuItem::Command, toqstr(name), func, QString(), optional, origin));
- optional = false;
break;
}
add(MenuItem(MenuItem::SwitchArguments));
break;
+ case md_captions:
+ add(MenuItem(MenuItem::Captions));
+ break;
+
+ case md_switchcaptions:
+ add(MenuItem(MenuItem::SwitchCaptions));
+ break;
+
+ case md_env_separators:
+ add(MenuItem(MenuItem::EnvironmentSeparators));
+ break;
+
case md_optsubmenu:
- optional = true;
- // fallback to md_submenu
case md_submenu: {
lex.next(true);
docstring const mlabel = translateIfPossible(lex.getDocString());
lex.next(true);
docstring const mname = lex.getDocString();
+ bool const optional = (md_type == md_optsubmenu);
add(MenuItem(MenuItem::Submenu,
toqstr(mlabel), toqstr(mname), QString(), optional));
- optional = false;
break;
}
case md_endmenu:
- quit = true;
break;
default:
action = LFUN_BUFFER_EXPORT;
break;
default:
- LASSERT(false, /* */);
+ LATTEST(false);
return;
}
+ sort(formats.begin(), formats.end(), Format::formatSorter);
bool const view_update = (kind == MenuItem::ViewFormats
|| kind == MenuItem::UpdateFormats);
continue;
break;
default:
- LASSERT(false, /* */);
+ // we already asserted earlier in this case
+ // LATTEST(false);
continue;
}
if (!shortcut.empty())
vector<docstring> const keys = getVectorFromString(key);
vector<CitationStyle> const citeStyleList = buf->params().citeStyles();
+ static const size_t max_length = 40;
vector<docstring> citeStrings =
buf->masterBibInfo().getCiteStrings(keys, citeStyleList, bv->buffer(),
- false, before, after, from_utf8("dialog"));
+ before, after, from_utf8("dialog"), max_length);
vector<docstring>::const_iterator cit = citeStrings.begin();
vector<docstring>::const_iterator end = citeStrings.end();
if (!bv)
return;
+ if (!bv->cursor().inTexted())
+ return;
+
Inset const * inset = &bv->cursor().inset();
Layout::LaTeXArgMap args = bv->cursor().paragraph().layout().args();
if (inset && args.empty())
}
}
+
+void MenuDefinition::expandCaptions(Buffer const * buf, bool switchcap)
+{
+ if (!buf)
+ return;
+
+ vector<docstring> caps;
+ DocumentClass const & dc = buf->params().documentClass();
+ TextClass::InsetLayouts::const_iterator lit = dc.insetLayouts().begin();
+ TextClass::InsetLayouts::const_iterator len = dc.insetLayouts().end();
+ for (; lit != len; ++lit) {
+ if (prefixIs(lit->first, from_ascii("Caption:")))
+ caps.push_back(lit->first);
+ }
+
+ if (caps.empty() || (switchcap && caps.size() == 1))
+ return;
+ if (caps.size() == 1) {
+ docstring dummy;
+ docstring const type = split(*caps.begin(), dummy, ':');
+ add(MenuItem(MenuItem::Command, qt_("Caption"),
+ FuncRequest(LFUN_CAPTION_INSERT, translateIfPossible(type))));
+ return;
+ }
+
+ MenuDefinition captions;
+
+ vector<docstring>::const_iterator cit = caps.begin();
+ vector<docstring>::const_iterator end = caps.end();
+
+ for (int ii = 1; cit != end; ++cit, ++ii) {
+ docstring dummy;
+ docstring const type = split(*cit, dummy, ':');
+ docstring const trtype = translateIfPossible(type);
+ docstring const cmitem = bformat(_("Caption (%1$s)"), trtype);
+ // make menu item optional, otherwise we would also see
+ // forbidden caption types
+ if (switchcap)
+ addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(cmitem),
+ FuncRequest(LFUN_INSET_MODIFY,
+ from_ascii("changetype ")
+ + type), QString(), true));
+ else
+ captions.addWithStatusCheck(MenuItem(MenuItem::Command,
+ toqstr(trtype),
+ FuncRequest(LFUN_CAPTION_INSERT,
+ type), QString(), true));
+ }
+ if (!captions.empty()) {
+ MenuItem item(MenuItem::Submenu, qt_("Caption"));
+ item.setSubmenu(captions);
+ add(item);
+ }
+}
+
+
+void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv)
+{
+ if (!bv)
+ return;
+ Text const * text = bv->cursor().text();
+ // no paragraphs and no separators exist in math
+ if (!text)
+ return;
+
+ pit_type pit = bv->cursor().selBegin().pit();
+ Paragraph const & par = text->getPar(pit);
+ docstring const curlayout = par.layout().name();
+ docstring outerlayout;
+ depth_type current_depth = par.params().depth();
+ // check if we have an environment in our nesting hierarchy
+ Paragraph cpar = par;
+ while (true) {
+ if (pit == 0 || cpar.params().depth() == 0)
+ break;
+ --pit;
+ cpar = text->getPar(pit);
+ if (cpar.params().depth() < current_depth
+ && cpar.layout().isEnvironment()) {
+ outerlayout = cpar.layout().name();
+ current_depth = cpar.params().depth();
+ }
+ }
+ if (par.layout().isEnvironment()) {
+ docstring const label =
+ bformat(_("Start New Environment (%1$s)"),
+ translateIfPossible(curlayout));
+ add(MenuItem(MenuItem::Command, toqstr(label),
+ FuncRequest(LFUN_ENVIRONMENT_SPLIT)));
+ }
+ if (!outerlayout.empty()) {
+ docstring const label =
+ bformat(_("Start New Parent Environment (%1$s)"),
+ translateIfPossible(outerlayout));
+ add(MenuItem(MenuItem::Command, toqstr(label),
+ FuncRequest(LFUN_ENVIRONMENT_SPLIT,
+ from_ascii("outer"))));
+ }
+}
+
} // namespace anon
subMenu->setEnabled(m->status().enabled());
} else {
// we have a MenuItem::Command
- qMenu.addAction(new Action(view, QIcon(), label(*m),
+ qMenu.addAction(new Action(QIcon(), label(*m),
m->func(), m->tooltip(), &qMenu));
}
}
/** The entries with the following kind are expanded to a
sequence of Command MenuItems: Lastfiles, Documents,
ViewFormats, ExportFormats, UpdateFormats, Branches,
- Indices, Arguments, SwitchArguments
+ Indices, Arguments, SwitchArguments, Captions, SwitchCaptions,
+ EnvironmentSeparators
*/
void expand(MenuDefinition const & frommenu, MenuDefinition & tomenu,
BufferView const *) const;
/// Initialize specific MACOS X menubar
- void macxMenuBarInit(GuiView * view, QMenuBar * qmb);
+ void macxMenuBarInit(QMenuBar * qmb);
/// Mac special menu.
/** This defines a menu whose entries list the FuncRequests
that this menubar will be used also when one of LyX' dialogs has
focus. (JMarc)
*/
-void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb)
+void Menus::Impl::macxMenuBarInit(QMenuBar * qmb)
{
/* Since Qt 4.2, the qt/mac menu code has special code for
specifying the role of a menu entry. However, it does not
QAction::MenuRole role;
};
- MacMenuEntry entries[] = {
+ static MacMenuEntry entries[] = {
{LFUN_DIALOG_SHOW, "aboutlyx", "About LyX",
QAction::AboutRole},
{LFUN_DIALOG_SHOW, "prefs", "Preferences",
QAction::PreferencesRole},
- /* {LFUN_RECONFIGURE, "", "Reconfigure",
- QAction::ApplicationSpecificRole}, */
+#if !(defined(QT_MAC_USE_COCOA) || (QT_VERSION >= 0x050000))
+ /* This doesn't work with Cocoa. */
+ {LFUN_RECONFIGURE, "", "Reconfigure",
+ QAction::ApplicationSpecificRole},
+#endif
{LFUN_LYX_QUIT, "", "Quit LyX", QAction::QuitRole}
};
const size_t num_entries = sizeof(entries) / sizeof(entries[0]);
MenuDefinition::const_iterator cit = mac_special_menu_.begin();
MenuDefinition::const_iterator end = mac_special_menu_.end();
for (size_t i = 0 ; cit != end ; ++cit, ++i) {
-#if defined(QT_MAC_USE_COCOA) && (QT_MAC_USE_COCOA > 0)
- if (first_call || entries[i].role != QAction::ApplicationSpecificRole) {
- Action * action = new Action(view, QIcon(), cit->label(),
- cit->func(), QString(), qMenu);
- action->setMenuRole(entries[i].role);
- qMenu->addAction(action);
- }
-#else
- Action * action = new Action(view, QIcon(), cit->label(),
+ Action * action = new Action(QIcon(), cit->label(),
cit->func(), QString(), qMenu);
action->setMenuRole(entries[i].role);
qMenu->addAction(action);
-#endif
}
}
tomenu.expandArguments(bv, true);
break;
+ case MenuItem::Captions:
+ tomenu.expandCaptions(buf, false);
+ break;
+
+ case MenuItem::SwitchCaptions:
+ tomenu.expandCaptions(buf, true);
+ break;
+
+ case MenuItem::EnvironmentSeparators:
+ tomenu.expandEnvironmentSeparators(bv);
+ break;
+
case MenuItem::Submenu: {
MenuItem item(*cit);
item.setSubmenu(MenuDefinition(cit->submenuname()));
{
const_iterator cit = find_if(menulist_.begin(), menulist_.end(),
MenuNamesEqual(name));
- if (cit == menulist_.end())
+ if (cit == menulist_.end()) {
LYXERR0("No submenu named " << name);
- LASSERT(cit != menulist_.end(), /**/);
+ LASSERT(false, { static const MenuDefinition m; return m; });
+ }
return (*cit);
}
{
iterator it = find_if(menulist_.begin(), menulist_.end(),
MenuNamesEqual(name));
- if (it == menulist_.end())
+ if (it == menulist_.end()) {
LYXERR0("No submenu named " << name);
- LASSERT(it != menulist_.end(), /**/);
+ LASSERT(false, { static MenuDefinition m; return m; });
+ }
return (*it);
}
// create duplicate items in the application menu. It seems
// that Qt does not remove them when the QMenubar is cleared.
LYXERR(Debug::GUI, "Creating Mac OS X special menu bar");
- d->macxMenuBarInit(view, qmb);
+ d->macxMenuBarInit(qmb);
#endif
} else {
// Clear all menubar contents before filling it.
Menu * menu = new Menu(view, m->submenuname(), true);
menu->setTitle(label(*m));
+
+#if defined(Q_WS_MACX) && (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);
+#endif
+
qmb->addMenu(menu);
d->name_map_[view][name] = menu;
projects / lyx.git / blobdiff