diff options
Diffstat (limited to 'src/ui/mainwindow.cpp')
| -rw-r--r-- | src/ui/mainwindow.cpp | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 5b5af9b2f..07e021c4b 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -426,31 +426,39 @@ void MainWindow::createActions() this, SLOT(next()), tr("B")); m_mainMenu->addAction(tr("&Play/Pause"),this, SLOT(playPause()), tr("Space")); m_mainMenu->addSeparator(); - QAction *repeateAllAction = m_mainMenu->addAction(tr("&Repeat Playlist")); - QAction *shuffleAction = m_mainMenu->addAction(tr("&Shuffle")); - QAction *autoStopAction = m_mainMenu->addAction(tr("&Stop After Track")); - QAction *repeateTrackAction = m_mainMenu->addAction(tr("&Repeat Track")); + m_mainMenu->addAction(QIcon::fromTheme("go-up"), tr("&Jump To File"), + this, SLOT(jumpToFile()), tr("J")); + m_mainMenu->addSeparator(); + m_mainMenu->addMenu(new ViewMenu(this)); + + QMenu *plMenu = m_mainMenu->addMenu(tr("Playlist")); + QAction *repeateAllAction = plMenu->addAction(tr("&Repeat Playlist")); + QAction *repeateTrackAction = plMenu->addAction(tr("&Repeat Track")); + QAction *shuffleAction = plMenu->addAction(tr("&Shuffle")); + QAction *noPlAdvanceAction = plMenu->addAction(tr("&No Playlist Advance")); + QAction *stopAfterSelectedAction = plMenu->addAction(tr("&Stop After Selected Song")); + QAction *clearQueueAction = plMenu->addAction(tr("&Clear Queue")); repeateAllAction->setCheckable (true); repeateTrackAction->setCheckable (true); - autoStopAction->setCheckable (true); + noPlAdvanceAction->setCheckable (true); shuffleAction->setCheckable (true); repeateAllAction->setShortcut(tr("R")) ; repeateTrackAction->setShortcut(tr("Ctrl+R")) ; - autoStopAction->setShortcut(tr("Ctrl+S")) ; + noPlAdvanceAction->setShortcut(tr("Ctrl+N")) ; + stopAfterSelectedAction->setShortcut(tr("Ctrl+S")); + clearQueueAction->setShortcut(tr("Alt+Q")); shuffleAction->setShortcut(tr("S")) ; connect(repeateAllAction, SIGNAL(triggered (bool)), m_pl_manager, SLOT(setRepeatableList(bool))); connect(repeateTrackAction, SIGNAL(triggered (bool)), m_player, SLOT(setRepeatable(bool))); - connect(autoStopAction, SIGNAL(triggered (bool)), m_player, SLOT(setAutoStop(bool))); + connect(noPlAdvanceAction, SIGNAL(triggered (bool)), m_player, SLOT(setNoPlaylistAdvance(bool))); connect(shuffleAction, SIGNAL(triggered (bool)), m_pl_manager, SLOT(setShuffle(bool))); + connect(stopAfterSelectedAction, SIGNAL(triggered (bool)), m_pl_manager, SLOT(stopAfterSelected())); + connect(clearQueueAction, SIGNAL(triggered()), m_pl_manager, SLOT(clearQueue())); connect(m_pl_manager, SIGNAL(repeatableListChanged(bool)), repeateAllAction, SLOT(setChecked(bool))); connect(m_player, SIGNAL (repeatableChanged(bool)), repeateTrackAction, SLOT(setChecked(bool))); - connect(m_player, SIGNAL (autoStopChanged(bool)), autoStopAction, SLOT(setChecked(bool))); + connect(m_player, SIGNAL (noPlaylistAdvanceChanged(bool)), noPlAdvanceAction, SLOT(setChecked(bool))); connect(m_pl_manager, SIGNAL(shuffleChanged(bool)), shuffleAction, SLOT(setChecked(bool))); - m_mainMenu->addSeparator(); - m_mainMenu->addAction(QIcon::fromTheme("go-up"), tr("&Jump To File"), - this, SLOT(jumpToFile()), tr("J")); - m_mainMenu->addSeparator(); - m_mainMenu->addMenu(new ViewMenu(this)); + m_visMenu = new VisualMenu(this); m_mainMenu->addMenu(m_visMenu); m_mainMenu->addMenu(m_generalHandler->createMenu(GeneralHandler::TOOLS_MENU, tr("Tools"), this)); |