From e3471c47f1ea7256e15f7c9cff8a3c067a7afc90 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Wed, 24 Sep 2014 15:10:18 +0100 Subject: [PATCH] Made scrobble toggle consistent with other menu toggles. --- src/libtomahawk/ActionCollection.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 31e0ce1d0..46d9e0f03 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -74,10 +74,9 @@ ActionCollection::initActions() m_actionCollection[ "realtimeFollowingAlong" ] = realtimeFollowingAlong; bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening; - QAction *privacyToggle = new QAction( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ), this ); - privacyToggle->setIcon( ImageRegistry::instance()->icon( RESPATH "images/private-listening.svg" ) ); - privacyToggle->setIconVisibleInMenu( isPublic ); - m_actionCollection[ "togglePrivacy" ] = privacyToggle; + m_actionCollection[ "togglePrivacy" ] = new QAction( tr( "&Listen Privately" ) , this ); + m_actionCollection[ "togglePrivacy" ]->setCheckable( true ); + m_actionCollection[ "togglePrivacy" ]->setChecked( !isPublic ); connect( m_actionCollection[ "togglePrivacy" ], SIGNAL( triggered() ), SLOT( togglePrivateListeningMode() ), Qt::UniqueConnection ); m_actionCollection[ "loadPlaylist" ] = new QAction( tr( "&Load Playlist" ), this ); @@ -347,10 +346,8 @@ ActionCollection::togglePrivateListeningMode() else TomahawkSettings::instance()->setPrivateListeningMode( TomahawkSettings::PublicListening ); - QAction *privacyToggle = m_actionCollection[ "togglePrivacy" ]; bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening; - privacyToggle->setText( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ) ); - privacyToggle->setIconVisibleInMenu( isPublic ); + m_actionCollection[ "togglePrivacy" ]->setChecked( !isPublic ); emit privacyModeChanged(); }