Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QLPopupMenu.C

diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C
index ed8065215a0746a9553f7d8bb350642f00707c75..863243d42cf992fd5fdd46fa19f06149973f7383 100644 (file)
--- a/src/frontends/qt2/QLPopupMenu.C
+++ b/src/frontends/qt2/QLPopupMenu.C
@@ -1,96 +1,127 @@
 /**
  * \file QLPopupMenu.h
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <levon@movementarian.org>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "support/lstrings.h"
 #include "MenuBackend.h"
 #include "lyxfunc.h"
+#include "kbmap.h"
 #include "debug.h"
- 
+
 #include "QtView.h"
- 
+
 #include "QLPopupMenu.h"
 
-#include "support/lstrings.h"
+#include <boost/scoped_ptr.hpp>
+
+using std::pair;
+using std::make_pair;
+
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
 
 namespace {
- 
+
 string const getLabel(MenuItem const & mi)
 {
        string const shortcut = mi.shortcut();
-       string label = mi.label();
+       string label = subst(mi.label(), "&", "&&");
 
-       label = subst(label, "&", "&&");
- 
        if (shortcut.empty())
                return label;
- 
+
        string::size_type pos = label.find(shortcut);
        if (pos == string::npos)
                return label;
-       label.insert(pos, "&");
- 
+       label.insert(pos, 1, '&');
+
+       if (mi.kind() == MenuItem::Command) {
+               // FIXME: backend should do this
+               string const accel(toplevel_keymap->findbinding(mi.action()));
+
+               if (!accel.empty()) {
+                       label += '\t' + accel.substr(1, accel.find(']') - 1);
+               }
+
+               lyxerr[Debug::GUI] << "Label: " << mi.label()
+                                  << " Shortcut: " << mi.shortcut()
+                                  << " Accel: " << accel << endl;
+       } else
+               lyxerr[Debug::GUI] << "Label: " << mi.label()
+                                  << " Shortcut: " << mi.shortcut() << endl;
+
        return label;
 }
 
-} 
+} // namespace anon
 
 
-int createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner)
+pair<int, QLPopupMenu *>
+createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel)
 {
        // FIXME: leaks ??
-       QLPopupMenu * pm = new QLPopupMenu(owner, item->submenuname());
-       return parent->insertItem(getLabel(*item).c_str(), pm);
+       QLPopupMenu * pm = new QLPopupMenu(owner, item->submenuname(), is_toplevel);
+       int id = parent->insertItem(getLabel(*item).c_str(), pm);
+       return make_pair(id, pm);
 }
- 
- 
-QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, string const & name)
+
+
+QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner,
+                        string const & name, bool toplevel)
        : owner_(owner), name_(name)
 {
-       connect(this, SIGNAL(aboutToShow()), this, SLOT(showing()));
+       if (toplevel)
+               connect(this, SIGNAL(aboutToShow()), this, SLOT(showing()));
+       connect(this, SIGNAL(activated(int)),
+               owner_->view(), SLOT(activated(int)));
 }
- 
 
-bool QLPopupMenu::disabled(string const & name)
+
+// FIXME: should all be in backend
+bool QLPopupMenu::disabled(Menu * menu)
 {
        bool disable = true;
- 
-       Menu tomenu;
-       Menu const frommenu = owner_->backend().getMenu(name);
-       owner_->backend().expand(frommenu, tomenu, owner_->view()->buffer());
-       Menu::const_iterator m = tomenu.begin();
-       Menu::const_iterator end = tomenu.end();
+
+       Menu::const_iterator m = menu->begin();
+       Menu::const_iterator end = menu->end();
        for (; m != end; ++m) {
-               if (m->kind() == MenuItem::Submenu && !disabled(m->submenuname())) {
-                       disable = false;
-               } else {
+               if (m->kind() == MenuItem::Submenu) {
+                       if (!disabled(m->submenu()))
+                               disable = false;
+               } else if (m->kind() != MenuItem::Separator) {
                        FuncStatus const status =
-                               owner_->view()->getLyXFunc().getStatus(m->action());
+                               owner_->view()->getLyXFunc()
+                               .getStatus(m->action());
                        if (!status.disabled())
                                disable = false;
                }
        }
        return disable;
 }
- 
 
-void QLPopupMenu::showing()
+
+void QLPopupMenu::populate(Menu * menu)
 {
-       clear();
-       Menu tomenu;
-       Menu const frommenu = owner_->backend().getMenu(name_);
-       owner_->backend().expand(frommenu, tomenu, owner_->view()->buffer());
-       Menu::const_iterator m = tomenu.begin();
-       Menu::const_iterator end = tomenu.end();
+       Menu::const_iterator m = menu->begin();
+       Menu::const_iterator end = menu->end();
        for (; m != end; ++m) {
                if (m->kind() == MenuItem::Separator) {
                        insertSeparator();
                } else if (m->kind() == MenuItem::Submenu) {
-                       int id(createMenu(this, m, owner_));
-                       setItemEnabled(id, !disabled(m->submenuname()));
+                       pair<int, QLPopupMenu *> res = createMenu(this, &(*m), owner_);
+                       setItemEnabled(res.first, !disabled(m->submenu()));
+                       res.second->populate(m->submenu());
                } else {
                        FuncStatus const status =
                                owner_->view()->getLyXFunc().getStatus(m->action());
@@ -102,3 +133,13 @@ void QLPopupMenu::showing()
                }
        }
 }
+
+
+void QLPopupMenu::showing()
+{
+       clear();
+       Menu tomenu;
+       Menu const frommenu = owner_->backend().getMenu(name_);
+       owner_->backend().expand(frommenu, tomenu, owner_->view()->buffer());
+       populate(&tomenu);
+}