From 025bafab76abcae5a30959d0ff9af46c08249224 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Thu, 8 Apr 2010 20:48:22 +0000 Subject: [PATCH] Put the "show..." and "group by..." library options in a submenu. Fixes issue #187. --- src/mainwindow.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3564bf8a7..686906e57 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -221,7 +221,9 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent) filter_age_group->addAction(ui_.filter_age_month); filter_age_group->addAction(ui_.filter_age_three_months); filter_age_group->addAction(ui_.filter_age_year); - filter_age_group->setExclusive(true); + + QMenu* filter_age_menu = new QMenu("Show", this); + filter_age_menu->addActions(filter_age_group->actions()); QSignalMapper* filter_age_mapper = new QSignalMapper(this); filter_age_mapper->setMapping(ui_.filter_age_all, -1); @@ -263,6 +265,9 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent) group_by_group_->addAction(ui_.group_by_genre_artist_album); group_by_group_->addAction(ui_.group_by_advanced); + QMenu* group_by_menu = new QMenu("Group by", this); + group_by_menu->addActions(group_by_group_->actions()); + connect(group_by_group_, SIGNAL(triggered(QAction*)), SLOT(GroupByClicked(QAction*))); connect(library_, SIGNAL(GroupingChanged(Library::Grouping)), group_by_dialog_, SLOT(LibraryGroupingChanged(Library::Grouping))); @@ -273,9 +278,8 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent) // Library config menu QMenu* library_menu = new QMenu(this); - library_menu->addActions(filter_age_group->actions()); - library_menu->addSeparator(); - library_menu->addActions(group_by_group_->actions()); + library_menu->addMenu(filter_age_menu); + library_menu->addMenu(group_by_menu); library_menu->addSeparator(); library_menu->addAction(tr("Configure library..."), library_config_dialog_, SLOT(show())); ui_.library_options->setMenu(library_menu);