aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2021-03-30 18:04:09 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2021-03-30 18:04:09 +0000
commit7dabfaefa6c405e2aaa4804168486abd31a976dd (patch)
tree4c44cffbe1a7e2a44b4ec4ba37e79daedf454d5a /src
parent16a2f0eee3f0ee6c3c57666faa985b7ec0232e0a (diff)
downloadqmmp-7dabfaefa6c405e2aaa4804168486abd31a976dd.tar.gz
qmmp-7dabfaefa6c405e2aaa4804168486abd31a976dd.tar.bz2
qmmp-7dabfaefa6c405e2aaa4804168486abd31a976dd.zip
skinned: moved "group tracks" and "show header" options to playlist
submenu git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9795 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp5
-rw-r--r--src/plugins/Ui/skinned/playlist.cpp8
2 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index f9715c5f8..d52da19f1 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -446,8 +446,11 @@ void MainWindow::createActions()
SLOT(setPlayListTransitionEnabled(bool))));
plMenu->addAction(SET_ACTION(ActionManager::STOP_AFTER_SELECTED, m_pl_manager,
SLOT(stopAfterSelected())));
-
plMenu->addAction(SET_ACTION(ActionManager::CLEAR_QUEUE, m_pl_manager, SLOT(clearQueue())));
+ plMenu->addSeparator();
+ plMenu->addAction(ACTION(ActionManager::PL_SHOW_HEADER));
+ plMenu->addAction(ACTION(ActionManager::PL_GROUP_TRACKS));
+
connect(m_ui_settings, SIGNAL(repeatableListChanged(bool)),
ACTION(ActionManager::REPEAT_ALL), SLOT(setChecked(bool)));
connect(m_ui_settings, SIGNAL (repeatableTrackChanged(bool)),
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 92ca9e667..19c8e7835 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -309,10 +309,6 @@ void PlayList::createActions()
m_pl_manager, SLOT(randomizeList()));
m_sortMenu->addAction (QIcon::fromTheme("view-sort-descending"), tr("Reverse List"),
m_pl_manager, SLOT(reverseList()));
-
- m_sortMenu->addAction(SET_ACTION(ActionManager::PL_GROUP_TRACKS, m_ui_settings, SLOT(setGroupsEnabled(bool))));
- m_sortMenu->addAction(ACTION(ActionManager::PL_SHOW_HEADER));
- ACTION(ActionManager::PL_GROUP_TRACKS)->setChecked(m_ui_settings->isGroupsEnabled());
//playlist context menu
m_listWidget->menu()->addAction(ActionManager::instance()->action(ActionManager::PL_SHOW_INFO));
m_listWidget->menu()->addSeparator();
@@ -341,6 +337,10 @@ 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())));
+
+ //actions
+ SET_ACTION(ActionManager::PL_GROUP_TRACKS, m_ui_settings, SLOT(setGroupsEnabled(bool)));
+ ACTION(ActionManager::PL_GROUP_TRACKS)->setChecked(m_ui_settings->isGroupsEnabled());
}
void PlayList::closeEvent (QCloseEvent *e)