FCL/sf/app/musicplayer: comparison mpviewplugins/mpcollectionviewplugin/src/mpcollectionpopuphandler.cpp

equal deleted inserted replaced

-:b95ddb5a0d10
+:eff9df3d9c98
 // INCLUDE FILES
 #include <hbaction.h>
 #include <hbmenu.h>
 #include <hbmessagebox.h>
+#include <hbprogressdialog.h>
 #include <hbselectiondialog.h>
 #include <hbinputdialog.h>
 #include <hblabel.h>
 #include <hblistview.h>
 #include <hbscrollbar.h>
-#include "mpengine.h"
+#include "mpenginefactory.h"
 #include "mpcollectionview.h"
 #include "mpmpxcollectiondata.h"
 #include "mpcollectiondatamodel.h"
-#include "mpmpxcollectionviewdefs.h"
+#include "mpcollectiontbonelistdatamodel.h"
 #include "mpcollectionpopuphandler.h"
 #include "mptrace.h"
 const int KNullIndex = -1;
+const int KSongsToDisplayProgressDlg = 100;
+// Popups launched by this class
+const QString KContextMenu = QString( "ContextMenu" );
+const QString KProgressDialog = QString( "ProgressDialog" );
+const QString KAddToPlaylistSelectionDialog = QString( "AddToPlaylistSelectionDialog" );
+const QString KInputTextDialog = QString( "InputTextDialog" );
+const QString KGetModelIndexesListDialog = QString( "GetModelIndexesListDialog" );
+const QString KArrangeSongsDialog = QString( "ArrangeSongsDialog" );
+const QString KRequestDeleteMessageBox = QString( "RequestDeleteMessageBox" );
+// Popups Actions
+const QString KOk = QString( "Ok" );
+const QString KCancel = QString( "Cancel" );
+const QString KNew = QString( "New" );
+const QString KOpen = QString( "Open" );
+const QString KAdd = QString( "Add" );
+const QString KDelete = QString( "Delete" );
+const QString KRenamePlayList = QString( "RenamePlayList" );
+//------------------------------------------------------------------
+//    MpPopupHandlerPermanentData
+//------------------------------------------------------------------
+/*!
+\class MpPopupHandlerPermanentData. This class is used by MpCollectionPopupHandler to
+store permanent data needed during asynchronous popups operation.
+*/
+class MpPopupHandlerPermanentData : public QObject
+{
+public:
+MpPopupHandlerPermanentData( QObject *parent=0 );
+virtual ~MpPopupHandlerPermanentData();
+void clear();
+public:
+MpMpxCollectionData         *mIsolatedCollectionData;        // Not own
+QAbstractItemModel          *mAbstractItemModel;             // Own
+QList<int>                  mSelectedItems;
+QString                     mOriginalName;
+int                         mContextMenuIndex;
+};
+/*!
+Constructs the popup handler permanent data.
+*/
+MpPopupHandlerPermanentData::MpPopupHandlerPermanentData( QObject *parent )
+: QObject( parent ),
+mIsolatedCollectionData( 0 ),
+mAbstractItemModel( 0 ),
+mContextMenuIndex( KNullIndex )
+{
+TX_ENTRY
+mSelectedItems.clear();
+mOriginalName.clear();
+TX_EXIT
+}
+/*!
+Destructs the popup handler permanent data.
+*/
+MpPopupHandlerPermanentData::~MpPopupHandlerPermanentData()
+{
+TX_ENTRY
+clear();
+TX_EXIT
+}
+/*!
+\internal
+Clears all permanent data.
+*/
+void MpPopupHandlerPermanentData::clear()
+{
+TX_ENTRY
+mSelectedItems.clear();
+mOriginalName.clear();
+mContextMenuIndex = KNullIndex;
+if ( mIsolatedCollectionData ) {
+MpEngineFactory::sharedEngine()->releaseIsolatedCollection();
+mIsolatedCollectionData = 0;
+}
+if ( mAbstractItemModel ) {
+delete mAbstractItemModel;
+mAbstractItemModel = 0;
+}
+//clearing any child Objects.
+foreach (QObject* child, children()) {
+child->deleteLater();
+}
+TX_EXIT
+}
+//------------------------------------------------------------------
+//    MpCollectionPopupHandler
+//------------------------------------------------------------------
 /*!
 \class MpCollectionPopupHandler
 \brief Music Player collection popup handler.
 MpCollectionPopupHandler::MpCollectionPopupHandler( MpCollectionView *parent )
 : QObject( parent ),
 mView( parent ),
 mOutstandingPopup( 0 ),
 mMpEngine( 0 ),
-mPermanentData( 0 )
+mPermanentData( 0 ),
-{
+mExternalEventsConnected( false )
-TX_ENTRY
+{
-mMpEngine = MpEngine::instance();
+TX_ENTRY
+mMpEngine = MpEngineFactory::sharedEngine();
 mPermanentData = new MpPopupHandlerPermanentData( this );
 TX_EXIT
 }
 /*!
 Default view context menu.
 */
 void MpCollectionPopupHandler::openDefaultViewContextMenu( int index, const QPointF &coords )
 {
 TX_ENTRY
-HbMenu *contextMenu = 0;
-HbAction *action;
+if ( mView->isActivated() ) {
-bool usbBlocked = mMpEngine->verifyUsbBlocking();
+HbMenu *contextMenu = 0;
-switch ( mMpEngine->collectionData()->context() ) {
+HbAction *action;
-case ECollectionContextAllSongs:
+bool usbBlocked = mMpEngine->verifyUsbBlocking();
-case ECollectionContextArtistSongs:
-case ECollectionContextAlbumSongs:
+switch ( mMpEngine->collectionData()->context() ) {
-contextMenu = new HbMenu();
+case ECollectionContextAllSongs:
-action = contextMenu->addAction( hbTrId( "txt_common_menu_play_music" ) );
+case ECollectionContextArtistAllSongs:
-action->setObjectName( "open" );
+case ECollectionContextArtistAlbumsTBone:
-action = contextMenu->addAction( hbTrId( "txt_mus_menu_add_to_playlist" ) );
+case ECollectionContextAlbumsTBone:
-action->setObjectName( "add" );
+contextMenu = new HbMenu();
-action->setEnabled( !usbBlocked );
+action = contextMenu->addAction( hbTrId( "txt_common_menu_play_music" ) );
-action = contextMenu->addAction( hbTrId( "txt_common_menu_delete" ) );
+action->setObjectName( KOpen );
-action->setObjectName( "delete" );
+action = contextMenu->addAction( hbTrId( "txt_mus_menu_add_to_playlist" ) );
-action->setEnabled( !usbBlocked );
+action->setObjectName( KAdd );
-break;
+action->setEnabled( !usbBlocked );
-case ECollectionContextAlbums:
+action = contextMenu->addAction( hbTrId( "txt_common_menu_delete" ) );
-case ECollectionContextArtists:
+action->setObjectName( KDelete );
-case ECollectionContextArtistAlbums:
+action->setEnabled( !usbBlocked );
-contextMenu = new HbMenu();
+break;
-action = contextMenu->addAction( hbTrId( "txt_common_menu_open" ) );
+case ECollectionContextAlbums:
-action->setObjectName( "open" );
+case ECollectionContextArtists:
-action = contextMenu->addAction( hbTrId( "txt_mus_menu_add_to_playlist" ) );
+case ECollectionContextArtistAlbums:
-action->setObjectName( "add" );
-action->setEnabled( !usbBlocked );
-action = contextMenu->addAction( hbTrId( "txt_common_menu_delete" ) );
-action->setObjectName( "delete" );
-action->setEnabled( !usbBlocked );
-break;
-case ECollectionContextPlaylists:
-if ( !mMpEngine->collectionData()->isAutoPlaylist( index ) ) {
 contextMenu = new HbMenu();
 action = contextMenu->addAction( hbTrId( "txt_common_menu_open" ) );
-action->setObjectName( "open" );
+action->setObjectName( KOpen );
+action = contextMenu->addAction( hbTrId( "txt_mus_menu_add_to_playlist" ) );
+action->setObjectName( KAdd );
+action->setEnabled( !usbBlocked );
 action = contextMenu->addAction( hbTrId( "txt_common_menu_delete" ) );
-action->setObjectName("delete");
+action->setObjectName( KDelete );
 action->setEnabled( !usbBlocked );
-action = contextMenu->addAction( hbTrId( "txt_common_menu_rename_item" ) );
+break;
-action->setObjectName( "rename playlist" );
+case ECollectionContextPlaylists:
-action->setEnabled( !usbBlocked );
+if ( !mMpEngine->collectionData()->isAutoPlaylist( index ) ) {
-}
+contextMenu = new HbMenu();
-break;
+action = contextMenu->addAction( hbTrId( "txt_common_menu_open" ) );
-case ECollectionContextPlaylistSongs:
+action->setObjectName( KOpen );
-if ( !mMpEngine->collectionData()->isAutoPlaylist() ) {
+action = contextMenu->addAction( hbTrId( "txt_common_menu_delete" ) );
+action->setObjectName(KDelete);
+action->setEnabled( !usbBlocked );
+action = contextMenu->addAction( hbTrId( "txt_common_menu_rename_item" ) );
+action->setObjectName( KRenamePlayList );
+action->setEnabled( !usbBlocked );
+}
+break;
+case ECollectionContextPlaylistSongs:
+if ( !mMpEngine->collectionData()->isAutoPlaylist() ) {
+contextMenu = new HbMenu();
+action = contextMenu->addAction( hbTrId( "txt_common_menu_play_music" ) );
+action->setObjectName( KOpen );
+action = contextMenu->addAction( hbTrId( "txt_common_menu_remove" ) );
+action->setObjectName( KDelete );
+action->setEnabled( !usbBlocked );
+}
+break;
+default:
+break;
+}
+if ( contextMenu ) {
+mPermanentData->mContextMenuIndex = index;
+contextMenu->setPreferredPos( coords );
+contextMenu->setObjectName( KContextMenu );
+contextMenu->setAttribute( Qt::WA_DeleteOnClose );
+setOutstandingPopup( contextMenu );
+contextMenu->open( this, SLOT( defaultContextMenuOptionSelected( HbAction* ) ) );
+}
+}
+TX_EXIT
+}
+/*!
+Fetch view context menu
+*/
+void MpCollectionPopupHandler::openFetchViewContextMenu( int index, const QPointF &coords )
+{
+TX_ENTRY_ARGS( "index=" << index );
+if ( mView->isActivated() ) {
+HbAction *action;
+HbMenu *contextMenu = 0;
+switch ( mMpEngine->collectionData()->context() ) {
+case ECollectionContextAllSongs:
+case ECollectionContextArtistAlbumsTBone:
+case ECollectionContextArtistAllSongs:
+case ECollectionContextAlbumsTBone:
+case ECollectionContextPlaylistSongs:
 contextMenu = new HbMenu();
-action = contextMenu->addAction( hbTrId( "txt_common_menu_play_music" ) );
+action = contextMenu->addAction( hbTrId("txt_common_menu_play_music") );
-action->setObjectName( "open" );
+action->setEnabled( !mMpEngine->verifyUsbBlocking() );
-action = contextMenu->addAction( hbTrId( "txt_common_menu_remove" ) );
+break;
-action->setObjectName( "delete" );
+default:
-action->setEnabled( !usbBlocked );
+break;
 }
-break;
-default:
+if ( contextMenu ) {
-break;
-}
-if ( contextMenu ) {
-if ( mView->isActivated() ) {
 mPermanentData->mContextMenuIndex = index;
 contextMenu->setPreferredPos( coords );
 contextMenu->setAttribute( Qt::WA_DeleteOnClose );
+contextMenu->setObjectName( KContextMenu );
 setOutstandingPopup( contextMenu );
-contextMenu->open( this, SLOT( defaultContextMenuOptionSelected( HbAction* ) ) );
+contextMenu->open( this, SLOT( fetcherContextMenuOptionSelected( HbAction* ) ) );
-}
-else {
-delete contextMenu;
-contextMenu = 0;
-}
-}
-TX_EXIT
-}
-/*!
-Fetch view context menu
-*/
-void MpCollectionPopupHandler::openFetchViewContextMenu( int index, const QPointF &coords )
-{
-TX_ENTRY_ARGS( "index=" << index );
-HbAction *action;
-HbMenu *contextMenu = 0;
-switch ( mMpEngine->collectionData()->context() ) {
-case ECollectionContextAllSongs:
-case ECollectionContextArtistSongs:
-case ECollectionContextAlbumSongs:
-case ECollectionContextPlaylistSongs:
-case ECollectionContextGenreSongs:
-contextMenu = new HbMenu();
-action = contextMenu->addAction( hbTrId("txt_common_menu_play_music") );
-action->setEnabled( mMpEngine->verifyUsbBlocking() );
-break;
-default:
-break;
-}
-if ( contextMenu ) {
-if ( mView->isActivated() ) {
-mPermanentData->mContextMenuIndex = index;
-contextMenu->setPreferredPos( coords );
-contextMenu->setAttribute( Qt::WA_DeleteOnClose );
-setOutstandingPopup( contextMenu );
-contextMenu->open( this, SLOT( fetcherContextMenuOptionSelected( HbAction* ) ) );
-}
-else {
-delete contextMenu;
-contextMenu = 0;
 }
 }
 TX_EXIT
 }
 SLOT( handleAddSongsToPlayList( HbAction* ) ) );
 TX_EXIT
 }
 /*!
+Request to select songs to add to the playlist from TBone
+*/
+void MpCollectionPopupHandler::openAddSongsToPlaylistFromTBone( )
+{
+TX_ENTRY
+MpCollectionTBoneListDataModel *model;
+model = new MpCollectionTBoneListDataModel( mMpEngine->collectionData() );
+//this item will be deleted when clearing permanent data.
+model->setParent(mPermanentData);
+model->refreshModel();
+getModelIndexes( hbTrId( "txt_mus_title_select_songs" ), model,
+SLOT( handleAddSongsToPlayList( HbAction* ) ) );
+TX_EXIT
+}
+/*!
 Request to select songs to be deleted
 */
 void MpCollectionPopupHandler::openDeleteSongs( QAbstractItemModel* model )
 {
 TX_ENTRY
 }
 /*!
 Request to reorder songs
 */
-void MpCollectionPopupHandler::openArrangeSongs( MpMpxCollectionData* collectionData )
+void MpCollectionPopupHandler::openArrangeSongs( )
 {
 TX_ENTRY
-launchArrangeSongsDialog( collectionData );
+launchArrangeSongsDialog();
 TX_EXIT
 }
 /*!
 Closes any active popup
 */
-void MpCollectionPopupHandler::cancelOngoingPopup()
+void MpCollectionPopupHandler::cancelOngoingPopup( bool onlyContextMenu )
 {
 TX_ENTRY
 if ( mOutstandingPopup ) {
-mOutstandingPopup->close();
+if ( onlyContextMenu ) {
+if ( mOutstandingPopup->objectName() == KContextMenu ) {
-//Delete/Clear permanent data until current popup gets deleted
+mOutstandingPopup->close();
-mPermanentData->setParent( mOutstandingPopup );
+mPermanentData->clear();
-//Generate new permanent data for future popups
+}
-mPermanentData = new MpPopupHandlerPermanentData( this );
+}
+else {
+mOutstandingPopup->close();
+//Delete/Clear permanent data until current popup gets deleted
+mPermanentData->setParent( mOutstandingPopup );
+//Generate new permanent data for future popups
+mPermanentData = new MpPopupHandlerPermanentData( this );
+}
 }
 else {
 mPermanentData->clear();
 }
+TX_EXIT
-TX_EXIT
-}
-/*!
-TODO: Workaround for HbListView multiple events: longPress and activated. Remove once HbListView get fixed (wk16)
-*/
-bool MpCollectionPopupHandler::showingPopup()
-{
-return mOutstandingPopup;
 }
 /*!
 Slot to be called when an option has been selected from default context menu.
 */
 TX_ENTRY
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
 QList<int> selection;
 selection.append( mPermanentData->mContextMenuIndex );
-if ( objectName == "open" ) {
+if ( objectName == KOpen ) {
 mView->openItem( mPermanentData->mContextMenuIndex );
 }
-if ( objectName == "add" ) {
+if ( objectName == KAdd ) {
 launchAddToPlaylistDialog( selection );
 }
-else if ( objectName == "delete" ) {
+else if ( objectName == KDelete ) {
 requestDelete( selection );
 }
-else if ( objectName == "rename playlist" ) {
+else if ( objectName == KRenamePlayList ) {
 QString currentName;
 currentName = mMpEngine->collectionData()->itemData(
 mPermanentData->mContextMenuIndex, MpMpxCollectionData::Title );
 openRenamePlaylistItemDialog( currentName );
 }
 clearOutstandingPopup( dialog );
 bool operationCompleted( true );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "new" ) {
+if ( objectName == KNew ) {
 QStringList playlists;
 mMpEngine->findPlaylists( playlists );
 queryNewPlaylistName( playlists, SLOT( handleAddToPlaylistGetTextFinished( HbAction* ) ) );
 operationCompleted = false;
 }
 clearOutstandingPopup( dialog );
 bool operationCompleted( true );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QString newPlaylistName = dialog->value().toString();
 if ( newPlaylistName.length() ) {
 //Create new playlist with given name
 mMpEngine->createPlaylist( newPlaylistName, mPermanentData->mSelectedItems );
 }
 clearOutstandingPopup( dialog );
 bool operationCompleted( true );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QString newPlaylistName = dialog->value().toString();
 if ( newPlaylistName.length() ) {
 if ( newPlaylistName != mPermanentData->mOriginalName ) {
 mMpEngine->renamePlaylist( newPlaylistName );
 }
 clearOutstandingPopup( dialog );
 bool operationCompleted( true );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QString newPlaylistName = dialog->value().toString();
 if ( newPlaylistName.length() ) {
 if ( newPlaylistName != mPermanentData->mOriginalName ) {
 mMpEngine->renamePlaylist( newPlaylistName, mPermanentData->mContextMenuIndex );
 }
 HbSelectionDialog *dialog = qobject_cast<HbSelectionDialog *>( sender() );
 clearOutstandingPopup( dialog );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QModelIndexList selectedModelIndexes;
 selectedModelIndexes = dialog->selectedModelIndexes();
 if ( selectedModelIndexes.count() ) {
 QList<int> selection;
 for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
 selection.append( selectedModelIndexes.at( i ).row() );
 }
 launchAddToPlaylistDialog( selection );
 }
 }
+else {
+mPermanentData->clear();
+}
 }
 //Dialog is using CollectionView main model, avoid dialog destructor to alter it.
 dialog->setModel( 0 );
 HbSelectionDialog *dialog = qobject_cast<HbSelectionDialog *>( sender() );
 clearOutstandingPopup( dialog );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QModelIndexList selectedModelIndexes;
 selectedModelIndexes = dialog->selectedModelIndexes();
 if ( selectedModelIndexes.count() ) {
 QList<int> selection;
 for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
 HbSelectionDialog *dialog = qobject_cast<HbSelectionDialog *>( sender() );
 clearOutstandingPopup( dialog );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QModelIndexList selectedModelIndexes;
 selectedModelIndexes = dialog->selectedModelIndexes();
 if ( selectedModelIndexes.count() ) {
 QList<int> selection;
 for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
 clearOutstandingPopup( dialog );
 bool operationCompleted( true );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QString newPlaylistName = dialog->value().toString();
 if ( newPlaylistName.length() ) {
 //Store the new playlist name and query for the items to be added
 mPermanentData->mOriginalName = newPlaylistName;
 getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),
 HbSelectionDialog *dialog = qobject_cast<HbSelectionDialog *>( sender() );
 clearOutstandingPopup( dialog );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 QList<int> selection;
 QModelIndexList selectedModelIndexes;
 selectedModelIndexes = dialog->selectedModelIndexes();
 if ( selectedModelIndexes.count() ) {
 for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
 HbMessageBox *dialog = qobject_cast<HbMessageBox *>( sender() );
 clearOutstandingPopup( dialog );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
-if ( objectName == "ok" ) {
+if ( objectName == KOk ) {
 mMpEngine->deleteSongs( mPermanentData->mSelectedItems );
 }
 selectedAction->setEnabled( false );
 }
 mPermanentData->clear();
+TX_EXIT
+}
+/*!
+Slot called upon notification from MpEngine indicating start of
+deleting process.
+*/
+void MpCollectionPopupHandler::handleDeleteStarted( TCollectionContext context, int count )
+{
+TX_ENTRY
+if ( context == ECollectionContextPlaylistSongs ) {
+if (count >= KSongsToDisplayProgressDlg) {  //show progress dialog if removing more than 100 songs
+launchProgressDialog( "txt_mus_info_removing_songs" );
+}
+}
+else if (context != ECollectionContextPlaylists ) {  //no progress dialog for delete playlist
+launchProgressDialog( "txt_mus_info_deleting" );
+}
+TX_EXIT
+}
+/*!
+Slot called upon notification from MpEngine indicating 'count' songs are going to be added.
+*/
+void MpCollectionPopupHandler::handleAddingSongs( int count )
+{
+TX_ENTRY
+if ( count >= KSongsToDisplayProgressDlg )
+{
+HbProgressDialog *addSongsWaitNote = new HbProgressDialog( HbProgressDialog::WaitDialog );
+connect( addSongsWaitNote, SIGNAL( cancelled() ), mMpEngine, SLOT( cancelCollectionRequest() ) );
+addSongsWaitNote->setModal( true );
+addSongsWaitNote->setText( hbTrId( "txt_mus_info_adding_songs" ) );
+addSongsWaitNote->setObjectName( KProgressDialog );
+addSongsWaitNote->setAttribute( Qt::WA_DeleteOnClose );
+setOutstandingPopup( addSongsWaitNote );
+addSongsWaitNote->show();
+}
+TX_EXIT
+}
+/*!
+Slot called upon notification from MpEngine indicating end of
+deleting or adding process.
+*/
+void MpCollectionPopupHandler::handleOperationEnded( bool success )
+{
+TX_ENTRY
+Q_UNUSED( success );
+if ( mOutstandingPopup && ( mOutstandingPopup->objectName() == KProgressDialog ) ) {
+HbProgressDialog *dialog = qobject_cast<HbProgressDialog *>( mOutstandingPopup );
+dialog->cancel();
+}
 TX_EXIT
 }
 /*!
 Slot to be called when a popup is getting closed. Usefull when a dialog is closed before it finishes
 Launches the 'Add to playlist' dialog.
 */
 void MpCollectionPopupHandler::launchAddToPlaylistDialog( QList<int> &selection )
 {
 TX_ENTRY
-if (!mView->isActivated()) {
-mPermanentData->clear();
-return;
-}
 QStringList playlists;
 mPermanentData->mSelectedItems = selection;
 mMpEngine->findPlaylists( playlists );
 if ( playlists.count() ) {
 //There are saved playlists, query for a saved playlist or new.
 dialog->setStringItems( playlists );
 dialog->setSelectionMode( HbAbstractItemView::SingleSelection );
 dialog->setHeadingWidget(new HbLabel( hbTrId( "txt_mus_title_select_playlist" ) ) );
 dialog->clearActions();
 action = new HbAction( hbTrId( "txt_mus_button_new" ) );
-action->setObjectName( "new" );
+action->setObjectName( KNew );
 dialog->addAction( action );
 action = new HbAction( hbTrId( "txt_common_button_cancel" ) );
-action->setObjectName( "cancel" );
+action->setObjectName( KCancel );
 dialog->addAction( action );
+dialog->setObjectName( KAddToPlaylistSelectionDialog );
 dialog->setAttribute( Qt::WA_DeleteOnClose );
 setOutstandingPopup( dialog );
 dialog->open( this, SLOT( handleAddToPlaylistDialogFinished( HbAction* ) ) );
 }
 else {
 */
 void MpCollectionPopupHandler::getText( const QString &label, const QString &text,
 const char *handler )
 {
 TX_ENTRY
-if ( !mView->isActivated() ) {
-mPermanentData->clear();
-return;
-}
 HbAction *action;
 HbInputDialog *dialog = new HbInputDialog();
 dialog->setPromptText( label );
 dialog->setInputMode( HbInputDialog::TextInput );
 dialog->setValue( text );
 dialog->clearActions();
 action = new HbAction( hbTrId( "txt_common_button_ok" ) );
-action->setObjectName( "ok" );
+action->setObjectName( KOk );
 dialog->addAction( action );
 action = new HbAction( hbTrId( "txt_common_button_cancel" ) );
-action->setObjectName( "cancel" );
+action->setObjectName( KCancel );
 dialog->addAction( action );
+dialog->setObjectName( KInputTextDialog );
 dialog->setAttribute( Qt::WA_DeleteOnClose );
 setOutstandingPopup( dialog );
 dialog->open( this, handler );
 TX_EXIT
 }
 void MpCollectionPopupHandler::getModelIndexes( const QString &label, QAbstractItemModel* model,
 const char *handler)
 {
 TX_ENTRY
-if ( !mView->isActivated() ) {
+connectExternalEvents();
-mPermanentData->clear();
-return;
-}
 HbAction *action;
 HbSelectionDialog *dialog = new HbSelectionDialog();
 dialog->setHeadingWidget( new HbLabel( label ) );
 dialog->setSelectionMode( HbAbstractItemView::MultiSelection );
 dialog->setModel( model );
 dialog->clearActions();
 action = new HbAction( hbTrId( "txt_common_button_ok" ) );
-action->setObjectName( "ok" );
+action->setObjectName( KOk );
 dialog->addAction( action );
 action = new HbAction( hbTrId( "txt_common_button_cancel" ) );
-action->setObjectName( "cancel" );
+action->setObjectName( KCancel );
 dialog->addAction( action );
+dialog->setObjectName( KGetModelIndexesListDialog );
 dialog->setAttribute( Qt::WA_DeleteOnClose );
 setOutstandingPopup( dialog );
 dialog->open( this, handler );
 TX_EXIT
 }
 /*!
 \internal
 Launches a list dialog to reorder them.
-\a collectionData Base to generate dialog's model.
+*/
-*/
+void MpCollectionPopupHandler::launchArrangeSongsDialog()
-void MpCollectionPopupHandler::launchArrangeSongsDialog( MpMpxCollectionData* collectionData )
 {
 TX_ENTRY
-if ( !mView->isActivated() ) {
-return;
-}
 HbListView *listView = new HbListView();
 listView->setItemRecycling( true );
 listView->setScrollingStyle( HbListView::PanOrFlick );
 listView->setClampingStyle( HbListView::BounceBackClamping );
 scrollbar->show();
 scrollbar->setInteractive( true);
 listView->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAsNeeded);
 MpCollectionDataModel *model;
 //Ownership of the model is passed to the listView as a child object.
-model = new MpCollectionDataModel( collectionData, listView );
+model = new MpCollectionDataModel( mMpEngine->collectionData() , listView );
 model->refreshModel();
 connect( model,
 SIGNAL( orderChanged( int, int, int, int ) ),
 mMpEngine,
 SLOT( reorderPlaylist( int, int, int, int ) ) );
 dialog->setContentWidget( listView );
 dialog->clearActions();
 HbAction *action;
 action = new HbAction( hbTrId( "txt_common_button_ok" ) );
 dialog->addAction( action );
+dialog->setObjectName( KArrangeSongsDialog );
 dialog->setAttribute( Qt::WA_DeleteOnClose );
 setOutstandingPopup(dialog);
 dialog->open( this, SLOT( handleArrangeSongs( HbAction* ) ) );
 TX_EXIT
 {
 TX_ENTRY
 QString message;
 mPermanentData->mSelectedItems = selection;
 bool needsConfirmation = true;
+connectExternalEvents();
 switch ( mMpEngine->collectionData()->context() ) {
 case ECollectionContextAllSongs:
-case ECollectionContextArtistSongs:
+case ECollectionContextArtistAlbumsTBone:
-case ECollectionContextAlbumSongs:
+case ECollectionContextArtistAllSongs:
+case ECollectionContextAlbumsTBone:
 message = hbTrId( "txt_mus_delete_song" );
 break;
 case ECollectionContextArtists:
 message = hbTrId( "txt_mus_delete_artist" );
 break;
 break;
 case ECollectionContextPlaylists:
 message = hbTrId( "txt_mus_delete_playlist" );
 break;
 case ECollectionContextPlaylistSongs:
-case ECollectionContextGenres:
-case ECollectionContextGenreSongs:
 needsConfirmation = false;
 mMpEngine->deleteSongs( mPermanentData->mSelectedItems );
 mPermanentData->clear();
 break;
 case ECollectionContextUnknown:
 TX_LOG_ARGS( "Invalid Collection Context" );
 break;
 }
 if ( needsConfirmation ) {
-if ( !mView->isActivated() ) {
-mPermanentData->clear();
-return;
-}
 HbAction *action;
 HbMessageBox *dialog = new HbMessageBox( HbMessageBox::MessageTypeQuestion );
 dialog->setText( message );
 dialog->setTimeout( HbPopup::NoTimeout );
 dialog->clearActions();
 action = new HbAction( hbTrId( "txt_common_button_yes" ) );
-action->setObjectName( "ok" );
+action->setObjectName( KOk );
 dialog->addAction( action );
 action = new HbAction( hbTrId( "txt_common_button_no" ) );
-action->setObjectName( "cancel" );
+action->setObjectName( KCancel );
 dialog->addAction( action );
+dialog->setObjectName( KRequestDeleteMessageBox );
 dialog->setAttribute( Qt::WA_DeleteOnClose );
 setOutstandingPopup( dialog );
 dialog->open( this, SLOT( handleRequestDelete( HbAction* ) ) );
 }
 TX_EXIT
 }
-//------------------------------------------------------------------
-//    MpPopupHandlerPermanentData
-//------------------------------------------------------------------
-/*!
-Constructs the popup handler permanent data.
-*/
-MpCollectionPopupHandler::MpPopupHandlerPermanentData::MpPopupHandlerPermanentData( QObject *parent )
-: QObject( parent ),
-mIsolatedCollectionData( 0 ),
-mAbstractItemModel( 0 ),
-mContextMenuIndex( KNullIndex )
-{
-TX_ENTRY
-mSelectedItems.clear();
-mOriginalName.clear();
-TX_EXIT
-}
-/*!
-Destructs the popup handler permanent data.
-*/
-MpCollectionPopupHandler::MpPopupHandlerPermanentData::~MpPopupHandlerPermanentData()
-{
-TX_ENTRY
-clear();
-TX_EXIT
-}
 /*!
 \internal
-Clears all permanent data.
+Launches a waiting progress note.
-*/
+\a content String id to display in the dialog.
-void MpCollectionPopupHandler::MpPopupHandlerPermanentData::clear()
+*/
-{
+void MpCollectionPopupHandler::launchProgressDialog( const char *id )
-TX_ENTRY
+{
-mSelectedItems.clear();
+HbProgressDialog *deleteProgressNote = new HbProgressDialog( HbProgressDialog::WaitDialog );
-mOriginalName.clear();
+connect( deleteProgressNote, SIGNAL( cancelled() ), mMpEngine, SLOT( cancelCollectionRequest() ) );
-mContextMenuIndex = KNullIndex;
+deleteProgressNote->setModal( true );
-if ( mIsolatedCollectionData ) {
+deleteProgressNote->setDismissPolicy( HbPopup::NoDismiss );
-MpEngine::instance()->releaseIsolatedCollection();
+deleteProgressNote->setText( hbTrId( id ) );
-mIsolatedCollectionData = 0;
+deleteProgressNote->setObjectName( KProgressDialog );
-}
+deleteProgressNote->setAttribute( Qt::WA_DeleteOnClose );
-if ( mAbstractItemModel ) {
+setOutstandingPopup( deleteProgressNote );
-delete mAbstractItemModel;
+deleteProgressNote->show();
-mAbstractItemModel = 0;
+}
-}
-TX_EXIT
+/*!
-}
+\internal
+Connects MpEngine signals on demand in order to save time at start up.
+*/
+void MpCollectionPopupHandler::connectExternalEvents()
+{
+if ( !mExternalEventsConnected ) {
+connect( mMpEngine, SIGNAL( deleteStarted( TCollectionContext, int ) ),
+this, SLOT( handleDeleteStarted( TCollectionContext, int ) ) );
+connect( mMpEngine, SIGNAL( songsDeleted( bool ) ), this, SLOT( handleOperationEnded( bool ) ) );
+connect( mMpEngine, SIGNAL( aboutToAddSongs( int ) ), this, SLOT( handleAddingSongs( int ) ) );
+connect( mMpEngine, SIGNAL( playlistSaved( bool ) ), this, SLOT( handleOperationEnded( bool ) ) );
+mExternalEventsConnected = true;
+}
+}

branch	GCC_SURGE
changeset 44	eff9df3d9c98
parent 41	ea59c434026a
child 43	0f32e550d9d8