mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-15 02:24:50 +02:00
Code Issues Releases Wiki Activity

Add greenDot indicator for collaborative playlist

Browse Source
This commit is contained in:
Hugo Lindström
2012-08-16 21:28:38 +02:00
parent 9a60c04afc
commit f4890a8987
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources.qrc
View File

@@ -152,5 +152,6 @@
<file>data/images/subscribe-off.png</file> <file>data/images/subscribe-off.png</file>
<file>data/images/add-contact.png</file> <file>data/images/add-contact.png</file>
<file>data/images/account-none.png</file> <file>data/images/account-none.png</file>
<file>data/images/green-dot.png</file>
</qresource> </qresource>
</RCC> </RCC>

10
src/sourcetree/SourceDelegate.cpp
View File

@@ -40,7 +40,6 @@
#define TREEVIEW_INDENT_ADD 12 #define TREEVIEW_INDENT_ADD 12
SourceDelegate::SourceDelegate( QAbstractItemView* parent ) SourceDelegate::SourceDelegate( QAbstractItemView* parent )
: QStyledItemDelegate( parent ) : QStyledItemDelegate( parent )
, m_parent( parent ) , m_parent( parent )
@@ -72,6 +71,7 @@ SourceDelegate::SourceDelegate( QAbstractItemView* parent )
m_realtimeUnlocked.load( RESPATH "images/open-padlock.png" ); m_realtimeUnlocked.load( RESPATH "images/open-padlock.png" );
m_nowPlayingSpeaker.load( RESPATH "images/now-playing-speaker.png" ); m_nowPlayingSpeaker.load( RESPATH "images/now-playing-speaker.png" );
m_nowPlayingSpeakerDark.load( RESPATH "images/now-playing-speaker-dark.png" ); m_nowPlayingSpeakerDark.load( RESPATH "images/now-playing-speaker-dark.png" );
m_collaborativeOn.load( RESPATH "images/green-dot.png" );
} }
@@ -569,6 +569,13 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
const QRect subRect( o.rect.right() - padding - imgWidth, o.rect.top() + padding, imgWidth, imgWidth ); const QRect subRect( o.rect.right() - padding - imgWidth, o.rect.top() + padding, imgWidth, imgWidth );
painter->drawPixmap( subRect, icon ); painter->drawPixmap( subRect, icon );
} }
if ( plItem->collaborative() )
{
const int imgWidth = m_collaborativeOn.size().width();
const QRect subRect( o.rect.left(), o.rect.top(), imgWidth, imgWidth );
painter->drawPixmap( subRect, m_collaborativeOn );
}
} }
else else
QStyledItemDelegate::paint( painter, o, index ); QStyledItemDelegate::paint( painter, o, index );
@@ -579,7 +586,6 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
painter->restore(); painter->restore();
} }
void void
SourceDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const SourceDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{ {

4
src/sourcetree/SourceDelegate.h
View File

@@ -61,7 +61,6 @@ private slots:
private: private:
void paintDecorations( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; void paintDecorations( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
void paintCollection( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; void paintCollection( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
void paintCategory( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; void paintCategory( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
void paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; void paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
@@ -73,9 +72,8 @@ private:
QMimeData *m_dropMimeData; QMimeData *m_dropMimeData;
mutable SourceTreeItem::DropType m_hoveredDropType; // Hack to keep easily track of the current highlighted DropType in paint() mutable SourceTreeItem::DropType m_hoveredDropType; // Hack to keep easily track of the current highlighted DropType in paint()
QMap< QModelIndex, AnimationHelper* > m_expandedMap; QMap< QModelIndex, AnimationHelper* > m_expandedMap;
QPixmap m_headphonesOn, m_headphonesOff, m_realtimeLocked, m_realtimeUnlocked, m_nowPlayingSpeaker, m_nowPlayingSpeakerDark; QPixmap m_headphonesOn, m_headphonesOff, m_realtimeLocked, m_realtimeUnlocked, m_nowPlayingSpeaker, m_nowPlayingSpeakerDark, m_collaborativeOn;
qint64 m_lastClicked; qint64 m_lastClicked;
QMap< int, SourceTreeItem::DropType > m_dropTypeMap; QMap< int, SourceTreeItem::DropType > m_dropTypeMap;
QMap< int, QString > m_dropTypeTextMap; QMap< int, QString > m_dropTypeTextMap;
QMap< int, QPixmap > m_dropTypeImageMap; QMap< int, QPixmap > m_dropTypeImageMap;