*
* \author John Levon
* \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
- * \author André Pönitz
+ * \author André Pönitz
* \author Dekel Tsur
* \author Martin Vermeer
*
#include "Action.h"
#include "GuiApplication.h"
#include "GuiView.h"
+#include "qt_helpers.h"
#include "BranchList.h"
#include "Buffer.h"
#include "LyX.h" // for lastfiles
#include "LyXFunc.h"
#include "Paragraph.h"
-#include "qt_helpers.h"
#include "Session.h"
#include "TextClass.h"
#include "TocBackend.h"
#include "ToolbarBackend.h"
+#include "support/assert.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/filetools.h"
#include <QCursor>
#include <QHash>
+#include <QList>
#include <QMenuBar>
#include <QString>
// MacOSX specific stuff is at the end.
-class Menu;
+class MenuDefinition;
///
class MenuItem {
Branches
};
- explicit MenuItem(Kind kind);
+ explicit MenuItem(Kind kind) : kind_(kind), optional_(false) {}
MenuItem(Kind kind,
QString const & label,
QString const & submenu = QString(),
- bool optional = false);
+ bool optional = false)
+ : kind_(kind), label_(label), submenuname_(submenu), optional_(optional)
+ {
+ LASSERT(kind == Submenu, /**/);
+ }
MenuItem(Kind kind,
QString const & label,
FuncRequest const & func,
- bool optional = false);
+ bool optional = false)
+ : kind_(kind), label_(label), func_(func), optional_(optional)
+ {
+ func_.origin = FuncRequest::MENU;
+ }
+
+ // boost::shared_ptr<MenuDefinition> needs this apprently...
+ ~MenuItem() {}
- /// This one is just to please boost::shared_ptr<>
- ~MenuItem();
/// The label of a given menuitem
- QString label() const;
+ QString label() const { return label_.split('|')[0]; }
+
/// The keyboard shortcut (usually underlined in the entry)
- QString shortcut() const;
+ QString shortcut() const
+ {
+ return label_.contains('|') ? label_.split('|')[1] : QString();
+ }
/// The complete label, with label and shortcut separated by a '|'
QString fulllabel() const { return label_;}
/// The kind of entry
FuncStatus & status() { return status_; }
/// returns the status of the lfun associated with this entry
void status(FuncStatus const & status) { status_ = status; }
+
///returns the binding associated to this action.
- QString binding() const;
+ QString binding() const
+ {
+ if (kind_ != Command)
+ return QString();
+ // Get the keys bound to this action, but keep only the
+ // first one later
+ KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func_);
+ if (bindings.size())
+ return toqstr(bindings.begin()->print(KeySequence::ForGui));
+
+ LYXERR(Debug::KBMAP, "No binding for "
+ << lyxaction.getActionName(func_.action)
+ << '(' << func_.argument() << ')');
+ return QString();
+ }
+
/// the description of the submenu (if relevant)
QString const & submenuname() const { return submenuname_; }
/// set the description of the submenu
void submenuname(QString const & name) { submenuname_ = name; }
///
- Menu * submenu() const { return submenu_.get(); }
+ bool hasSubmenu() const { return !submenu_.isEmpty(); }
///
- void setSubmenu(Menu * menu);
+ MenuDefinition const & submenu() const { return submenu_.at(0); }
+ MenuDefinition & submenu() { return submenu_[0]; }
+ ///
+ void setSubmenu(MenuDefinition const & menu)
+ {
+ submenu_.clear();
+ submenu_.append(menu);
+ }
private:
///
bool optional_;
///
FuncStatus status_;
- ///
- boost::shared_ptr<Menu> submenu_;
+ /// contains 0 or 1 item.
+ QList<MenuDefinition> submenu_;
};
///
-class Menu {
+class MenuDefinition {
public:
///
typedef std::vector<MenuItem> ItemList;
///
typedef ItemList::const_iterator const_iterator;
-
///
- explicit Menu(QString const & name = QString()) : name_(name) {}
+ explicit MenuDefinition(QString const & name = QString()) : name_(name) {}
///
void read(Lexer &);
// names in a stack.
bool searchMenu(FuncRequest const & func, std::vector<docstring> & names)
const;
-
-private:
- friend class Menus;
///
bool hasFunc(FuncRequest const &) const;
/// Add the menu item unconditionally
void expandPasteRecent();
void expandToolbars();
void expandBranches(Buffer const * buf);
-
- ItemList items_;
- ///
- QString name_;
-};
-
-/// a submenu
-class GuiPopupMenu : public QMenu
-{
-public:
///
- GuiPopupMenu(GuiView * owner, MenuItem const & mi, bool top_level)
- : QMenu(owner), owner_(owner), top_level_(top_level)
- {
- name_ = mi.submenuname();
- setTitle(label(mi));
- }
-
- /// populates the menu or one of its submenu
- /// This is used as a recursive function
- void populate(QMenu * qMenu, Menu * menu);
-
- /// Get a Menu item label from the menu backend
- QString label(MenuItem const & mi) const;
-
- void showEvent(QShowEvent * ev)
- {
- if (top_level_)
- guiApp->menus().updateMenu(name_);
- QMenu::showEvent(ev);
- }
-
- bool const top_level_;
-
+ ItemList items_;
///
- Menu topLevelMenu_;
-
- /// our owning view
- GuiView * owner_;
- /// the name of this menu
QString name_;
};
-class MenuNamesEqual
-{
-public:
- MenuNamesEqual(QString const & name) : name_(name) {}
- bool operator()(Menu const & menu) const { return menu.name() == name_; }
-private:
- QString name_;
-};
-
-///
-typedef std::vector<Menu> MenuList;
-///
-typedef MenuList::const_iterator const_iterator;
-///
-typedef MenuList::iterator iterator;
-
-
-void GuiPopupMenu::populate(QMenu * qMenu, Menu * menu)
-{
- LYXERR(Debug::GUI, "populating menu " << fromqstr(menu->name()));
- if (menu->size() == 0) {
- LYXERR(Debug::GUI, "\tERROR: empty menu " << fromqstr(menu->name()));
- return;
- }
- LYXERR(Debug::GUI, " ***** menu entries " << menu->size());
-
- Menu::const_iterator m = menu->begin();
- Menu::const_iterator end = menu->end();
-
- for (; m != end; ++m) {
-
- if (m->kind() == MenuItem::Separator) {
-
- qMenu->addSeparator();
- LYXERR(Debug::GUI, "adding Menubar Separator");
-
- } else if (m->kind() == MenuItem::Submenu) {
-
- LYXERR(Debug::GUI, "** creating New Sub-Menu "
- << fromqstr(label(*m)));
- QMenu * subMenu = qMenu->addMenu(label(*m));
- populate(subMenu, m->submenu());
-
- } else { // we have a MenuItem::Command
-
- LYXERR(Debug::GUI, "creating Menu Item "
- << fromqstr(m->label()));
-
- Action * action = new Action(*owner_,
- QIcon(), label(*m), m->func(), QString());
- qMenu->addAction(action);
- }
- }
-}
-
-
-QString GuiPopupMenu::label(MenuItem const & mi) const
-{
- QString label = mi.label();
- label.replace("&", "&&");
-
- QString shortcut = mi.shortcut();
- if (!shortcut.isEmpty()) {
- int pos = label.indexOf(shortcut);
- if (pos != -1)
- //label.insert(pos, 1, char_type('&'));
- label.replace(pos, 0, "&");
- }
-
- QString const binding = mi.binding();
- if (!binding.isEmpty())
- label += '\t' + binding;
-
- return label;
-}
-
-} // namespace anon
-
-struct Menus::Impl {
- ///
- void add(Menu const &);
- ///
- bool hasMenu(QString const &) const;
- ///
- Menu & getMenu(QString const &);
- ///
- Menu const & getMenu(QString const &) const;
- ///
- bool empty() const { return menulist_.empty(); }
- /** This defines a menu whose entries list the FuncRequests
- that will be removed by expand() in other menus. This is
- used by the Qt/Mac code
- */
- void setSpecialMenu(Menu const & menu) { specialmenu_ = menu; }
- ///
- Menu const & specialMenu() { return specialmenu_; }
-
- /// Expands some special entries of the menu
- /** The entries with the following kind are expanded to a
- sequence of Command MenuItems: Lastfiles, Documents,
- ViewFormats, ExportFormats, UpdateFormats, Branches
- */
- void expand(Menu const & frommenu, Menu & tomenu,
- Buffer const *) const;
- ///
- const_iterator begin() const { return menulist_.begin(); }
- ///
- iterator begin() { return menulist_.begin(); }
- ///
- const_iterator end() const { return menulist_.end(); }
- ///
- iterator end() { return menulist_.end(); }
-
- ///
- MenuList menulist_;
- ///
- Menu menubar_;
- ///
- Menu specialmenu_;
-
- /// Initialize specific MACOS X menubar
- void macxMenuBarInit(GuiView * view);
-
- typedef QHash<QString, GuiPopupMenu *> NameMap;
-
- /// name to menu for \c menu() method.
- NameMap name_map_;
-};
-
-
-Menus::Menus(): d(new Impl) {}
-
-
-bool Menus::searchMenu(FuncRequest const & func,
- vector<docstring> & names) const
-{
- return d->menubar_.searchMenu(func, names);
-}
-
-
-void Menus::fillMenuBar(GuiView * view)
-{
- // Clear all menubar contents before filling it.
- view->menuBar()->clear();
-
-#ifdef Q_WS_MACX
- // setup special mac specific menu item
- macxMenuBarInit(view);
-#endif
-
- LYXERR(Debug::GUI, "populating menu bar" << fromqstr(d->menubar_.name()));
-
- if (d->menubar_.size() == 0) {
- LYXERR(Debug::GUI, "\tERROR: empty menu bar"
- << fromqstr(d->menubar_.name()));
- return;
- }
- else {
- LYXERR(Debug::GUI, "menu bar entries "
- << d->menubar_.size());
- }
-
- Menu menu;
- d->expand(d->menubar_, menu, view->buffer());
-
- Menu::const_iterator m = menu.begin();
- Menu::const_iterator end = menu.end();
-
- for (; m != end; ++m) {
-
- if (m->kind() != MenuItem::Submenu) {
- LYXERR(Debug::GUI, "\tERROR: not a submenu " << fromqstr(m->label()));
- continue;
- }
-
- LYXERR(Debug::GUI, "menu bar item " << fromqstr(m->label())
- << " is a submenu named " << fromqstr(m->submenuname()));
-
- QString name = m->submenuname();
- if (!d->hasMenu(name)) {
- LYXERR(Debug::GUI, "\tERROR: " << fromqstr(name)
- << " submenu has no menu!");
- continue;
- }
-
- GuiPopupMenu * qmenu = new GuiPopupMenu(view, *m, true);
- view->menuBar()->addMenu(qmenu);
-
- d->name_map_[name] = qmenu;
- }
-}
-
-
-void Menus::updateMenu(QString const & name)
-{
- GuiPopupMenu * qmenu = d->name_map_[name];
- LYXERR(Debug::GUI, "GuiPopupMenu::updateView()"
- << "\tTriggered menu: " << fromqstr(qmenu->name_));
- qmenu->clear();
-
- if (qmenu->name_.isEmpty())
- return;
-
- // Here, We make sure that theLyXFunc points to the correct LyXView.
- theLyXFunc().setLyXView(qmenu->owner_);
-
- Menu const & fromLyxMenu = d->getMenu(qmenu->name_);
- d->expand(fromLyxMenu, qmenu->topLevelMenu_, qmenu->owner_->buffer());
-
- if (!d->hasMenu(qmenu->topLevelMenu_.name())) {
- LYXERR(Debug::GUI, "\tWARNING: menu seems empty"
- << fromqstr(qmenu->topLevelMenu_.name()));
- }
- qmenu->populate(qmenu, &qmenu->topLevelMenu_);
-}
-
-
-QMenu * Menus::menu(QString const & name)
-{
- LYXERR(Debug::GUI, "Context menu requested: " << fromqstr(name));
- GuiPopupMenu * menu = d->name_map_.value(name, 0);
- if (!menu)
- LYXERR0("resquested context menu not found: " << fromqstr(name));
- return menu;
-}
-
-
-/// Some special Qt/Mac support hacks
-
-/*
- Here is what the Qt documentation says about how a menubar is chosen:
-
- 1) If the window has a QMenuBar then it is used. 2) If the window
- is a modal then its menubar is used. If no menubar is specified
- then a default menubar is used (as documented below) 3) If the
- window has no parent then the default menubar is used (as
- documented below).
-
- The above 3 steps are applied all the way up the parent window
- chain until one of the above are satisifed. If all else fails a
- default menubar will be created, the default menubar on Qt/Mac is
- an empty menubar, however you can create a different default
- menubar by creating a parentless QMenuBar, the first one created
- will thus be designated the default menubar, and will be used
- whenever a default menubar is needed.
-
- Thus, for Qt/Mac, we add the menus to a free standing menubar, so
- that this menubar will be used also when one of LyX' dialogs has
- focus. (JMarc)
-*/
-
-void Menus::Impl::macxMenuBarInit(GuiView * view)
-{
- // The Mac menubar initialisation must be done only once!
- static bool done = false;
- if (done)
- return;
- done = true;
-
- /* Since Qt 4.2, the qt/mac menu code has special code for
- specifying the role of a menu entry. However, it does not
- work very well with our scheme of creating menus on demand,
- and therefore we need to put these entries in a special
- invisible menu. (JMarc)
- */
-
- /* The entries of our special mac menu. If we add support for
- * special entries in Menus, we could imagine something
- * like
- * SpecialItem About " "About LyX" "dialog-show aboutlyx"
- * and therefore avoid hardcoding. I am not sure it is worth
- * the hassle, though. (JMarc)
- */
- struct MacMenuEntry {
- kb_action action;
- char const * arg;
- char const * label;
- QAction::MenuRole role;
- };
-
- MacMenuEntry entries[] = {
- {LFUN_DIALOG_SHOW, "aboutlyx", "About LyX",
- QAction::AboutRole},
- {LFUN_DIALOG_SHOW, "prefs", "Preferences",
- QAction::PreferencesRole},
- {LFUN_RECONFIGURE, "", "Reconfigure",
- QAction::ApplicationSpecificRole},
- {LFUN_LYX_QUIT, "", "Quit LyX", QAction::QuitRole}
- };
- const size_t num_entries = sizeof(entries) / sizeof(entries[0]);
-
- // the special menu for Menus.
- Menu special;
- for (size_t i = 0 ; i < num_entries ; ++i) {
- FuncRequest const func(entries[i].action,
- from_utf8(entries[i].arg));
- special.add(MenuItem(MenuItem::Command, entries[i].label, func));
- }
- setSpecialMenu(special);
-
- // add the entries to a QMenu that will eventually be empty
- // and therefore invisible.
- QMenu * qMenu = view->menuBar()->addMenu("special");
-
- // we do not use 'special' because it is a temporary variable,
- // whereas Menus::specialMenu points to a persistent copy.
- Menu::const_iterator cit = specialMenu().begin();
- Menu::const_iterator end = specialMenu().end();
- for (size_t i = 0 ; cit != end ; ++cit, ++i) {
- Action * action = new Action(*view, QIcon(), cit->label(),
- cit->func(), QString());
- action->setMenuRole(entries[i].role);
- qMenu->addAction(action);
- }
-}
-
-
-MenuItem::MenuItem(Kind kind)
- : kind_(kind), optional_(false)
-{}
-
-
-MenuItem::MenuItem(Kind kind, QString const & label,
- QString const & submenu, bool optional)
- : kind_(kind), label_(label),
- submenuname_(submenu), optional_(optional)
-{
- BOOST_ASSERT(kind == Submenu);
-}
-
-
-MenuItem::MenuItem(Kind kind, QString const & label,
- FuncRequest const & func, bool optional)
- : kind_(kind), label_(label), func_(func), optional_(optional)
-{
- func_.origin = FuncRequest::MENU;
-}
-
-
-MenuItem::~MenuItem()
-{}
-
-
-void MenuItem::setSubmenu(Menu * menu)
-{
- submenu_.reset(menu);
-}
-
-
-QString MenuItem::label() const
-{
- return label_.split('|')[0];
-}
-
-
-QString MenuItem::shortcut() const
-{
- return label_.contains('|') ? label_.split('|')[1] : QString();
-}
-
-
-QString MenuItem::binding() const
-{
- if (kind_ != Command)
- return QString();
-
- // Get the keys bound to this action, but keep only the
- // first one later
- KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func_);
+/// Helper for std::find_if
+class MenuNamesEqual
+{
+public:
+ MenuNamesEqual(QString const & name) : name_(name) {}
+ bool operator()(MenuDefinition const & menu) const { return menu.name() == name_; }
+private:
+ QString name_;
+};
- if (bindings.size())
- return toqstr(bindings.begin()->print(KeySequence::ForGui));
- LYXERR(Debug::KBMAP, "No binding for "
- << lyxaction.getActionName(func_.action)
- << '(' << func_.argument() << ')');
- return QString();
-}
+///
+typedef std::vector<MenuDefinition> MenuList;
+///
+typedef MenuList::const_iterator const_iterator;
+///
+typedef MenuList::iterator iterator;
+/////////////////////////////////////////////////////////////////////
+// MenuDefinition implementation
+/////////////////////////////////////////////////////////////////////
-void Menu::addWithStatusCheck(MenuItem const & i)
+void MenuDefinition::addWithStatusCheck(MenuItem const & i)
{
switch (i.kind()) {
}
case MenuItem::Submenu: {
- if (i.submenu()) {
+ if (i.hasSubmenu()) {
bool enabled = false;
- for (const_iterator cit = i.submenu()->begin();
- cit != i.submenu()->end(); ++cit) {
+ for (const_iterator cit = i.submenu().begin();
+ cit != i.submenu().end(); ++cit) {
if ((cit->kind() == MenuItem::Command
|| cit->kind() == MenuItem::Submenu)
&& cit->status().enabled()) {
}
-void Menu::read(Lexer & lex)
+void MenuDefinition::read(Lexer & lex)
{
- enum Menutags {
+ enum {
md_item = 1,
md_branches,
md_documents,
md_floatlistinsert,
md_floatinsert,
md_pasterecent,
- md_toolbars,
- md_last
+ md_toolbars
};
- struct keyword_item menutags[md_last - 1] = {
+ LexerKeyword menutags[] = {
{ "bookmarks", md_bookmarks },
{ "branches", md_branches },
{ "charstyles", md_charstyles },
{ "viewformats", md_viewformats }
};
- lex.pushTable(menutags, md_last - 1);
- if (lyxerr.debugging(Debug::PARSER))
- lex.printTable(lyxerr);
+ lex.pushTable(menutags);
+ lex.setContext("MenuDefinition::read: ");
bool quit = false;
bool optional = false;
break;
default:
- lex.printError("Menu::read: "
- "Unknown menu tag: `$$Token'");
+ lex.printError("Unknown menu tag");
break;
}
}
}
-MenuItem const & Menu::operator[](size_type i) const
+MenuItem const & MenuDefinition::operator[](size_type i) const
{
return items_[i];
}
-bool Menu::hasFunc(FuncRequest const & func) const
+bool MenuDefinition::hasFunc(FuncRequest const & func) const
{
for (const_iterator it = begin(), et = end(); it != et; ++it)
if (it->func() == func)
}
-void Menu::checkShortcuts() const
+void MenuDefinition::checkShortcuts() const
{
// This is a quadratic algorithm, but we do not care because
// menus are short enough
}
-bool Menu::searchMenu(FuncRequest const & func, vector<docstring> & names) const
+bool MenuDefinition::searchMenu(FuncRequest const & func, vector<docstring> & names) const
{
const_iterator m = begin();
const_iterator m_end = end();
}
if (m->kind() == MenuItem::Submenu) {
names.push_back(qstring_to_ucs4(m->label()));
- Menu const & submenu = *m->submenu();
- if (submenu.searchMenu(func, names))
+ if (!m->hasSubmenu()) {
+ LYXERR(Debug::GUI, "Warning: non existing sub menu label="
+ << fromqstr(m->label())
+ << " name=" << fromqstr(m->submenuname()));
+ names.pop_back();
+ continue;
+ }
+ if (m->submenu().searchMenu(func, names))
return true;
names.pop_back();
}
}
-namespace {
-
bool compareFormat(Format const * p1, Format const * p2)
{
return *p1 < *p2;
return toqstr(str);
}
-} // namespace anon
-
-void Menu::expandLastfiles()
+void MenuDefinition::expandLastfiles()
{
LastFilesSection::LastFiles const & lf = LyX::cref().session().lastFiles().lastFiles();
LastFilesSection::LastFiles::const_iterator lfit = lf.begin();
}
-void Menu::expandDocuments()
+void MenuDefinition::expandDocuments()
{
Buffer * first = theBufferList().first();
if (first) {
}
-void Menu::expandBookmarks()
+void MenuDefinition::expandBookmarks()
{
lyx::BookmarksSection const & bm = LyX::cref().session().bookmarks();
}
-void Menu::expandFormats(MenuItem::Kind kind, Buffer const * buf)
+void MenuDefinition::expandFormats(MenuItem::Kind kind, Buffer const * buf)
{
if (!buf && kind != MenuItem::ImportFormats) {
add(MenuItem(MenuItem::Command,
typedef vector<Format const *> Formats;
Formats formats;
- kb_action action;
+ FuncCode action;
switch (kind) {
case MenuItem::ImportFormats:
continue;
break;
default:
- BOOST_ASSERT(false);
+ LASSERT(false, /**/);
break;
}
// FIXME: if we had proper support for translating the
}
-void Menu::expandFloatListInsert(Buffer const * buf)
+void MenuDefinition::expandFloatListInsert(Buffer const * buf)
{
if (!buf) {
add(MenuItem(MenuItem::Command, qt_("No Document Open!"),
}
-void Menu::expandFloatInsert(Buffer const * buf)
+void MenuDefinition::expandFloatInsert(Buffer const * buf)
{
if (!buf) {
add(MenuItem(MenuItem::Command, qt_("No Document Open!"),
}
-void Menu::expandFlexInsert(Buffer const * buf, string s)
+void MenuDefinition::expandFlexInsert(Buffer const * buf, string s)
{
if (!buf) {
add(MenuItem(MenuItem::Command, qt_("No Document Open!"),
size_t const max_number_of_items = 25;
-void Menu::expandToc2(Toc const & toc_list,
+void MenuDefinition::expandToc2(Toc const & toc_list,
size_t from, size_t to, int depth)
{
int shortcut_count = 0;
size_t pos = from;
while (pos < to) {
size_t new_pos = pos + 1;
- while (new_pos < to &&
- toc_list[new_pos].depth() > depth)
+ while (new_pos < to && toc_list[new_pos].depth() > depth)
++new_pos;
QString label(4 * max(0, toc_list[pos].depth() - depth), ' ');
add(MenuItem(MenuItem::Command,
label, FuncRequest(toc_list[pos].action())));
} else {
+ MenuDefinition sub;
+ sub.expandToc2(toc_list, pos, new_pos, depth + 1);
MenuItem item(MenuItem::Submenu, label);
- item.setSubmenu(new Menu);
- item.submenu()->expandToc2(toc_list, pos, new_pos, depth + 1);
+ item.setSubmenu(sub);
add(item);
}
pos = new_pos;
}
-void Menu::expandToc(Buffer const * buf)
+void MenuDefinition::expandToc(Buffer const * buf)
{
// To make things very cleanly, we would have to pass buf to
// all MenuItem constructors and to expandToc2. However, we
add(MenuItem(MenuItem::Command, qt_("Master Document"), f));
}
+ MenuDefinition other_lists;
+
FloatList const & floatlist = buf->params().documentClass().floats();
TocList const & toc_list = buf->tocBackend().tocs();
TocList::const_iterator cit = toc_list.begin();
if (cit->first == "tableofcontents")
continue;
- // All the rest is for floats
- auto_ptr<Menu> menu(new Menu);
- TocIterator ccit = cit->second.begin();
- TocIterator eend = cit->second.end();
- for (; ccit != eend; ++ccit) {
- QString const label = limitStringLength(ccit->str());
- menu->add(MenuItem(MenuItem::Command, label,
- FuncRequest(ccit->action())));
- }
string const & floatName = floatlist.getType(cit->first).listName();
QString label;
- if (!floatName.empty())
+ bool in_other_list = true;
+ if (!floatName.empty()) {
label = qt_(floatName);
- // BUG3633: listings is not a proper float so its name
- // is not shown in floatlist.
+ in_other_list = false;
+ }
+ else if (cit->first == "child") {
+ label = qt_("Child Documents");
+ in_other_list = false;
+ } else if (cit->first == "graphics")
+ label = qt_("List of Graphics");
else if (cit->first == "equation")
label = qt_("List of Equations");
else if (cit->first == "index")
label = qt_("List of Indexes");
- else if (cit->first == "listing")
- label = qt_("List of Listings");
+ else if (cit->first == "listing") {
+ // FIXME: the listing navigate menu causes a crash for unknown
+ // reason. See http://bugzilla.lyx.org/show_bug.cgi?id=4613
+ // This is a temporary fix:
+ //label = qt_("List of Listings");
+ continue;
+ }
else if (cit->first == "marginalnote")
label = qt_("List of Marginal notes");
else if (cit->first == "note")
label = qt_("Labels and References");
else if (cit->first == "citation")
label = qt_("List of Citations");
- // this should not happen now, but if something else like
- // listings is added later, this can avoid an empty menu name.
else
- label = qt_("Other floats");
+ // This should not happen unless the entry is missing above.
+ label = qt_("Other floats: ") + toqstr(cit->first);
+
+ MenuDefinition submenu;
+
+ if (cit->second.size() >= 30) {
+ FuncRequest f(LFUN_DIALOG_SHOW, "toc " + cit->first);
+ submenu.add(MenuItem(MenuItem::Command, qt_("Open Navigator..."), f));
+ } else {
+ TocIterator ccit = cit->second.begin();
+ TocIterator eend = cit->second.end();
+ for (; ccit != eend; ++ccit) {
+ QString const label = limitStringLength(ccit->str());
+ submenu.add(MenuItem(MenuItem::Command, label,
+ FuncRequest(ccit->action())));
+ }
+ }
+
MenuItem item(MenuItem::Submenu, label);
- item.setSubmenu(menu.release());
+ item.setSubmenu(submenu);
+ if (in_other_list)
+ other_lists.add(item);
+ else {
+ item.setSubmenu(submenu);
+ add(item);
+ }
+ }
+ if (!other_lists.empty()) {
+ MenuItem item(MenuItem::Submenu, qt_("Other Lists"));
+ item.setSubmenu(other_lists);
add(item);
}
+
// Handle normal TOC
cit = toc_list.find("tableofcontents");
if (cit == end) {
}
-void Menu::expandPasteRecent()
+void MenuDefinition::expandPasteRecent()
{
vector<docstring> const sel = cap::availableSelections();
}
-void Menu::expandToolbars()
+void MenuDefinition::expandToolbars()
{
//
// extracts the toolbars from the backend
}
-void Menu::expandBranches(Buffer const * buf)
+void MenuDefinition::expandBranches(Buffer const * buf)
{
if (!buf) {
add(MenuItem(MenuItem::Command,
}
}
+} // namespace anon
+
+
+/////////////////////////////////////////////////////////////////////
+// Menu::Impl definition and implementation
+/////////////////////////////////////////////////////////////////////
+
+struct Menu::Impl
+{
+ /// populates the menu or one of its submenu
+ /// This is used as a recursive function
+ void populate(QMenu & qMenu, MenuDefinition const & menu);
+
+ /// Only needed for top level menus.
+ MenuDefinition * top_level_menu;
+ /// our owning view
+ GuiView * view;
+ /// the name of this menu
+ QString name;
+};
+
+
+
+/// Get a MenuDefinition item label from the menu backend
+static QString label(MenuItem const & mi)
+{
+ QString label = mi.label();
+ label.replace("&", "&&");
+
+ QString shortcut = mi.shortcut();
+ if (!shortcut.isEmpty()) {
+ int pos = label.indexOf(shortcut);
+ if (pos != -1)
+ //label.insert(pos, 1, char_type('&'));
+ label.replace(pos, 0, "&");
+ }
+
+ QString const binding = mi.binding();
+ if (!binding.isEmpty())
+ label += '\t' + binding;
+
+ return label;
+}
+
+void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu)
+{
+ LYXERR(Debug::GUI, "populating menu " << fromqstr(menu.name()));
+ if (menu.size() == 0) {
+ LYXERR(Debug::GUI, "\tERROR: empty menu " << fromqstr(menu.name()));
+ return;
+ }
+ LYXERR(Debug::GUI, " ***** menu entries " << menu.size());
+ MenuDefinition::const_iterator m = menu.begin();
+ MenuDefinition::const_iterator end = menu.end();
+ for (; m != end; ++m) {
+ if (m->kind() == MenuItem::Separator)
+ qMenu.addSeparator();
+ else if (m->kind() == MenuItem::Submenu) {
+ QMenu * subMenu = qMenu.addMenu(label(*m));
+ populate(*subMenu, m->submenu());
+ } else {
+ // we have a MenuItem::Command
+ qMenu.addAction(new Action(view, QIcon(), label(*m),
+ m->func(), QString(), &qMenu));
+ }
+ }
+}
+
+/////////////////////////////////////////////////////////////////////
+// Menu implementation
+/////////////////////////////////////////////////////////////////////
+
+Menu::Menu(GuiView * gv, QString const & name, bool top_level)
+: QMenu(gv), d(new Menu::Impl)
+{
+ d->top_level_menu = top_level? new MenuDefinition : 0;
+ d->view = gv;
+ d->name = name;
+ setTitle(name);
+ if (d->top_level_menu)
+ connect(this, SIGNAL(aboutToShow()), this, SLOT(updateView()));
+}
+
+
+Menu::~Menu()
+{
+ delete d->top_level_menu;
+ delete d;
+}
+
+
+void Menu::updateView()
+{
+ guiApp->menus().updateMenu(this);
+}
+
+
+/////////////////////////////////////////////////////////////////////
+// Menus::Impl definition and implementation
+/////////////////////////////////////////////////////////////////////
+
+struct Menus::Impl {
+ ///
+ bool hasMenu(QString const &) const;
+ ///
+ MenuDefinition & getMenu(QString const &);
+ ///
+ MenuDefinition const & getMenu(QString const &) const;
+
+ /// Expands some special entries of the menu
+ /** The entries with the following kind are expanded to a
+ sequence of Command MenuItems: Lastfiles, Documents,
+ ViewFormats, ExportFormats, UpdateFormats, Branches
+ */
+ void expand(MenuDefinition const & frommenu, MenuDefinition & tomenu,
+ Buffer const *) const;
+
+ /// Initialize specific MACOS X menubar
+ void macxMenuBarInit(GuiView * view, QMenuBar * qmb);
+
+ /// Mac special menu.
+ /** This defines a menu whose entries list the FuncRequests
+ that will be removed by expand() in other menus. This is
+ used by the Qt/Mac code
+ */
+ MenuDefinition specialmenu_;
+
+ ///
+ MenuList menulist_;
+ ///
+ MenuDefinition menubar_;
+
+ typedef QMap<GuiView *, QHash<QString, Menu*> > NameMap;
+
+ /// name to menu for \c menu() method.
+ NameMap name_map_;
+};
+
+/*
+ Here is what the Qt documentation says about how a menubar is chosen:
+
+ 1) If the window has a QMenuBar then it is used. 2) If the window
+ is a modal then its menubar is used. If no menubar is specified
+ then a default menubar is used (as documented below) 3) If the
+ window has no parent then the default menubar is used (as
+ documented below).
+
+ The above 3 steps are applied all the way up the parent window
+ chain until one of the above are satisifed. If all else fails a
+ default menubar will be created, the default menubar on Qt/Mac is
+ an empty menubar, however you can create a different default
+ menubar by creating a parentless QMenuBar, the first one created
+ will thus be designated the default menubar, and will be used
+ whenever a default menubar is needed.
+
+ Thus, for Qt/Mac, we add the menus to a free standing menubar, so
+ that this menubar will be used also when one of LyX' dialogs has
+ focus. (JMarc)
+*/
+void Menus::Impl::macxMenuBarInit(GuiView * view, 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
+ work very well with our scheme of creating menus on demand,
+ and therefore we need to put these entries in a special
+ invisible menu. (JMarc)
+ */
+
+ /* The entries of our special mac menu. If we add support for
+ * special entries in Menus, we could imagine something
+ * like
+ * SpecialItem About " "About LyX" "dialog-show aboutlyx"
+ * and therefore avoid hardcoding. I am not sure it is worth
+ * the hassle, though. (JMarc)
+ */
+ struct MacMenuEntry {
+ FuncCode action;
+ char const * arg;
+ char const * label;
+ QAction::MenuRole role;
+ };
+
+ MacMenuEntry entries[] = {
+ {LFUN_DIALOG_SHOW, "aboutlyx", "About LyX",
+ QAction::AboutRole},
+ {LFUN_DIALOG_SHOW, "prefs", "Preferences",
+ QAction::PreferencesRole},
+ {LFUN_RECONFIGURE, "", "Reconfigure",
+ QAction::ApplicationSpecificRole},
+ {LFUN_LYX_QUIT, "", "Quit LyX", QAction::QuitRole}
+ };
+ const size_t num_entries = sizeof(entries) / sizeof(entries[0]);
+
+ // the special menu for Menus. Fill it up only once.
+ if (specialmenu_.size() == 0) {
+ for (size_t i = 0 ; i < num_entries ; ++i) {
+ FuncRequest const func(entries[i].action,
+ from_utf8(entries[i].arg));
+ specialmenu_.add(MenuItem(MenuItem::Command,
+ entries[i].label, func));
+ }
+ }
+
+ // add the entries to a QMenu that will eventually be empty
+ // and therefore invisible.
+ QMenu * qMenu = qmb->addMenu("special");
+ MenuDefinition::const_iterator cit = specialmenu_.begin();
+ MenuDefinition::const_iterator end = specialmenu_.end();
+ for (size_t i = 0 ; cit != end ; ++cit, ++i) {
+ Action * action = new Action(view, QIcon(), cit->label(),
+ cit->func(), QString(), qMenu);
+ action->setMenuRole(entries[i].role);
+ qMenu->addAction(action);
+ }
+}
+
-void Menus::Impl::expand(Menu const & frommenu, Menu & tomenu,
- Buffer const * buf) const
+void Menus::Impl::expand(MenuDefinition const & frommenu,
+ MenuDefinition & tomenu, Buffer const * buf) const
{
if (!tomenu.empty())
tomenu.clear();
- for (Menu::const_iterator cit = frommenu.begin();
+ for (MenuDefinition::const_iterator cit = frommenu.begin();
cit != frommenu.end() ; ++cit) {
switch (cit->kind()) {
case MenuItem::Lastfiles:
case MenuItem::Submenu: {
MenuItem item(*cit);
- item.setSubmenu(new Menu(cit->submenuname()));
- expand(getMenu(cit->submenuname()),
- *item.submenu(), buf);
+ item.setSubmenu(MenuDefinition(cit->submenuname()));
+ expand(getMenu(cit->submenuname()), item.submenu(), buf);
tomenu.addWithStatusCheck(item);
}
break;
}
// we do not want the menu to end with a separator
- if (!tomenu.empty()
- && tomenu.items_.back().kind() == MenuItem::Separator)
+ if (!tomenu.empty() && tomenu.items_.back().kind() == MenuItem::Separator)
tomenu.items_.pop_back();
// Check whether the shortcuts are unique
}
+bool Menus::Impl::hasMenu(QString const & name) const
+{
+ return find_if(menulist_.begin(), menulist_.end(),
+ MenuNamesEqual(name)) != menulist_.end();
+}
+
+
+MenuDefinition const & Menus::Impl::getMenu(QString const & name) const
+{
+ const_iterator cit = find_if(menulist_.begin(), menulist_.end(),
+ MenuNamesEqual(name));
+ if (cit == menulist_.end())
+ lyxerr << "No submenu named " << fromqstr(name) << endl;
+ LASSERT(cit != menulist_.end(), /**/);
+ return (*cit);
+}
+
+
+MenuDefinition & Menus::Impl::getMenu(QString const & name)
+{
+ iterator it = find_if(menulist_.begin(), menulist_.end(),
+ MenuNamesEqual(name));
+ if (it == menulist_.end())
+ lyxerr << "No submenu named " << fromqstr(name) << endl;
+ LASSERT(it != menulist_.end(), /**/);
+ return (*it);
+}
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// Menus
+//
+/////////////////////////////////////////////////////////////////////
+
+Menus::Menus() : d(new Impl) {}
+
+Menus::~Menus()
+{
+ delete d;
+}
+
void Menus::read(Lexer & lex)
{
- enum Menutags {
- md_menu = 1,
+ enum {
+ md_menu,
md_menubar,
md_endmenuset,
- md_last
};
- struct keyword_item menutags[md_last - 1] = {
+ LexerKeyword menutags[] = {
{ "end", md_endmenuset },
{ "menu", md_menu },
{ "menubar", md_menubar }
};
- //consistency check
- if (compare_ascii_no_case(lex.getString(), "menuset")) {
- lyxerr << "Menubackend::read: ERROR wrong token:`"
- << lex.getString() << '\'' << endl;
- }
+ // consistency check
+ if (compare_ascii_no_case(lex.getString(), "menuset"))
+ LYXERR0("Menus::read: ERROR wrong token: `" << lex.getString() << '\'');
- lex.pushTable(menutags, md_last - 1);
- if (lyxerr.debugging(Debug::PARSER))
- lex.printTable(lyxerr);
+ lex.pushTable(menutags);
+ lex.setContext("Menus::read");
bool quit = false;
case md_menu: {
lex.next(true);
QString const name = toqstr(lex.getDocString());
- if (d->hasMenu(name)) {
+ if (d->hasMenu(name))
d->getMenu(name).read(lex);
- } else {
- Menu menu(name);
+ else {
+ MenuDefinition menu(name);
menu.read(lex);
- d->add(menu);
+ d->menulist_.push_back(menu);
}
break;
}
quit = true;
break;
default:
- lex.printError("menubackend::read: "
- "Unknown menu tag: `$$Token'");
+ lex.printError("Unknown menu tag");
break;
}
}
}
-void Menus::Impl::add(Menu const & menu)
+bool Menus::searchMenu(FuncRequest const & func,
+ vector<docstring> & names) const
{
- menulist_.push_back(menu);
+ MenuDefinition menu;
+ d->expand(d->menubar_, menu, 0);
+ return menu.searchMenu(func, names);
}
-bool Menus::Impl::hasMenu(QString const & name) const
+void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
{
- return find_if(begin(), end(), MenuNamesEqual(name)) != end();
+ if (initial) {
+#ifdef Q_WS_MACX
+ // setup special mac specific menu item
+ d->macxMenuBarInit(view, qmb);
+#endif
+ } else {
+ // Clear all menubar contents before filling it.
+ qmb->clear();
+ }
+
+ LYXERR(Debug::GUI, "populating menu bar" << fromqstr(d->menubar_.name()));
+
+ if (d->menubar_.size() == 0) {
+ LYXERR(Debug::GUI, "\tERROR: empty menu bar"
+ << fromqstr(d->menubar_.name()));
+ return;
+ }
+ LYXERR(Debug::GUI, "menu bar entries " << d->menubar_.size());
+
+ MenuDefinition menu;
+ Buffer * buf = 0;
+ if (view)
+ buf = view->buffer();
+ d->expand(d->menubar_, menu, buf);
+
+ MenuDefinition::const_iterator m = menu.begin();
+ MenuDefinition::const_iterator end = menu.end();
+
+ for (; m != end; ++m) {
+
+ if (m->kind() != MenuItem::Submenu) {
+ LYXERR(Debug::GUI, "\tERROR: not a submenu " << fromqstr(m->label()));
+ continue;
+ }
+
+ LYXERR(Debug::GUI, "menu bar item " << fromqstr(m->label())
+ << " is a submenu named " << fromqstr(m->submenuname()));
+
+ QString name = m->submenuname();
+ if (!d->hasMenu(name)) {
+ LYXERR(Debug::GUI, "\tERROR: " << fromqstr(name)
+ << " submenu has no menu!");
+ continue;
+ }
+
+ Menu * menu = new Menu(view, m->submenuname(), true);
+ menu->setTitle(label(*m));
+ qmb->addMenu(menu);
+
+ d->name_map_[view][name] = menu;
+ }
}
-Menu const & Menus::Impl::getMenu(QString const & name) const
+void Menus::updateMenu(Menu * qmenu)
{
- const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name));
- if (cit == end())
- lyxerr << "No submenu named " << fromqstr(name) << endl;
- BOOST_ASSERT(cit != end());
- return (*cit);
+ LYXERR(Debug::GUI, "Triggered menu: " << fromqstr(qmenu->d->name));
+ qmenu->clear();
+
+ if (qmenu->d->name.isEmpty())
+ return;
+
+ // Here, We make sure that theLyXFunc points to the correct LyXView.
+ theLyXFunc().setLyXView(qmenu->d->view);
+
+ if (!d->hasMenu(qmenu->d->name)) {
+ qmenu->addAction(qt_("No action defined!"));
+ LYXERR(Debug::GUI, "\tWARNING: non existing menu: "
+ << fromqstr(qmenu->d->name));
+ return;
+ }
+
+ MenuDefinition const & fromLyxMenu = d->getMenu(qmenu->d->name);
+ Buffer * buf = 0;
+ if (qmenu->d->view)
+ buf = qmenu->d->view->buffer();
+ d->expand(fromLyxMenu, *qmenu->d->top_level_menu, buf);
+ qmenu->d->populate(*qmenu, *qmenu->d->top_level_menu);
}
-Menu & Menus::Impl::getMenu(QString const & name)
+Menu * Menus::menu(QString const & name, GuiView & view)
{
- iterator it = find_if(begin(), end(), MenuNamesEqual(name));
- if (it == end())
- lyxerr << "No submenu named " << fromqstr(name) << endl;
- BOOST_ASSERT(it != end());
- return (*it);
-}
+ LYXERR(Debug::GUI, "Context menu requested: " << fromqstr(name));
+ Menu * menu = d->name_map_[&view].value(name, 0);
+ if (!menu && !name.startsWith("context-")) {
+ LYXERR0("requested context menu not found: " << fromqstr(name));
+ return 0;
+ }
+ menu = new Menu(&view, name, true);
+ d->name_map_[&view][name] = menu;
+ return menu;
+}
} // namespace frontend
} // namespace lyx
projects / lyx.git / blobdiff