* Properly fix time display in stable.

CMakeLists.txt

@@ -16,7 +16,7 @@ SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
 
 SET( TOMAHAWK_VERSION_MAJOR 0 )
 SET( TOMAHAWK_VERSION_MINOR 4 )
-SET( TOMAHAWK_VERSION_PATCH 0 )
+SET( TOMAHAWK_VERSION_PATCH 1 )
 
 #SET( TOMAHAWK_VERSION_RC 0 )
 

ChangeLog

@@ -1,38 +1,48 @@
+Version 0.4.1:
+    * Fixed various crashes.
+    * Fixed issues with auto-updating XSPF playlists.
+    * Double-clicking a playlist starts playing it.
+    * Resolvers can now return disc number and album position for results.
+    * Fixed sorting playlists by track number.
+    * Fixed issues with changing proxy.
+    * Fixed Twitter authentication issues.
+    * Fixed Grooveshark support on Windows.
+
 Version 0.4.0:
-  * Added visual notification for database indexing job.
-  * Fixed icons not appearing in resolvers list.
-  * Fixed various UI glitches and stray error messages in stations.
-  * Fixed bug where album page would resolve bottom-to-top.
-  * Fixed bug where Footnotes would not update when changing selected album in Album View.
-  * Fixed dragging albums and artists from charts, album, and artist views.
-  * Fixed bug where filter text would be one step behind filter value.
-  * Fixed bug where resolvers would enable themselves after auto-updating.
-  * Fixed occasional crash when dropping tracks onto New Station item.
-  * Added jump-to-current-track support for search results page. 
-  * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
-  * Fixed non-resolving tracks when dragging from album view.
-  * Fixed /Volumes directory not showing up on OS X.
-  * Fixed fetching album covers for albums with special characters.
-  * Show errors and continue gracefully when resolved audio is not available.
-  * Fixed various crashes on exit.
-  * Added basic command-line options for playback control.
-  * Bumped up web api timeouts to allow web clients to finish resolving.
-  * Added filename suggestion when exporting a playlist.
-  * Cleaned up highlighting of artist names in album view.
-  * Cleaned up alignment of playlist items.
-  * Fixed potential crash when searching.
-  * Added support for disc number.
-  * Added SoundCloudWall.com charts.
-  * Added ability to "lock on" to a user when listening along, to skip along.
-  * Fixed bug where loved tracks would be refreshed much too often.
-  * Fixed startup crash on OS X.
-  * Fixed some font size issues.
-  * Sped up Tomahawk startup by moving chart loading into a separate thread.
-  * Added support for parsing Grooveshark and Tinysong tracks and playlists.
-  * Reorganized sidebar to follow more logical item groupings.
-  * Added artist and album results to global searches.
-  * Fixed style and contrast issues when using GTK styles.
-  * Fixed paths to artwork when using MPRIS2 interface.
+    * Added visual notification for database indexing job.
+    * Fixed icons not appearing in resolvers list.
+    * Fixed various UI glitches and stray error messages in stations.
+    * Fixed bug where album page would resolve bottom-to-top.
+    * Fixed bug where Footnotes would not update when changing selected album in Album View.
+    * Fixed dragging albums and artists from charts, album, and artist views.
+    * Fixed bug where filter text would be one step behind filter value.
+    * Fixed bug where resolvers would enable themselves after auto-updating.
+    * Fixed occasional crash when dropping tracks onto New Station item.
+    * Added jump-to-current-track support for search results page. 
+    * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
+    * Fixed non-resolving tracks when dragging from album view.
+    * Fixed /Volumes directory not showing up on OS X.
+    * Fixed fetching album covers for albums with special characters.
+    * Show errors and continue gracefully when resolved audio is not available.
+    * Fixed various crashes on exit.
+    * Added basic command-line options for playback control.
+    * Bumped up web api timeouts to allow web clients to finish resolving.
+    * Added filename suggestion when exporting a playlist.
+    * Cleaned up highlighting of artist names in album view.
+    * Cleaned up alignment of playlist items.
+    * Fixed potential crash when searching.
+    * Added support for disc number.
+    * Added SoundCloudWall.com charts.
+    * Added ability to "lock on" to a user when listening along, to skip along.
+    * Fixed bug where loved tracks would be refreshed much too often.
+    * Fixed startup crash on OS X.
+    * Fixed some font size issues.
+    * Sped up Tomahawk startup by moving chart loading into a separate thread.
+    * Added support for parsing Grooveshark and Tinysong tracks and playlists.
+    * Reorganized sidebar to follow more logical item groupings.
+    * Added artist and album results to global searches.
+    * Fixed style and contrast issues when using GTK styles.
+    * Fixed paths to artwork when using MPRIS2 interface.
  
 Version 0.3.3:
     * Automatically load Super Collection tracks when no official release

