[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok/src
From:       Alexandre Pereira de Oliveira <alexnewmail-bugs () yahoo ! com ! br>
Date:       2005-04-22 18:51:34
Message-ID: 20050422185134.BB1B25FA () office ! kde ! org
[Download RAW message or body]

CVS commit by aoliveira: 

In context browser, show prettyTile when the song has no title tag (instead of " - \
                ").
BUG: 95606


  M +28 -16    contextbrowser.cpp   1.448


--- kdeextragear-1/amarok/src/contextbrowser.cpp  #1.447:1.448
@@ -1363,7 +1363,10 @@ bool CurrentTrackJob::doJob()
         albumImageTitleAttr = i18n( "Click for information from amazon.%1, \
right-click for menu." ).arg( CoverManager::amazonTld() );  
-    m_HTMLSource.append( QStringx(
+    m_HTMLSource.append(
         "<div id='current_box' class='box'>"
             "<div id='current_box-header' class='box-header'>"
+            // Show "Title - Artist \n Album", or only "PrettyTitle" if there's no \
title tag +            + ( !currentTrack.title().isEmpty()
+            ? QStringx(
                 "<span id='current_box-header-songname' \
                class='box-header-title'>%1</span> "
                 "<span id='current_box-header-separator' \
class='box-header-title'>-</span> " @@ -1398,5 +1401,14 @@ bool \
CurrentTrackJob::doJob()  << escapeHTMLAttr( currentTrack.album() )
             << escapeHTMLAttr( currentTrack.title() )
-            << escapeHTML( locate( "data", "amarok/images/musicbrainz.png" ) ) ) );
+                << escapeHTML( locate( "data", "amarok/images/musicbrainz.png" ) ) )
+            : QString ( //no title
+                "<span id='current_box-header-prettytitle' \
class='box-header-prettytitle'>%1</span> " +                "</div>"
+                "<table id='current_box-table' class='box-body' width='100%' \
cellpadding='0' cellspacing='0'>" +                    "<tr>"
+                        "<td id='current_box-information-td' align='right'>"
+                )
+                .arg( escapeHTML( currentTrack.prettyTitle() ) )
+            ) );
 
     if ( !values.isEmpty() )


[prev in list] [next in list] [prev in thread] [next in thread]