Bump to 0.8.3rc3.

CMakeLists.txt

@@ -39,7 +39,7 @@ ENDIF()
 SET( TOMAHAWK_VERSION_MAJOR 0 )
 SET( TOMAHAWK_VERSION_MINOR 8 )
 SET( TOMAHAWK_VERSION_PATCH 3 )
-SET( TOMAHAWK_VERSION_RC 1 )
+SET( TOMAHAWK_VERSION_RC 3 )
 
 SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs da de en el es fi fr hi_IN hu gl id it ja lt nl pl pt_BR ro ru sq sv th tr uk vi zh_CN zh_TW )
 

ChangeLog

@@ -7,6 +7,7 @@ Version 0.8.3:
     * Fixed repeat one/all icons.
     * Be more lenient about accepting JSPF and M3U playlists.
     * Improved support for compilation albums.
+    * (Windows) Fixed support for Windows XP.
     * (OS X) Fixed settings dialog appearance on Yosemite.
     * (OS X) Fixed SSL errors on Yosemite.
 

src/libtomahawk/Album.cpp

@@ -201,15 +201,14 @@ Album::id() const
     Q_D( const Album );
     s_idMutex.lockForRead();
     const bool waiting = d->waitingForId;
-    unsigned int finalId = d->id;
     s_idMutex.unlock();
 
     if ( waiting )
     {
-        finalId = d->idFuture.result();
+        d->idFuture.waitForFinished();
 
         s_idMutex.lockForWrite();
-        d->id = finalId;
+        d->id = d->idFuture.result();
         d->waitingForId = false;
 
         if ( d->id > 0 )
@@ -218,7 +217,7 @@ Album::id() const
         s_idMutex.unlock();
     }
 
-    return finalId;
+    return d->id;
 }
 
 

src/libtomahawk/Artist.cpp

@@ -338,12 +338,10 @@ Artist::id() const
 //        qDebug() << Q_FUNC_INFO << "Asked for artist ID and NOT loaded yet" << m_name << m_idFuture.isFinished();
         m_idFuture.waitForFinished();
 //        qDebug() << "DONE WAITING:" << m_idFuture.resultCount() << m_idFuture.isResultReadyAt( 0 ) << m_idFuture.isCanceled() << m_idFuture.isFinished() << m_idFuture.isPaused() << m_idFuture.isRunning() << m_idFuture.isStarted();
-        unsigned int finalid = m_idFuture.result();
-
 //        qDebug() << Q_FUNC_INFO << "Got loaded artist:" << m_name << finalid;
 
         s_idMutex.lockForWrite();
-        m_id = finalid;
+        m_id = m_idFuture.result();
         m_waitingForFuture = false;
 
         if ( m_id > 0 )

src/libtomahawk/playlist/ColumnView.cpp

@@ -135,14 +135,7 @@ ColumnView::setTreeModel( TreeModel* model )
 
     guid(); // this will set the guid on the header
 
-    if ( m_proxyModel->style() == PlayableProxyModel::Fancy )
-    {
-        setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    }
-    else
-    {
-        setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
-    }
+    setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
 
     connect( model, SIGNAL( changed() ), this, SIGNAL( modelChanged() ) );
     emit modelChanged();

src/libtomahawk/playlist/GridView.cpp

@@ -248,12 +248,10 @@ GridView::resizeEvent( QResizeEvent* event )
 
 void GridView::wheelEvent( QWheelEvent* e )
 {
-#ifndef Q_WS_MAC
     //HACK: Workaround for QTBUG-7232: Smooth scrolling (scroll per pixel) in ItemViews
     //      does not work as expected.
     verticalScrollBar()->setSingleStep( delegate()->itemSize().height() / 8 );
                                      // ^ scroll step is 1/8 of the estimated row height
-#endif
 
     QListView::wheelEvent( e );
 }

src/libtomahawk/playlist/PlayableProxyModel.cpp

@@ -699,10 +699,10 @@ PlayableProxyModel::updateDetailedInfo( const QModelIndex& index )
     {
         item->query()->track()->cover( QSize( 0, 0 ) );
 
-        if ( style() == PlayableProxyModel::Fancy )
+/*        if ( style() == PlayableProxyModel::Fancy )
         {
             item->query()->track()->loadSocialActions();
-        }
+        }*/
     }
 }
 

src/libtomahawk/playlist/TrackView.cpp

@@ -87,9 +87,11 @@ TrackView::TrackView( QWidget* parent )
     setContextMenuPolicy( Qt::CustomContextMenu );
 
     m_timer.setInterval( SCROLL_TIMEOUT );
-    connect( verticalScrollBar(), SIGNAL( rangeChanged( int, int ) ), SLOT( onViewChanged() ) );
-    connect( verticalScrollBar(), SIGNAL( valueChanged( int ) ), SLOT( onViewChanged() ) );
-    connect( &m_timer, SIGNAL( timeout() ), SLOT( onScrollTimeout() ) );
+
+    // enable those connects if you want to enable lazily loading extra information for visible items
+//    connect( verticalScrollBar(), SIGNAL( rangeChanged( int, int ) ), SLOT( onViewChanged() ) );
+//    connect( verticalScrollBar(), SIGNAL( valueChanged( int ) ), SLOT( onViewChanged() ) );
+//    connect( &m_timer, SIGNAL( timeout() ), SLOT( onScrollTimeout() ) );
 
     connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
     connect( this, SIGNAL( customContextMenuRequested( const QPoint& ) ), SLOT( onCustomContextMenu( const QPoint& ) ) );

src/tomahawk/TomahawkApp.cpp

@@ -194,7 +194,7 @@ TomahawkApp::init()
     f.setPointSize( 10 );
 #endif
 #ifdef Q_OS_MAC
-    f.setPointSize( f.pointSize() - 2 );
+    f.setPointSize( f.pointSize() - 1 );
 #endif
 
     setFont( f );

src/tomahawk/TomahawkWindow.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
  *   Copyright 2012,      Teo Mrnjavac <teo@kde.org>
@@ -1425,7 +1425,7 @@ TomahawkWindow::showAboutTomahawk()
          .arg( TomahawkUtils::appFriendlyVersion() );
 #endif
 
-    const QString copyright( tr( "Copyright 2010 - 2014" ) );
+    const QString copyright( tr( "Copyright 2010 - 2015" ) );
     const QString thanksto( tr( "Thanks to:" ) );
 
     desc = QString( "%1<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"

src/tomahawk/sourcetree/SourceTreeView.cpp

@@ -107,7 +107,7 @@ SourceTreeView::SourceTreeView( QWidget* parent )
 
     // TODO animation conflicts with the expanding-playlists-when-collection-is-null
     // so investigate
-//     setAnimated( true );
+    setAnimated( false );
 
     m_delegate = new SourceDelegate( this );
     connect( m_delegate, SIGNAL( latchOn( Tomahawk::source_ptr ) ), SLOT( latchOnOrCatchUp( Tomahawk::source_ptr ) ) );