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 4f99d1d44d003407f2ad536c21c74c90f6ef9af1..863243d42cf992fd5fdd46fa19f06149973f7383 100644 (file)
--- a/src/frontends/qt2/QLPopupMenu.C
+++ b/src/frontends/qt2/QLPopupMenu.C
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author John Levon 
+ * \author John Levon
  *
  * Full author contact details are available in file CREDITS
  */
@@ -14,52 +14,71 @@
 #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
 
 
-pair<int, QLPopupMenu *> createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel)
+pair<int, QLPopupMenu *>
+createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel)
 {
        // FIXME: leaks ??
        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, bool toplevel)
+
+
+QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner,
+                        string const & name, bool toplevel)
        : owner_(owner), name_(name)
 {
        if (toplevel)
@@ -67,27 +86,30 @@ QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool tople
        connect(this, SIGNAL(activated(int)),
                owner_->view(), SLOT(activated(int)));
 }
- 
 
+
+// FIXME: should all be in backend
 bool QLPopupMenu::disabled(Menu * menu)
 {
        bool disable = true;
- 
+
        Menu::const_iterator m = menu->begin();
        Menu::const_iterator end = menu->end();
        for (; m != end; ++m) {
-               if (m->kind() == MenuItem::Submenu && !disabled(m->submenu())) {
-                       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::populate(Menu * menu)
 {
@@ -112,12 +134,12 @@ void QLPopupMenu::populate(Menu * menu)
        }
 }
 
- 
+
 void QLPopupMenu::showing()
 {
        clear();
        Menu tomenu;
        Menu const frommenu = owner_->backend().getMenu(name_);
        owner_->backend().expand(frommenu, tomenu, owner_->view()->buffer());
-       populate(&tomenu); 
+       populate(&tomenu);
 }