diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-11-28 18:17:34 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-11-28 18:17:34 +0000 |
| commit | da7c4209e34c9f6016b99c863c86a3c9f7a02d75 (patch) | |
| tree | fabffac66eea1033ab26ec76289f5b93fb7adb79 /src/plugins/Ui/skinned/dock.cpp | |
| parent | b2e1f73fb9241195991f6fdbbe26ac9ff11b6582 (diff) | |
| download | qmmp-da7c4209e34c9f6016b99c863c86a3c9f7a02d75.tar.gz qmmp-da7c4209e34c9f6016b99c863c86a3c9f7a02d75.tar.bz2 qmmp-da7c4209e34c9f6016b99c863c86a3c9f7a02d75.zip | |
fixed plugin hotkeys (Closes issue 511)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2519 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui/skinned/dock.cpp')
| -rw-r--r-- | src/plugins/Ui/skinned/dock.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp index c5ec1cf0b..d8ca5f49a 100644 --- a/src/plugins/Ui/skinned/dock.cpp +++ b/src/plugins/Ui/skinned/dock.cpp @@ -255,9 +255,18 @@ bool Dock::isDocked (QWidget* mv, QWidget* st) void Dock::addActions (QList<QAction *> actions) { - m_actions << actions; + QList<QAction *> new_actions; + foreach(QAction *action, actions) + { + if(!m_actions.contains(action)) + { + connect(action, SIGNAL(destroyed(QObject *)), SLOT(removeAction(QObject *))); + new_actions.append(action); + m_actions.append(action); + } + } for (int i = 0; i<m_widgetList.size(); ++i) - m_widgetList.at (i)->addActions (actions); + m_widgetList.at (i)->addActions (new_actions); } bool Dock::isUnder(QWidget* upper, QWidget* nether, int dy) @@ -278,3 +287,8 @@ void Dock::align(QWidget* w, int dy) } } } + +void Dock::removeAction(QObject *action) +{ + m_actions.removeAll(qobject_cast<QAction *> (action)); +} |
