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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/widgets
From:       Kevin Funk <krf () gmx ! de>
Date:       2009-01-08 23:28:39
Message-ID: 1231457319.573360.12441.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 907947 by kfunk:

Move volume info to grid and fix some logic

 M  +5 -1      TrackTooltip.cpp  
 M  +4 -5      TrackTooltip.h  


--- trunk/extragear/multimedia/amarok/src/widgets/TrackTooltip.cpp #907946:907947
@@ -152,6 +152,7 @@
 
     if( m_track )
     {
+        m_tooltip.clear();
         m_haspos = false;
 
         QStringList left, right;
@@ -159,6 +160,9 @@
 
         QString filename = "", title = ""; //special case these, put the first one \
encountered on top  
+        right << QString("<i>%1%</i>").arg( The::engineController()->volume() );
+        left << "<i>Volume</i>";
+
         const float score = m_track->score();
         if( score > 0.f )
         {
@@ -204,7 +208,7 @@
             left << i18n( "Length" );
         }
 
-        m_tooltip = i18n( "<i>Volume: %1%</i>", QString::number( \
The::engineController()->volume() ) ); +//        m_tooltip = i18n( "<i>Volume: \
                %1%</i>", QString::number( The::engineController()->volume() ) );
         //NOTE it seems to be necessary to <center> each element indivdually
         m_tooltip += "<table cellpadding='2' cellspacing='2' align='center'><tr>";
 
--- trunk/extragear/multimedia/amarok/src/widgets/TrackTooltip.h #907946:907947
@@ -37,14 +37,14 @@
         TrackToolTip( QWidget* parent );
         ~TrackToolTip();
         static TrackToolTip* instance();
-    
+
         void show( const QPoint &bottomRight );
 
         //Reimplemented from Meta::Observer
         using Observer::metadataChanged;
         void metadataChanged( Meta::TrackPtr track );
         void metadataChanged( Meta::AlbumPtr album );
-    
+
     public slots:
        void hide(); 
 
@@ -67,7 +67,7 @@
         void clear();
         QString tooltip() const;
         void updateWidgets();
-    
+
         static TrackToolTip *s_instance;
 
         QList<QWidget> m_widgets;
@@ -77,7 +77,7 @@
         bool           m_haspos;
         QString        m_title;
         QTimer*        m_timer;
-            
+
         QLabel *m_imageLabel;
         QPixmap m_image;
         QLabel *m_titleLabel;
@@ -85,4 +85,3 @@
 };
 
 #endif
-


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