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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Nikolaj Hald Nielsen <nhnFreespirit () gmail ! com>
Date:       2009-07-08 9:34:23
Message-ID: 1247045663.576589.10879.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 993199 by nhnielsen:

Use new hover info images for podcast and user playlist category

 M  +9 -13     browsers/playlistbrowser/PlaylistCategory.cpp  
 M  +2 -2      browsers/playlistbrowser/PodcastCategory.cpp  
 M  +2 -0      images/CMakeLists.txt  


--- trunk/extragear/multimedia/amarok/src/browsers/playlistbrowser/PlaylistCategory.cpp \
#993198:993199 @@ -25,7 +25,6 @@
 #include "statusbar/StatusBar.h"
 #include "UserPlaylistModel.h"
 
-
 #include <KAction>
 #include <KIcon>
 #include <KLineEdit>
@@ -33,6 +32,7 @@
 #include <QGridLayout>
 #include <QHeaderView>
 #include <QLabel>
+#include <KStandardDirs>
 #include <QToolBar>
 #include <QVBoxLayout>
 
@@ -47,13 +47,9 @@
 
     setLongDescription( i18n( "Create, edit, organize and load playlists. Amarok \
automatically adds any playlists found when scanning your collection, and any \
playlists that you save are also shown here." ) );  
-    KIconLoader loader;
-    setImagePath( loader.iconPath( "view-media-playlist", -128, true ) );
+    setImagePath( KStandardDirs::locate( "data", \
"amarok/images/hover_info_user_playlists.png" ) );  
-
-
-    
-    setContentsMargins(0,0,0,0);
+    setContentsMargins( 0, 0, 0, 0 );
     m_toolBar = new QToolBar( this );
     m_toolBar->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
 
@@ -62,12 +58,12 @@
     m_playlistView = new UserPlaylistTreeView( m_groupedProxy, this );
 //    m_playlistView = new UserPlaylistTreeView( The::userPlaylistModel(), this );
     m_playlistView->setFrameShape( QFrame::NoFrame );
-    m_playlistView->setContentsMargins(0,0,0,0);
+    m_playlistView->setContentsMargins( 0, 0, 0, 0 );
     m_playlistView->header()->hide();
 
-    m_playlistView->setDragEnabled(true);
-    m_playlistView->setAcceptDrops(true);
-    m_playlistView->setDropIndicatorShown(true);
+    m_playlistView->setDragEnabled( true );
+    m_playlistView->setAcceptDrops( true );
+    m_playlistView->setDropIndicatorShown( true );
 
     m_playlistView->setEditTriggers( QAbstractItemView::NoEditTriggers );
 
@@ -75,7 +71,7 @@
 
     m_playlistView->setAlternatingRowColors( true );
 
-    m_addGroupAction = new KAction( KIcon("folder-new" ), i18n( "Add Folder" ), this \
); +    m_addGroupAction = new KAction( KIcon( "folder-new" ), i18n( "Add Folder" ), \
this  );  m_toolBar->addAction( m_addGroupAction );
     connect( m_addGroupAction, SIGNAL( triggered( bool ) ),
              m_playlistView, SLOT( createNewGroup() ) );
@@ -105,7 +101,7 @@
     connect( this, SIGNAL( closeClicked() ), this, SLOT( delayedDestruct() ) );
     connect( this, SIGNAL( hidden() ), this, SLOT( delayedDestruct() ) );
     connect( this, SIGNAL( cancelClicked() ), this, SLOT( delayedDestruct() ) );
-    connect( m_streamUrl, SIGNAL( textChanged(const QString &) ), this, SLOT( \
slotTextChanged( const QString& ))); +    connect( m_streamUrl, SIGNAL( \
textChanged(const QString &) ), this, SLOT( slotTextChanged( const QString& ) ) );  \
enableButtonOk( false );  show();
 }
--- trunk/extragear/multimedia/amarok/src/browsers/playlistbrowser/PodcastCategory.cpp \
#993198:993199 @@ -46,6 +46,7 @@
 #include <KAction>
 #include <KMenu>
 #include <KIcon>
+#include <KStandardDirs>
 
 #include <typeinfo>
 
@@ -88,8 +89,7 @@
 
     setLongDescription( i18n( "Manage your podcast subscriptions and browse \
individual episodes. Downloading episodes to the disk is also done here, or you can \
tell Amarok to do so automatically." ) );  
-    KIconLoader loader;
-    setImagePath( loader.iconPath( "podcast-amarok", -128, true ) );
+    setImagePath( KStandardDirs::locate( "data", \
"amarok/images/hover_info_podcasts.png" ) );  
     
 
--- trunk/extragear/multimedia/amarok/src/images/CMakeLists.txt #993198:993199
@@ -48,6 +48,8 @@
         hover_info_files.png
         hover_info_internet.png
         hover_info_playlists.png
+        hover_info_user_playlists.png
+        hover_info_podcasts.png
         DESTINATION ${DATA_INSTALL_DIR}/amarok/images
 )
 


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