1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-19 15:29:42 +01:00

Merge branch 'master' of github.com:tomahawk-player/tomahawk

This commit is contained in:
Jason Herskowitz 2011-11-07 19:25:44 -05:00
commit 35bbfac2c5
2 changed files with 6 additions and 0 deletions

View File

@ -128,6 +128,7 @@ SourceTreeView::setupMenus()
m_playlistMenu.clear();
m_roPlaylistMenu.clear();
m_latchMenu.clear();
m_privacyMenu.clear();
bool readonly = true;
SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
@ -145,6 +146,8 @@ SourceTreeView::setupMenus()
QAction* latchOnAction = ActionCollection::instance()->getAction( "latchOn" );
m_latchMenu.addAction( latchOnAction );
m_privacyMenu.addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
if ( type == SourcesModel::Collection )
{
CollectionItem* item = itemFromIndex< CollectionItem >( m_contextMenuIndex );
@ -432,6 +435,8 @@ SourceTreeView::onCustomContextMenu( const QPoint& pos )
CollectionItem* item = itemFromIndex< CollectionItem >( m_contextMenuIndex );
if ( !item->source().isNull() && !item->source()->isLocal() )
m_latchMenu.exec( mapToGlobal( pos ) );
else if ( !item->source().isNull() )
m_privacyMenu.exec( mapToGlobal( pos ) );
}
}

View File

@ -103,6 +103,7 @@ private:
QMenu m_playlistMenu;
QMenu m_roPlaylistMenu;
QMenu m_latchMenu;
QMenu m_privacyMenu;
QAction* m_loadPlaylistAction;
QAction* m_renamePlaylistAction;
QAction* m_deletePlaylistAction;