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

Remove star rating display

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-27 18:30:58 +01:00
parent c2bd1cf917
commit f9f1f358ec
3 changed files with 9 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/libtomahawk/accounts/AccountDelegate.cpp
View File

@@ -318,72 +318,19 @@ AccountDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option,
painter->drawText( descRect, Qt::AlignLeft | Qt::TextWordWrap | Qt::AlignTop, desc );
runningBottom = descRect.bottom();
if ( index.data( AccountModel::CanRateRole ).toBool() )
// TODO: Readd download count
QString versionString = index.data( AccountModel::VersionRole ).toString();
if ( !versionString.isEmpty() )
{
// rating stars
const int rating = index.data( AccountModel::RatingRole ).toInt();
// int runningEdge = opt.rect.right() - 2*PADDING - ratingWidth;
int runningEdge = textRect.left();
// int starsTop = opt.rect.bottom() - 3*PADDING - m_ratingStarNegative.height();
int starsTop = runningBottom + PADDING;
for ( int i = 1; i < 6; i++ )
{
QRect r( runningEdge, starsTop, STAR_SIZE, STAR_SIZE );
// QRect r( runningEdge, opt.rect.top() + PADDING, m_ratingStarPositive.width(), m_ratingStarPositive.height() );
if ( i == 1 )
m_cachedStarRects[ index ] = r;
int pkgTop = runningBottom + PADDING;
int h = painter->fontMetrics().height();
const bool userHasRated = index.data( AccountModel::UserHasRatedRole ).toBool();
if ( !userHasRated && // Show on-hover animation if the user hasn't rated it yet, and is hovering over it
m_hoveringOver > -1 &&
m_hoveringItem == index )
{
if ( i <= m_hoveringOver ) // positive star
painter->drawPixmap( r, TomahawkUtils::defaultPixmap( TomahawkUtils::StarHovered, TomahawkUtils::Original, r.size() ) );
else
painter->drawPixmap( r, TomahawkUtils::defaultPixmap( TomahawkUtils::Unstarred, TomahawkUtils::Original, r.size() ) );
}
else
{
if ( i <= rating ) // positive or rated star
{
if ( userHasRated )
painter->drawPixmap( r, TomahawkUtils::defaultPixmap( TomahawkUtils::StarHovered, TomahawkUtils::Original, r.size() ) );
else
painter->drawPixmap( r, TomahawkUtils::defaultPixmap( TomahawkUtils::Starred, TomahawkUtils::Original, r.size() ) );
}
else
painter->drawPixmap( r, TomahawkUtils::defaultPixmap( TomahawkUtils::Unstarred, TomahawkUtils::Original, r.size() ) );
}
runningEdge += STAR_SIZE + PADDING_BETWEEN_STARS;
}
QRect pkgRect( runningEdge, pkgTop, h, h );
painter->drawPixmap( pkgRect, TomahawkUtils::defaultPixmap( TomahawkUtils::ResolverBundle, TomahawkUtils::Original, pkgRect.size() ) );
// downloaded num times
QString count = tr( "%1 downloads" ).arg( index.data( AccountModel::DownloadCounterRole ).toInt() );
painter->setFont( descFont );
const int countW = painter->fontMetrics().width( count );
const QRect countRect( runningEdge + 50, starsTop, countW, painter->fontMetrics().height() );
count = painter->fontMetrics().elidedText( count, Qt::ElideRight, rightEdge - PADDING - countRect.left() );
painter->drawText( countRect, Qt::AlignLeft, count );
// runningEdge = authorRect.x();
}
else //no rating, it's not attica, let's show other stuff...
{
QString versionString = index.data( AccountModel::VersionRole ).toString();
if ( !versionString.isEmpty() )
{
int runningEdge = textRect.left();
int pkgTop = runningBottom + PADDING;
int h = painter->fontMetrics().height();
QRect pkgRect( runningEdge, pkgTop, h, h );
painter->drawPixmap( pkgRect, TomahawkUtils::defaultPixmap( TomahawkUtils::ResolverBundle, TomahawkUtils::Original, pkgRect.size() ) );
QRect textRect( runningEdge + PADDING + h, pkgTop, painter->fontMetrics().width( versionString ), h );
painter->drawText( textRect, Qt::AlignLeft, versionString );
}
QRect textRect( runningEdge + PADDING + h, pkgTop, painter->fontMetrics().width( versionString ), h );
painter->drawText( textRect, Qt::AlignLeft, versionString );
}
// Title and description!
@@ -501,35 +448,6 @@ AccountDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QS
}
}
if ( m_cachedStarRects.contains( index ) )
{
QRect fullStars = m_cachedStarRects[ index ];
const int starsWidth = 5 * ( STAR_SIZE + PADDING_BETWEEN_STARS );
fullStars.setWidth( starsWidth );
QMouseEvent* me = static_cast< QMouseEvent* >( event );
if ( fullStars.contains( me->pos() ) )
{
const int eachStar = starsWidth / 5;
const int clickOffset = me->pos().x() - fullStars.x();
const int whichStar = (clickOffset / eachStar) + 1;
if ( event->type() == QEvent::MouseButtonRelease )
{
model->setData( index, whichStar, AccountModel::RatingRole );
}
else if ( event->type() == QEvent::MouseMove )
{
// 0-indexed
m_hoveringOver = whichStar;
m_hoveringItem = index;
}
return true;
}
}
if ( m_hoveringOver > -1 )
{
emit update( m_hoveringItem );

1
src/libtomahawk/accounts/AccountDelegate.h
View File

@@ -83,7 +83,6 @@ private:
int m_hoveringOver;
QPersistentModelIndex m_hoveringItem, m_configPressed;
mutable QHash< QPersistentModelIndex, QRect > m_cachedButtonRects;
mutable QHash< QPersistentModelIndex, QRect > m_cachedStarRects;
mutable QHash< QPersistentModelIndex, QRect > m_cachedConfigRects;
mutable QHash< QPersistentModelIndex, QSize > m_sizeHints;
mutable QHash< QPersistentModelIndex, AnimatedSpinner* > m_loadingSpinners;

37
src/libtomahawk/accounts/AccountModel.cpp
View File

@@ -264,8 +264,6 @@ AccountModel::data( const QModelIndex& index, int role ) const
return c.author();
case RowTypeRole:
return TopLevelAccount;
case RatingRole:
return c.rating() / 20; // rating is out of 100
case DownloadCounterRole:
return c.downloads();
case CanRateRole:
@@ -411,8 +409,6 @@ AccountModel::data( const QModelIndex& index, int role ) const
return hasAttica;
case AuthorRole:
return hasAttica ? content.author() : QString();
case RatingRole:
return hasAttica ? content.rating() / 20 : 0; // rating is out of 100
case DownloadCounterRole:
return hasAttica ? content.downloads() : QVariant();
case RowTypeRole:
@@ -595,39 +591,6 @@ AccountModel::setData( const QModelIndex& index, const QVariant& value, int role
return false;
}
if ( role == RatingRole )
{
// We only support rating Attica resolvers for the moment.
Attica::Content content;
if ( node->type == AccountModelNode::AtticaType )
{
content = node->atticaContent;
AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( content );
// For now only allow rating if a resolver is installed!
if ( state != AtticaManager::Installed && state != AtticaManager::NeedsUpgrade )
return false;
} // Allow rating custom attica accounts regardless as user may have installed manually
else if ( node->type == AccountModelNode::CustomAccountType && qobject_cast< CustomAtticaAccount* >( node->customAccount ) )
content = qobject_cast< CustomAtticaAccount* >( node->customAccount )->atticaContent();
Q_ASSERT( !content.id().isNull() );
if ( AtticaManager::instance()->userHasRated( content ) )
return false;
content.setRating( value.toInt() * 20 );
AtticaManager::instance()->uploadRating( content );
if ( node->type == AccountModelNode::AtticaType )
node->atticaContent = content;
emit dataChanged( index, index );
return true;
}
return false;
}