SVN commit 996109 by dmeltzer:

Rename and clarify the descriptions of some of the collections in the browser list.  This is up for discussion, but I feel it's an improvement.

 M  +6 -10     MainWindow.cpp  
 M  +6 -5      browsers/BrowserCategoryList.cpp  


--- trunk/extragear/multimedia/amarok/src/MainWindow.cpp #996108:996109
@@ -220,8 +220,8 @@
     m_newToolbar->setMovable ( true );
 
     addToolBar( Qt::TopToolBarArea, m_newToolbar );
-    
 
+
     PERF_LOG( "Create sidebar" )
     m_browsers = new BrowserWidget( this );
     m_browsers->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
@@ -292,14 +292,11 @@
     {
         Debug::Block block( "Creating browsers. Please report long start times!" );
 
-
-
-
         PERF_LOG( "Creating CollectionWidget" )
         m_collectionBrowser = new CollectionWidget( "collections", 0 );
-        m_collectionBrowser->setPrettyName( i18n( "Collections" ) );
+        m_collectionBrowser->setPrettyName( i18n( "Local Music" ) );
         m_collectionBrowser->setIcon( KIcon( "collection-amarok" ) );
-        m_collectionBrowser->setShortDescription( i18n( "The list of available collections" ) );
+        m_collectionBrowser->setShortDescription( i18n( "Local sources of content" ) );
         m_browsers->list()->addCategory( m_collectionBrowser );
         PERF_LOG( "Created CollectionWidget" )
 
@@ -309,7 +306,7 @@
         internetContentServiceBrowser->setParent( 0 );
         internetContentServiceBrowser->setPrettyName( i18n( "Internet" ) );
         internetContentServiceBrowser->setIcon( KIcon( "applications-internet" ) );
-        internetContentServiceBrowser->setShortDescription( i18n( "Sources of online content" ) );
+        internetContentServiceBrowser->setShortDescription( i18n( "Online sources of content" ) );
         m_browsers->list()->addCategory( internetContentServiceBrowser );
         PERF_LOG( "Created ServiceBrowser" )
 
@@ -320,7 +317,7 @@
         m_playlistBrowser = new PlaylistBrowserNS::PlaylistBrowser( "playlists", 0 );
         m_playlistBrowser->setPrettyName( i18n("Playlists") );
         m_playlistBrowser->setIcon( KIcon( "view-media-playlist-amarok" ) );
-        m_playlistBrowser->setShortDescription( i18n( "Different kinds of playlists" ) );
+        m_playlistBrowser->setShortDescription( i18n( "Various types of playlists" ) );
         m_browsers->list()->addCategory( m_playlistBrowser );
         PERF_LOG( "CreatedPlaylsitBrowser" )
 
@@ -329,7 +326,7 @@
         FileBrowser::Widget * fileBrowser = new FileBrowser::Widget( "files", 0 );
         fileBrowser->setPrettyName( i18n("Files") );
         fileBrowser->setIcon( KIcon( "folder-amarok" ) );
-        fileBrowser->setShortDescription( i18n( "Browse local files" ) );
+        fileBrowser->setShortDescription( i18n( "Browse local hard drive for content" ) );
         m_browsers->list()->addCategory( fileBrowser );
         PERF_LOG( "Created FileBrowser" )
 
@@ -340,7 +337,6 @@
         internetContentServiceBrowser->setScriptableServiceManager( The::scriptableServiceManager() );
         PERF_LOG( "ScriptableServiceManager done" )
 
-        #undef addBrowserMacro
         PERF_LOG( "finished MainWindow::init" )
     }
 
--- trunk/extragear/multimedia/amarok/src/browsers/BrowserCategoryList.cpp #996108:996109
@@ -38,10 +38,11 @@
 {
     setObjectName( name );
     setParent( parent );
-    
+
     debug() << "BrowserCategoryList named " << name << " starting...";
 
     m_searchWidget = new SearchWidget( this, this, false );
+    m_searchWidget->setClickMessage( i18n( "Filter Music Sources" ) );
 
     m_filterTimer.setSingleShot( true );
     connect( &m_filterTimer, SIGNAL( timeout() ), this, SLOT( slotFilterNow() ) );
@@ -54,7 +55,7 @@
     m_categoryListView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); // Scrolling per item is really not smooth and looks terrible
     m_categoryListView->setHorizontalScrollMode( QAbstractItemView::ScrollPerPixel ); // Scrolling per item is really not smooth and looks terrible
 #endif
-    
+
     m_categoryListView->setFrameShape( QFrame::NoFrame );
 
     m_proxyModel = new BrowserCategoryListSortFilterProxyModel( this );
@@ -69,7 +70,7 @@
     m_categoryListView->setAlternatingRowColors( true );
     m_categoryListView->setModel( m_proxyModel );
     m_categoryListView->setMouseTracking ( true );
-    
+
     connect( m_categoryListView, SIGNAL( activated( const QModelIndex & ) ), this, SLOT( categoryActivated( const QModelIndex & ) ) );
 
     connect( m_categoryListView, SIGNAL( entered( const QModelIndex & ) ), this, SLOT( categoryEntered( const QModelIndex & ) ) );
@@ -166,7 +167,7 @@
         BrowserCategoryList *childList = dynamic_cast<BrowserCategoryList*>( m_currentCategory );
         if ( childList )
             childList->home();
-        
+
         m_currentCategory->setParent( 0 );
         m_categoryListView->setParent( this );
         m_currentCategory = 0; // remove any context stuff we might have added
@@ -274,7 +275,7 @@
             return leftover;
         }
         return QString();
-        
+
     }
 
     //check if there are more arguments in the navigate string.