aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/Ui/skinned/dock.cpp18
-rw-r--r--src/plugins/Ui/skinned/dock.h3
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp3
3 files changed, 22 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));
+}
diff --git a/src/plugins/Ui/skinned/dock.h b/src/plugins/Ui/skinned/dock.h
index 0b5791fa7..eb5572475 100644
--- a/src/plugins/Ui/skinned/dock.h
+++ b/src/plugins/Ui/skinned/dock.h
@@ -45,6 +45,9 @@ public:
void addActions(QList<QAction *> actions);
void align(QWidget*, int dy);
+private slots:
+ void removeAction(QObject *action);
+
private:
QPoint snapDesktop(QPoint, QWidget*);
QPoint snap(QPoint, QWidget*, QWidget*);
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index afede3eaa..ad3b84802 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -294,6 +294,9 @@ void MainWindow::readSettings()
m_hideOnClose = settings.value("hide_on_close", false).toBool();
settings.endGroup();
+
+ Dock::instance()->addActions(m_uiHelper->actions(UiHelper::PLAYLIST_MENU));
+ Dock::instance()->addActions(m_uiHelper->actions(UiHelper::TOOLS_MENU));
}
void MainWindow::writeSettings()