src/audiocontrols.cpp

@@ -237,6 +237,7 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
     ui->timeLabel->setText( TomahawkUtils::timeToString( 0 ) );
     ui->timeLeftLabel->setFixedWidth( ui->timeLeftLabel->fontMetrics().width( QString( duration.length() + 1, QChar( '0' ) ) ) );
     ui->timeLeftLabel->setText( "-" + duration );
+    m_lastTextSecondShown = 0;
 
     ui->stackedLayout->setCurrentWidget( ui->pauseButton );
 
@@ -361,6 +362,14 @@ AudioControls::onPlaybackStopped()
 void
 AudioControls::onPlaybackTimer( qint64 msElapsed )
 {
+    const int seconds = msElapsed / 1000;
+    if ( seconds != m_lastTextSecondShown && !m_currentTrack.isNull() )
+    {
+        ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
+        ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
+        m_lastTextSecondShown = seconds;
+    }
+    
     //tDebug( LOGEXTRA ) << Q_FUNC_INFO << "msElapsed =" << msElapsed << "and timer current time =" << m_sliderTimeLine.currentTime() << "and m_seekMsecs =" << m_seekMsecs;
     if ( msElapsed > 0 && msElapsed != m_lastSliderCheck && m_seekMsecs == -1 && msElapsed - 500 < m_lastSliderCheck )
         return;
@@ -377,10 +386,6 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
     if ( sender() != &m_phononTickCheckTimer )
         m_phononTickCheckTimer.start( 1000 );
 
-    const int seconds = msElapsed / 1000;
-    ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
-    ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
-
     if ( m_noTimeChange )
     {
         if ( m_sliderTimeLine.currentTime() != msElapsed )

src/audiocontrols.h

@@ -100,6 +100,7 @@ private:
     qint64 m_seekMsecs;
     qint64 m_lastSliderCheck;
     bool m_noTimeChange;
+    qint64 m_lastTextSecondShown;
 };
 
 #endif // AUDIOCONTROLS_H

src/tomahawkwindow.cpp

@@ -741,11 +741,21 @@ TomahawkWindow::setWindowTitle( const QString& title )
 void
 TomahawkWindow::showAboutTomahawk()
 {
-    QMessageBox::about( this, tr( "About Tomahawk" ),
-                        tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>Copyright 2010 - 2012<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"
-                            "Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson" )
-                        .arg( TomahawkUtils::appFriendlyVersion() )
-                        .arg( qApp->applicationVersion() ) );
+    QString head, desc;
+
+#ifdef DEBUG_BUILD
+    head = tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>" )
+         .arg( TomahawkUtils::appFriendlyVersion() )
+         .arg( qApp->applicationVersion() );
+#else
+    head = tr( "<h2><b>Tomahawk %1</h2>" )
+         .arg( TomahawkUtils::appFriendlyVersion() );
+#endif
+
+    desc = tr( "Copyright 2010 - 2012<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"
+               "Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson" );
+
+    QMessageBox::about( this, tr( "About Tomahawk" ), head + desc );
 }