--- a/mpviewplugins/mpcollectionviewplugin/inc/mpcollectionview.h	Mon May 03 12:29:20 2010 +0300
+++ b/mpviewplugins/mpcollectionviewplugin/inc/mpcollectionview.h	Fri May 14 15:49:53 2010 +0300
@@ -38,8 +38,8 @@
 class MpMpxCollectionData;
 class MpNowPlayingWidget;
 class MpSnapshotWidget;
+class MpCollectionPopupHandler;
 class QTranslator;
-class HbPopup;
 
 class MpCollectionView : public MpViewBase
 {
@@ -54,6 +54,8 @@
     void activateView();
     void deactivateView();
     void setDefaultView();
+    bool isActivated();    
+    void openItem( int index );
 
 signals:
 
@@ -65,6 +67,7 @@
 
     void openSongs();
     void openArtists();
+    void openAlbums();
     void openPlaylists();
     void openGenres();
     void find();
@@ -91,11 +94,8 @@
 
     void prepareToAddToPlaylist();
     void handleIsolatedCollectionOpened( MpMpxCollectionData* collectionData );
-    void addToCurrentPlaylist( MpMpxCollectionData* collectionData );
-    void createNewPlaylist( MpMpxCollectionData* collectionData );
     void arrangeSongs();
     void openContextMenu( int index, const QPointF &coords );
-    void outstandingPopupClosing();
 
     void handleUsbBlocked( bool blocked );
     void handleLibraryAboutToUpdate();
@@ -103,9 +103,6 @@
 
 private:
 
-    void openDefaultViewContextMenu( int index, const QPointF &coords );
-    void openFetchViewContextMenu( int index, const QPointF &coords );
-
     void setMainToolBar();
     void setPlaylistToolBar();
 
@@ -118,13 +115,8 @@
 
     void setBannerVisibility( bool visible );
     int generateShuffleIndex();
-    void launchAddToPlaylistDialog( QList<int> &selection );
     void startContainerTransition( TCollectionContext contextFrom, TCollectionContext contextTo );
-    void requestDelete( QList<int> &selection );
-    QModelIndexList getModelIndexes( const QString &label, QAbstractItemModel* model, bool &ok );
-    QString getText(const QString &label,const QString &text, bool &ok);
-    void setOutstandingPopup(HbPopup *popup);
-    bool queryNewPlaylistName(QString &newPlaylistName , const QStringList &playlists );
+    void cancelOngoingOperation();
 
 private:
 
@@ -142,8 +134,8 @@
     bool                            mBannerAttached;
 
     HbMainWindow                    *mWindow;               // Not own
-    HbAction                        *mSoftKeyQuit;          // Not own
-    HbAction                        *mSoftKeyBack;          // Not own
+    HbAction                        *mNavigationQuit;       // Not own
+    HbAction                        *mNavigationBack;       // Not own
 
     MpCollectionDocumentLoader      *mDocumentLoader;       // Own
     HbWidget                        *mMainContainer;        // Own
@@ -157,7 +149,7 @@
     QTranslator                     *mCommonTranslator;     // Own
 
     bool                            mActivationWaiting;
-    HbPopup                         *mOutstandingPopup;     // Not own
+    MpCollectionPopupHandler        *mMpPopupHandler;       // Own
 
     bool                            mUsbBlocked;