comparison framework/MainWindowBase.cpp @ 391:9e31759254fe

Attempt to get rebuilt-shortcuts working on OS/X (unsuccessfully)

 }
 
 void
 MainWindowBase::finaliseMenus()
 {
+    cerr << "deleting mapper " << m_menuShortcutMapper << endl;
     delete m_menuShortcutMapper;
     m_menuShortcutMapper = 0;
+
+    foreach (QShortcut *sc, m_appShortcuts) {
+        cerr << "deleting shortcut " << sc << endl;
+        delete sc;
+    }
+    m_appShortcuts.clear();
 
     QMenuBar *mb = menuBar();
     QList<QMenu *> menus = mb->findChildren<QMenu *>();
     foreach (QMenu *menu, menus) {
         if (menu) finaliseMenu(menu);

         QKeySequence sc = a->shortcut();
         if (sc.count() == 1 && !(sc[0] & Qt::KeyboardModifierMask)) {
             QShortcut *newSc = new QShortcut(sc, a->parentWidget());
             QObject::connect(newSc, SIGNAL(activated()),
                              m_menuShortcutMapper, SLOT(map()));
-            cerr << "setting mapping for action " << a << ", name " << a->text() << endl;
+            cerr << "setting mapping for action " << a << ", name " << a->text() << " on mapper " << m_menuShortcutMapper << " through shortcut " << newSc << endl;
             m_menuShortcutMapper->setMapping(newSc, a);
+            m_appShortcuts.push_back(newSc);
         }
     }
 #endif
 }
 
 void
 MainWindowBase::menuActionMapperInvoked(QObject *o)
 {
+    cerr << "menuActionMapperInvoked from mapper " << sender() << endl;
     QAction *a = qobject_cast<QAction *>(o);
     if (a && a->isEnabled()) {
         cerr << "about to call trigger on action " << a << ", name " << a->text() << endl;
         a->trigger();
     }