comparison src/filestatuswidget.cpp @ 630:bddd0924109f

* Fixed bug where ctrl+shift+s wouldn't work because of "ambiguous shortcut overload"
author Sam Izzo <sam@humbug.net>
date Mon, 27 Aug 2012 00:52:44 +1000
parents 080258d897db
children ac8188fd6bc9
comparison
equal deleted inserted replaced
629:080258d897db 630:bddd0924109f
154 act->setProperty("state", s); 154 act->setProperty("state", s);
155 act->setProperty("activity", a); 155 act->setProperty("activity", a);
156 if (m_shortcuts.contains(a)) { 156 if (m_shortcuts.contains(a)) {
157 QString shortcut = m_shortcuts[a]; 157 QString shortcut = m_shortcuts[a];
158 act->setShortcut(shortcut); 158 act->setShortcut(shortcut);
159 act->setShortcutContext(Qt::WidgetShortcut);
159 } 160 }
160 connect(act, SIGNAL(triggered()), this, SLOT(menuActionActivated())); 161 connect(act, SIGNAL(triggered()), this, SLOT(menuActionActivated()));
161 w->insertAction(0, act); 162 w->insertAction(0, act);
162 } 163 }
163 w->setContextMenuPolicy(Qt::ActionsContextMenu); 164 w->setContextMenuPolicy(Qt::ActionsContextMenu);