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

List:       kde-commits
Subject:    extragear/multimedia/amarok [BROKEN EMAIL]
From:       Gav Wood <gav () indigoarchive ! net>
Date:       2005-11-08 13:56:11
Message-ID: 1131458171.954742.4662.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 478941 by gav:

More slight Moodbar changes:
   Made it impossible to have Moodbar column in playlist when Moodbar not enabled.


 M  +4 -0      README  
 M  +7 -6      src/playlist.cpp  
 M  +1 -0      src/playlist.h  
 M  +1 -1      src/playlistitem.cpp  
 M  +1 -0      src/playlistwindow.cpp  


--- trunk/extragear/multimedia/amarok/README #478940:478941
@@ -110,7 +110,11 @@
       (CD burning support)
       http://www.k3b.org
 
+    * Exscalibar >= 1.0.1
+      (Moodbar support)
+      http://www.sf.net/projects/exscalibar
 
+
 Please note, if compiling from source you must also install the devel versions
 of these packages.
 --------------------------------------------------------------------------------
--- trunk/extragear/multimedia/amarok/src/playlist.cpp #478940:478941
@@ -249,7 +249,7 @@
         , m_itemToReallyCenter( 0 )
         , m_renameItem( 0 )
         , m_lockStack( 0 )
-        , m_columnFraction( 15, 0 )
+        , m_columnFraction( PlaylistItem::NUM_COLUMNS, 0 )
 {
     s_instance = this;
 
@@ -290,7 +290,7 @@
     addColumn( i18n( "Score"      ),   0 );
     addColumn( i18n( "Type"       ),   0 );
     addColumn( i18n( "Playcount"  ),   0 );
-    addColumn( i18n( "Moodbar"    ),  AmarokConfig::showMoodbar() ? 40 : 0 );
+    addColumn( i18n( "Moodbar"    ),  AmarokConfig::showMoodbar() ? 100 : 0 );
 
     setRenameable( 0, false ); //TODO allow renaming of the filename
     setRenameable( 1 );
@@ -2079,10 +2079,11 @@
         popup.setItemEnabled( HIDE, mouseOverColumn != -1 );
 
         for( int i = 0; i < columns(); ++i ) //columns() references a property
-        {
-            popup.insertItem( columnText( i ), i, i + 1 );
-            popup.setItemChecked( i, columnWidth( i ) != 0 );
-        }
+            if(i != PlaylistItem::Moodbar || AmarokConfig::showMoodbar())
+            {
+                popup.insertItem( columnText( i ), i, i + 1 );
+                popup.setItemChecked( i, columnWidth( i ) != 0 );
+            }
 
         //TODO for 1.2.1
         //popup.insertSeparator();
--- trunk/extragear/multimedia/amarok/src/playlist.h #478940:478941
@@ -139,6 +139,7 @@
         friend class UrlLoader;
         friend class QueueManager;
         friend class QueueLabel;
+        friend class PlaylistWindow;
         friend void amaroK::DcopPlaylistHandler::removeCurrentTrack(); //calls \
removeItem() and currentTrack()  friend void PlaylistWindow::init(); //setting up \
connections etc.  friend TrackToolTip::TrackToolTip();
--- trunk/extragear/multimedia/amarok/src/playlistitem.cpp #478940:478941
@@ -535,7 +535,7 @@
     //p->translate( 2, 0 ); width -= 3;
 
     // Don't try to draw if width or height is 0, as this crashes Qt
-    if( !painter || !listView() || width == 0 || height() == 0 )
+    if( !painter || !listView() || width <= 0 || height() == 0 )
         return;
 
     static const QImage currentTrackLeft  = locate( "data", \
                "amarok/images/currenttrack_bar_left.png" );
--- trunk/extragear/multimedia/amarok/src/playlistwindow.cpp #478940:478941
@@ -469,6 +469,7 @@
         ContextBrowser::instance()->unsetFont();
         break;
     }
+    Playlist::instance()->setColumnWidth( PlaylistItem::Moodbar, \
AmarokConfig::showMoodbar() ? 100 : 0 );  }
 
 


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