*
* \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 "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 {
bool optional = false)
: kind_(kind), label_(label), submenuname_(submenu), optional_(optional)
{
- BOOST_ASSERT(kind == Submenu);
+ LASSERT(kind == Submenu, /**/);
}
MenuItem(Kind kind,
func_.origin = FuncRequest::MENU;
}
- // boost::shared_ptr<Menu> needs this apprently...
+ // boost::shared_ptr<MenuDefinition> needs this apprently...
~MenuItem() {}
/// The label of a given menuitem
/// 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) { submenu_.reset(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 &);
QString name_;
};
-/// a submenu
-class GuiPopupMenu : public QMenu
-{
-public:
- ///
- GuiPopupMenu(GuiView * gv, MenuItem const & mi, bool top_level)
- : QMenu(gv), top_level_menu(top_level? new Menu : 0), view(gv),
- name(mi.submenuname())
- {
- setTitle(label(mi));
- }
-
- ~GuiPopupMenu() { delete top_level_menu; }
-
- /// 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_menu)
- guiApp->menus().updateMenu(name);
- QMenu::showEvent(ev);
- }
-
- /// Only needed for top level menus.
- Menu * top_level_menu;
- /// our owning view
- GuiView * view;
- /// the name of this menu
- QString name;
-};
/// Helper for std::find_if
class MenuNamesEqual
{
public:
MenuNamesEqual(QString const & name) : name_(name) {}
- bool operator()(Menu const & menu) const { return menu.name() == name_; }
+ bool operator()(MenuDefinition const & menu) const { return menu.name() == name_; }
private:
QString name_;
};
///
-typedef std::vector<Menu> MenuList;
+typedef std::vector<MenuDefinition> MenuList;
///
typedef MenuList::const_iterator const_iterator;
///
typedef MenuList::iterator iterator;
/////////////////////////////////////////////////////////////////////
-// GuiPopupMenu implementation
-/////////////////////////////////////////////////////////////////////
-
-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();
- 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()));
- }
- }
-}
-
-
-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;
-}
-
-/////////////////////////////////////////////////////////////////////
-// Menu implementation
+// 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();
}
}
-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
- Menu * submenu = new Menu;
- 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())));
- }
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(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;
///
- Menu & getMenu(QString const &);
+ MenuDefinition & getMenu(QString const &);
///
- Menu const & getMenu(QString const &) 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(Menu const & frommenu, Menu & tomenu,
- Buffer const *) const;
+ void expand(MenuDefinition const & frommenu, MenuDefinition & tomenu,
+ Buffer const *) const;
/// Initialize specific MACOS X menubar
- void macxMenuBarInit(GuiView * view);
+ 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
*/
- Menu specialmenu_;
+ MenuDefinition specialmenu_;
///
MenuList menulist_;
///
- Menu menubar_;
+ MenuDefinition menubar_;
- typedef QHash<QString, GuiPopupMenu *> NameMap;
+ typedef QMap<GuiView *, QHash<QString, Menu*> > NameMap;
/// name to menu for \c menu() method.
NameMap name_map_;
};
-
-/////////////////////////////////////////////////////////////////////
-// Menus::Impl implementation
-/////////////////////////////////////////////////////////////////////
-
/*
Here is what the Qt documentation says about how a menubar is chosen:
that this menubar will be used also when one of LyX' dialogs has
focus. (JMarc)
*/
-void Menus::Impl::macxMenuBarInit(GuiView * view)
+void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb)
{
- // 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,
* the hassle, though. (JMarc)
*/
struct MacMenuEntry {
- kb_action action;
+ FuncCode action;
char const * arg;
char const * label;
QAction::MenuRole role;
};
const size_t num_entries = sizeof(entries) / sizeof(entries[0]);
- // the special menu for Menus.
- 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));
+ // 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 = view->menuBar()->addMenu("special");
- Menu::const_iterator cit = specialmenu_.begin();
- Menu::const_iterator end = specialmenu_.end();
+ 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());
+ 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;
}
-Menu const & Menus::Impl::getMenu(QString const & name) const
+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;
- BOOST_ASSERT(cit != menulist_.end());
+ LASSERT(cit != menulist_.end(), /**/);
return (*cit);
}
-Menu & Menus::Impl::getMenu(QString const & name)
+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;
- BOOST_ASSERT(it != menulist_.end());
+ LASSERT(it != menulist_.end(), /**/);
return (*it);
}
+
/////////////////////////////////////////////////////////////////////
-// Menus implementation
+//
+// Menus
+//
/////////////////////////////////////////////////////////////////////
-Menus::Menus(): d(new Impl) {}
+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;
if (d->hasMenu(name))
d->getMenu(name).read(lex);
else {
- Menu menu(name);
+ MenuDefinition menu(name);
menu.read(lex);
d->menulist_.push_back(menu);
}
quit = true;
break;
default:
- lex.printError("menubackend::read: "
- "Unknown menu tag: `$$Token'");
+ lex.printError("Unknown menu tag");
break;
}
}
bool Menus::searchMenu(FuncRequest const & func,
vector<docstring> & names) const
{
- return d->menubar_.searchMenu(func, names);
+ MenuDefinition menu;
+ d->expand(d->menubar_, menu, 0);
+ return menu.searchMenu(func, names);
}
-void Menus::fillMenuBar(GuiView * view)
+void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
{
- // Clear all menubar contents before filling it.
- view->menuBar()->clear();
-
+ if (initial) {
#ifdef Q_WS_MACX
- // setup special mac specific menu item
- d->macxMenuBarInit(view);
+ // 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()));
<< fromqstr(d->menubar_.name()));
return;
}
- else {
- LYXERR(Debug::GUI, "menu bar entries "
- << d->menubar_.size());
- }
+ LYXERR(Debug::GUI, "menu bar entries " << d->menubar_.size());
- Menu menu;
- d->expand(d->menubar_, menu, view->buffer());
+ MenuDefinition menu;
+ Buffer * buf = 0;
+ if (view)
+ buf = view->buffer();
+ d->expand(d->menubar_, menu, buf);
- Menu::const_iterator m = menu.begin();
- Menu::const_iterator end = menu.end();
+ MenuDefinition::const_iterator m = menu.begin();
+ MenuDefinition::const_iterator end = menu.end();
for (; m != end; ++m) {
continue;
}
- GuiPopupMenu * qmenu = new GuiPopupMenu(view, *m, true);
- view->menuBar()->addMenu(qmenu);
+ Menu * menu = new Menu(view, m->submenuname(), true);
+ menu->setTitle(label(*m));
+ qmb->addMenu(menu);
- d->name_map_[name] = qmenu;
+ d->name_map_[view][name] = menu;
}
}
-void Menus::updateMenu(QString const & name)
+void Menus::updateMenu(Menu * qmenu)
{
- GuiPopupMenu * qmenu = d->name_map_[name];
- LYXERR(Debug::GUI, "GuiPopupMenu::updateView()"
- << "\tTriggered menu: " << fromqstr(qmenu->name));
+ LYXERR(Debug::GUI, "Triggered menu: " << fromqstr(qmenu->d->name));
qmenu->clear();
- if (qmenu->name.isEmpty())
+ if (qmenu->d->name.isEmpty())
return;
// Here, We make sure that theLyXFunc points to the correct LyXView.
- theLyXFunc().setLyXView(qmenu->view);
+ theLyXFunc().setLyXView(qmenu->d->view);
- Menu const & fromLyxMenu = d->getMenu(qmenu->name);
- d->expand(fromLyxMenu, *qmenu->top_level_menu, qmenu->view->buffer());
-
- if (!d->hasMenu(qmenu->top_level_menu->name())) {
- LYXERR(Debug::GUI, "\tWARNING: menu seems empty"
- << fromqstr(qmenu->top_level_menu->name()));
+ if (!d->hasMenu(qmenu->d->name)) {
+ qmenu->addAction(qt_("No action defined!"));
+ LYXERR(Debug::GUI, "\tWARNING: non existing menu: "
+ << fromqstr(qmenu->d->name));
+ return;
}
- qmenu->populate(qmenu, qmenu->top_level_menu);
+
+ 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);
}
-QMenu * Menus::menu(QString const & name)
+Menu * Menus::menu(QString const & name, GuiView & view)
{
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));
+ 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;
}
projects / lyx.git / blobdiff