diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-10-25 09:02:34 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-10-25 09:02:34 +0000 |
| commit | 0b96bbb6b76be0c9e33b6eb6fe8c6a2675a11728 (patch) | |
| tree | 700a88735a95291a371ba90c0680e640dc424a16 /src/plugins | |
| parent | e956dd352f693de6c6a0eca5c078a1fffbb385c2 (diff) | |
| download | qmmp-0b96bbb6b76be0c9e33b6eb6fe8c6a2675a11728.tar.gz qmmp-0b96bbb6b76be0c9e33b6eb6fe8c6a2675a11728.tar.bz2 qmmp-0b96bbb6b76be0c9e33b6eb6fe8c6a2675a11728.zip | |
refactoring
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2442 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Ui/skinned/actionmanager.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/actionmanager.h | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/playlist.cpp | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp index 44e655e74..ac77d7923 100644 --- a/src/plugins/Ui/skinned/actionmanager.cpp +++ b/src/plugins/Ui/skinned/actionmanager.cpp @@ -113,6 +113,11 @@ QAction *ActionManager::use(int type, const QObject *receiver, const char *membe return act; } +QList<QAction *> ActionManager::actions() +{ + return m_actions.values(); +} + ActionManager* ActionManager::instance() { return m_instance; diff --git a/src/plugins/Ui/skinned/actionmanager.h b/src/plugins/Ui/skinned/actionmanager.h index 33e6302fb..b966b15c7 100644 --- a/src/plugins/Ui/skinned/actionmanager.h +++ b/src/plugins/Ui/skinned/actionmanager.h @@ -89,12 +89,12 @@ public: SETTINGS, ABOUT, ABOUT_QT, - QUIT, + QUIT }; QAction *action(int type); QAction *use(int type, const QObject *receiver, const char *member); - QList<int> actions(); + QList<QAction *> actions(); void saveActions(); static ActionManager* instance(); diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index deb57d80a..8b7b1f113 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.cpp @@ -422,7 +422,7 @@ void MainWindow::createActions() connect(backward,SIGNAL(triggered(bool)),this,SLOT(backward())); Dock::instance()->addActions(QList<QAction*>() << forward << backward); - Dock::instance()->addActions(m_mainMenu->actions()); + Dock::instance()->addActions(ActionManager::instance()->actions()); } void MainWindow::about() diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index 292b14b22..0880becda 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.cpp @@ -302,12 +302,6 @@ void PlayList::createActions() m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_SELECT_PREVIOUS, m_pl_manager, SLOT(selectPreviousPlayList()))); m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_SHOW_MANAGER, this, SLOT(showPlayLists()))); - Dock::instance()->addActions (m_addMenu->actions()); - Dock::instance()->addActions (m_subMenu->actions()); - Dock::instance()->addActions (m_sortMenu->actions()); - Dock::instance()->addActions (m_listWidget->menu()->actions()); - Dock::instance()->addActions (m_selectMenu->actions()); - Dock::instance()->addActions (m_playlistMenu->actions()); } void PlayList::closeEvent (QCloseEvent *e) |