← Back to branch summary

~ted/hud/filter-underscores

« back to all changes in this revision

Viewing changes to service/WindowContextImpl.cpp

  • Committer: CI bot
  • Author(s): Pete Woods
  • Date: 2014-03-14 16:37:28 UTC
  • mfrom: (376.1.22 trunk)
  • Revision ID: ps-jenkins@lists.canonical.com-20140314163728-lnn0hb4vmsb016ya
Support multiple GMenuCollectors for each window, and multiple QtGActionGroups for each QtGMenuModel. Fixes: 1288025

Show diffs side-by-side

added added

removed removed

Lines of Context:
service/WindowContextImpl.cpp
46
46
void WindowContextImpl::addMenu(const QString &context,
47
47
                const MenuDefinition &menuDefinition) {
48
48
 
 
49
        QMap<QString, QDBusObjectPath> actions;
 
50
        actions[menuDefinition.actionPrefix] = menuDefinition.actionPath;
 
51
 
49
52
        m_collectors[context] = m_factory.newGMenuCollector(menuDefinition.name,
50
 
                        menuDefinition.actionPath, menuDefinition.menuPath);
 
53
                        actions, menuDefinition.menuPath);
51
54
}
52
55
 
53
56
Collector::Ptr WindowContextImpl::activeCollector() {